[opensuse-translation-commit] r96068 - branches/plus-SLE12-SP2/yast/en_GB/po

Author: keichwa Date: 2016-07-04 11:37:18 +0200 (Mon, 04 Jul 2016) New Revision: 96068 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/live-installer.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/rdp.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/reipl.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/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/vpn.en_GB.po branches/plus-SLE12-SP2/yast/en_GB/po/yast2-apparmor.en_GB.po Log: merged 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/add-on-creator.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: add-on-creator\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-03-27 19:10+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/add-on.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: add-on\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:35+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-03-27 19:11+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -89,15 +89,16 @@ msgid "<li>Media: %1, Path: %2, Product: %3</li>\n" msgstr "<li>Media: %1, Path: %2, Product: %3</li>\n" -#. error report -#: src/clients/add-on_auto.rb:185 +#. set addon specific sig-handling +#: src/clients/add-on_auto.rb:186 +msgid "Make the add-on \"%1\" available via \"%2\"." +msgstr "" + +#. just report error +#: src/clients/add-on_auto.rb:193 msgid "Failed to add add-on product." msgstr "Failed to add add-on product." -#: src/clients/add-on_auto.rb:193 -msgid "Make the add-on \"%1\" available via \"%2\"." -msgstr "" - #. placeholder for unknown path #. summary item, %1 is product name, %2 media URL, %3 directory on media #. placeholder for unknown directory 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/audit-laf.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/auth-client.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-30 10:04+0100\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -17,1193 +17,2024 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. translators: command line help text for authentication client module -#: src/clients/auth-client.rb:46 -msgid "Authentication client configuration module" -msgstr "Authentication client configuration module" +#. Edit Kerberos realm configuration +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52 +#, fuzzy +#| msgid "Realm" +msgid "Realm name" +msgstr "Realm" -#. translators: command line help text for summary action -#: src/clients/auth-client.rb:56 -msgid "Configuration summary of the authentication client" -msgstr "Configuration summary of the authentication client" +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53 +msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)" +msgstr "" -#. translators: command line help text for summary action -#: src/clients/auth-client.rb:61 -msgid "Create autoyast rnc from @parameters" -msgstr "Create autoyast rnc from @parameters" +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55 +msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)" +msgstr "" +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58 +#, fuzzy +#| msgid "Remote Administration Settings" +msgid "Host Name of Administration Server (Optional)" +msgstr "Remote Administration Settings" + +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60 +msgid "Host Name of Master Key Distribution Server (Optional)" +msgstr "" + +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:62 +msgid "Key Distribution Centres (Optional If Auto-Discovery via DNS is Enabled)" +msgstr "" + +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:68 +msgid "Custom Mappings of Principal Names to User Names" +msgstr "" + +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69 +#, fuzzy +#| msgid "Principal Container" +msgid "Principal Name" +msgstr "Principal Container" + +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69 +msgid "User Name" +msgstr "User Name" + +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:74 +msgid "Custom Rules for Mapping Principal Names to User Names" +msgstr "" + +#. Add a KDC +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:89 +#, fuzzy +#| msgid "Open ports for the Key Distribution Center" +msgid "Please type in the host name of Key Distribution Centre:" +msgstr "Open ports for the Key Distribution Centre" + +#. Add an auth_to_local +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102 +msgid "Please type in the auth_to_local rule:" +msgstr "" + +#. Add an auth_to_local_names +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115 +msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":" +msgstr "" + +#. Save realm settings +#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135 +#, fuzzy +#| msgid "Please enter your last name" +msgid "Please enter realm name." +msgstr "Enter your last name." + +#. Edit more configuration items for Kerberos. +#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48 +#, fuzzy +#| msgid "Partition of Menu File" +msgid "Default Location of Keytab File" +msgstr "Partition of Menu File" + +#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:50 +msgid "Encryption Types for TGS (Space separated)" +msgstr "" + +#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:52 +msgid "Encryption Types for Ticket (Space separated)" +msgstr "" + +#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:54 +msgid "Encryption Types for Sessions (Space separated)" +msgstr "" + +#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:56 +msgid "Additional Addresses to be put in Ticket (Comma separated)" +msgstr "" + +#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59 +#, fuzzy +#| msgid "R&eset" +msgid "Reset" +msgstr "R&eset" + +#. Edit more configuration items for LDAP. +#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53 +#, fuzzy +#| msgid "On Cable Connection" +msgid "In Case Of Connection Outage:" +msgstr "On Cable Connection" + +#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54 +msgid "Retry The Operation Endlessly" +msgstr "" + +#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:55 +msgid "Do Not Retry And Fail The Operation" +msgstr "" + +#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:57 +#, fuzzy +#| msgid "Time-Out in Tenths of Seconds" +msgid "Timeout for Bind Operations in Seconds" +msgstr "Time-Out in Tenths of Seconds" + +#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59 +#, fuzzy +#| msgid "Timeout in Seconds" +msgid "Timeout for Search Operations in Seconds" +msgstr "Timeout in Seconds" + +#. the last saved tab +#: src/lib/authui/ldapkrb/main_dialog.rb:44 +#: src/lib/authui/ldapkrb/main_dialog.rb:63 +msgid "Use a Directory as Identity Provider (LDAP)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:44 +#: src/lib/authui/ldapkrb/main_dialog.rb:67 +#, fuzzy +#| msgid "authentication via eDirectory" +msgid "Authentication via Kerberos" +msgstr "authentication via eDirectory" + +#. LDAP tab events +#: src/lib/authui/ldapkrb/main_dialog.rb:76 +msgid "" +"This computer is currently using SSSD to authenticate users.\n" +"Before you may use legacy LDAP authentication (pam_ldap), please disable SSSD from \"User Logon Management\"." +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:84 +msgid "" +"This computer is currently reading user database from SSSD identity provider.\n" +"Before you may use LDAP user database (nss_ldap), please disable SSSD user database from \"User Logon Management\"." +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:92 +msgid "" +"This computer is currently reading group database from SSSD identity provider.\n" +"Before you may use LDAP group database (nss_ldap), please disable SSSD group database from \"User Logon Management\"." +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:100 +msgid "" +"This computer is currently reading sudoers database from SSSD identity provider.\n" +"Before you may use LDAP sudoers database (nss_ldap), please disable SSSD sudo database from \"User Logon Management\"." +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:108 +msgid "" +"This computer is currently reading automount database from SSSD identity provider.\n" +"Before you may use LDAP automount database (nss_ldap), please disable SSSD automount database from \"User Logon Management\"." +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:118 +#, fuzzy +#| msgid "Please enter a new share name." +msgid "Please enter server URI." +msgstr "Please enter a new share name." + +#: src/lib/authui/ldapkrb/main_dialog.rb:126 +#, fuzzy +#| msgid "Please enter a new share name." +msgid "Please enter DN of search base." +msgstr "Please enter a new share name." + +#. Test URI input +#: src/lib/authui/ldapkrb/main_dialog.rb:133 +msgid "Successfully contacted LDAP server on URI %s!" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:135 +msgid "" +"Connection check has failed on URI %s.\n" +"\n" +"%s" +msgstr "" + +#. Test host address input, construct URI for each one. +#: src/lib/authui/ldapkrb/main_dialog.rb:154 +msgid "Successfully contacted LDAP server on host %s" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:156 +msgid "" +"Connection check has failed on host %s.\n" +"\n" +"%s" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:163 +msgid "" +"The name service cache is should only used with legacy LDAP identity provider,\n" +"but your system currently has authentication domain enabled, which is not compatible with the cache.\n" +"\n" +"Do you still wish to enable the cache?" +msgstr "" + +#. Kerberos tab events +#: src/lib/authui/ldapkrb/main_dialog.rb:176 +msgid "" +"This computer is currently using SSSD to authenticate users.\n" +"Before you may use Kerberos authentication (pam_krb5), please disable SSSD from \"User Logon Management\"." +msgstr "" + +#. Save Kerberos +#: src/lib/authui/ldapkrb/main_dialog.rb:184 +#: src/lib/authui/ldapkrb/main_dialog.rb:194 +#: src/lib/authui/ldapkrb/main_dialog.rb:205 +#: src/lib/authui/ldapkrb/main_dialog.rb:210 +#: src/lib/authui/ldapkrb/main_dialog.rb:316 +#: src/lib/authui/ldapkrb/main_dialog.rb:408 +#: src/lib/authui/ldapkrb/main_dialog.rb:432 +#, fuzzy +#| msgid "Model not specified." +msgid "(not specified)" +msgstr "Model not specified." + +#: src/lib/authui/ldapkrb/main_dialog.rb:202 +#, fuzzy +#| msgid "Are you sure you want to delete: " +msgid "Are you sure to delete realm %s?" +msgstr "Are you sure you want to delete: " + +#: src/lib/authui/ldapkrb/main_dialog.rb:334 +msgid "Allow LDAP Users To Authenticate (pam_ldap)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:335 +msgid "Cache LDAP Entries For Faster Response (nscd)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:336 +#: src/lib/authui/ldapkrb/main_dialog.rb:405 +#, fuzzy +#| msgid "Create Home Directory on Login" +msgid "Automatically Create Home Directory" +msgstr "Create Home Directory on Login" + +#: src/lib/authui/ldapkrb/main_dialog.rb:338 +msgid "Read the following items from LDAP data source:" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:339 +#: src/lib/authui/sssd/main_dialog.rb:80 +msgid "Users" +msgstr "Users" + +#: src/lib/authui/ldapkrb/main_dialog.rb:340 +#: src/lib/authui/sssd/main_dialog.rb:81 +msgid "Groups" +msgstr "Groups" + +#: src/lib/authui/ldapkrb/main_dialog.rb:341 +#: src/lib/authui/sssd/main_dialog.rb:82 +msgid "Super-User Commands (sudo)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:342 +msgid "Network Disk Locations (automount)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:344 +#, fuzzy +#| msgid "Use the LDAP server to store user information" +msgid "Enter LDAP server locations (space separated), in either format:" +msgstr "Use the LDAP server to store user information" + +#: src/lib/authui/ldapkrb/main_dialog.rb:345 +msgid "- Host name or IP and port number (ip:port)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:346 +msgid "- URI (ldap://server:port, ldaps://server:port)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:348 +msgid "DN of Search Base (e.g. dc=example,dc=com)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:352 +msgid "DN of Bind User (Leave Empty for Anonymous Bind)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:354 +msgid "Password of the Bind User (Leave Empty for Anonymous Bind)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:357 +msgid "Identify Group Members by Their DNs (RFC2307bis)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:359 +msgid "Leave LDAP Connections Open for Consecutive Requests" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:362 +#, fuzzy +#| msgid "Communication" +msgid "Secure LDAP communication" +msgstr "Communication" + +#: src/lib/authui/ldapkrb/main_dialog.rb:363 +#, fuzzy +#| msgid "Do Not Use TLS" +msgid "Do Not Use Security" +msgstr "Do Not Use TLS" + +#: src/lib/authui/ldapkrb/main_dialog.rb:364 +#, fuzzy +#| msgid "Communication" +msgid "Secure Communication via TLS" +msgstr "Communication" + +#: src/lib/authui/ldapkrb/main_dialog.rb:365 +msgid "Secure Communication via StartTLS" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:368 +#, fuzzy +#| msgid "&Test Connection" +msgid "Test Connection" +msgstr "&Test Connection" + +#: src/lib/authui/ldapkrb/main_dialog.rb:368 +#: src/lib/authui/ldapkrb/main_dialog.rb:428 +#: src/lib/authui/sssd/main_dialog.rb:186 +#, fuzzy +#| msgid "&Extended partition" +msgid "Extended Options" +msgstr "&Extended partition" + +#. If not specified, append the default port number +#: src/lib/authui/ldapkrb/main_dialog.rb:403 +#, fuzzy +#| msgid "Allows \"anonymous\" user access to authenticated areas" +msgid "Allow Kerberos Users To Authenticate (pam_krb5)" +msgstr "Allows \"anonymous\" user access to authenticated areas" + +#: src/lib/authui/ldapkrb/main_dialog.rb:407 +#, fuzzy +#| msgid "D&isable User Login" +msgid "Default Realm For User Login:" +msgstr "D&isable User Login" + +#: src/lib/authui/ldapkrb/main_dialog.rb:409 +#, fuzzy +#| msgid "Authentication Realms" +msgid "All Authentication Realms" +msgstr "Authentication Realms" + +#: src/lib/authui/ldapkrb/main_dialog.rb:411 +#, fuzzy +#| msgid "Realm" +msgid "Add Realm" +msgstr "Realm" + +#: src/lib/authui/ldapkrb/main_dialog.rb:411 +#, fuzzy +#| msgid "&Edit Default" +msgid "Edit Realm" +msgstr "&Edit Default" + +#: src/lib/authui/ldapkrb/main_dialog.rb:411 +#, fuzzy +#| msgid "Delete " +msgid "Delete Realm" +msgstr "Delete " + +#: src/lib/authui/ldapkrb/main_dialog.rb:414 +msgid "Use DNS TXT Record to Discover Realms" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:416 +msgid "Use DNS SVC record to Discover KDC servers" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:419 +msgid "Allow Insecure Encryption (Windows NT)" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:421 +msgid "Allow KDC on Other Networks to Issue Authentication Tickets" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:423 +msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User" +msgstr "" + +#: src/lib/authui/ldapkrb/main_dialog.rb:425 +msgid "Issue Address-Less Tickets for Computers Behind NAT" +msgstr "" + +#. Entry point can be :sssd, :ldapkrb, or :auto +#. In auto mode, there will be two change settings buttons. +#: src/lib/authui/main_dialog.rb:46 +#, fuzzy +#| msgid "Kerberos Client" +msgid "LDAP and Kerberos Client" +msgstr "Kerberos Client" + +#: src/lib/authui/main_dialog.rb:48 +#, fuzzy +#| msgid "User &Management" +msgid "User Logon Management" +msgstr "User &Management" + +#: src/lib/authui/main_dialog.rb:63 +#, fuzzy +#| msgid "Base Settings" +msgid "Change Settings" +msgstr "Base Settings" + +#. Allow entering both SSSD and ldapkrb settings +#: src/lib/authui/main_dialog.rb:67 +#, fuzzy +#| msgid "User Permissions Configuration" +msgid "User Logon Configuration" +msgstr "User Permissions Configuration" + +#: src/lib/authui/main_dialog.rb:68 +#, fuzzy +#| msgid "LDAP Server Configuration" +msgid "LDAP/Kerberos Configuration" +msgstr "LDAP Server Configuration" + +#. Let user choose one additional parameter to customise for domain. +#: src/lib/authui/main_dialog.rb:89 +#: src/lib/authui/sssd/extended_param_dialog.rb:54 +#: src/lib/authui/sssd/main_dialog.rb:177 +#: src/lib/authui/sssd/manage_ad_dialog.rb:98 +msgid "Name" +msgstr "Name" + +#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177 +#: src/lib/authui/sssd/manage_ad_dialog.rb:98 +msgid "Value" +msgstr "Value" + +#: src/lib/authui/main_dialog.rb:91 +#, fuzzy +#| msgid "User Name" +msgid "Computer Name" +msgstr "User Name" + +#: src/lib/authui/main_dialog.rb:92 +#, fuzzy +#| msgid "&Full User Name" +msgid "Full Computer Name" +msgstr "&Full User Name" + +#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93 +#, fuzzy +#| msgid "Supplemented resolvables" +msgid "(Name is not resolvable)" +msgstr "Supplemented resolvables" + +#: src/lib/authui/main_dialog.rb:93 +#, fuzzy +#| msgid "Network mask" +msgid "Network Domain" +msgstr "Network mask" + +#: src/lib/authui/main_dialog.rb:94 +msgid "IP Addresses" +msgstr "IP Addresses" + +#: src/lib/authui/main_dialog.rb:95 +#, fuzzy +#| msgid "Additional Domains" +msgid "Identity Domains" +msgstr "Additional Domains" + +#: src/lib/authui/sssd/extended_param_dialog.rb:54 +msgid "Description" +msgstr "Description" + +#: src/lib/authui/sssd/extended_param_dialog.rb:65 +#, fuzzy +#| msgid "&Extended partition" +msgid "Extended options" +msgstr "&Extended partition" + +#: src/lib/authui/sssd/extended_param_dialog.rb:68 +#, fuzzy +#| msgid "Filter:" +msgid "Name filter:" +msgstr "Filter:" + #. Create parameter editor controls (label, input, help text) and return them. -#: src/lib/yauthclient/initial_customisation_dialog.rb:70 +#: src/lib/authui/sssd/initial_customisation_dialog.rb:74 #, fuzzy #| msgid "None" msgid "None." msgstr "None" #. Render controls for editing parameter values, according to parameter data type. -#: src/lib/yauthclient/initial_customisation_dialog.rb:105 +#: src/lib/authui/sssd/initial_customisation_dialog.rb:109 #, fuzzy #| msgid "Modem Parameters" msgid "Mandatory Parameters" msgstr "Modem Parameters" -#: src/lib/yauthclient/initial_customisation_dialog.rb:112 +#: src/lib/authui/sssd/initial_customisation_dialog.rb:116 #, fuzzy #| msgid "Optional Parameter File" msgid "Optional Parameters" msgstr "Optional Parameter File" #. Check that all mandatory parameters are set -#: src/lib/yauthclient/initial_customisation_dialog.rb:138 +#: src/lib/authui/sssd/initial_customisation_dialog.rb:142 msgid "Please complete all of the following mandatory parameters:\n" msgstr "" +#. SSSD section name to UI caption mapping +#: src/lib/authui/sssd/main_dialog.rb:40 +msgid "Global Options" +msgstr "Global Options" + +#: src/lib/authui/sssd/main_dialog.rb:40 +#, fuzzy +#| msgid "Filter:" +msgid "Name switch" +msgstr "Filter:" + +#: src/lib/authui/sssd/main_dialog.rb:41 +msgid "Authentication" +msgstr "Authentication" + +#: src/lib/authui/sssd/main_dialog.rb:41 +msgid "Sudo" +msgstr "" + +#: src/lib/authui/sssd/main_dialog.rb:42 +#, fuzzy +#| msgid "Mount" +msgid "Auto-Mount" +msgstr "Mount" + +#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84 +#, fuzzy +#| msgid "GPG Public Keys" +msgid "SSH Public Keys" +msgstr "GPG Public Keys" + +#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85 +msgid "Privilege Account Certificate (MS-PAC)" +msgstr "" + #. Render overview and edit buttons on left side, config editor on right side. -#: src/lib/yauthclient/main_dialog.rb:55 +#: src/lib/authui/sssd/main_dialog.rb:67 #, fuzzy -#| msgid "Authentication Client Configuration (sssd)" -msgid "Authentication Client Configuration" -msgstr "Authentication Client Configuration (sssd)" +#| msgid "Manage User Quota" +msgid "Manage Domain User Logon" +msgstr "Manage User Quota" -#. Overview of all config sections -#: src/lib/yauthclient/main_dialog.rb:62 -msgid "Global Configuration" -msgstr "Global Configuration" +#: src/lib/authui/sssd/main_dialog.rb:75 +#, fuzzy +#| msgid "Current Status: " +msgid "Daemon Status: " +msgstr "Current Status: " -#: src/lib/yauthclient/main_dialog.rb:65 -msgid "Create Home Directory on Login" +#: src/lib/authui/sssd/main_dialog.rb:75 +msgid "Running" +msgstr "Running" + +#: src/lib/authui/sssd/main_dialog.rb:75 +#, fuzzy +#| msgid "&Stop" +msgid "Stopped" +msgstr "&Stop" + +#: src/lib/authui/sssd/main_dialog.rb:76 +msgid "Allow Domain User Logon" +msgstr "" + +#: src/lib/authui/sssd/main_dialog.rb:77 +#, fuzzy +#| msgid "Create Home Directory on Login" +msgid "Create Home Directory" msgstr "Create Home Directory on Login" -#: src/lib/yauthclient/main_dialog.rb:68 +#: src/lib/authui/sssd/main_dialog.rb:79 #, fuzzy -#| msgid "Enable the NTP daemon" -msgid "Enable SSSD daemon" -msgstr "Enable the NTP daemon" +#| msgid "Enabling sources..." +msgid "Enable domain data source:" +msgstr "Enabling sources..." -#: src/lib/yauthclient/main_dialog.rb:73 +#: src/lib/authui/sssd/main_dialog.rb:83 +msgid "Map Network Drives (automount)" +msgstr "" + +#: src/lib/authui/sssd/main_dialog.rb:91 #, fuzzy -#| msgid "Selections" -msgid "Sections" -msgstr "Selections" +#| msgid "Domain" +msgid "Join Domain" +msgstr "Domain" -#: src/lib/yauthclient/main_dialog.rb:76 +#: src/lib/authui/sssd/main_dialog.rb:92 #, fuzzy -#| msgid "Network Services" -msgid "New Service/Domain" -msgstr "Network Services" +#| msgid "Local Domains" +msgid "Leave Domain" +msgstr "Local Domains" -#: src/lib/yauthclient/main_dialog.rb:77 +#: src/lib/authui/sssd/main_dialog.rb:93 #, fuzzy -#| msgid "Selected Service" -msgid "Delete Service/Domain" -msgstr "Selected Service" +#| msgid "Clients Domain Name" +msgid "Clear Domain Cache" +msgstr "Clients Domain Name" -#. TRANSLATORS: Label of the area used to customise parameters. -#. %s is the name of the section being customised. -#: src/lib/yauthclient/main_dialog.rb:114 -msgid "Customisation - %s" +#. Render overview of all config sections in tree. +#. For the currently selection config section, render customised parameters and values in a table. +#: src/lib/authui/sssd/main_dialog.rb:138 +#: src/lib/authui/sssd/main_dialog.rb:150 +#, fuzzy +#| msgid "Search Options" +msgid "Service Options" +msgstr "Search Options" + +#: src/lib/authui/sssd/main_dialog.rb:139 +#: src/lib/authui/sssd/main_dialog.rb:150 +#, fuzzy +#| msgid "Scan Options" +msgid "Domain Options" +msgstr "Scan Options" + +#: src/lib/authui/sssd/main_dialog.rb:151 +msgid "Select Global Options, a service, or a domain to customise." msgstr "" -#: src/lib/yauthclient/main_dialog.rb:118 -#: src/lib/yauthclient/main_dialog.rb:143 -msgid "Name" -msgstr "Name" +#. Additional widgets for a domain +#: src/lib/authui/sssd/main_dialog.rb:157 +#, fuzzy +#| msgid "Really delete this domain?" +msgid "Use this domain" +msgstr "Really delete this domain?" -#: src/lib/yauthclient/main_dialog.rb:118 -msgid "Value" -msgstr "Value" +#. Additiona widgets for an AD domain +#: src/lib/authui/sssd/main_dialog.rb:162 +#, fuzzy +#| msgid "Active Directory Server" +msgid "Enroll to Active Directory" +msgstr "Active Directory Server" -#: src/lib/yauthclient/main_dialog.rb:118 -#: src/lib/yauthclient/main_dialog.rb:143 -msgid "Description" -msgstr "Description" +#. TRANSLATORS: Label of the area used to customise parameters. +#. %s is the name of the section being customised. +#: src/lib/authui/sssd/main_dialog.rb:172 +#, fuzzy +#| msgid "Options" +msgid "Options - %s" +msgstr "Options" -#. For the currently selected config section, render list of additional parameters for customisation. -#: src/lib/yauthclient/main_dialog.rb:137 +#. Delete the chosen domain +#: src/lib/authui/sssd/main_dialog.rb:217 #, fuzzy -#| msgid "Modem Parameters" -msgid "More Parameters" -msgstr "Modem Parameters" +#| msgid "Please select a scanner from the list." +msgid "Please select a domain among the list." +msgstr "Please select a scanner from the list." -#: src/lib/yauthclient/main_dialog.rb:140 +#: src/lib/authui/sssd/main_dialog.rb:220 #, fuzzy -#| msgid "Filter:" -msgid "Name filter:" -msgstr "Filter:" +#| msgid "Do you really want to delete partition %1?" +msgid "Do you really wish to erase configuration for domain %s?" +msgstr "Do you really want to delete partition %1?" -#. Check system environment for the proper operation of SSSD -#: src/lib/yauthclient/main_dialog.rb:169 +#. Enable/disable SSSD daemon +#: src/lib/authui/sssd/main_dialog.rb:252 msgid "" -"Your system is configured for using nss_ldap.\n" -"This module is designed to configure your system via sssd.\n" -"If you continue, your nss_ldap configuration will be removed.\n" -"Do you want to continue?" +"This computer is currently using legacy LDAP or Kerberos method to authenticate users.\n" +"Before you may use SSSD to authenticate users, please disable LDAP and Kerberos authentication from \"LDAP and Kerberos Client\"." msgstr "" -"Your system is configured for using nss_ldap.\n" -"This module is designed to configure your system via sssd.\n" -"If you continue, your nss_ldap configuration will be removed.\n" -"Do you want to continue?" -#: src/lib/yauthclient/main_dialog.rb:179 +#. Enable/disable NSS password database +#: src/lib/authui/sssd/main_dialog.rb:284 msgid "" -"Your system is configured as OES client.\n" -"This module is designed to configure your system via sssd.\n" -"If you continue, your OES client configuration will be deactivated.\n" -"Do you want to continue?" +"This computer is currently reading user database from LDAP identity provider.\n" +"Before you may use SSSD user database, please disable LDAP user database from \"LDAP and Kerberos Client\"." msgstr "" -"Your system is configured as OES client.\n" -"This module is designed to configure your system via sssd.\n" -"If you continue, your OES client configuration will be deactivated.\n" -"Do you want to continue?" -#. Delete the chosen section (domain or service) -#: src/lib/yauthclient/main_dialog.rb:223 -#, fuzzy -#| msgid "You cannot delete the active profile." -msgid "You may not delete section SSSD." -msgstr "You cannot delete the active profile." +#. Enable/disable NSS group database +#: src/lib/authui/sssd/main_dialog.rb:302 +msgid "" +"This computer is currently reading group database from LDAP identity provider.\n" +"Before you may use SSSD group database, please disable LDAP group database from \"LDAP and Kerberos Client\"." +msgstr "" -#: src/lib/yauthclient/main_dialog.rb:225 -#, fuzzy -#| msgid "Do you really want to delete partition %1?" -msgid "Do you really wish to delete section %s?" -msgstr "Do you really want to delete partition %1?" +#. Enable/disable NSS sudoers database +#: src/lib/authui/sssd/main_dialog.rb:320 +msgid "" +"This computer is currently reading sudoers database from LDAP identity provider.\n" +"Before you may use SSSD sudoers database, please disable LDAP sudoers database from \"LDAP and Kerberos Client\"." +msgstr "" +#: src/lib/authui/sssd/main_dialog.rb:328 +msgid "" +"Sudo data source has been globally enabled.\n" +"Please remember to also customise \"sudo_provider\" parameter in Extended Options of each individual domain that provides sudo data." +msgstr "" + +#. Enable/disable NSS automount database +#: src/lib/authui/sssd/main_dialog.rb:342 +msgid "" +"This computer is currently reading automount database from LDAP identity provider.\n" +"Before you may use SSSD automount database, please disable LDAP automount database from \"LDAP and Kerberos Client\"." +msgstr "" + +#: src/lib/authui/sssd/main_dialog.rb:350 +msgid "" +"Automount data source has been globally enabled.\n" +"Please remember to also customise \"autofs_provider\" parameter in Extended Options of each individual domain that provides automount data." +msgstr "" + +#. Enable/disable PAC responder +#: src/lib/authui/sssd/main_dialog.rb:374 +msgid "" +"MS-PAC data source has been globally enabled.\n" +"This optional feature depends on the capabilities of your Microsoft Active Directory domain.\n" +"SSSD may fail to start if Active Directory domain lacks the support, in which case please turn off this feature." +msgstr "" + #. Forbid removal of mandatory parameters -#: src/lib/yauthclient/main_dialog.rb:269 +#: src/lib/authui/sssd/main_dialog.rb:409 msgid "This is a mandatory parameter and it may not be deleted." msgstr "" #. Warn against removal of important parameters -#: src/lib/yauthclient/main_dialog.rb:274 +#: src/lib/authui/sssd/main_dialog.rb:414 #, fuzzy #| msgid "Modem parameter details" msgid "Confirm parameter removal: " msgstr "Modem parameter details" -#: src/lib/yauthclient/main_dialog.rb:275 +#: src/lib/authui/sssd/main_dialog.rb:415 msgid "" -"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n" +"The parameter is important. Removal of the parameter may cause configuration failure.\n" "Please consult SSSD manual page before moving on.\n" -"Do you still wish to continue?" +"Do you still wish to remove the parameter?" msgstr "" #. Save settings - validate -#: src/lib/yauthclient/main_dialog.rb:305 +#: src/lib/authui/sssd/main_dialog.rb:434 #, fuzzy -#| msgid "Logging enabled" -msgid "No domain enabled" -msgstr "Logging enabled" +#| msgid "NIS domain" +msgid "No domain" +msgstr "NIS domain" -#: src/lib/yauthclient/main_dialog.rb:306 +#: src/lib/authui/sssd/main_dialog.rb:435 #, fuzzy #| msgid "" #| "There are no activated domains in the [sssd] section.\n" #| "sssd will not be started. Only local authentication will be available.\n" #| "Do you want to write this configuration?" msgid "" -"No domain has been enabled in [sssd] \"domains\" parameter.\n" -"SSSD will not start, and only local authentication will be available.\n" +"You have not configured any authentication domain, yet you chose to enable domain authentication.\n" +"SSSD will fail to start, and only local authentication will be available.\n" "Do you still wish to proceed?" msgstr "" "There are no activated domains in the [sssd] section.\n" "sssd will not be started. Only local authentication will be available.\n" "Do you want to write this configuration?" -#. user must correct the mistake -#: src/lib/yauthclient/main_dialog.rb:323 -msgid "Inactive domain(s) found" +#. Remove all SSSD cache files +#: src/lib/authui/sssd/main_dialog.rb:455 +#, fuzzy +#| msgid "No patches have been installed." +msgid "All cached data have been erased." +msgstr "No patches have been installed." + +#. The frame is shown only if AD server can be discovered or is explicitly specified +#. The frame is hidden if the module is not running in autoyast mode and AD server is not found/specified +#: src/lib/authui/sssd/manage_ad_dialog.rb:68 +msgid "Enter AD user credentials (e.g. Administrator) to enroll or re-enroll this computer:" msgstr "" -#. Render input box and dropdowns for service/domain creation -#: src/lib/yauthclient/new_section_dialog.rb:49 +#: src/lib/authui/sssd/manage_ad_dialog.rb:69 +msgid "Username" +msgstr "Username" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:70 +msgid "Password" +msgstr "Password" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:71 +msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\"" +msgstr "" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:72 +msgid "Overwrite Samba configuration to work with this AD" +msgstr "" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:76 +#: src/lib/authui/sssd/manage_ad_dialog.rb:86 +msgid "(Not applicable in AutoYast editor)" +msgstr "" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:78 +msgid " (Auto-discovered via DNS)" +msgstr "" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:82 #, fuzzy -#| msgid "Would you like to enable access to the profile repository?" -msgid "Would you like to enable another service or join a domain?" -msgstr "Would you like to enable access to the profile repository?" +#| msgid "Show error&s" +msgid "(DNS error)" +msgstr "Show error&s" -#. New service -#: src/lib/yauthclient/new_section_dialog.rb:54 -msgid "Service" -msgstr "Service" +#: src/lib/authui/sssd/manage_ad_dialog.rb:83 +msgid "" +"The name resolution service on this computer does not satisfy AD enrollment requirements.\n" +"Please configure your network environment to use AD server as the name resolver." +msgstr "" -#. New domain and provider types -#: src/lib/yauthclient/new_section_dialog.rb:58 -msgid "Domain" -msgstr "Domain" +#: src/lib/authui/sssd/manage_ad_dialog.rb:89 +msgid "Already enrolled" +msgstr "" -#: src/lib/yauthclient/new_section_dialog.rb:61 -msgid "Domain name (example.com):" +#: src/lib/authui/sssd/manage_ad_dialog.rb:91 +#, fuzzy +#| msgid "Not Installed" +msgid "Not yet enrolled" +msgstr "Not Installed" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:114 +#, fuzzy +#| msgid "Active Directory Server" +msgid "Active Directory enrollment" +msgstr "Active Directory Server" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:116 +#, fuzzy +#| msgid "Current status:" +msgid "Current status" +msgstr "Current status:" + +#: src/lib/authui/sssd/manage_ad_dialog.rb:116 +#, fuzzy +#| msgid "Writing SCPM status..." +msgid "Gathering status..." +msgstr "Writing SCPM status..." + +#. Enroll the computer, or save the enrollment details +#: src/lib/authui/sssd/manage_ad_dialog.rb:134 +#, fuzzy +#| msgid "Enter the user password." +msgid "Please enter both username and password." +msgstr "Enter the user password." + +#. join_ad will configure and apply Kerberos and then join AD +#: src/lib/authui/sssd/manage_ad_dialog.rb:144 +msgid "AD enrollment details have been saved for AutoYast. Please keep in mind that AD user password is saved in plain text." msgstr "" -#: src/lib/yauthclient/new_section_dialog.rb:64 +#: src/lib/authui/sssd/manage_ad_dialog.rb:150 +msgid "" +"Enrollment has completed successfully!\n" +"\n" +"Command output:\n" +msgstr "" + +#. If user enters this dialog once again, the details should be cleared. +#: src/lib/authui/sssd/manage_ad_dialog.rb:158 +msgid "" +"The enrollment process failed.\n" +"\n" +"Command output:\n" +msgstr "" + +#. ID provider to UI caption mapping and reversed mapping +#: src/lib/authui/sssd/new_section_dialog.rb:37 +#: src/lib/authui/sssd/new_section_dialog.rb:50 +msgid "Delegate to third-party software library (proxy_lib_name)" +msgstr "" + +#: src/lib/authui/sssd/new_section_dialog.rb:38 +#: src/lib/authui/sssd/new_section_dialog.rb:51 #, fuzzy -#| msgid "Identification:" -msgid "Identification provider:" -msgstr "Identification:" +#| msgid "&Local Database" +msgid "Local SSSD file database" +msgstr "&Local Database" -#: src/lib/yauthclient/new_section_dialog.rb:69 +#: src/lib/authui/sssd/new_section_dialog.rb:39 +#: src/lib/authui/sssd/new_section_dialog.rb:49 #, fuzzy -#| msgid "&Authentication Mode" -msgid "Authentication provider:" -msgstr "&Authentication Mode" +#| msgid "Active Directory Server" +msgid "Microsoft Active Directory" +msgstr "Active Directory Server" -#: src/lib/yauthclient/new_section_dialog.rb:72 -msgid "Activate Domain" -msgstr "Activate Domain" +#: src/lib/authui/sssd/new_section_dialog.rb:40 +#: src/lib/authui/sssd/new_section_dialog.rb:48 +#, fuzzy +#| msgid "Free" +msgid "FreeIPA" +msgstr "Free" -#. Create new service -#: src/lib/yauthclient/new_section_dialog.rb:105 +#: src/lib/authui/sssd/new_section_dialog.rb:41 +#: src/lib/authui/sssd/new_section_dialog.rb:46 +msgid "Generic directory service (LDAP)" +msgstr "" + +#: src/lib/authui/sssd/new_section_dialog.rb:47 #, fuzzy -#| msgid "These services will be enabled" -msgid "There are no more services to be enabled." -msgstr "These services will be enabled" +#| msgid "Write Kerberos settings" +msgid "Generic Kerberos service" +msgstr "Write Kerberos settings" +#: src/lib/authui/sssd/new_section_dialog.rb:52 +#, fuzzy +#| msgid "The username to be used for proxy authentication" +msgid "The domain does not provide authentication service" +msgstr "The username to be used for proxy authentication" + +#. New domain and provider types +#: src/lib/authui/sssd/new_section_dialog.rb:75 +#, fuzzy +#| msgid "Domain name cannot be empty." +msgid "Domain name (such as example.com):" +msgstr "Domain name cannot be empty." + +#: src/lib/authui/sssd/new_section_dialog.rb:78 +msgid "Which service provides identity data, such as user names and group memberships?" +msgstr "" + +#: src/lib/authui/sssd/new_section_dialog.rb:83 +#, fuzzy +#| msgid "The username to be used for proxy authentication" +msgid "Which service handles user authentication?" +msgstr "The username to be used for proxy authentication" + +#: src/lib/authui/sssd/new_section_dialog.rb:86 +#, fuzzy +#| msgid "Unable to join the domain." +msgid "Enable the domain" +msgstr "Unable to join the domain." + #. Create new domain -#: src/lib/yauthclient/new_section_dialog.rb:123 +#: src/lib/authui/sssd/new_section_dialog.rb:106 #, fuzzy -#| msgid "Enter a name for the new profile." -msgid "Please enter a name for the new domain." -msgstr "Enter a name for the new profile." +#| msgid "Please enter a new share name." +msgid "Please enter the domain name." +msgstr "Please enter a new share name." -#: src/lib/yauthclient/new_section_dialog.rb:126 +#: src/lib/authui/sssd/new_section_dialog.rb:109 +msgid "The domain name collides with a reserved keyword. Please choose a different name." +msgstr "" + +#: src/lib/authui/sssd/new_section_dialog.rb:112 #, fuzzy #| msgid "This domain is already defined." msgid "The domain name is already in-use." msgstr "This domain is already defined." #. Define Global Parameters -#: src/lib/yauthclient/params.rb:108 -msgid "Indicates what is the syntax of the config file." -msgstr "Indicates what is the syntax of the config file." +#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user. +#: src/lib/authui/sssd/params.rb:110 +#, fuzzy +#| msgid "Boot loader configuration file contains errors" +msgid "Version of configuration file syntax (1 or 2)" +msgstr "Boot loader configuration file contains errors" -#: src/lib/yauthclient/params.rb:114 -msgid "Comma separated list of services that are started when sssd itself starts." -msgstr "Comma separated list of services that are started when sssd itself starts." - -#: src/lib/yauthclient/params.rb:115 -msgid "" -"\n" -"Supported services: nss, pam, sudo, autofs, ssh" -msgstr "" - -#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174 +#: src/lib/authui/sssd/params.rb:115 src/lib/authui/sssd/params.rb:166 msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up" msgstr "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up" -#: src/lib/yauthclient/params.rb:125 -msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." -msgstr "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." - -#: src/lib/yauthclient/params.rb:126 -msgid "This parameter contains the list of domains in the order these will be queried." -msgstr "This parameter contains the list of domains in the order these will be queried." - -#: src/lib/yauthclient/params.rb:130 -msgid "Default regular expression that describes how to parse the string containing user name and domain into these components" +#: src/lib/authui/sssd/params.rb:119 +#, fuzzy +#| msgid "Default regular expression that describes how to parse the string containing user name and domain into these components" +msgid "The regular expression parses user name and domain name into components" msgstr "Default regular expression that describes how to parse the string containing user name and domain into these components" -#: src/lib/yauthclient/params.rb:134 -msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." +#: src/lib/authui/sssd/params.rb:123 +#, fuzzy +#| msgid "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." +msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN" msgstr "The default printf(3)-compatible format that describes how to translate a (name, domain) tuple into a fully qualified name." -#: src/lib/yauthclient/params.rb:138 -msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." +#: src/lib/authui/sssd/params.rb:127 +#, fuzzy +#| msgid "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." +msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver" msgstr "SSSD monitors the state of resolv.conf to identify when it needs to update its internal DNS resolver." -#: src/lib/yauthclient/params.rb:139 -msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." -msgstr "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." - -#: src/lib/yauthclient/params.rb:143 -msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files." +#: src/lib/authui/sssd/params.rb:131 +#, fuzzy +#| msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files." +msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files" msgstr "Directory on the filesystem where SSSD should store Kerberos replay cache files." -#: src/lib/yauthclient/params.rb:147 -msgid "This string will be used as a default domain name for all names without a domain name component." +#: src/lib/authui/sssd/params.rb:135 +#, fuzzy +#| msgid "This string will be used as a default domain name for all names without a domain name component." +msgid "A default domain name for all names without a domian name component" msgstr "This string will be used as a default domain name for all names without a domain name component." #. Define Global Services Parameters -#: src/lib/yauthclient/params.rb:154 -msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." -msgstr "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." +#. NSS configuration options +#. PAM configuration options +#. SUDO configuration options +#. AUTOFS configuration options +#. SSH configuration options +#. DOMAIN SECTIONS +#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]” +#: src/lib/authui/sssd/params.rb:139 src/lib/authui/sssd/params.rb:146 +#: src/lib/authui/sssd/params.rb:188 src/lib/authui/sssd/params.rb:266 +#: src/lib/authui/sssd/params.rb:308 src/lib/authui/sssd/params.rb:320 +#: src/lib/authui/sssd/params.rb:332 src/lib/authui/sssd/params.rb:350 +msgid "Level of details for logging. Can be numeric (0-9) or a big mask such as 0x0010 (lowest level) or 0xFFF (highest level)" +msgstr "" -#: src/lib/yauthclient/params.rb:159 +#: src/lib/authui/sssd/params.rb:151 msgid "Add a timestamp to the debug messages" msgstr "Add a timestamp to the debug messages" -#: src/lib/yauthclient/params.rb:164 +#: src/lib/authui/sssd/params.rb:156 msgid "Add microseconds to the timestamp in debug messages" msgstr "Add microseconds to the timestamp in debug messages" -#: src/lib/yauthclient/params.rb:169 -msgid "Timeout in seconds between heartbeats for this service." +#: src/lib/authui/sssd/params.rb:161 +#, fuzzy +#| msgid "Timeout in seconds between heartbeats for this service." +msgid "Timeout in seconds between heartbeats for this service" msgstr "Timeout in seconds between heartbeats for this service." -#: src/lib/yauthclient/params.rb:179 -msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." +#: src/lib/authui/sssd/params.rb:171 +#, fuzzy +#| msgid "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." +msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process" msgstr "This option specifies the maximum number of file descriptors that may be opened at one time by this SSSD process." -#: src/lib/yauthclient/params.rb:184 -msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." +#: src/lib/authui/sssd/params.rb:176 +#, fuzzy +#| msgid "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." +msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication" msgstr "This option specifies the number of seconds that a client of an SSSD process can hold onto a file descriptor without communicating on it." -#: src/lib/yauthclient/params.rb:189 -msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." -msgstr "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." +#: src/lib/authui/sssd/params.rb:181 +msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure" +msgstr "" -#. NSS configuration options -#: src/lib/yauthclient/params.rb:197 +#: src/lib/authui/sssd/params.rb:193 msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?" msgstr "How many seconds should cache nss_sss enumerations (requests for info about all users)?" -#: src/lib/yauthclient/params.rb:202 +#: src/lib/authui/sssd/params.rb:198 msgid "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain." msgstr "The entry cache can be set to automatically update entries in the background if they are requested beyond a percentage of the entry_cache_timeout value for the domain." -#: src/lib/yauthclient/params.rb:207 +#: src/lib/authui/sssd/params.rb:203 msgid "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again." msgstr "Specifies for how many seconds nss_sss should cache negative cache hits (that is, queries for invalid database entries, like nonexistent ones) before asking the back end again." -#: src/lib/yauthclient/params.rb:213 +#: src/lib/authui/sssd/params.rb:209 #, fuzzy #| msgid "Exclude certain users from being fetched from the sss NSS database." msgid "Exclude certain users from being fetched by SSS backend" msgstr "Exclude certain users from being fetched from the sss NSS database." -#: src/lib/yauthclient/params.rb:219 +#: src/lib/authui/sssd/params.rb:215 #, fuzzy #| msgid "Exclude certain groups from being fetched from the sss NSS database." msgid "Exclude certain groups from being fetched by SSS backend" msgstr "Exclude certain groups from being fetched from the sss NSS database." -#: src/lib/yauthclient/params.rb:224 +#: src/lib/authui/sssd/params.rb:220 msgid "If you want filtered user to still be group members set this option to false." msgstr "If you want filtered user to still be group members set this option to false." -#: src/lib/yauthclient/params.rb:228 +#: src/lib/authui/sssd/params.rb:224 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/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185 +#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1209 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." -#: src/lib/yauthclient/params.rb:236 +#: src/lib/authui/sssd/params.rb:232 msgid "Override the login shell for all users." msgstr "Override the login shell for all users." -#: src/lib/yauthclient/params.rb:240 +#: src/lib/authui/sssd/params.rb:236 msgid "Restrict user shell to one of the listed values." msgstr "Restrict user shell to one of the listed values." -#: src/lib/yauthclient/params.rb:244 +#: src/lib/authui/sssd/params.rb:240 msgid "Replace any instance of these shells with the shell_fallback" msgstr "Replace any instance of these shells with the shell_fallback" -#: src/lib/yauthclient/params.rb:249 +#: src/lib/authui/sssd/params.rb:245 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/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189 +#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1213 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." -#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301 +#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301 msgid "Specifies time in seconds for which the list of subdomains will be considered valid." msgstr "Specifies time in seconds for which the list of subdomains will be considered valid." -#: src/lib/yauthclient/params.rb:263 +#: src/lib/authui/sssd/params.rb:259 msgid "Specifies time in seconds for which records in the in-memory cache will be valid." msgstr "Specifies time in seconds for which records in the in-memory cache will be valid." -#. PAM configuration options -#: src/lib/yauthclient/params.rb:271 +#: src/lib/authui/sssd/params.rb:271 msgid "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)." msgstr "If the authentication provider is offline, how long we should allow cached logins (in days since the last successful online login)." -#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/params.rb:281 +#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/params.rb:281 msgid "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible." msgstr "The time in minutes which has to pass after offline_failed_login_attempts has been reached before a new login attempt is possible." -#: src/lib/yauthclient/params.rb:286 +#: src/lib/authui/sssd/params.rb:286 msgid "Controls what kind of messages are shown to the user during authentication." msgstr "Controls what kind of messages are shown to the user during authentication." -#: src/lib/yauthclient/params.rb:291 +#: src/lib/authui/sssd/params.rb:291 msgid "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." 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/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788 -#: src/lib/yauthclient/params.rb:1073 +#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:811 +#: src/lib/authui/sssd/params.rb:1096 msgid "Display a warning N days before the password expires." msgstr "Display a warning N days before the password expires." -#. SUDO configuration options -#: src/lib/yauthclient/params.rb:309 +#: src/lib/authui/sssd/params.rb:313 msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries." msgstr "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries." -#. AUTOFS configuration options -#: src/lib/yauthclient/params.rb:317 +#: src/lib/authui/sssd/params.rb:325 msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again." msgstr "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again." -#. SSH configuration options -#: src/lib/yauthclient/params.rb:325 +#: src/lib/authui/sssd/params.rb:337 msgid "Whether or not to hash host names and addresses in the managed known_hosts file." msgstr "Whether or not to hash host names and addresses in the managed known_hosts file." -#: src/lib/yauthclient/params.rb:330 +#: src/lib/authui/sssd/params.rb:342 msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested." msgstr "How many seconds to keep a host in the managed known_hosts file after its host keys were requested." -#. DOMAIN SECTIONS -#. These configuration options can be present in a domain configuration section, that is, in a section called “[domain/NAME]” -#: src/lib/yauthclient/params.rb:339 src/lib/yauthclient/params.rb:344 +#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360 msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored." msgstr "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored." -#: src/lib/yauthclient/params.rb:350 +#: src/lib/authui/sssd/params.rb:366 msgid "Read all entities from backend database (increase server load)" msgstr "" -#: src/lib/yauthclient/params.rb:355 +#: src/lib/authui/sssd/params.rb:371 msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal." msgstr "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal." -#: src/lib/yauthclient/params.rb:360 +#: src/lib/authui/sssd/params.rb:376 #, fuzzy #| msgid "How many seconds nss_sss schould consider entries valid before asking the backend again." msgid "How many seconds nss_sss should consider entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider entries valid before asking the backend again." -#: src/lib/yauthclient/params.rb:365 +#: src/lib/authui/sssd/params.rb:381 #, fuzzy #| msgid "How many seconds nss_sss schould consider user entries valid before asking the backend again." msgid "How many seconds nss_sss should consider user entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider user entries valid before asking the backend again." -#: src/lib/yauthclient/params.rb:370 +#: src/lib/authui/sssd/params.rb:386 #, fuzzy #| msgid "How many seconds nss_sss schould consider group entries valid before asking the backend again." msgid "How many seconds nss_sss should consider group entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider group entries valid before asking the backend again." -#: src/lib/yauthclient/params.rb:375 +#: src/lib/authui/sssd/params.rb:391 #, fuzzy #| msgid "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again." msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider netgroup entries valid before asking the backend again." -#: src/lib/yauthclient/params.rb:380 +#: src/lib/authui/sssd/params.rb:396 #, fuzzy #| msgid "How many seconds nss_sss schould consider service entries valid before asking the backend again." msgid "How many seconds nss_sss should consider service entries valid before asking the backend again." msgstr "How many seconds nss_sss schould consider service entries valid before asking the backend again." -#: src/lib/yauthclient/params.rb:385 +#: src/lib/authui/sssd/params.rb:401 msgid "How many seconds sudo should consider rules valid before asking the backend again." msgstr "How many seconds sudo should consider rules valid before asking the backend again." -#: src/lib/yauthclient/params.rb:390 +#: src/lib/authui/sssd/params.rb:406 msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again." msgstr "How many seconds the autofs service should consider automounter maps valid before asking the backend again." -#: src/lib/yauthclient/params.rb:396 +#: src/lib/authui/sssd/params.rb:412 msgid "Cache credentials for offline use" msgstr "" -#: src/lib/yauthclient/params.rb:401 +#: src/lib/authui/sssd/params.rb:417 msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache." msgstr "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache." -#: src/lib/yauthclient/params.rb:408 +#: src/lib/authui/sssd/params.rb:424 msgid "The identification provider used for the domain." msgstr "The identification provider used for the domain." -#: src/lib/yauthclient/params.rb:413 +#: src/lib/authui/sssd/params.rb:429 msgid "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS." msgstr "Use the full name and domain (as formatted by the domain's full_name_format) as the user's login name reported to NSS." -#: src/lib/yauthclient/params.rb:420 +#: src/lib/authui/sssd/params.rb:436 msgid "The authentication provider used for the domain" msgstr "The authentication provider used for the domain" -#: src/lib/yauthclient/params.rb:426 +#: src/lib/authui/sssd/params.rb:442 msgid "The access control provider used for the domain." msgstr "The access control provider used for the domain." -#: src/lib/yauthclient/params.rb:431 +#: src/lib/authui/sssd/params.rb:447 msgid "The provider which should handle change password operations for the domain." msgstr "The provider which should handle change password operations for the domain." -#: src/lib/yauthclient/params.rb:437 +#: src/lib/authui/sssd/params.rb:453 msgid "The SUDO provider used for the domain." msgstr "The SUDO provider used for the domain." -#: src/lib/yauthclient/params.rb:443 +#: src/lib/authui/sssd/params.rb:459 msgid "The provider which should handle loading of selinux settings." msgstr "The provider which should handle loading of selinux settings." -#: src/lib/yauthclient/params.rb:449 +#: src/lib/authui/sssd/params.rb:465 msgid "The provider which should handle fetching of subdomains." msgstr "The provider which should handle fetching of subdomains." -#: src/lib/yauthclient/params.rb:455 +#: src/lib/authui/sssd/params.rb:471 msgid "The autofs provider used for the domain." msgstr "The autofs provider used for the domain." -#: src/lib/yauthclient/params.rb:461 +#: src/lib/authui/sssd/params.rb:477 msgid "The provider used for retrieving host identity information." msgstr "The provider used for retrieving host identity information." -#: src/lib/yauthclient/params.rb:466 +#: src/lib/authui/sssd/params.rb:482 msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components." msgstr "Regular expression for this domain that describes how to parse the string containing user name and domain into these components." -#: src/lib/yauthclient/params.rb:471 +#: src/lib/authui/sssd/params.rb:487 msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name." msgstr "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name." -#: src/lib/yauthclient/params.rb:477 +#: src/lib/authui/sssd/params.rb:493 msgid "Provides the ability to select preferred address family to use when performing DNS lookups." msgstr "Provides the ability to select preferred address family to use when performing DNS lookups." -#: src/lib/yauthclient/params.rb:482 +#: src/lib/authui/sssd/params.rb:498 msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable." msgstr "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable." -#: src/lib/yauthclient/params.rb:486 +#: src/lib/authui/sssd/params.rb:502 msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query." msgstr "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query." -#: src/lib/yauthclient/params.rb:490 +#: src/lib/authui/sssd/params.rb:506 msgid "Override the primary GID value with the one specified." msgstr "Override the primary GID value with the one specified." -#: src/lib/yauthclient/params.rb:495 +#: src/lib/authui/sssd/params.rb:512 msgid "Treat user and group names as case sensitive." msgstr "Treat user and group names as case sensitive." -#: src/lib/yauthclient/params.rb:500 +#: src/lib/authui/sssd/params.rb:517 msgid "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias." msgstr "When a user or group is looked up by name in the proxy provider, a second lookup by ID is performed to 'canonicalize' the name in case the requested name was an alias." -#: src/lib/yauthclient/params.rb:505 +#: src/lib/authui/sssd/params.rb:522 msgid "Use this homedir as default value for all subdomains within this domain." msgstr "Use this homedir as default value for all subdomains within this domain." #. Following options will be provided by SSSD's 'simple' access-control provider -#: src/lib/yauthclient/params.rb:511 +#: src/lib/authui/sssd/params.rb:528 msgid "Comma separated list of users who are allowed to log in." msgstr "Comma separated list of users who are allowed to log in." -#: src/lib/yauthclient/params.rb:516 +#: src/lib/authui/sssd/params.rb:533 msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain." msgstr "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain." -#: src/lib/yauthclient/params.rb:521 +#: src/lib/authui/sssd/params.rb:538 msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain." msgstr "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain." #. The local domain section #. This section contains settings for domain that stores users and groups in SSSD native database, that is, a domain that uses id_provider=local. -#: src/lib/yauthclient/params.rb:530 +#: src/lib/authui/sssd/params.rb:547 msgid "The tools append the login name to base_directory and use that as the home directory." msgstr "The tools append the login name to base_directory and use that as the home directory." -#: src/lib/yauthclient/params.rb:535 +#: src/lib/authui/sssd/params.rb:552 msgid "Indicate if a home directory should be created by default for new users." msgstr "Indicate if a home directory should be created by default for new users." -#: src/lib/yauthclient/params.rb:540 +#: src/lib/authui/sssd/params.rb:557 msgid "Indicate if a home directory should be removed by default for deleted users." msgstr "Indicate if a home directory should be removed by default for deleted users." -#: src/lib/yauthclient/params.rb:545 +#: src/lib/authui/sssd/params.rb:562 msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory." msgstr "Used by sss_useradd(8) to specify the default permissions on a newly created home directory." -#: src/lib/yauthclient/params.rb:550 +#: src/lib/authui/sssd/params.rb:567 msgid "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)" msgstr "The skeleton directory, which contains files and directories to be copied in the user's home directory, when the home directory is created by sss_useradd(8)" -#: src/lib/yauthclient/params.rb:555 +#: src/lib/authui/sssd/params.rb:572 msgid "The mail spool directory." msgstr "The mail spool directory." -#: src/lib/yauthclient/params.rb:559 +#: src/lib/authui/sssd/params.rb:576 msgid "The command that is run after a user is removed." msgstr "The command that is run after a user is removed." #. The ldap domain section -#: src/lib/yauthclient/params.rb:568 +#: src/lib/authui/sssd/params.rb:585 +msgid "(Active Directory specific) Use token-groups attribute if available" +msgstr "" + +#: src/lib/authui/sssd/params.rb:591 msgid "URIs (ldap://) of LDAP servers (comma separated)" msgstr "" -#: src/lib/yauthclient/params.rb:574 +#: src/lib/authui/sssd/params.rb:597 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/yauthclient/params.rb:579 +#: src/lib/authui/sssd/params.rb:602 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/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591 +#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:614 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/yauthclient/params.rb:597 +#: src/lib/authui/sssd/params.rb:620 #, fuzzy #| msgid "Base DN for the database" msgid "Base DN for LDAP search" msgstr "Base DN for the database" -#: src/lib/yauthclient/params.rb:604 +#: src/lib/authui/sssd/params.rb:627 #, fuzzy #| msgid "LDAP secure port" msgid "LDAP schema type" msgstr "LDAP secure port" -#: src/lib/yauthclient/params.rb:608 +#: src/lib/authui/sssd/params.rb:631 msgid "The default bind DN to use for performing LDAP operations." msgstr "The default bind DN to use for performing LDAP operations." -#: src/lib/yauthclient/params.rb:614 +#: src/lib/authui/sssd/params.rb:637 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/yauthclient/params.rb:618 +#: src/lib/authui/sssd/params.rb:641 msgid "The authentication token of the default bind DN." msgstr "The authentication token of the default bind DN." -#: src/lib/yauthclient/params.rb:623 +#: src/lib/authui/sssd/params.rb:646 msgid "The object class of a user entry in LDAP." msgstr "The object class of a user entry in LDAP." -#: src/lib/yauthclient/params.rb:628 +#: src/lib/authui/sssd/params.rb:651 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/yauthclient/params.rb:633 +#: src/lib/authui/sssd/params.rb:656 msgid "The LDAP attribute that corresponds to the user's id." msgstr "The LDAP attribute that corresponds to the user's id." -#: src/lib/yauthclient/params.rb:638 +#: src/lib/authui/sssd/params.rb:661 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/yauthclient/params.rb:643 +#: src/lib/authui/sssd/params.rb:666 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/yauthclient/params.rb:648 +#: src/lib/authui/sssd/params.rb:671 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/yauthclient/params.rb:653 +#: src/lib/authui/sssd/params.rb:676 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/yauthclient/params.rb:658 +#: src/lib/authui/sssd/params.rb:681 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/yauthclient/params.rb:663 +#: src/lib/authui/sssd/params.rb:686 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/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873 +#: src/lib/authui/sssd/params.rb:691 src/lib/authui/sssd/params.rb:896 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/yauthclient/params.rb:673 +#: src/lib/authui/sssd/params.rb:696 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/yauthclient/params.rb:678 +#: src/lib/authui/sssd/params.rb:701 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/yauthclient/params.rb:683 +#: src/lib/authui/sssd/params.rb:706 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/yauthclient/params.rb:688 +#: src/lib/authui/sssd/params.rb:711 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/yauthclient/params.rb:693 +#: src/lib/authui/sssd/params.rb:716 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/yauthclient/params.rb:698 +#: src/lib/authui/sssd/params.rb:721 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/yauthclient/params.rb:703 +#: src/lib/authui/sssd/params.rb:726 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/yauthclient/params.rb:708 +#: src/lib/authui/sssd/params.rb:731 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/yauthclient/params.rb:713 +#: src/lib/authui/sssd/params.rb:736 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/yauthclient/params.rb:718 +#: src/lib/authui/sssd/params.rb:741 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/yauthclient/params.rb:723 +#: src/lib/authui/sssd/params.rb:746 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/yauthclient/params.rb:728 +#: src/lib/authui/sssd/params.rb:751 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/yauthclient/params.rb:733 +#: src/lib/authui/sssd/params.rb:756 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/yauthclient/params.rb:738 +#: src/lib/authui/sssd/params.rb:761 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/yauthclient/params.rb:743 +#: src/lib/authui/sssd/params.rb:766 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/yauthclient/params.rb:747 +#: src/lib/authui/sssd/params.rb:770 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/yauthclient/params.rb:752 +#: src/lib/authui/sssd/params.rb:775 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/yauthclient/params.rb:753 +#: src/lib/authui/sssd/params.rb:776 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/yauthclient/params.rb:758 +#: src/lib/authui/sssd/params.rb:781 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/yauthclient/params.rb:763 +#: src/lib/authui/sssd/params.rb:786 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/yauthclient/params.rb:768 +#: src/lib/authui/sssd/params.rb:791 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/yauthclient/params.rb:773 +#: src/lib/authui/sssd/params.rb:796 msgid "The LDAP attribute that lists the user's group memberships." msgstr "The LDAP attribute that lists the user's group memberships." -#: src/lib/yauthclient/params.rb:778 +#: src/lib/authui/sssd/params.rb:801 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/yauthclient/params.rb:783 +#: src/lib/authui/sssd/params.rb:806 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/yauthclient/params.rb:793 +#: src/lib/authui/sssd/params.rb:816 msgid "The object class of a group entry in LDAP." msgstr "The object class of a group entry in LDAP." -#: src/lib/yauthclient/params.rb:798 +#: src/lib/authui/sssd/params.rb:821 msgid "The LDAP attribute that corresponds to the group name." msgstr "The LDAP attribute that corresponds to the group name." -#: src/lib/yauthclient/params.rb:803 +#: src/lib/authui/sssd/params.rb:826 msgid "The LDAP attribute that corresponds to the group's id." msgstr "The LDAP attribute that corresponds to the group's id." -#: src/lib/yauthclient/params.rb:808 +#: src/lib/authui/sssd/params.rb:831 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/yauthclient/params.rb:813 +#: src/lib/authui/sssd/params.rb:836 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/yauthclient/params.rb:818 +#: src/lib/authui/sssd/params.rb:841 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/yauthclient/params.rb:823 +#: src/lib/authui/sssd/params.rb:846 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/yauthclient/params.rb:829 +#: src/lib/authui/sssd/params.rb:852 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/yauthclient/params.rb:835 +#: src/lib/authui/sssd/params.rb:858 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/yauthclient/params.rb:841 +#: src/lib/authui/sssd/params.rb:864 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/yauthclient/params.rb:847 +#: src/lib/authui/sssd/params.rb:870 msgid " The object class of a netgroup entry in LDAP." msgstr " The object class of a netgroup entry in LDAP." -#: src/lib/yauthclient/params.rb:853 +#: src/lib/authui/sssd/params.rb:876 msgid "The LDAP attribute that corresponds to the netgroup name." msgstr "The LDAP attribute that corresponds to the netgroup name." -#: src/lib/yauthclient/params.rb:858 +#: src/lib/authui/sssd/params.rb:881 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/yauthclient/params.rb:863 +#: src/lib/authui/sssd/params.rb:886 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/yauthclient/params.rb:868 +#: src/lib/authui/sssd/params.rb:891 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/yauthclient/params.rb:878 +#: src/lib/authui/sssd/params.rb:901 msgid "The object class of a service entry in LDAP." msgstr "The object class of a service entry in LDAP." -#: src/lib/yauthclient/params.rb:883 +#: src/lib/authui/sssd/params.rb:906 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/yauthclient/params.rb:888 +#: src/lib/authui/sssd/params.rb:911 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/yauthclient/params.rb:893 +#: src/lib/authui/sssd/params.rb:916 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/yauthclient/params.rb:899 +#: src/lib/authui/sssd/params.rb:922 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/yauthclient/params.rb:904 +#: src/lib/authui/sssd/params.rb:927 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/yauthclient/params.rb:909 +#: src/lib/authui/sssd/params.rb:932 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/yauthclient/params.rb:914 +#: src/lib/authui/sssd/params.rb:937 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/yauthclient/params.rb:919 +#: src/lib/authui/sssd/params.rb:942 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/yauthclient/params.rb:924 +#: src/lib/authui/sssd/params.rb:947 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/yauthclient/params.rb:929 +#: src/lib/authui/sssd/params.rb:952 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/yauthclient/params.rb:934 +#: src/lib/authui/sssd/params.rb:957 msgid "Disable the LDAP paging control." msgstr "Disable the LDAP paging control." -#: src/lib/yauthclient/params.rb:938 +#: src/lib/authui/sssd/params.rb:961 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/yauthclient/params.rb:943 +#: src/lib/authui/sssd/params.rb:966 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/yauthclient/params.rb:950 +#: src/lib/authui/sssd/params.rb:973 msgid "Validate server certification in LDAP TLS session" msgstr "" -#: src/lib/yauthclient/params.rb:954 +#: src/lib/authui/sssd/params.rb:977 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/yauthclient/params.rb:958 +#: src/lib/authui/sssd/params.rb:981 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/yauthclient/params.rb:962 +#: src/lib/authui/sssd/params.rb:985 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/yauthclient/params.rb:966 +#: src/lib/authui/sssd/params.rb:989 msgid "Specifies the file that contains the client's key." msgstr "Specifies the file that contains the client's key." -#: src/lib/yauthclient/params.rb:971 +#: src/lib/authui/sssd/params.rb:994 msgid "Specifies acceptable cipher suites." msgstr "Specifies acceptable cipher suites." -#: src/lib/yauthclient/params.rb:976 +#: src/lib/authui/sssd/params.rb:999 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/yauthclient/params.rb:981 +#: src/lib/authui/sssd/params.rb:1004 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/yauthclient/params.rb:985 +#: src/lib/authui/sssd/params.rb:1008 msgid "Specify the SASL mechanism to use." msgstr "Specify the SASL mechanism to use." -#: src/lib/yauthclient/params.rb:990 +#: src/lib/authui/sssd/params.rb:1013 msgid "Specify the SASL authorization id to use." msgstr "Specify the SASL authorization id to use." -#: src/lib/yauthclient/params.rb:995 +#: src/lib/authui/sssd/params.rb:1018 msgid "Specify the SASL realm to use." msgstr "Specify the SASL realm to use." -#: src/lib/yauthclient/params.rb:1000 +#: src/lib/authui/sssd/params.rb:1023 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/yauthclient/params.rb:1005 +#: src/lib/authui/sssd/params.rb:1028 msgid "Specify the keytab to use when using SASL/GSSAPI." msgstr "Specify the keytab to use when using SASL/GSSAPI." -#: src/lib/yauthclient/params.rb:1010 +#: src/lib/authui/sssd/params.rb:1033 msgid "Specifies that the id_provider should init Kerberos credentials (TGT)." msgstr "Specifies that the id_provider should init Kerberos credentials (TGT)." -#: src/lib/yauthclient/params.rb:1015 +#: src/lib/authui/sssd/params.rb:1038 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/yauthclient/params.rb:1020 +#: src/lib/authui/sssd/params.rb:1043 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/yauthclient/params.rb:1025 +#: src/lib/authui/sssd/params.rb:1048 msgid "Specifies whether automatic referral chasing should be enabled." msgstr "Specifies whether automatic referral chasing should be enabled." -#: src/lib/yauthclient/params.rb:1030 +#: src/lib/authui/sssd/params.rb:1053 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/yauthclient/params.rb:1034 +#: src/lib/authui/sssd/params.rb:1057 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/yauthclient/params.rb:1039 +#: src/lib/authui/sssd/params.rb:1062 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/yauthclient/params.rb:1044 +#: src/lib/authui/sssd/params.rb:1067 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/yauthclient/params.rb:1049 +#: src/lib/authui/sssd/params.rb:1072 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/yauthclient/params.rb:1055 +#: src/lib/authui/sssd/params.rb:1078 msgid "Comma separated list of access control options." msgstr "Comma separated list of access control options." -#: src/lib/yauthclient/params.rb:1060 +#: src/lib/authui/sssd/params.rb:1083 msgid "Specifies how alias dereferencing is done when performing a search." msgstr "Specifies how alias dereferencing is done when performing a search." -#: src/lib/yauthclient/params.rb:1065 +#: src/lib/authui/sssd/params.rb:1088 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/yauthclient/params.rb:1078 +#: src/lib/authui/sssd/params.rb:1101 #, 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/yauthclient/params.rb:1082 +#: src/lib/authui/sssd/params.rb:1105 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/yauthclient/params.rb:1087 +#: src/lib/authui/sssd/params.rb:1110 msgid "Kerberos realm (e.g. EXAMPLE.COM)" msgstr "" -#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096 +#: src/lib/authui/sssd/params.rb:1114 src/lib/authui/sssd/params.rb:1119 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/yauthclient/params.rb:1101 +#: src/lib/authui/sssd/params.rb:1124 msgid "Directory to store credential caches." msgstr "Directory to store credential caches." -#: src/lib/yauthclient/params.rb:1106 +#: src/lib/authui/sssd/params.rb:1129 msgid "Location of the user's credential cache." msgstr "Location of the user's credential cache." -#: src/lib/yauthclient/params.rb:1111 +#: src/lib/authui/sssd/params.rb:1134 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/yauthclient/params.rb:1116 +#: src/lib/authui/sssd/params.rb:1139 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/yauthclient/params.rb:1121 +#: src/lib/authui/sssd/params.rb:1144 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/yauthclient/params.rb:1126 +#: src/lib/authui/sssd/params.rb:1149 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/yauthclient/params.rb:1130 +#: src/lib/authui/sssd/params.rb:1153 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/yauthclient/params.rb:1134 +#: src/lib/authui/sssd/params.rb:1157 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/yauthclient/params.rb:1138 +#: src/lib/authui/sssd/params.rb:1161 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/yauthclient/params.rb:1143 +#: src/lib/authui/sssd/params.rb:1166 msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." msgstr "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication." -#: src/lib/yauthclient/params.rb:1147 +#: src/lib/authui/sssd/params.rb:1170 msgid "Specifies the server principal to use for FAST." msgstr "Specifies the server principal to use for FAST." -#: src/lib/yauthclient/params.rb:1152 +#: src/lib/authui/sssd/params.rb:1175 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/yauthclient/params.rb:1164 +#: src/lib/authui/sssd/params.rb:1187 msgid "Specifies the name of the Active Directory domain." msgstr "Specifies the name of the Active Directory domain." -#: src/lib/yauthclient/params.rb:1169 +#: src/lib/authui/sssd/params.rb:1192 msgid "IP addresses or host names of AD servers (comma separated)" msgstr "" -#: src/lib/yauthclient/params.rb:1173 +#: src/lib/authui/sssd/params.rb:1196 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/yauthclient/params.rb:1177 -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." +#: src/lib/authui/sssd/params.rb:1201 +#, 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/yauthclient/params.rb:1181 +#: src/lib/authui/sssd/params.rb:1205 msgid "Override the user's home directory." msgstr "Override the user's home directory." -#: src/lib/yauthclient/params.rb:1194 +#: src/lib/authui/sssd/params.rb:1218 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/yauthclient/params.rb:1199 +#: src/lib/authui/sssd/params.rb:1223 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/yauthclient/params.rb:1204 +#: src/lib/authui/sssd/params.rb:1228 msgid "Specifies the number of IDs available for each slice." msgstr "Specifies the number of IDs available for each slice." -#: src/lib/yauthclient/params.rb:1208 +#: src/lib/authui/sssd/params.rb:1232 msgid "Specify the domain SID of the default domain." msgstr "Specify the domain SID of the default domain." -#: src/lib/yauthclient/params.rb:1212 +#: src/lib/authui/sssd/params.rb:1236 msgid "Specify the name of the default domain." msgstr "Specify the name of the default domain." -#: src/lib/yauthclient/params.rb:1217 +#: src/lib/authui/sssd/params.rb:1241 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/yauthclient/params.rb:1229 +#: src/lib/authui/sssd/params.rb:1253 msgid "Specifies the name of the IPA domain." msgstr "Specifies the name of the IPA domain." -#: src/lib/yauthclient/params.rb:1234 +#: src/lib/authui/sssd/params.rb:1258 msgid "IP addresses or host names of IPA servers (comma separated)" msgstr "" -#: src/lib/yauthclient/params.rb:1238 -msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name." -msgstr "May be set on machines where the hostname(5) does not reflect the fully qualified name." +#: src/lib/authui/sssd/params.rb:1263 +#, 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/yauthclient/params.rb:1243 +#: src/lib/authui/sssd/params.rb:1268 #, 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/yauthclient/params.rb:1248 +#: src/lib/authui/sssd/params.rb:1273 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/yauthclient/params.rb:1253 +#: src/lib/authui/sssd/params.rb:1278 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/yauthclient/params.rb:1257 +#: src/lib/authui/sssd/params.rb:1282 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." -#. autofs may only start after sssd is started -#: src/modules/AuthClient.rb:230 -msgid "Failed to enable %s service. Please use system journal to diagnose." -msgstr "" +#~ msgid "Authentication client configuration module" +#~ msgstr "Authentication client configuration module" -#: src/modules/AuthClient.rb:232 -msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose." -msgstr "" +#~ msgid "Configuration summary of the authentication client" +#~ msgstr "Configuration summary of the authentication client" -#. end Export -#. ################################################################ -#. ################################################################ -#. Summary() -#. returns html formated configuration summary -#. @return summary -#: src/modules/AuthClient.rb:345 -msgid "System is configured for using nss_ldap.\n" -msgstr "System is configured for using nss_ldap.\n" +#~ msgid "Create autoyast rnc from @parameters" +#~ msgstr "Create autoyast rnc from @parameters" -#: src/modules/AuthClient.rb:348 -msgid "System is configured for using sssd.\n" -msgstr "System is configured for using sssd.\n" +#, fuzzy +#~| msgid "Authentication Client Configuration (sssd)" +#~ msgid "Authentication Client Configuration" +#~ msgstr "Authentication Client Configuration (sssd)" -#: src/modules/AuthClient.rb:354 -msgid "System is configured for using OES.\n" -msgstr "System is configured for using OES.\n" +#~ msgid "Global Configuration" +#~ msgstr "Global Configuration" -#: src/modules/AuthClient.rb:357 -msgid "System is configured for using /etc/passwd only.\n" -msgstr "System is configured for using /etc/passwd only.\n" +#, fuzzy +#~| msgid "Enable the NTP daemon" +#~ msgid "Enable SSSD daemon" +#~ msgstr "Enable the NTP daemon" #, fuzzy +#~| msgid "Selections" +#~ msgid "Sections" +#~ msgstr "Selections" + +#, fuzzy +#~| msgid "Network Services" +#~ msgid "New Service/Domain" +#~ msgstr "Network Services" + +#, fuzzy +#~| msgid "Selected Service" +#~ msgid "Delete Service/Domain" +#~ msgstr "Selected Service" + +#, fuzzy +#~| msgid "Modem Parameters" +#~ msgid "More Parameters" +#~ msgstr "Modem Parameters" + +#~ msgid "" +#~ "Your system is configured for using nss_ldap.\n" +#~ "This module is designed to configure your system via sssd.\n" +#~ "If you continue, your nss_ldap configuration will be removed.\n" +#~ "Do you want to continue?" +#~ msgstr "" +#~ "Your system is configured for using nss_ldap.\n" +#~ "This module is designed to configure your system via sssd.\n" +#~ "If you continue, your nss_ldap configuration will be removed.\n" +#~ "Do you want to continue?" + +#~ msgid "" +#~ "Your system is configured as OES client.\n" +#~ "This module is designed to configure your system via sssd.\n" +#~ "If you continue, your OES client configuration will be deactivated.\n" +#~ "Do you want to continue?" +#~ msgstr "" +#~ "Your system is configured as OES client.\n" +#~ "This module is designed to configure your system via sssd.\n" +#~ "If you continue, your OES client configuration will be deactivated.\n" +#~ "Do you want to continue?" + +#, fuzzy +#~| msgid "You cannot delete the active profile." +#~ msgid "You may not delete section SSSD." +#~ msgstr "You cannot delete the active profile." + +#, fuzzy +#~| msgid "Logging enabled" +#~ msgid "No domain enabled" +#~ msgstr "Logging enabled" + +#, fuzzy +#~| msgid "Would you like to enable access to the profile repository?" +#~ msgid "Would you like to enable another service or join a domain?" +#~ msgstr "Would you like to enable access to the profile repository?" + +#~ msgid "Service" +#~ msgstr "Service" + +#, fuzzy +#~| msgid "Identification:" +#~ msgid "Identification provider:" +#~ msgstr "Identification:" + +#, fuzzy +#~| msgid "&Authentication Mode" +#~ msgid "Authentication provider:" +#~ msgstr "&Authentication Mode" + +#~ msgid "Activate Domain" +#~ msgstr "Activate Domain" + +#, fuzzy +#~| msgid "These services will be enabled" +#~ msgid "There are no more services to be enabled." +#~ msgstr "These services will be enabled" + +#, fuzzy +#~| msgid "Enter a name for the new profile." +#~ msgid "Please enter a name for the new domain." +#~ msgstr "Enter a name for the new profile." + +#~ msgid "Indicates what is the syntax of the config file." +#~ msgstr "Indicates what is the syntax of the config file." + +#~ msgid "Comma separated list of services that are started when sssd itself starts." +#~ msgstr "Comma separated list of services that are started when sssd itself starts." + +#~ msgid "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." +#~ msgstr "SSSD can use more domains at the same time, but at least one must be configured or SSSD won't start." + +#~ msgid "This parameter contains the list of domains in the order these will be queried." +#~ msgstr "This parameter contains the list of domains in the order these will be queried." + +#~ msgid "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." +#~ msgstr "By default, we will attempt to use inotify for this, and will fall back to polling resolv.conf every five seconds if inotify cannot be used." + +#~ msgid "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." +#~ msgstr "Bit mask that indicates which debug levels will be visible. 0x0010 is the default value as well as the lowest allowed value, 0xFFF0 is the most verbose mode." + +#~ msgid "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." +#~ msgstr "If a service is not responding to ping checks (see the “timeout” option), it is first sent the SIGTERM signal that instructs it to quit gracefully." + +#~ msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name." +#~ msgstr "May be set on machines where the hostname(5) does not reflect the fully qualified name." + +#~ msgid "System is configured for using nss_ldap.\n" +#~ msgstr "System is configured for using nss_ldap.\n" + +#~ msgid "System is configured for using sssd.\n" +#~ msgstr "System is configured for using sssd.\n" + +#~ msgid "System is configured for using OES.\n" +#~ msgstr "System is configured for using OES.\n" + +#~ msgid "System is configured for using /etc/passwd only.\n" +#~ msgstr "System is configured for using /etc/passwd only.\n" + +#, fuzzy #~| msgid "Authentication Key" #~ msgid "Authentication Client Config" #~ msgstr "Authentication Key" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/auth-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -457,12 +457,12 @@ msgid "Configure Account for Replication" msgstr "Configure Account for Replication" -#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914 -#: src/modules/LdapDatabase.rb:1173 +#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908 +#: src/modules/LdapDatabase.rb:1167 msgid "is not a valid LDAP DN" msgstr "is not a valid LDAP DN" -#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679 +#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673 msgid "Password" msgstr "Password" @@ -488,8 +488,8 @@ msgid "Provider Details" msgstr "Provider Details" -#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607 -#: src/modules/LdapDatabase.rb:1702 +#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601 +#: src/modules/LdapDatabase.rb:1696 msgid "Protocol" msgstr "Protocol" @@ -497,7 +497,7 @@ msgid "Provider Hostname" msgstr "Provider Hostname" -#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624 +#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618 msgid "Use StartTLS" msgstr "Use StartTLS" @@ -582,8 +582,8 @@ msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n" msgstr "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n" -#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971 -#: src/modules/LdapDatabase.rb:1998 +#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965 +#: src/modules/LdapDatabase.rb:1992 msgid "The test returned the following error messages:" msgstr "The test returned the following error messages:" @@ -2440,7 +2440,7 @@ msgid "Index Cache (IDL cache)" msgstr "Index Cache (IDL cache)" -#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102 +#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096 msgid "Checkpoint Settings" msgstr "Checkpoint Settings" @@ -2510,7 +2510,7 @@ msgstr "Add Index" #. encoding: utf-8 -#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239 +#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233 msgid "Password Policy Settings" msgstr "Password Policy Settings" @@ -2673,145 +2673,145 @@ msgstr "The directory does not exist. Create it?" #. try to read the ppolicy from the server -#: src/modules/LdapDatabase.rb:637 +#: src/modules/LdapDatabase.rb:631 msgid "Authentication failed. The password is probably incorrect.\n" msgstr "Authentication failed. The password is probably incorrect.\n" -#: src/modules/LdapDatabase.rb:640 +#: src/modules/LdapDatabase.rb:634 msgid "The error message was: '" msgstr "The error message was: '" -#: src/modules/LdapDatabase.rb:645 +#: src/modules/LdapDatabase.rb:639 msgid "Try again?" msgstr "Try again?" #. PasswordPolicyDialog only returns the changes made to the original #. Entry, try to merge them here -#: src/modules/LdapDatabase.rb:720 +#: src/modules/LdapDatabase.rb:714 msgid "Available Attribute Types" msgstr "Available Attribute Types" -#: src/modules/LdapDatabase.rb:724 +#: src/modules/LdapDatabase.rb:718 msgid "Selected Attribute Types" msgstr "Selected Attribute Types" #. Popup to add/edit the acl "by" clauses -#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985 +#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979 msgid "Who should this rule apply to" msgstr "Who should this rule apply to" -#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946 -#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227 +#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940 +#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221 msgid "Entry DN" msgstr "Entry DN" -#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990 +#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984 msgid "Select" msgstr "Select" -#: src/modules/LdapDatabase.rb:826 +#: src/modules/LdapDatabase.rb:820 msgid "Define the Access Level" msgstr "Define the Access Level" -#: src/modules/LdapDatabase.rb:836 +#: src/modules/LdapDatabase.rb:830 msgid "Stop access control evaluation here (default)" msgstr "Stop access control evaluation here (default)" -#: src/modules/LdapDatabase.rb:843 +#: src/modules/LdapDatabase.rb:837 msgid "Continue with next access control rule (\"break\")" msgstr "Continue with next access control rule (\"break\")" -#: src/modules/LdapDatabase.rb:849 +#: src/modules/LdapDatabase.rb:843 msgid "Continue evaluation of this rule (\"continue\")" msgstr "Continue evaluation of this rule (\"continue\")" -#: src/modules/LdapDatabase.rb:904 +#: src/modules/LdapDatabase.rb:898 msgid "Please enter a DN in the textfield" msgstr "Please enter a DN in the textfield" -#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090 -#: src/modules/LdapDatabase.rb:1225 +#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084 +#: src/modules/LdapDatabase.rb:1219 msgid "Subtree DN" msgstr "Subtree DN" -#: src/modules/LdapDatabase.rb:950 +#: src/modules/LdapDatabase.rb:944 msgid "Group DN" msgstr "Group DN" -#: src/modules/LdapDatabase.rb:973 +#: src/modules/LdapDatabase.rb:967 msgid "Edit Access Control Rule" msgstr "Edit Access Control Rule" -#: src/modules/LdapDatabase.rb:978 +#: src/modules/LdapDatabase.rb:972 msgid "Target Objects" msgstr "Target Objects" -#: src/modules/LdapDatabase.rb:999 +#: src/modules/LdapDatabase.rb:993 msgid "Matching the filter:" msgstr "Matching the filter:" -#: src/modules/LdapDatabase.rb:1006 +#: src/modules/LdapDatabase.rb:1000 msgid "LDAP Filter" msgstr "LDAP Filter" -#: src/modules/LdapDatabase.rb:1016 +#: src/modules/LdapDatabase.rb:1010 msgid "Apply this rule only to the listed attribute" msgstr "Apply this rule only to the listed attribute" -#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315 +#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309 msgid "Attributes" msgstr "Attributes" -#: src/modules/LdapDatabase.rb:1023 +#: src/modules/LdapDatabase.rb:1017 msgid "Edit" msgstr "Edit" -#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041 +#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035 msgid "Access Level" msgstr "Access Level" -#: src/modules/LdapDatabase.rb:1039 +#: src/modules/LdapDatabase.rb:1033 msgid "Who" msgstr "Who" -#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315 +#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309 msgid "DN" msgstr "DN" -#: src/modules/LdapDatabase.rb:1042 +#: src/modules/LdapDatabase.rb:1036 msgid "Flow Control" msgstr "Flow Control" -#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319 +#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313 msgid "Up" msgstr "Up" -#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320 +#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314 msgid "Down" msgstr "Down" #. FIXME: Validate attribute types -#: src/modules/LdapDatabase.rb:1185 +#: src/modules/LdapDatabase.rb:1179 msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield" msgstr "Enter a list of valid attributes in the <b>Attributes</b> textfield" -#: src/modules/LdapDatabase.rb:1197 +#: src/modules/LdapDatabase.rb:1191 msgid "Enter valid a LDAP filter in the textfield" msgstr "Enter valid a LDAP filter in the textfield" -#: src/modules/LdapDatabase.rb:1203 +#: src/modules/LdapDatabase.rb:1197 msgid "You must add at least one item to the \"Access Level\" list." msgstr "You must add at least one item to the \"Access Level\" list." -#: src/modules/LdapDatabase.rb:1315 +#: src/modules/LdapDatabase.rb:1309 msgid "Target" msgstr "Target" -#: src/modules/LdapDatabase.rb:1315 +#: src/modules/LdapDatabase.rb:1309 msgid "Filter" msgstr "Filter" -#: src/modules/LdapDatabase.rb:1347 +#: src/modules/LdapDatabase.rb:1341 msgid "" "The selected database contains access control rules that are currently\n" "not supported by YaST. The Access Control Dialog will be disabled.\n" @@ -2819,93 +2819,93 @@ "The selected database contains access control rules that are currently\n" "not supported by YaST. The Access Control Dialog will be disabled.\n" -#: src/modules/LdapDatabase.rb:1594 +#: src/modules/LdapDatabase.rb:1588 msgid "This database is a Replication Consumer." msgstr "This database is a Replication Consumer." -#: src/modules/LdapDatabase.rb:1614 +#: src/modules/LdapDatabase.rb:1608 msgid "Provider Name" msgstr "Provider Name" -#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716 +#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710 msgid "Port" msgstr "Port" -#: src/modules/LdapDatabase.rb:1637 +#: src/modules/LdapDatabase.rb:1631 msgid "Replication Type" msgstr "Replication Type" -#: src/modules/LdapDatabase.rb:1644 +#: src/modules/LdapDatabase.rb:1638 msgid "Replication Interval" msgstr "Replication Interval" -#: src/modules/LdapDatabase.rb:1647 +#: src/modules/LdapDatabase.rb:1641 msgid "Days" msgstr "Days" -#: src/modules/LdapDatabase.rb:1651 +#: src/modules/LdapDatabase.rb:1645 msgid "Hours" msgstr "Hours" -#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118 +#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112 msgid "Minutes" msgstr "Minutes" -#: src/modules/LdapDatabase.rb:1659 +#: src/modules/LdapDatabase.rb:1653 msgid "Seconds" msgstr "Seconds" -#: src/modules/LdapDatabase.rb:1672 +#: src/modules/LdapDatabase.rb:1666 msgid "Authentication DN" msgstr "Authentication DN" -#: src/modules/LdapDatabase.rb:1693 +#: src/modules/LdapDatabase.rb:1687 msgid "Custom update referral" msgstr "Custom update referral" -#: src/modules/LdapDatabase.rb:1709 +#: src/modules/LdapDatabase.rb:1703 msgid "Target Host" msgstr "Target Host" #. no updateref -#: src/modules/LdapDatabase.rb:1929 +#: src/modules/LdapDatabase.rb:1923 msgid "Invalid replication interval specified" msgstr "Invalid replication interval specified" #. test connection -#: src/modules/LdapDatabase.rb:1965 +#: src/modules/LdapDatabase.rb:1959 msgid "Checking LDAP connectivity to the provider failed." msgstr "Checking LDAP connectivity to the provider failed." -#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007 +#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001 msgid "Do you still want to continue?" msgstr "Do you still want to continue?" -#: src/modules/LdapDatabase.rb:1989 +#: src/modules/LdapDatabase.rb:1983 msgid "Checking the LDAPsync capabilities of the provider failed." msgstr "Checking the LDAPsync capabilities of the provider failed." -#: src/modules/LdapDatabase.rb:1995 +#: src/modules/LdapDatabase.rb:1989 msgid "Please verify that the target server is enabled to be a LDAPsync provider" msgstr "Please verify that the target server is enabled to be a LDAPsync provider" -#: src/modules/LdapDatabase.rb:2094 +#: src/modules/LdapDatabase.rb:2088 msgid "Enable ldapsync provider for this database" msgstr "Enable ldapsync provider for this database" -#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144 +#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138 msgid "Operations" msgstr "Operations" -#: src/modules/LdapDatabase.rb:2131 +#: src/modules/LdapDatabase.rb:2125 msgid "Session Log" msgstr "Session Log" -#: src/modules/LdapDatabase.rb:2137 +#: src/modules/LdapDatabase.rb:2131 msgid "Enable Session Log" msgstr "Enable Session Log" -#: src/modules/LdapDatabase.rb:2271 +#: src/modules/LdapDatabase.rb:2265 msgid "Replication Settings" msgstr "Replication Settings" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/autoinst.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:16+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 19:11+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -32,7 +32,7 @@ #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123 #: src/include/autoinstall/conftree.rb:622 -#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352 +#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:358 msgid "This may take a while" msgstr "This may take a while" @@ -54,12 +54,12 @@ #. command line options #. Init variables -#. Import users configuration from the profile -#. +#. We will have to set default entries which are defined +#. in the import call of ServicesManager #. Backup #. Now check if there any classes defined in theis pre final control file #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148 -#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410 +#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389 #: src/clients/inst_autosetup_upgrade.rb:484 #: src/modules/AutoInstallRules.rb:1001 msgid "" @@ -336,25 +336,23 @@ msgid "Executing Post-Scripts" msgstr "Executing Post-Scripts" -#. Do not restart dbus. Otherwise some services will hang. -#. bnc#937900 -#: src/clients/inst_autoconfigure.rb:304 +#: src/clients/inst_autoconfigure.rb:303 #, fuzzy #| msgid "Determine running services" msgid "Restarting all running services" msgstr "Determine running services" -#: src/clients/inst_autoconfigure.rb:327 +#: src/clients/inst_autoconfigure.rb:326 msgid "Activating systemd default target" msgstr "" #. Just in case, remove this file to avoid reconfiguring... -#: src/clients/inst_autoconfigure.rb:342 +#: src/clients/inst_autoconfigure.rb:341 msgid "Finishing Configuration" msgstr "Finishing Configuration" #. NetworkInterfaces::Write( ".*" ); -#: src/clients/inst_autoconfigure.rb:448 +#: src/clients/inst_autoconfigure.rb:444 #, fuzzy msgid "Processing resource %1" msgstr "Reading resources..." @@ -528,100 +526,86 @@ #. Uwe Gansert #. #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ -#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47 +#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>" msgstr "<P>Please wait while the system is prepared for autoinstallation.</P>" -#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52 +#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52 msgid "Execute pre-install user scripts" msgstr "Execute pre-install user scripts" -#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51 +#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51 msgid "Configure General Settings " msgstr "Configure General Settings " -#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53 +#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53 msgid "Set up language" msgstr "Set up language" -#: src/clients/inst_autosetup.rb:60 +#: src/clients/inst_autosetup.rb:57 msgid "Create partition plans" msgstr "Create partition plans" -#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56 +#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56 msgid "Configure Bootloader" msgstr "Configure Bootloader" -#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54 +#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54 msgid "Registration" msgstr "Registration" -#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55 +#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55 msgid "Configure Software selections" msgstr "Configure Software selections" -#: src/clients/inst_autosetup.rb:64 +#: src/clients/inst_autosetup.rb:61 msgid "Configure Systemd Default Target" msgstr "" -#: src/clients/inst_autosetup.rb:65 -#, fuzzy -#| msgid "Configure Volume Groups" -msgid "Configure users and groups" -msgstr "Configure Volume Groups" - -#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61 +#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61 msgid "Executing pre-install user scripts..." msgstr "Executing pre-install user scripts..." -#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60 +#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60 msgid "Configuring general settings..." msgstr "Configuring general settings..." -#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62 +#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62 #, fuzzy #| msgid "Set up language" msgid "Setting up language..." msgstr "Set up language" -#: src/clients/inst_autosetup.rb:72 +#: src/clients/inst_autosetup.rb:68 msgid "Creating partition plans..." msgstr "Creating partition plans..." -#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65 +#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65 msgid "Configuring Bootloader..." msgstr "Configuring Bootloader..." -#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63 +#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63 #, fuzzy #| msgid "Repairing file system..." msgid "Registering the system..." msgstr "Repairing file system..." -#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64 +#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64 msgid "Configuring Software selections..." msgstr "Configuring Software selections..." -#: src/clients/inst_autosetup.rb:76 +#: src/clients/inst_autosetup.rb:72 #, fuzzy #| msgid "Configuring language..." msgid "Configuring Systemd Default Target..." msgstr "Configuring language..." -#: src/clients/inst_autosetup.rb:77 -msgid "Importing users and groups configuration..." -msgstr "" - -#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69 +#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69 msgid "Preparing System for Automated Installation" msgstr "Preparing System for Automated Installation" -#. Second stage of installation will not be called but a -#. network configuration is available. So this will be written -#. while the general inst_finish process at the end of the -#. first stage. But for the installation workflow the linuxrc -#. network settings will be taken. (bnc#944942) -#: src/clients/inst_autosetup.rb:183 +#. configure general settings +#: src/clients/inst_autosetup.rb:164 #, fuzzy #| msgid "Signing the Add-On Product" msgid "Handling Add-On Products..." @@ -630,12 +614,12 @@ #. Set it in the Language module. #. #. Set it in the Language module. -#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149 +#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149 msgid "Configuring language..." msgstr "Configuring language..." #. Yes, do not set Storage testsuite here as we want really GUI with proposal -#: src/clients/inst_autosetup.rb:290 +#: src/clients/inst_autosetup.rb:273 msgid "" "Error while configuring partitions.\n" "Try again.\n" @@ -644,7 +628,7 @@ "Try again.\n" #. Software -#: src/clients/inst_autosetup.rb:344 +#: src/clients/inst_autosetup.rb:331 msgid "" "Error while configuring software selections.\n" "Try again.\n" @@ -1671,7 +1655,7 @@ #. list<any> l = [ "key1",0,"key3" ]; #. m[ l ] = v; #. @return [Hash] -#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807 +#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813 msgid "Checking XML with RNG validation..." msgstr "Checking XML with RNG validation..." @@ -1682,7 +1666,7 @@ msgstr "Section %1 not found." #. jing validation -- validates complete xml profile -#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819 +#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825 msgid "Checking XML with RNC validation..." msgstr "Checking XML with RNC validation..." @@ -1724,7 +1708,7 @@ msgstr "Turn Off the Machine after the First Stage" #: src/include/autoinstall/general_dialogs.rb:90 -#: src/modules/AutoinstGeneral.rb:126 +#: src/modules/AutoinstGeneral.rb:121 msgid "Signature Handling" msgstr "Signature Handling" @@ -2418,7 +2402,7 @@ #. @param [String] result_profile the resulting control file path #. @return [Boolean] true on success #. autoyast has read the autoyast configuration file but something went wrong -#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738 +#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:744 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" msgstr "The XML parser reported an error while parsing the autoyast profile. The error message is:\n" @@ -2439,46 +2423,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:278 +#: src/modules/AutoinstConfig.rb:273 #, fuzzy msgid "Choose Profile" msgstr "&Use Profile" #. SetProtocolMessage () #. @return [void] -#: src/modules/AutoinstConfig.rb:334 +#: src/modules/AutoinstConfig.rb:329 msgid "Retrieving control file from floppy." msgstr "Retrieving control file from floppy." -#: src/modules/AutoinstConfig.rb:337 +#: src/modules/AutoinstConfig.rb:332 msgid "Retrieving control file (%1) from TFTP server: %2." msgstr "Retrieving control file (%1) from TFTP server: %2." -#: src/modules/AutoinstConfig.rb:343 +#: src/modules/AutoinstConfig.rb:338 msgid "Retrieving control file (%1) from NFS server: %2." msgstr "Retrieving control file (%1) from NFS server: %2." -#: src/modules/AutoinstConfig.rb:349 +#: src/modules/AutoinstConfig.rb:344 msgid "Retrieving control file (%1) from HTTP server: %2." msgstr "Retrieving control file (%1) from HTTP server: %2." -#: src/modules/AutoinstConfig.rb:355 +#: src/modules/AutoinstConfig.rb:350 msgid "Retrieving control file (%1) from FTP server: %2." msgstr "Retrieving control file (%1) from FTP server: %2." -#: src/modules/AutoinstConfig.rb:361 +#: src/modules/AutoinstConfig.rb:356 msgid "Copying control file from file: %1." msgstr "Copying control file from file: %1." -#: src/modules/AutoinstConfig.rb:366 +#: src/modules/AutoinstConfig.rb:361 msgid "Copying control file from device: /dev/%1." msgstr "Copying control file from device: /dev/%1." -#: src/modules/AutoinstConfig.rb:370 +#: src/modules/AutoinstConfig.rb:365 msgid "Copying control file from default location." msgstr "Copying control file from default location." -#: src/modules/AutoinstConfig.rb:372 +#: src/modules/AutoinstConfig.rb:367 msgid "Source unknown." msgstr "Source unknown." @@ -2488,7 +2472,7 @@ #. { #. local_rules_file = (string)WFM::Args(1); #. } -#: src/modules/AutoinstConfig.rb:452 +#: src/modules/AutoinstConfig.rb:447 msgid "" "<h3>AutoYaST Configuration Management System</h3>\n" "<p>Almost all resources of the control file can be\n" @@ -2498,7 +2482,7 @@ "<p>Almost all resources of the control file can be\n" "configured using the configuration management system.</p>\n" -#: src/modules/AutoinstConfig.rb:457 +#: src/modules/AutoinstConfig.rb:452 #, fuzzy msgid "" "<p>Most of the modules used to create the configuration are identical to those available\n" @@ -2513,7 +2497,7 @@ "install another system using AutoYaST.\n" "</p>\n" -#: src/modules/AutoinstConfig.rb:464 +#: src/modules/AutoinstConfig.rb:459 msgid "" "<p>In addition to the existing and familiar modules,\n" "new interfaces were created for special and complex configurations, including\n" @@ -2549,105 +2533,81 @@ #. string language_name = ""; #. string keyboard_name = ""; -#: src/modules/AutoinstGeneral.rb:90 +#: src/modules/AutoinstGeneral.rb:85 msgid "Confirm installation?" msgstr "Confirm installation?" -#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99 -#: src/modules/AutoinstGeneral.rb:108 src/modules/AutoinstGeneral.rb:115 -#: src/modules/AutoinstGeneral.rb:122 +#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 +#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110 +#: src/modules/AutoinstGeneral.rb:117 msgid "Yes" msgstr "Yes" -#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99 -#: src/modules/AutoinstGeneral.rb:108 +#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94 +#: src/modules/AutoinstGeneral.rb:103 msgid "No" msgstr "No" -#: src/modules/AutoinstGeneral.rb:96 +#: src/modules/AutoinstGeneral.rb:91 msgid "Second Stage of AutoYaST" msgstr "Second Stage of AutoYaST" -#: src/modules/AutoinstGeneral.rb:104 +#: src/modules/AutoinstGeneral.rb:99 msgid "Halting the machine after stage one" msgstr "Halting the machine after stage one" -#: src/modules/AutoinstGeneral.rb:113 +#: src/modules/AutoinstGeneral.rb:108 #, fuzzy msgid "Halting the machine after stage two" msgstr "Halting the machine after stage one" -#: src/modules/AutoinstGeneral.rb:120 +#: src/modules/AutoinstGeneral.rb:115 #, fuzzy msgid "Reboot the machine after stage two" msgstr "Halting the machine after stage one" -#: src/modules/AutoinstGeneral.rb:130 +#: src/modules/AutoinstGeneral.rb:125 msgid "Accepting unsigned files" msgstr "Accepting unsigned files" -#: src/modules/AutoinstGeneral.rb:131 +#: src/modules/AutoinstGeneral.rb:126 msgid "Not accepting unsigned files" msgstr "Not accepting unsigned files" -#: src/modules/AutoinstGeneral.rb:140 +#: src/modules/AutoinstGeneral.rb:135 msgid "Accepting files without a checksum" msgstr "Accepting files without a checksum" -#: src/modules/AutoinstGeneral.rb:141 +#: src/modules/AutoinstGeneral.rb:136 msgid "Not accepting files without a checksum" msgstr "Not accepting files without a checksum" -#: src/modules/AutoinstGeneral.rb:150 +#: src/modules/AutoinstGeneral.rb:145 msgid "Accepting failed verifications" msgstr "Accepting failed verifications" -#: src/modules/AutoinstGeneral.rb:151 +#: src/modules/AutoinstGeneral.rb:146 msgid "Not accepting failed verifications" msgstr "Not accepting failed verifications" -#: src/modules/AutoinstGeneral.rb:156 +#: src/modules/AutoinstGeneral.rb:151 msgid "Accepting unknown GPG keys" msgstr "Accepting unknown GPG keys" -#: src/modules/AutoinstGeneral.rb:157 +#: src/modules/AutoinstGeneral.rb:152 msgid "Not accepting unknown GPG Keys" msgstr "Not accepting unknown GPG Keys" -#: src/modules/AutoinstGeneral.rb:162 +#: src/modules/AutoinstGeneral.rb:157 msgid "Importing new GPG keys" msgstr "Importing new GPG keys" -#: src/modules/AutoinstGeneral.rb:163 +#: src/modules/AutoinstGeneral.rb:158 msgid "Not importing new GPG Keys" msgstr "Not importing new GPG Keys" -#. NTP syncing -#: src/modules/AutoinstGeneral.rb:414 -#, fuzzy -#| msgid "Syncing server..." -msgid "Syncing time..." -msgstr "Syncing server..." - -#. TRANSLATORS: %s is the name of the ntp server -#: src/modules/AutoinstGeneral.rb:416 -msgid "Syncing time with %s." -msgstr "" - -#: src/modules/AutoinstGeneral.rb:420 -#, fuzzy -#| msgid "Parsing failed." -msgid "Time syncing failed." -msgstr "Parsing failed." - -#: src/modules/AutoinstGeneral.rb:424 -#, fuzzy -#| msgid "Cannot mount file system." -msgid "Cannot update system time." -msgstr "Cannot mount file system." - #. look for VGs to reuse -#: src/modules/AutoinstLVM.rb:113 +#: src/modules/AutoinstLVM.rb:111 #, fuzzy msgid "Cannot reuse volume group %1. The volume group does not exist." msgstr "can't reuse volume group %1. The volume group does not exist" @@ -2733,7 +2693,7 @@ msgstr "Unknown" #. warning text during the installation. %1 is a list of package names -#: src/modules/AutoinstSoftware.rb:172 +#: src/modules/AutoinstSoftware.rb:171 #, fuzzy msgid "" "These packages could not be found in the software repositories:\n" @@ -2744,29 +2704,29 @@ #. 4 means "already exists" #. Add add-ons -#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347 +#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345 #, fuzzy #| msgid "Reading file on %1 failed.\n" msgid "Adding repo %1 failed" msgstr "Reading file on %1 failed.\n" #. Install -#: src/modules/AutoinstSoftware.rb:375 +#: src/modules/AutoinstSoftware.rb:373 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log" msgstr "" -#: src/modules/AutoinstSoftware.rb:383 +#: src/modules/AutoinstSoftware.rb:381 #, fuzzy #| msgid "Checking installed packages..." msgid "Creating Image - installing packages" msgstr "Checking installed packages..." -#: src/modules/AutoinstSoftware.rb:393 +#: src/modules/AutoinstSoftware.rb:391 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log" msgstr "" #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") ); -#: src/modules/AutoinstSoftware.rb:404 +#: src/modules/AutoinstSoftware.rb:402 #, fuzzy #| msgid "Retrieving image file..." msgid "Store image to ..." @@ -2774,60 +2734,60 @@ #. Compress image: #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" . -#: src/modules/AutoinstSoftware.rb:433 +#: src/modules/AutoinstSoftware.rb:431 msgid "" "You can do changes to the image now in %1/\n" "If you press the ok-button, the image will be compressed and can't be changed anymore." msgstr "" -#: src/modules/AutoinstSoftware.rb:447 +#: src/modules/AutoinstSoftware.rb:445 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log" msgstr "" -#: src/modules/AutoinstSoftware.rb:454 +#: src/modules/AutoinstSoftware.rb:452 #, fuzzy #| msgid "Archive created successfully" msgid "Image created successfully" msgstr "Archive created successfully" #. copy a directory (ends with / in directory.yast) -#: src/modules/AutoinstSoftware.rb:490 +#: src/modules/AutoinstSoftware.rb:488 msgid "" "can not get the directory.yast file at `%1`.\n" "You can create that file with 'ls -F > directory.yast' if it's missing." msgstr "" #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir. -#: src/modules/AutoinstSoftware.rb:524 +#: src/modules/AutoinstSoftware.rb:522 #, fuzzy #| msgid "Cannot read configuration file." msgid "can not read '%1'. Try again?" msgstr "Cannot read configuration file." #. copy a file -#: src/modules/AutoinstSoftware.rb:542 +#: src/modules/AutoinstSoftware.rb:540 #, fuzzy #| msgid "Cannot read configuration file." msgid "can not read '%1'. ISO creation failed" msgstr "Cannot read configuration file." #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD -#: src/modules/AutoinstSoftware.rb:572 +#: src/modules/AutoinstSoftware.rb:570 #, fuzzy #| msgid "Creating ISO image directory..." msgid "Preparing ISO Filestructure ..." msgstr "Creating ISO image directory..." #. prepare and save isolinux.cfg boot menu of the media -#: src/modules/AutoinstSoftware.rb:621 +#: src/modules/AutoinstSoftware.rb:619 msgid "boot config for the DVD" msgstr "" -#: src/modules/AutoinstSoftware.rb:625 +#: src/modules/AutoinstSoftware.rb:623 msgid "Ok" msgstr "Ok" -#: src/modules/AutoinstSoftware.rb:628 +#: src/modules/AutoinstSoftware.rb:626 msgid "" "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n" "If you press the ok-button, the iso will be created." @@ -2835,19 +2795,19 @@ #. create the actual ISO file #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") ); -#: src/modules/AutoinstSoftware.rb:647 +#: src/modules/AutoinstSoftware.rb:645 #, fuzzy #| msgid "Creating ISO image..." msgid "Store ISO image to ..." msgstr "Creating ISO image..." -#: src/modules/AutoinstSoftware.rb:648 +#: src/modules/AutoinstSoftware.rb:646 #, fuzzy #| msgid "Creating ISO image..." msgid "Creating ISO File ..." msgstr "Creating ISO image..." -#: src/modules/AutoinstSoftware.rb:669 +#: src/modules/AutoinstSoftware.rb:667 #, fuzzy #| msgid "Successfully Tested %1" msgid "ISO successfully created at %1" @@ -2855,29 +2815,29 @@ #. Summary #. @return Html formatted configuration summary -#: src/modules/AutoinstSoftware.rb:745 +#: src/modules/AutoinstSoftware.rb:743 msgid "Selected Patterns" msgstr "Selected Patterns" -#: src/modules/AutoinstSoftware.rb:755 +#: src/modules/AutoinstSoftware.rb:753 msgid "Individually Selected Packages" msgstr "Individually Selected Packages" -#: src/modules/AutoinstSoftware.rb:761 +#: src/modules/AutoinstSoftware.rb:759 msgid "Packages to Remove" msgstr "Packages to Remove" -#: src/modules/AutoinstSoftware.rb:768 +#: src/modules/AutoinstSoftware.rb:766 msgid "Force Kernel Package" msgstr "Force Kernel Package" #. set SoftLock to avoid the installation of recommended patterns (#159466) -#: src/modules/AutoinstSoftware.rb:858 +#: src/modules/AutoinstSoftware.rb:856 msgid "Could not set patterns: %1." msgstr "Could not set patterns: %1." #. Solve dependencies -#: src/modules/AutoinstSoftware.rb:919 +#: src/modules/AutoinstSoftware.rb:917 msgid "The package resolver run failed. Please check your software section in the autoyast profile." msgstr "The package resolver run failed. Please check your software section in the autoyast profile." @@ -2926,14 +2886,14 @@ #. Prepare Profile for saving and remove empty data structs #. @return [void] -#: src/modules/Profile.rb:351 +#: src/modules/Profile.rb:357 msgid "Collecting configuration data..." msgstr "Collecting configuration data..." #. Save YCP data into XML #. @param path to file #. @return [Boolean] true on success -#: src/modules/Profile.rb:454 +#: src/modules/Profile.rb:460 msgid "Encrypted AutoYaST profile. Enter the password twice." msgstr "" @@ -2941,7 +2901,7 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:528 +#: src/modules/Profile.rb:534 #, fuzzy msgid "Could not write section %1 to file %2." msgstr "Cannot write comment to file %1." @@ -2949,7 +2909,7 @@ #. Read XML into YCP data #. @param path to file #. @return [Boolean] -#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190 +#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190 msgid "Encrypted AutoYaST profile. Enter the correct password." msgstr "" @@ -2967,6 +2927,26 @@ msgid "&OK" msgstr "&OK" +#, fuzzy +#~| msgid "Configure Volume Groups" +#~ msgid "Configure users and groups" +#~ msgstr "Configure Volume Groups" + +#, fuzzy +#~| msgid "Syncing server..." +#~ msgid "Syncing time..." +#~ msgstr "Syncing server..." + +#, fuzzy +#~| msgid "Parsing failed." +#~ msgid "Time syncing failed." +#~ msgstr "Parsing failed." + +#, fuzzy +#~| msgid "Cannot mount file system." +#~ msgid "Cannot update system time." +#~ msgstr "Cannot mount file system." + #~ msgid "Configure runlevel" #~ msgstr "Configure runlevel" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/base.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: base\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 17:00+0200\n" "PO-Revision-Date: 2008-03-27 19:13+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -390,7 +390,7 @@ #. for translators: use the localized page for your language if it exists, #. check the combo box "In other laguages" on top of the page #: library/control/src/modules/InstError.rb:167 -#: library/control/src/modules/ProductControl.rb:1444 +#: library/control/src/modules/ProductControl.rb:1450 msgid "http://en.opensuse.org/Bugs/YaST" msgstr "" @@ -431,7 +431,7 @@ msgstr "Removing Packages..." #. error report -#: library/control/src/modules/ProductControl.rb:1253 +#: library/control/src/modules/ProductControl.rb:1259 msgid "No workflow defined for this installation mode." msgstr "No workflow defined for this installation mode." @@ -449,14 +449,14 @@ #. button label #. Button that will continue with the installation #: library/control/src/modules/ProductProfile.rb:183 -#: library/general/src/modules/Popup.rb:744 +#: library/general/src/modules/Popup.rb:737 msgid "&Continue Installation" msgstr "&Continue Installation" #. button label #. Button that will really abort the installation #: library/control/src/modules/ProductProfile.rb:185 -#: library/general/src/modules/Popup.rb:742 +#: library/general/src/modules/Popup.rb:735 msgid "&Abort Installation" msgstr "&Abort Installation" @@ -497,7 +497,7 @@ msgstr "An internal error occurred when integrating additional workflow." #. message popup, %1 is a label of some widget -#: library/cwm/src/modules/CWM.rb:677 +#: library/cwm/src/modules/CWM.rb:691 msgid "The value of %1 is invalid." msgstr "The value of %1 is invalid." @@ -1117,6 +1117,87 @@ "<p>In some environments, all or some\n" "F keys are not available.</p>" +#. @param service [Object] An object providing the following methods: +#. #name, #start, #stop, #enabled?, #running? +#. For systemd compliant services, just do +#. Yast::SystemdService.find("name_of_the_service") +#. Note that this widget will #start and #stop the service by itself but +#. the actions referenced by the flags (reloading and enabling/disabling) +#. are expected to be done by the caller, when the whole configuration is +#. written. +#. @param reload_flag [Boolean] Initial value for the "reload" checkbox. +#. Keep in mind it will always be displayed as unchecked if the service +#. is not running, despite the real value. +#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox. +#. :reload means the service will be reloaded. +#. :restart means the service will be restarted. +#: library/general/src/lib/ui/service_status.rb:59 +#, fuzzy +#| msgid "Masquerading Settings:" +msgid "Restart After Saving Settings" +msgstr "Masquerading Settings:" + +#: library/general/src/lib/ui/service_status.rb:61 +#, fuzzy +#| msgid "Masquerading Settings:" +msgid "Reload After Saving Settings" +msgstr "Masquerading Settings:" + +#. @return [YaST::Term] +#: library/general/src/lib/ui/service_status.rb:68 +#, fuzzy +#| msgid "Service Start" +msgid "Service Status" +msgstr "Service Start" + +#. rubocop:enable Style/TrivialAccessors +#. Content for the help +#: library/general/src/lib/ui/service_status.rb:133 +msgid "" +"<p><b><big>Current status</big></b><br>\n" +"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n" +"<p><b><big>%{reload_label}</big></b><br>\n" +"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</p>\n" +"<p><b><big>Start During System Boot</big></b><br>\n" +"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n" +msgstr "" + +#. Widget displaying the status and associated buttons +#: library/general/src/lib/ui/service_status.rb:159 +msgid "Current status:" +msgstr "Current status:" + +#. Widget to configure the status on boot +#: library/general/src/lib/ui/service_status.rb:172 +#, fuzzy +#| msgid "Activate During Boot" +msgid "Start During System Boot" +msgstr "Activate During Boot" + +#. TRANSLATORS: status of a service +#: library/general/src/lib/ui/service_status.rb:196 +#, fuzzy +#| msgid "Running" +msgid "running" +msgstr "Running" + +#: library/general/src/lib/ui/service_status.rb:198 +#, fuzzy +#| msgid "S&top now ..." +msgid "Stop now" +msgstr "S&top now ..." + +#. TRANSLATORS: status of a service +#: library/general/src/lib/ui/service_status.rb:203 +msgid "stopped" +msgstr "" + +#: library/general/src/lib/ui/service_status.rb:205 +#, fuzzy +#| msgid "&Start now ..." +msgid "Start now" +msgstr "&Start now ..." + #. TRANSLATORS: popup question (with continue / cancel buttons) #. %1 is the filesystem path #: library/general/src/modules/FileUtils.rb:292 @@ -1317,7 +1398,7 @@ #. this media (CD) so no packages from this media will be installed #. PushButton label #: library/general/src/modules/Label.rb:250 -#: library/packages/src/modules/PackageCallbacks.rb:664 +#: library/packages/src/modules/PackageCallbacks.rb:665 #: library/wizard/src/modules/Confirm.rb:126 msgid "&Skip" msgstr "&Skip" @@ -1340,7 +1421,7 @@ #. TextEntry Label #. textentry label #: library/general/src/modules/Label.rb:319 -#: library/packages/src/modules/PackageCallbacks.rb:2230 +#: library/packages/src/modules/PackageCallbacks.rb:2231 msgid "&Password" msgstr "&Password" @@ -1565,27 +1646,27 @@ msgstr "listen value to delete not found" #. Confirm user request to abort installation -#: library/general/src/modules/Popup.rb:740 +#: library/general/src/modules/Popup.rb:733 msgid "Really abort the installation?" msgstr "Really abort the installation?" #. Confirm user request to abort System Repair -#: library/general/src/modules/Popup.rb:749 +#: library/general/src/modules/Popup.rb:742 msgid "Really abort YaST System Repair?" msgstr "Really abort YaST System Repair?" #. Button that will really abort the repair -#: library/general/src/modules/Popup.rb:751 +#: library/general/src/modules/Popup.rb:744 msgid "Abort System Repair" msgstr "Abort System Repair" #. Button that will continue with the repair -#: library/general/src/modules/Popup.rb:753 +#: library/general/src/modules/Popup.rb:746 msgid "&Continue System Repair" msgstr "&Continue System Repair" #. Warning text for aborting an installation before anything is installed -#: library/general/src/modules/Popup.rb:756 +#: library/general/src/modules/Popup.rb:749 msgid "" "If you abort the installation now,\n" "Linux will not be installed.\n" @@ -1598,7 +1679,7 @@ #. Warning text for aborting an installation during the install process #. - After some installation steps have been performed - e.g. #. disks formatted / some packages already installed -#: library/general/src/modules/Popup.rb:766 +#: library/general/src/modules/Popup.rb:759 msgid "" "If you abort the installation now, you will\n" "have an incomplete Linux system\n" @@ -1612,7 +1693,7 @@ #. Warning text for aborting an installation during the install process #. right in the middle of some critical process (e.g. formatting) -#: library/general/src/modules/Popup.rb:775 +#: library/general/src/modules/Popup.rb:768 msgid "" "If you abort the installation now,\n" "Linux will be unusable.\n" @@ -1623,18 +1704,18 @@ "You will need to reinstall." #. Confirm aborting the program -#: library/general/src/modules/Popup.rb:829 +#: library/general/src/modules/Popup.rb:822 msgid "Really abort?" msgstr "Really abort?" #. Additional hint when trying to abort program in spite of changes -#: library/general/src/modules/Popup.rb:837 +#: library/general/src/modules/Popup.rb:830 msgid "All changes will be lost!" msgstr "All changes will be lost!" #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later #. button label -#: library/general/src/modules/Popup.rb:867 +#: library/general/src/modules/Popup.rb:860 msgid "&Details..." msgstr "&Details..." @@ -2691,47 +2772,47 @@ "No spaces are allowed.\n" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:115 +#: library/network/src/modules/SuSEFirewall.rb:116 msgid "External Zone" msgstr "External Zone" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:119 +#: library/network/src/modules/SuSEFirewall.rb:120 msgid "Internal Zone" msgstr "Internal Zone" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/modules/SuSEFirewall.rb:123 +#: library/network/src/modules/SuSEFirewall.rb:124 msgid "Demilitarized Zone" msgstr "Demilitarized Zone" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:246 +#: library/network/src/modules/SuSEFirewall.rb:247 msgid "TCP" msgstr "TCP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:248 +#: library/network/src/modules/SuSEFirewall.rb:249 msgid "UDP" msgstr "UDP" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:250 +#: library/network/src/modules/SuSEFirewall.rb:251 msgid "RPC" msgstr "RPC" #. protocol name -#: library/network/src/modules/SuSEFirewall.rb:252 +#: library/network/src/modules/SuSEFirewall.rb:253 msgid "IP" msgstr "IP" #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title -#: library/network/src/modules/SuSEFirewall.rb:1158 +#: library/network/src/modules/SuSEFirewall.rb:1159 msgid "Unknown Zone" msgstr "Unknown Zone" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/modules/SuSEFirewall.rb:1506 +#: library/network/src/modules/SuSEFirewall.rb:1508 msgid "" "Interface '%1' is included in multiple firewall zones.\n" "Continuing with configuration can produce errors.\n" @@ -2747,8 +2828,8 @@ #. TRANSLATORS: Error message, %1 = interface name (like eth0) #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/modules/SuSEFirewall.rb:1971 -#: library/network/src/modules/SuSEFirewall.rb:2047 +#: library/network/src/modules/SuSEFirewall.rb:1973 +#: library/network/src/modules/SuSEFirewall.rb:2049 msgid "" "Interface '%1' is not assigned to any firewall zone.\n" "Run YaST2 Firewall and assign it.\n" @@ -2757,72 +2838,72 @@ "Run YaST2 Firewall and assign it.\n" #. TRANSLATORS: Dialog caption -#: library/network/src/modules/SuSEFirewall.rb:2478 +#: library/network/src/modules/SuSEFirewall.rb:2480 msgid "Initializing Firewall Configuration" msgstr "Initialising Firewall Configuration" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2486 +#: library/network/src/modules/SuSEFirewall.rb:2488 msgid "Check for network devices" msgstr "Check for network devices" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2488 +#: library/network/src/modules/SuSEFirewall.rb:2490 msgid "Read current configuration" msgstr "Read current configuration" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2490 +#: library/network/src/modules/SuSEFirewall.rb:2492 msgid "Check possibly conflicting services" msgstr "Check possibly conflicting services" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2494 +#: library/network/src/modules/SuSEFirewall.rb:2496 msgid "Checking for network devices..." msgstr "Checking for network devices..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2496 +#: library/network/src/modules/SuSEFirewall.rb:2498 msgid "Reading current configuration..." msgstr "Reading current configuration..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2498 +#: library/network/src/modules/SuSEFirewall.rb:2500 msgid "Checking possibly conflicting services..." msgstr "Checking possibly conflicting services..." #. TRANSLATORS: Dialog caption -#: library/network/src/modules/SuSEFirewall.rb:2648 +#: library/network/src/modules/SuSEFirewall.rb:2643 msgid "Writing Firewall Configuration" msgstr "Writing Firewall Configuration" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2656 +#: library/network/src/modules/SuSEFirewall.rb:2651 msgid "Write firewall settings" msgstr "Write firewall settings" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2658 +#: library/network/src/modules/SuSEFirewall.rb:2653 msgid "Adjust firewall service" msgstr "Adjust firewall service" #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2662 +#: library/network/src/modules/SuSEFirewall.rb:2657 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. TRANSLATORS: Progress step -#: library/network/src/modules/SuSEFirewall.rb:2664 +#: library/network/src/modules/SuSEFirewall.rb:2659 msgid "Adjusting firewall service..." msgstr "Adjusting firewall service..." #. TRANSLATORS: a popup error message -#: library/network/src/modules/SuSEFirewall.rb:2683 +#: library/network/src/modules/SuSEFirewall.rb:2678 msgid "Writing settings failed" msgstr "Writing settings failed" #. table item, %1 stands for the buggy protocol name -#: library/network/src/modules/SuSEFirewall.rb:3476 +#: library/network/src/modules/SuSEFirewall.rb:3471 msgid "Unknown protocol (%1)" msgstr "Unknown protocol (%1)" @@ -2920,51 +3001,52 @@ #. Returns service definition. #. See @services for the format. -#. If `silent` is not defined or set to `true`, function throws an exception -#. SuSEFirewalServiceNotFound if service is not found on disk. +#. If *silent* is `false` (the default), the method throws an exception +#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk. #. -#. @param [String] service name +#. @param [String] service name (including the "service:" prefix) #. @param [String] (optional) whether to silently return nil #. when service is not found (default false) +#. @api private #. Immediately writes the configuration of service defined by package to the #. service definition file. Service must be defined by package, this function #. doesn't work for hard-coded services (SuSEFirewallServices). -#. Function throws an exception SuSEFirewalServiceNotFound +#. Function throws an exception {Yast::SuSEFirewalServiceNotFound} #. if service is not known (undefined) or it is not a service #. defined by package. #. #. @param [String] service ID (e.g., "service:ssh") -#. @param map of full service definition +#. @param [Hash{String => Array<String>] store_definition of full service definition #. @return [Boolean] if successful (nil in case of developer's mistake) #. -#. @see #IsKnownService() -#. @see #ServiceDefinedByPackage() +#. @see #IsKnownService +#. @see #ServiceDefinedByPackage #. #. @example #. SetNeededPortsAndProtocols ( #. "service:something", -#. $[ -#. "tcp_ports" : [ "22", "ftp-data", "400:420" ], -#. "udp_ports" : [ ], -#. "rpc_ports" : [ "portmap", "ypbind" ], -#. "ip_protocols" : [ "esp" ], -#. "broadcast_ports" : [ ], -#. ] -#. ); -#: library/network/src/modules/SuSEFirewallServices.rb:354 -#: library/network/src/modules/SuSEFirewallServices.rb:637 +#. { +#. "tcp_ports" => [ "22", "ftp-data", "400:420" ], +#. "udp_ports" => [ ], +#. "rpc_ports" => [ "portmap", "ypbind" ], +#. "ip_protocols" => [ "esp" ], +#. "broadcast_ports"=> [ ], +#. } +#. ) +#: library/network/src/modules/SuSEFirewallServices.rb:356 +#: library/network/src/modules/SuSEFirewallServices.rb:640 msgid "Service with name '%{service_name}' does not exist" msgstr "" #. Fallback for presented service -#: library/network/src/modules/SuSEFirewallServices.rb:430 +#: library/network/src/modules/SuSEFirewallServices.rb:434 #, fuzzy #| msgid "Service: %1" msgid "Service: %{filename}" msgstr "Service: %1" #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server -#: library/network/src/modules/SuSEFirewallServices.rb:503 +#: library/network/src/modules/SuSEFirewallServices.rb:505 msgid "Unknown service '%1'" msgstr "Unknown service '%1'" @@ -2988,36 +3070,80 @@ msgid "&Uninstall" msgstr "&Uninstall" +#. TRANSLATORS: progress bar label +#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77 +#, fuzzy +#| msgid "Checking file system..." +msgid "Checking file conflicts..." +msgstr "Checking file system..." + +#. TRANSLATORS: help text for the file conflict detection progress +#: library/packages/src/lib/packages/file_conflict_callbacks.rb:87 +msgid "<p>Detecting the file conflicts is in progress.</p>" +msgstr "" + +#. TRANSLATORS: An error message, %s is the actual list of detected conflicts +#: library/packages/src/lib/packages/file_conflict_callbacks.rb:132 +msgid "" +"File conflicts detected, these conflicting files will be overwritten:\n" +"\n" +"%s" +msgstr "" + +#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed +#: library/packages/src/lib/packages/file_conflict_callbacks.rb:168 +msgid "" +"File conflicts happen when two packages attempt to install\n" +"files with the same name but different contents. If you continue\n" +"the conflicting files will be replaced, losing the previous content." +msgstr "" + +#. TRANSLATORS: Popup heading +#: library/packages/src/lib/packages/file_conflict_callbacks.rb:173 +msgid "A File Conflict Detected" +msgid_plural "File Conflicts Detected" +msgstr[0] "" +msgstr[1] "" + +#. Convert one message to richtext +#. +#. @return [String] Message converted to richtext +#: library/packages/src/lib/packages/update_messages_view.rb:35 +#, fuzzy +#| msgid "(no message available)" +msgid "This message will be available at %s" +msgstr "(no message available)" + #. -------------------------------------------------------------------------- #. defaults #. at start of file providal -#: library/packages/src/modules/PackageCallbacks.rb:149 -#: library/packages/src/modules/PackageCallbacks.rb:157 +#: library/packages/src/modules/PackageCallbacks.rb:150 +#: library/packages/src/modules/PackageCallbacks.rb:158 msgid "Downloading package %1 (%2)..." msgstr "Downloading package %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:161 +#: library/packages/src/modules/PackageCallbacks.rb:162 msgid "Downloading Package" msgstr "Downloading Package" #. error message, %1 is a package name -#: library/packages/src/modules/PackageCallbacks.rb:220 +#: library/packages/src/modules/PackageCallbacks.rb:221 #, fuzzy msgid "Package %1 is broken, integrity check has failed." msgstr "File integrity check failed: " #. command line mode - ask user whether installation of the failed package should be retried #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:232 -#: library/packages/src/modules/PackageCallbacks.rb:447 +#: library/packages/src/modules/PackageCallbacks.rb:233 +#: library/packages/src/modules/PackageCallbacks.rb:448 msgid "Retry installation of the package?" msgstr "Retry installation of the package?" #. command line mode - ask user whether the installation should be aborted #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:240 -#: library/packages/src/modules/PackageCallbacks.rb:455 +#: library/packages/src/modules/PackageCallbacks.rb:241 +#: library/packages/src/modules/PackageCallbacks.rb:456 msgid "Abort the installation?" msgstr "Abort the installation?" @@ -3026,58 +3152,58 @@ #. detail string is appended to the end #. error message, %1 is code of the error, #. detail string is appended to the end -#: library/packages/src/modules/PackageCallbacks.rb:268 -#: library/packages/src/modules/PackageCallbacks.rb:302 -#: library/packages/src/modules/PackageCallbacks.rb:2143 +#: library/packages/src/modules/PackageCallbacks.rb:269 +#: library/packages/src/modules/PackageCallbacks.rb:303 +#: library/packages/src/modules/PackageCallbacks.rb:2144 #, fuzzy msgid "Error: %1:" msgstr "Error: " #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a download error -#: library/packages/src/modules/PackageCallbacks.rb:326 +#: library/packages/src/modules/PackageCallbacks.rb:327 msgid "" "Ignoring a download failure may result in a broken system.\n" "Verify the system later by running the Software Management module.\n" msgstr "" #. At start of package install. -#: library/packages/src/modules/PackageCallbacks.rb:364 +#: library/packages/src/modules/PackageCallbacks.rb:365 msgid "Uninstalling package %1 (%2)..." msgstr "Uninstalling package %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:366 +#: library/packages/src/modules/PackageCallbacks.rb:367 msgid "Installing package %1 (%2)..." msgstr "Installing package %1 (%2)..." -#: library/packages/src/modules/PackageCallbacks.rb:374 +#: library/packages/src/modules/PackageCallbacks.rb:375 msgid "Uninstalling Package" msgstr "Uninstalling Package" -#: library/packages/src/modules/PackageCallbacks.rb:374 +#: library/packages/src/modules/PackageCallbacks.rb:375 msgid "Installing Package" msgstr "Installing Package" #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:430 +#: library/packages/src/modules/PackageCallbacks.rb:431 msgid "Removal of package %1 failed." msgstr "Removal of package %1 failed." #. error popup during package installation, %1 is the name of the package -#: library/packages/src/modules/PackageCallbacks.rb:433 +#: library/packages/src/modules/PackageCallbacks.rb:434 msgid "Installation of package %1 failed." msgstr "Installation of package %1 failed." #. TODO: add "Don't show again" checkbox #. a warning popup displayed after pressing [Ignore] after a package installation error -#: library/packages/src/modules/PackageCallbacks.rb:506 +#: library/packages/src/modules/PackageCallbacks.rb:507 msgid "" "Ignoring a package failure may result in a broken system.\n" "The system should be later verified by running the Software Management module." msgstr "" #. error report -#: library/packages/src/modules/PackageCallbacks.rb:575 +#: library/packages/src/modules/PackageCallbacks.rb:576 #, fuzzy msgid "" "<p>The repository at the specified URL now provides a different media ID.\n" @@ -3093,29 +3219,29 @@ #. media is double sided, we want the user to insert the 'Side A' of the media #. the complete string will be "<product> <media> <number>, <side>" #. e.g. "'SuSE Linux 9.0' DVD 1, Side A" -#: library/packages/src/modules/PackageCallbacks.rb:590 +#: library/packages/src/modules/PackageCallbacks.rb:591 msgid "Side A" msgstr "Side A" #. media is double sided, we want the user to insert the 'Side B' of the media -#: library/packages/src/modules/PackageCallbacks.rb:593 +#: library/packages/src/modules/PackageCallbacks.rb:594 msgid "Side B" msgstr "Side B" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:608 +#: library/packages/src/modules/PackageCallbacks.rb:609 #, fuzzy msgid "%1 (Disc %2)" msgstr "%1 (%2)" #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2) -#: library/packages/src/modules/PackageCallbacks.rb:611 +#: library/packages/src/modules/PackageCallbacks.rb:612 #, fuzzy msgid "%1 (Medium %2)" msgstr "Medium: %1" #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2") -#: library/packages/src/modules/PackageCallbacks.rb:617 +#: library/packages/src/modules/PackageCallbacks.rb:618 msgid "" "Insert\n" "'%1'" @@ -3124,7 +3250,7 @@ "'%1'" #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:622 +#: library/packages/src/modules/PackageCallbacks.rb:623 #, fuzzy msgid "" "Cannot access installation media\n" @@ -3137,7 +3263,7 @@ "Check that the directory is accessible." #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...") -#: library/packages/src/modules/PackageCallbacks.rb:634 +#: library/packages/src/modules/PackageCallbacks.rb:635 #, fuzzy msgid "" "Cannot access installation media \n" @@ -3151,54 +3277,54 @@ #. wrong media id, offer "Ignore" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:659 -#: library/packages/src/modules/PackageCallbacks.rb:1838 +#: library/packages/src/modules/PackageCallbacks.rb:660 +#: library/packages/src/modules/PackageCallbacks.rb:1839 #, fuzzy msgid "Skip Autorefresh" msgstr "&Skip Refresh" #. menu button label - used for more then one device #. push button label - in the media change popup, user can eject the CD/DVD -#: library/packages/src/modules/PackageCallbacks.rb:678 -#: library/packages/src/modules/PackageCallbacks.rb:681 +#: library/packages/src/modules/PackageCallbacks.rb:679 +#: library/packages/src/modules/PackageCallbacks.rb:682 msgid "&Eject" msgstr "&Eject" -#: library/packages/src/modules/PackageCallbacks.rb:688 +#: library/packages/src/modules/PackageCallbacks.rb:689 #, fuzzy msgid "A&utomatically Eject CD or DVD Medium" msgstr "Read &CD or DVD Medium" #. command line mode - ask user whether installation of the failed package should be retried -#: library/packages/src/modules/PackageCallbacks.rb:755 +#: library/packages/src/modules/PackageCallbacks.rb:756 msgid "Retry the installation?" msgstr "Retry the installation?" #. command line mode - ask user whether the installation should be aborted -#: library/packages/src/modules/PackageCallbacks.rb:763 +#: library/packages/src/modules/PackageCallbacks.rb:764 msgid "Skip the medium?" msgstr "Skip the medium?" #. otherwise ignore the medium -#: library/packages/src/modules/PackageCallbacks.rb:770 +#: library/packages/src/modules/PackageCallbacks.rb:771 msgid "Ignoring the bad medium..." msgstr "Ignoring the bad medium..." #. TextEntry label #. TextEntry label -#: library/packages/src/modules/PackageCallbacks.rb:791 -#: library/packages/src/modules/PackageCallbacks.rb:847 +#: library/packages/src/modules/PackageCallbacks.rb:792 +#: library/packages/src/modules/PackageCallbacks.rb:848 msgid "&URL" msgstr "&URL" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1039 +#: library/packages/src/modules/PackageCallbacks.rb:1040 #, fuzzy msgid "Creating Repository %1" msgstr "Probing repository " #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1072 +#: library/packages/src/modules/PackageCallbacks.rb:1073 #, fuzzy msgid "An error occurred while creating the repository." msgstr "Error occurred while reading the log." @@ -3206,9 +3332,9 @@ #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1076 -#: library/packages/src/modules/PackageCallbacks.rb:1203 -#: library/packages/src/modules/PackageCallbacks.rb:1313 +#: library/packages/src/modules/PackageCallbacks.rb:1077 +#: library/packages/src/modules/PackageCallbacks.rb:1204 +#: library/packages/src/modules/PackageCallbacks.rb:1314 #, fuzzy msgid "Unable to retrieve the remote repository description." msgstr "Unable to retrieve the remote source description." @@ -3216,24 +3342,24 @@ #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1079 -#: library/packages/src/modules/PackageCallbacks.rb:1206 -#: library/packages/src/modules/PackageCallbacks.rb:1316 +#: library/packages/src/modules/PackageCallbacks.rb:1080 +#: library/packages/src/modules/PackageCallbacks.rb:1207 +#: library/packages/src/modules/PackageCallbacks.rb:1317 msgid "An error occurred while retrieving the new metadata." msgstr "An error occurred while retrieving the new metadata." #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1082 -#: library/packages/src/modules/PackageCallbacks.rb:1209 -#: library/packages/src/modules/PackageCallbacks.rb:1319 +#: library/packages/src/modules/PackageCallbacks.rb:1083 +#: library/packages/src/modules/PackageCallbacks.rb:1210 +#: library/packages/src/modules/PackageCallbacks.rb:1320 #, fuzzy msgid "The repository is not valid." msgstr "The entered URL is not valid." #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1085 +#: library/packages/src/modules/PackageCallbacks.rb:1086 #, fuzzy msgid "The repository metadata is invalid." msgstr "The host name is invalid." @@ -3242,107 +3368,107 @@ #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether the repository refreshment should be retried #. command line mode - ask user whether target initializatin can be restarted -#: library/packages/src/modules/PackageCallbacks.rb:1098 -#: library/packages/src/modules/PackageCallbacks.rb:1228 -#: library/packages/src/modules/PackageCallbacks.rb:1332 -#: library/packages/src/modules/PackageCallbacks.rb:2097 +#: library/packages/src/modules/PackageCallbacks.rb:1099 +#: library/packages/src/modules/PackageCallbacks.rb:1229 +#: library/packages/src/modules/PackageCallbacks.rb:1333 +#: library/packages/src/modules/PackageCallbacks.rb:2098 #, fuzzy msgid "Retry?" msgstr "Retry" #. popup label (%1 is repository URL) -#: library/packages/src/modules/PackageCallbacks.rb:1144 -#: library/packages/src/modules/PackageCallbacks.rb:1152 +#: library/packages/src/modules/PackageCallbacks.rb:1145 +#: library/packages/src/modules/PackageCallbacks.rb:1153 #, fuzzy msgid "Probing Repository %1" msgstr "Probing repository " #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1199 +#: library/packages/src/modules/PackageCallbacks.rb:1200 #, fuzzy msgid "Error occurred while probing the repository." msgstr "Error occurred while reading the log." #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1212 +#: library/packages/src/modules/PackageCallbacks.rb:1213 #, fuzzy msgid "Repository probing details." msgstr "Repository Configuration" #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1215 +#: library/packages/src/modules/PackageCallbacks.rb:1216 #, fuzzy msgid "Repository metadata is invalid." msgstr "Host name is invalid." #. error message - a label followed by a richtext with details -#: library/packages/src/modules/PackageCallbacks.rb:1309 +#: library/packages/src/modules/PackageCallbacks.rb:1310 #, fuzzy msgid "Repository %1" msgstr "Repository: " #. at start of delta providal -#: library/packages/src/modules/PackageCallbacks.rb:1397 +#: library/packages/src/modules/PackageCallbacks.rb:1398 #, fuzzy msgid "Downloading delta RPM package %1 (%2)..." msgstr "Downloading package %1 (%2)..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1405 +#: library/packages/src/modules/PackageCallbacks.rb:1406 #, fuzzy msgid "Downloading Delta RPM package" msgstr "Downloading delta RPM %1" #. at start of delta application -#: library/packages/src/modules/PackageCallbacks.rb:1418 +#: library/packages/src/modules/PackageCallbacks.rb:1419 #, fuzzy msgid "Applying delta RPM package %1..." msgstr "Applying delta RPM: %1" #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1425 +#: library/packages/src/modules/PackageCallbacks.rb:1426 #, fuzzy msgid "Applying delta RPM package" msgstr "Applying delta RPM: %1" #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1427 -#: library/packages/src/modules/PackageCallbacks.rb:3075 +#: library/packages/src/modules/PackageCallbacks.rb:1428 +#: library/packages/src/modules/PackageCallbacks.rb:3082 msgid "Package: " msgstr "Package: " #. close popup -#: library/packages/src/modules/PackageCallbacks.rb:1493 +#: library/packages/src/modules/PackageCallbacks.rb:1494 #, fuzzy msgid "Starting script %1 (patch %2)..." msgstr "Starting script %1" #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:1502 +#: library/packages/src/modules/PackageCallbacks.rb:1503 #, fuzzy msgid "Running Script" msgstr "Running scripts..." #. label, patch name follows -#: library/packages/src/modules/PackageCallbacks.rb:1507 +#: library/packages/src/modules/PackageCallbacks.rb:1508 #, fuzzy msgid "Patch: " msgstr "Patch" #. label, script name follows -#: library/packages/src/modules/PackageCallbacks.rb:1516 +#: library/packages/src/modules/PackageCallbacks.rb:1517 #, fuzzy msgid "Script: " msgstr "Script" #. label -#: library/packages/src/modules/PackageCallbacks.rb:1522 +#: library/packages/src/modules/PackageCallbacks.rb:1523 #, fuzzy msgid "Output of the Script" msgstr "The Output of the Script mkinitrd" #. label, %1 is patch name with version and architecture -#: library/packages/src/modules/PackageCallbacks.rb:1610 +#: library/packages/src/modules/PackageCallbacks.rb:1611 #, fuzzy msgid "" "Patch: %1\n" @@ -3352,7 +3478,7 @@ "\n" #. a popup question with "Continue", "Skip" and "Abort" buttons -#: library/packages/src/modules/PackageCallbacks.rb:1627 +#: library/packages/src/modules/PackageCallbacks.rb:1628 msgid "" "The repositories are being refreshed.\n" "Continue with refreshing?\n" @@ -3362,37 +3488,37 @@ msgstr "" #. push button label -#: library/packages/src/modules/PackageCallbacks.rb:1642 +#: library/packages/src/modules/PackageCallbacks.rb:1643 msgid "&Skip Refresh" msgstr "&Skip Refresh" #. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:1676 +#: library/packages/src/modules/PackageCallbacks.rb:1677 #, fuzzy msgid "Downloading" msgstr "&Downloading" #. message in a progress popup #. progress bar label, %1 is URL with optional download rate -#: library/packages/src/modules/PackageCallbacks.rb:1723 -#: library/packages/src/modules/PackageCallbacks.rb:1771 +#: library/packages/src/modules/PackageCallbacks.rb:1724 +#: library/packages/src/modules/PackageCallbacks.rb:1772 msgid "Downloading: %1" msgstr "Downloading: %1" #. heading of popup #. heading of popup -#: library/packages/src/modules/PackageCallbacks.rb:1875 -#: library/packages/src/modules/PackageCallbacks.rb:1941 +#: library/packages/src/modules/PackageCallbacks.rb:1876 +#: library/packages/src/modules/PackageCallbacks.rb:1942 msgid "Checking Package Database" msgstr "Checking Package Database" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:1878 +#: library/packages/src/modules/PackageCallbacks.rb:1879 msgid "Rebuilding package database. This process can take some time." msgstr "Rebuilding package database. This process can take some time." #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:1911 +#: library/packages/src/modules/PackageCallbacks.rb:1912 msgid "" "Rebuilding of package database failed:\n" "%1" @@ -3401,16 +3527,16 @@ "%1" #. message in a progress popup -#: library/packages/src/modules/PackageCallbacks.rb:1944 +#: library/packages/src/modules/PackageCallbacks.rb:1945 msgid "Converting package database. This process can take some time." msgstr "Converting package database. This process can take some time." -#: library/packages/src/modules/PackageCallbacks.rb:1957 +#: library/packages/src/modules/PackageCallbacks.rb:1958 msgid "Status" msgstr "Status" #. error message, %1 is the cause for the error -#: library/packages/src/modules/PackageCallbacks.rb:1981 +#: library/packages/src/modules/PackageCallbacks.rb:1982 msgid "" "Conversion of package database failed:\n" "%1" @@ -3419,13 +3545,13 @@ "%1" #. progress message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2017 +#: library/packages/src/modules/PackageCallbacks.rb:2018 #, fuzzy msgid "Reading RPM database..." msgstr "Reading the database..." #. popup heading -#: library/packages/src/modules/PackageCallbacks.rb:2027 +#: library/packages/src/modules/PackageCallbacks.rb:2028 #, fuzzy msgid "Reading Installed Packages" msgstr "Verify Installed Packages" @@ -3437,30 +3563,30 @@ #. `Label(""), #. `PushButton(`id(`abort), Label::AbortButton()) #. ) -#: library/packages/src/modules/PackageCallbacks.rb:2033 -#: library/packages/src/modules/PackageCallbacks.rb:2049 +#: library/packages/src/modules/PackageCallbacks.rb:2034 +#: library/packages/src/modules/PackageCallbacks.rb:2050 #, fuzzy msgid "Scanning RPM database..." msgstr "Writing SCPM database..." #. error message, could not read RPM database -#: library/packages/src/modules/PackageCallbacks.rb:2086 +#: library/packages/src/modules/PackageCallbacks.rb:2087 #, fuzzy msgid "Initialization of the target failed." msgstr "Initialising the target directory failed" #. status message (command line mode) -#: library/packages/src/modules/PackageCallbacks.rb:2178 +#: library/packages/src/modules/PackageCallbacks.rb:2179 #, fuzzy msgid "RPM database read" msgstr "MySQL database admin" #. heading in a popup window -#: library/packages/src/modules/PackageCallbacks.rb:2212 +#: library/packages/src/modules/PackageCallbacks.rb:2213 msgid "User Authentication" msgstr "User Authentication" -#: library/packages/src/modules/PackageCallbacks.rb:2218 +#: library/packages/src/modules/PackageCallbacks.rb:2219 #, fuzzy msgid "" "URL: %1\n" @@ -3469,20 +3595,20 @@ msgstr "URL: %1" #. textentry label -#: library/packages/src/modules/PackageCallbacks.rb:2227 +#: library/packages/src/modules/PackageCallbacks.rb:2228 msgid "&User Name" msgstr "&User Name" #. check box -#: library/packages/src/modules/PackageCallbacks.rb:3010 +#: library/packages/src/modules/PackageCallbacks.rb:3017 msgid "Show &details" msgstr "Show &details" -#: library/packages/src/modules/PackageCallbacks.rb:3076 +#: library/packages/src/modules/PackageCallbacks.rb:3083 msgid "Size: " msgstr "Size: " -#: library/packages/src/modules/PackageCallbacks.rb:3099 +#: library/packages/src/modules/PackageCallbacks.rb:3106 msgid "Remaining time to automatic retry: %1" msgstr "" @@ -3564,12 +3690,12 @@ msgstr "" #. error report -#: library/packages/src/modules/PackageSystem.rb:415 +#: library/packages/src/modules/PackageSystem.rb:417 msgid "Installing required packages failed." msgstr "Installing required packages failed." #. continue/cancel popup -#: library/packages/src/modules/PackageSystem.rb:419 +#: library/packages/src/modules/PackageSystem.rb:421 msgid "" "Installing required packages failed. If you continue\n" "without installing required packages,\n" @@ -3580,12 +3706,12 @@ "YaST may not work properly.\n" #. error report -#: library/packages/src/modules/PackageSystem.rb:430 +#: library/packages/src/modules/PackageSystem.rb:432 msgid "Cannot continue without installing required packages." msgstr "Cannot continue without installing required packages." #. continue/cancel popup -#: library/packages/src/modules/PackageSystem.rb:435 +#: library/packages/src/modules/PackageSystem.rb:437 msgid "" "If you continue without installing required \n" "packages, YaST may not work properly.\n" @@ -3594,22 +3720,22 @@ "packages, YaST may not work properly.\n" #. dialog heading, %1 is package name -#: library/packages/src/modules/PackagesUI.rb:152 +#: library/packages/src/modules/PackagesUI.rb:156 msgid "Confirm Package License: %1" msgstr "Confirm Package License: %1" #. push button -#: library/packages/src/modules/PackagesUI.rb:159 +#: library/packages/src/modules/PackagesUI.rb:163 msgid "I &Agree" msgstr "I &Agree" #. push button -#: library/packages/src/modules/PackagesUI.rb:161 +#: library/packages/src/modules/PackagesUI.rb:165 msgid "I &Disagree" msgstr "I &Disagree" #. help text -#: library/packages/src/modules/PackagesUI.rb:173 +#: library/packages/src/modules/PackagesUI.rb:177 #, fuzzy msgid "" "<p><b><big>License Confirmation</big></b><br>\n" @@ -3632,7 +3758,7 @@ "their licenses, click <b>I Disagree with All</b>.</p>" #. Help text for software patterns / selections dialog -#: library/packages/src/modules/PackagesUI.rb:326 +#: library/packages/src/modules/PackagesUI.rb:347 msgid "" "<p>\n" "\t\t This dialog allows you to define this system's tasks and what software to install.\n" @@ -3641,7 +3767,7 @@ "\t\t </p>" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:333 +#: library/packages/src/modules/PackagesUI.rb:354 msgid "" "<p>\n" "\t\t Change the status of an item by clicking its status icon\n" @@ -3650,7 +3776,7 @@ "\t\t </p>" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:340 +#: library/packages/src/modules/PackagesUI.rb:361 msgid "" "<p>\n" "\t\t <b>Details</b> opens the detailed software package selection\n" @@ -3658,7 +3784,7 @@ "\t\t </p>" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:346 +#: library/packages/src/modules/PackagesUI.rb:367 msgid "" "<p>\n" "\t\t The disk usage display in the lower right corner shows the remaining disk space\n" @@ -3671,151 +3797,151 @@ #. Dialog title #. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems" -#: library/packages/src/modules/PackagesUI.rb:367 +#: library/packages/src/modules/PackagesUI.rb:388 msgid "Software Selection and System Tasks" msgstr "Software Selection and System Tasks" #. don't get all the way out - the user might just have #. been scared of the gory details. -#: library/packages/src/modules/PackagesUI.rb:408 +#: library/packages/src/modules/PackagesUI.rb:429 #, fuzzy msgid "(more)" msgstr "more..." -#: library/packages/src/modules/PackagesUI.rb:424 +#: library/packages/src/modules/PackagesUI.rb:445 #, fuzzy msgid "Installation Successfully Finished" msgstr "Installation finished.\n" -#: library/packages/src/modules/PackagesUI.rb:426 +#: library/packages/src/modules/PackagesUI.rb:447 #, fuzzy msgid "Package Installation Failed" msgstr "Package Installation" -#: library/packages/src/modules/PackagesUI.rb:438 +#: library/packages/src/modules/PackagesUI.rb:459 #, fuzzy msgid "Error Message: %1" msgstr "Error Message" -#: library/packages/src/modules/PackagesUI.rb:455 +#: library/packages/src/modules/PackagesUI.rb:476 #, fuzzy msgid "Failed Packages: %1" msgstr "Affected Packages: %1" -#: library/packages/src/modules/PackagesUI.rb:474 +#: library/packages/src/modules/PackagesUI.rb:495 #, fuzzy msgid "Installed Packages: %1" msgstr "Installed &Packages" -#: library/packages/src/modules/PackagesUI.rb:493 +#: library/packages/src/modules/PackagesUI.rb:514 #, fuzzy msgid "Updated Packages: %1" msgstr "Affected Packages: %1" -#: library/packages/src/modules/PackagesUI.rb:512 +#: library/packages/src/modules/PackagesUI.rb:533 #, fuzzy msgid "Removed Packages: %1" msgstr "Remove packages" -#: library/packages/src/modules/PackagesUI.rb:534 +#: library/packages/src/modules/PackagesUI.rb:555 #, fuzzy msgid "Not Installed Packages: %1" msgstr "Number of Installed Packages: " #. Table headings for CD statistics during installation -#: library/packages/src/modules/PackagesUI.rb:550 -#: library/packages/src/modules/SlideShow.rb:533 +#: library/packages/src/modules/PackagesUI.rb:571 +#: library/packages/src/modules/SlideShow.rb:534 msgid "Packages" msgstr "Packages" #. reset the items list -#: library/packages/src/modules/PackagesUI.rb:561 +#: library/packages/src/modules/PackagesUI.rb:582 #, fuzzy msgid "Elapsed Time: %1" msgstr "Default Lease Time: %1" -#: library/packages/src/modules/PackagesUI.rb:571 +#: library/packages/src/modules/PackagesUI.rb:592 #, fuzzy msgid "Total Installed Size: %1" msgstr "Installed Size:" -#: library/packages/src/modules/PackagesUI.rb:581 +#: library/packages/src/modules/PackagesUI.rb:602 #, fuzzy msgid "Total Downloaded Size: %1" msgstr "Total Download Size: " -#: library/packages/src/modules/PackagesUI.rb:590 +#: library/packages/src/modules/PackagesUI.rb:611 #, fuzzy msgid "Statistics" msgstr "Backup statistics:" #. display installation log -#: library/packages/src/modules/PackagesUI.rb:603 -#: library/packages/src/modules/PackagesUI.rb:691 +#: library/packages/src/modules/PackagesUI.rb:624 +#: library/packages/src/modules/PackagesUI.rb:712 #, fuzzy msgid "Installation log" msgstr "Installation Mode" -#: library/packages/src/modules/PackagesUI.rb:610 +#: library/packages/src/modules/PackagesUI.rb:631 msgid "Details" msgstr "Details" #. open a new wizard dialog if needed -#: library/packages/src/modules/PackagesUI.rb:658 +#: library/packages/src/modules/PackagesUI.rb:679 #, fuzzy #| msgid "Installing Package" msgid "After Installing Packages" msgstr "Installing Package" -#: library/packages/src/modules/PackagesUI.rb:659 +#: library/packages/src/modules/PackagesUI.rb:680 msgid "Show This Report" msgstr "" -#: library/packages/src/modules/PackagesUI.rb:660 +#: library/packages/src/modules/PackagesUI.rb:681 #, fuzzy #| msgid "&Finish" msgid "Finish" msgstr "&Finish" -#: library/packages/src/modules/PackagesUI.rb:661 +#: library/packages/src/modules/PackagesUI.rb:682 #, fuzzy #| msgid "Accessing the Package Management Failed" msgid "Continue in the Software Manager" msgstr "Accessing the Package Management Failed" -#: library/packages/src/modules/PackagesUI.rb:666 +#: library/packages/src/modules/PackagesUI.rb:687 #, fuzzy msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>" msgstr "<P><BIG><B>Loading Installed Packages</B></BIG></P><P>The package manager is reading installed packages...</P>" -#: library/packages/src/modules/PackagesUI.rb:674 +#: library/packages/src/modules/PackagesUI.rb:695 #, fuzzy #| msgid "Installation Error" msgid "Installation Report" msgstr "Installation Error" -#: library/packages/src/modules/PackagesUI.rb:696 +#: library/packages/src/modules/PackagesUI.rb:717 #, fuzzy msgid "Installed Packages" msgstr "Installed &Packages" -#: library/packages/src/modules/PackagesUI.rb:701 +#: library/packages/src/modules/PackagesUI.rb:722 #, fuzzy msgid "Updated Packages" msgstr "Changed Packages" -#: library/packages/src/modules/PackagesUI.rb:706 +#: library/packages/src/modules/PackagesUI.rb:727 #, fuzzy msgid "Removed Packages" msgstr "Remove packages" -#: library/packages/src/modules/PackagesUI.rb:711 +#: library/packages/src/modules/PackagesUI.rb:732 #, fuzzy msgid "Remaining Packages" msgstr "Removing Packages..." #. disabling installation report dialog, inform the user how to enable it back -#: library/packages/src/modules/PackagesUI.rb:732 +#: library/packages/src/modules/PackagesUI.rb:753 msgid "" "If you want to show this report dialog again edit\n" "\n" @@ -4274,85 +4400,85 @@ #. Return the description for the current stage. #. @return [String] localized string description #. translators: default global progress bar label -#: library/packages/src/modules/SlideShow.rb:151 #: library/packages/src/modules/SlideShow.rb:152 -#: library/packages/src/modules/SlideShow.rb:323 -#: library/packages/src/modules/SlideShow.rb:344 +#: library/packages/src/modules/SlideShow.rb:153 +#: library/packages/src/modules/SlideShow.rb:324 +#: library/packages/src/modules/SlideShow.rb:345 #, fuzzy msgid "Installing..." msgstr "Installing driver..." #. Table headings for CD statistics during installation -#: library/packages/src/modules/SlideShow.rb:529 +#: library/packages/src/modules/SlideShow.rb:530 msgid "Media" msgstr "Media" #. Table headings for CD statistics during installation - keep as short as possible! -#: library/packages/src/modules/SlideShow.rb:531 +#: library/packages/src/modules/SlideShow.rb:532 #, fuzzy msgid "Remaining" msgstr "Removing Packages..." #. Table headings for CD statistics during installation -#: library/packages/src/modules/SlideShow.rb:535 +#: library/packages/src/modules/SlideShow.rb:536 msgid "Time" msgstr "Time" #. Construct widgets for the "details" page #. #. @return A term describing the widgets -#: library/packages/src/modules/SlideShow.rb:551 +#: library/packages/src/modules/SlideShow.rb:552 #, fuzzy msgid "Actions performed:" msgstr "Actions Allowed for Users:\n" #. Help text while software packages are being installed (displayed only in rare cases) -#: library/packages/src/modules/SlideShow.rb:633 +#: library/packages/src/modules/SlideShow.rb:634 #, fuzzy msgid "<p>Packages are being installed.</p>" msgstr "<p>Please wait while packages are installed.</p>" -#: library/packages/src/modules/SlideShow.rb:634 +#: library/packages/src/modules/SlideShow.rb:635 msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>" msgstr "" #. Translators: Tab name, keep short, %s is product name, e.g. SLES -#: library/packages/src/modules/SlideShow.rb:652 +#: library/packages/src/modules/SlideShow.rb:653 #, fuzzy msgid "%s Release Notes" msgstr "Release Notes" #. tab -#: library/packages/src/modules/SlideShow.rb:664 +#: library/packages/src/modules/SlideShow.rb:665 msgid "Slide Sho&w" msgstr "Slide Sho&w" #. tab -#: library/packages/src/modules/SlideShow.rb:666 +#: library/packages/src/modules/SlideShow.rb:667 msgid "&Details" msgstr "&Details" #. Dialog heading - software packages are being upgraded -#: library/packages/src/modules/SlideShow.rb:705 +#: library/packages/src/modules/SlideShow.rb:706 #, fuzzy #| msgid "Perform Update" msgid "Performing Upgrade" msgstr "Perform Update" #. Dialog heading - software packages are being installed -#: library/packages/src/modules/SlideShow.rb:708 +#: library/packages/src/modules/SlideShow.rb:709 #, fuzzy #| msgid "Perform Installation" msgid "Performing Installation" msgstr "Perform Installation" #. Dialog heading while software packages are being installed -#: library/packages/src/modules/SlideShow.rb:743 +#: library/packages/src/modules/SlideShow.rb:744 msgid "Package Installation" msgstr "Package Installation" #. popup yes-no -#: library/packages/src/modules/SlideShow.rb:815 +#: library/packages/src/modules/SlideShow.rb:816 msgid "" "Do you really want\n" "to quit the installation?" @@ -4361,7 +4487,7 @@ "to quit the installation?" #. Mode::update (), Stage::cont () -#: library/packages/src/modules/SlideShow.rb:827 +#: library/packages/src/modules/SlideShow.rb:828 msgid "Aborted" msgstr "Aborted" @@ -4956,6 +5082,16 @@ msgid "Bluetooth device" msgstr "Bluetooth device" +#. Runs arguments without changed root. +#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs +#. @raise Cheetah::ExecutionFailed +#: library/system/src/lib/yast2/execute.rb:67 +msgid "" +"Execution of command \"%{command}\" failed.\n" +"Exit code: %{exitcode}\n" +"Error output: %{stderr}" +msgstr "" + #. Continue/Cancel question, %1 is a file name #: library/system/src/modules/FileChanges.rb:175 #, fuzzy @@ -5050,7 +5186,7 @@ "digits separated by colons." #. Translators: dot: ".", hyphen: "-" -#: library/types/src/modules/Hostname.rb:55 +#: library/types/src/modules/Hostname.rb:56 msgid "" "A valid domain name consists of components separated by dots.\n" "Each component contains letters, digits, and hyphens. A hyphen may not\n" @@ -5061,7 +5197,7 @@ "start or end a component and the last component may not begin with a digit." #. Translators: hyphen: "-" -#: library/types/src/modules/Hostname.rb:66 +#: library/types/src/modules/Hostname.rb:67 msgid "" "A valid host name consists of letters, digits, and hyphens.\n" "A host name may not begin or end with a hyphen.\n" @@ -6049,67 +6185,7 @@ "There is no reverse zone for %1 administered by your DNS server.\n" "Hostname %2 cannot be added." -#: src/lib/ui/srv_status_component.rb:60 #, fuzzy -#| msgid "Service Start" -msgid "Service Status" -msgstr "Service Start" - -#. Content for the help -#: src/lib/ui/srv_status_component.rb:114 -msgid "" -"<p><b><big>Current status</big></b><br>\n" -"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n" -"<p><b><big>Reload After Saving Settings</big></b><br>\n" -"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (via 'ok' or 'save' buttons).</p>\n" -"<p><b><big>Start During System Boot</big></b><br>\n" -"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n" -msgstr "" - -#. Widget displaying the status and associated buttons -#: src/lib/ui/srv_status_component.rb:181 -msgid "Current status:" -msgstr "Current status:" - -#. Widget to configure the status on boot -#: src/lib/ui/srv_status_component.rb:194 -#, fuzzy -#| msgid "Activate During Boot" -msgid "Start During System Boot" -msgstr "Activate During Boot" - -#. Widget to configure reloading of the running service -#: src/lib/ui/srv_status_component.rb:208 -#, fuzzy -#| msgid "Masquerading Settings:" -msgid "Reload After Saving Settings" -msgstr "Masquerading Settings:" - -#. TRANSLATORS: status of a service -#: src/lib/ui/srv_status_component.rb:218 -#, fuzzy -#| msgid "Running" -msgid "running" -msgstr "Running" - -#: src/lib/ui/srv_status_component.rb:220 -#, fuzzy -#| msgid "S&top now ..." -msgid "Stop now" -msgstr "S&top now ..." - -#. TRANSLATORS: status of a service -#: src/lib/ui/srv_status_component.rb:225 -msgid "stopped" -msgstr "" - -#: src/lib/ui/srv_status_component.rb:227 -#, fuzzy -#| msgid "&Start now ..." -msgid "Start now" -msgstr "&Start now ..." - -#, fuzzy #~ msgid "The correct repository medium could not be mounted." #~ msgstr "The correct source medium could not be mounted." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/bootloader.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:16+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 19:13+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -30,53 +30,148 @@ #. command line help text for delete action #: src/clients/bootloader.rb:58 -#, fuzzy -#| msgid "Set a global option" -msgid "Delete a global option" -msgstr "Set a global option" +msgid "Delete a global option or option of a section" +msgstr "Delete a global option or option of a section" #. command line help text for set action #: src/clients/bootloader.rb:65 -msgid "Set a global option" -msgstr "Set a global option" +msgid "Set a global option or option of a section" +msgstr "Set a global option or option of a section" +#. command line help text for add action +#: src/clients/bootloader.rb:72 +msgid "Add a new section - please use interactive mode" +msgstr "" + #. command line help text for print action -#: src/clients/bootloader.rb:75 +#: src/clients/bootloader.rb:82 msgid "Print value of specified option" msgstr "Print value of specified option" #. command line help text for an option -#: src/clients/bootloader.rb:83 +#: src/clients/bootloader.rb:90 +msgid "The name of the section" +msgstr "The name of the section" + +#. command line help text for an option +#: src/clients/bootloader.rb:97 msgid "The key of the option" msgstr "The key of the option" #. command line help text for an option -#: src/clients/bootloader.rb:90 +#: src/clients/bootloader.rb:104 msgid "The value of the option" msgstr "The value of the option" +#. command line error report, %1 is section name +#. command line error report, %1 is section name +#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225 +msgid "Section %1 not found." +msgstr "Section %1 not found." + #. command line error report -#: src/clients/bootloader.rb:152 +#: src/clients/bootloader.rb:201 msgid "Value was not specified." msgstr "Value was not specified." +#. Add a new bootloader section with specified name +#. @param [Hash] options a list of parameters passed as args +#. @return [Boolean] true on success +#: src/clients/bootloader.rb:239 +msgid "Add option is available only in commandline interactive mode" +msgstr "" + #. command line error report -#: src/clients/bootloader.rb:174 +#: src/clients/bootloader.rb:245 +msgid "Section name must be specified." +msgstr "Section name must be specified." + +#. command line error report +#: src/clients/bootloader.rb:265 msgid "Option was not specified." msgstr "Option was not specified." -#. command line, %1 is the value of bootloader option -#: src/clients/bootloader.rb:180 -#, fuzzy -#| msgid "Value: %1" -msgid "Value: %s" -msgstr "Value: %1" - #. command line error report -#: src/clients/bootloader.rb:183 +#: src/clients/bootloader.rb:284 msgid "Specified option does not exist." msgstr "Specified option does not exist." +#. command line, %1 is the value of bootloader option +#: src/clients/bootloader.rb:287 +msgid "Value: %1" +msgstr "Value: %1" + +#. progress step title +#: src/clients/bootloader_finish.rb:52 +msgid "Saving bootloader configuration..." +msgstr "Saving bootloader configuration..." + +#. TRANSLATORS: reboot message +#. %1 is replaced with additional message from reIPL +#: src/clients/bootloader_finish.rb:133 +msgid "" +"\n" +"Your system will now shut down.%1\n" +"For details, read the related chapter \n" +"in the documentation. \n" +msgstr "" + +#. Final message after all packages from CD1 are installed +#. and we're ready to start (boot into) the installed system +#. Message that will be displayed along with information +#. how the boot loader was installed +#: src/clients/bootloader_finish.rb:146 +msgid "The system will reboot now..." +msgstr "The system will reboot now..." + +#. warning text in the summary richtext +#: src/clients/bootloader_proposal.rb:116 +msgid "No boot loader is selected for installation. Your system might not be bootable." +msgstr "No boot loader is selected for installation. Your system might not be bootable." + +#. error in the proposal +#: src/clients/bootloader_proposal.rb:126 +msgid "Because of the partitioning, the bootloader cannot be installed properly" +msgstr "Because of the partitioning, the bootloader cannot be installed properly" + +#. proposal part - bootloader label +#: src/clients/bootloader_proposal.rb:225 +msgid "Booting" +msgstr "Booting" + +#. menubutton entry +#: src/clients/bootloader_proposal.rb:227 +msgid "&Booting" +msgstr "&Booting" + +#. Run dialog to adjust installation on i386 and AMD64 +#. @return [Symbol] for wizard sequencer +#. Run dialog to adjust installation on i386 and AMD64 +#. @return [Symbol] for wizard sequencer +#: src/include/bootloader/grub/dialogs.rb:41 +#: src/include/bootloader/grub2/dialogs.rb:221 +msgid "Disk Order" +msgstr "Disk Order" + +#: src/include/bootloader/grub/dialogs.rb:50 +#: src/include/bootloader/grub2/dialogs.rb:230 +#, fuzzy +msgid "Disk order settings" +msgstr "Filter settings" + +#. Run dialog for loader installation details on i386 +#. @return [Symbol] for wizard sequencer +#: src/include/bootloader/grub/dialogs.rb:68 +msgid "Boot Menu" +msgstr "Boot Menu" + +#. `VSpacing(1), +#. Window title +#: src/include/bootloader/grub/dialogs.rb:106 +#: src/include/bootloader/grub2/dialogs.rb:143 +msgid "Boot Loader Options" +msgstr "Boot Loader Options" + #. encoding: utf-8 #. File: #. include/bootloader/grup/helps.ycp @@ -169,13 +264,19 @@ #: src/include/bootloader/grub/helps.rb:47 msgid "" +"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n" +"It is recommended to install grub to MBR</p>" +msgstr "" + +#: src/include/bootloader/grub/helps.rb:50 +msgid "" "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n" "installed on your computer</p>" msgstr "" "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n" "installed on your computer</p>" -#: src/include/bootloader/grub/helps.rb:50 +#: src/include/bootloader/grub/helps.rb:53 msgid "" "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n" "partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n" @@ -187,43 +288,36 @@ "in <b>Boot Loader Options</b> to update the master boot record if that is needed or configure your other boot manager\n" "to start this section.</p>" -#: src/include/bootloader/grub/helps.rb:56 +#: src/include/bootloader/grub/helps.rb:59 msgid "" "<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n" "logical partition and the /boot partition is missing</p>" msgstr "" -#: src/include/bootloader/grub/helps.rb:59 +#: src/include/bootloader/grub/helps.rb:62 #, fuzzy msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>" msgstr "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from</p>" -#: src/include/bootloader/grub/helps.rb:62 +#: src/include/bootloader/grub/helps.rb:65 msgid "" "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n" "enable to write GRUB to MBR of both disks.</p>" msgstr "" -#: src/include/bootloader/grub/helps.rb:65 +#: src/include/bootloader/grub/helps.rb:68 #, fuzzy msgid "" "<p><b>Use Serial Console</b> lets you define the parameters to use\n" -"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>" +"for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>" msgstr "" "<p><b>Serial Connection Parameters</b> lets you define the parameters to use\n" "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>" -#: src/include/bootloader/grub/helps.rb:68 -#, fuzzy -#| msgid "" -#| "<p><b>Terminal Definition</b></p><br>\n" -#| "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" -#| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" -#| "command, as <code>serial console</code>. In this case, a terminal in which you\n" -#| "press any key will be selected as a GRUB terminal.</p>" +#: src/include/bootloader/grub/helps.rb:71 msgid "" "<p><b>Terminal Definition</b></p><br>\n" -"Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n" +"Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" "command, as <code>serial console</code>. In this case, a terminal in which you\n" "press any key will be selected as a GRUB terminal.</p>" @@ -234,7 +328,7 @@ "command, as <code>serial console</code>. In this case, a terminal in which you\n" "press any key will be selected as a GRUB terminal.</p>" -#: src/include/bootloader/grub/helps.rb:75 +#: src/include/bootloader/grub/helps.rb:78 msgid "" "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n" "that will be used for booting in case the default section is unbootable.</p>" @@ -242,23 +336,36 @@ "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n" "that will be used for booting in case the default section is unbootable.</p>" -#: src/include/bootloader/grub/helps.rb:78 +#: src/include/bootloader/grub/helps.rb:81 #, 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>" -#: src/include/bootloader/grub/helps.rb:81 +#: src/include/bootloader/grub/helps.rb:84 +msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>" +msgstr "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>" + +#: src/include/bootloader/grub/helps.rb:87 +msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>" +msgstr "" + +#: src/include/bootloader/grub/helps.rb:90 #, fuzzy +#| msgid "" +#| "<p><b>Password for the Menu Interface</b><br>\n" +#| "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" +#| "it in <b>Retype Password</b>.</p>" msgid "" "<p><b>Protect Boot Loader with Password</b><br>\n" -"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>" +"Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" +"it in <b>Retype Password</b>.</p>" msgstr "" "<p><b>Password for the Menu Interface</b><br>\n" "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" "it in <b>Retype Password</b>.</p>" #. help text 1/5 -#: src/include/bootloader/grub/helps.rb:91 +#: src/include/bootloader/grub/helps.rb:97 #, fuzzy msgid "" "<p><big><b>Disks Order</b></big><br>\n" @@ -271,140 +378,218 @@ "To specify the order of the disks according to the order in BIOS, use\n" "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.</p>" -#: src/include/bootloader/grub/helps.rb:101 +#: src/include/bootloader/grub/helps.rb:108 msgid "Boot Loader Locations" msgstr "Boot Loader Locations" -#: src/include/bootloader/grub/helps.rb:102 +#: src/include/bootloader/grub/helps.rb:109 #, fuzzy msgid "Set &active Flag in Partition Table for Boot Partition" msgstr "Set active Flag in Partition Table for Boot Partition" -#: src/include/bootloader/grub/helps.rb:105 -#: src/include/bootloader/routines/common_helps.rb:28 +#: src/include/bootloader/grub/helps.rb:112 +#: src/include/bootloader/routines/common_helps.rb:29 #, fuzzy msgid "&Timeout in Seconds" msgstr "Timeout in Seconds" -#: src/include/bootloader/grub/helps.rb:106 +#: src/include/bootloader/grub/helps.rb:113 #, fuzzy msgid "&Default Boot Section" msgstr "Default Boot Section" -#: src/include/bootloader/grub/helps.rb:107 +#: src/include/bootloader/grub/helps.rb:114 #, fuzzy msgid "Write &generic Boot Code to MBR" msgstr "Write generic Boot Code to MBR" -#: src/include/bootloader/grub/helps.rb:108 +#: src/include/bootloader/grub/helps.rb:115 +msgid "Use &Trusted Grub" +msgstr "" + +#: src/include/bootloader/grub/helps.rb:116 msgid "Custom Boot Partition" msgstr "Custom Boot Partition" -#: src/include/bootloader/grub/helps.rb:109 +#: src/include/bootloader/grub/helps.rb:117 msgid "Boot from Master Boot Record" msgstr "Boot from Master Boot Record" -#: src/include/bootloader/grub/helps.rb:110 +#: src/include/bootloader/grub/helps.rb:118 msgid "Boot from Root Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/helps.rb:111 +#: src/include/bootloader/grub/helps.rb:119 msgid "Boot from Boot Partition" msgstr "Boot from Boot Partition" -#: src/include/bootloader/grub/helps.rb:112 +#: src/include/bootloader/grub/helps.rb:120 #, fuzzy msgid "Boot from Extended Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/helps.rb:113 +#: src/include/bootloader/grub/helps.rb:121 #, fuzzy msgid "Serial Connection &Parameters" msgstr "Serial Connection Parameters" -#: src/include/bootloader/grub/helps.rb:114 +#: src/include/bootloader/grub/helps.rb:122 #, fuzzy msgid "Fallback Sections if Default fails" msgstr "Fallback Sections if default Fails" -#: src/include/bootloader/grub/helps.rb:115 +#: src/include/bootloader/grub/helps.rb:123 #, fuzzy msgid "&Hide Menu on Boot" msgstr "Hide Menu on Boot" -#: src/include/bootloader/grub/helps.rb:116 +#: src/include/bootloader/grub/helps.rb:124 #, fuzzy +msgid "Graphical &Menu File" +msgstr "Graphical Menu File" + +#: src/include/bootloader/grub/helps.rb:125 +#, fuzzy msgid "Pa&ssword for the Menu Interface" msgstr "Password for the Menu Interface" -#: src/include/bootloader/grub/helps.rb:117 +#: src/include/bootloader/grub/helps.rb:126 #, fuzzy msgid "Debugg&ing Flag" msgstr "Debugging Flag" +#. encoding: utf-8 +#. File: +#. modules/BootGRUB.ycp +#. +#. Module: +#. Bootloader installation and configuration +#. +#. Summary: +#. Module containing specific functions for GRUB configuration +#. and installation +#. +#. Authors: +#. Jiri Srain +#. Joachim Plack +#. Olaf Dabrunz +#. Philipp Thomas +#. +#. $Id$ +#: src/include/bootloader/grub/options.rb:68 +#, fuzzy +msgid "Choose new graphical menu file" +msgstr "Graphical Menu File" + +#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))), +#: src/include/bootloader/grub/options.rb:129 +#, fuzzy +msgid "Enable Acoustic &Signals" +msgstr "&Enable Authentication" + #. Validate function of a popup #. @param [String] key any widget key #. @param [Hash] event map event that caused validation #. @return [Boolean] true if widget settings ok -#: src/include/bootloader/grub/options.rb:73 +#: src/include/bootloader/grub/options.rb:254 msgid "Prot&ect Boot Loader with Password" msgstr "Prot&ect Boot Loader with Password" -#. TRANSLATORS: checkbox entry -#: src/include/bootloader/grub/options.rb:79 -msgid "P&rotect Entry Modification Only" -msgstr "" - #. text entry -#: src/include/bootloader/grub/options.rb:85 +#: src/include/bootloader/grub/options.rb:259 msgid "&Password" msgstr "&Password" #. text entry -#: src/include/bootloader/grub/options.rb:88 +#: src/include/bootloader/grub/options.rb:262 msgid "Re&type Password" msgstr "Re&type Password" +#. Common widget of a console +#. @return [Hash{String => Object}] CWS widget +#: src/include/bootloader/grub/options.rb:359 +#: src/include/bootloader/grub2/options.rb:295 +#, fuzzy +msgid "Use &serial console" +msgstr "Serial Console" + +#: src/include/bootloader/grub/options.rb:366 +#: src/include/bootloader/grub2/options.rb:302 +#, fuzzy +msgid "&Console arguments" +msgstr "invalid arguments" + +#. textentry header +#: src/include/bootloader/grub/options.rb:455 +msgid "&Device" +msgstr "&Device" + +#. disabling & enabling up/down, do it after change +#: src/include/bootloader/grub/options.rb:534 +#, fuzzy +msgid "Device map must contain at least one device" +msgstr "A class must contain at least one printer." + +#: src/include/bootloader/grub/options.rb:543 +msgid "D&isks" +msgstr "D&isks" + +#: src/include/bootloader/grub/options.rb:555 +msgid "&Up" +msgstr "&Up" + +#: src/include/bootloader/grub/options.rb:556 +msgid "&Down" +msgstr "&Down" + #. Create Frame "Boot Loader Location" #. #. @return [Yast::Term] with widgets -#: src/include/bootloader/grub/options.rb:222 +#: src/include/bootloader/grub/options.rb:730 #, fuzzy msgid "Boot from &Root Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/options.rb:224 +#: src/include/bootloader/grub/options.rb:731 #, fuzzy msgid "Boo&t from Boot Partition" msgstr "Boot from Boot Partition" -#: src/include/bootloader/grub/options.rb:235 -#, fuzzy -msgid "C&ustom Boot Partition" -msgstr "Custom Boot Partition" - -#: src/include/bootloader/grub/options.rb:250 -#: src/include/bootloader/grub/options.rb:280 -#: src/include/bootloader/grub/options.rb:301 +#: src/include/bootloader/grub/options.rb:739 +#: src/include/bootloader/grub/options.rb:766 +#: src/include/bootloader/grub/options.rb:801 msgid "Boot Loader Location" msgstr "Boot Loader Location" -#: src/include/bootloader/grub/options.rb:256 -#: src/include/bootloader/grub/options.rb:286 -#: src/include/bootloader/grub/options.rb:307 +#: src/include/bootloader/grub/options.rb:745 +#: src/include/bootloader/grub/options.rb:772 +#: src/include/bootloader/grub/options.rb:807 #, fuzzy msgid "Boot from &Master Boot Record" msgstr "Boot from Master Boot Record" -#: src/include/bootloader/grub/options.rb:263 +#: src/include/bootloader/grub/options.rb:752 #, fuzzy msgid "Boot from &Extended Partition" msgstr "Boot from Root Partition" -#: src/include/bootloader/grub/options.rb:312 +#: src/include/bootloader/grub/options.rb:778 +#: src/include/bootloader/grub/options.rb:819 +#, fuzzy +msgid "C&ustom Boot Partition" +msgstr "Custom Boot Partition" + +#: src/include/bootloader/grub/options.rb:812 msgid "Enable Red&undancy for MD Array" msgstr "" +#. push button +#. push button +#: src/include/bootloader/grub/options.rb:871 +#: src/include/bootloader/routines/global_widgets.rb:831 +msgid "Boot Loader Installation &Details" +msgstr "Boot Loader Installation &Details" + #. Title in tab #: src/include/bootloader/grub2/dialogs.rb:57 #, fuzzy @@ -413,45 +598,40 @@ msgstr "Boot Loader Options" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:84 +#: src/include/bootloader/grub2/dialogs.rb:82 #, fuzzy #| msgid "Other Kernel &Parameters" msgid "Kernel Parameters" msgstr "Other Kernel &Parameters" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:103 +#: src/include/bootloader/grub2/dialogs.rb:102 #, fuzzy #| msgid "Boot Loader Options" msgid "Bootloader Options" msgstr "Boot Loader Options" -#. Window title -#: src/include/bootloader/grub2/dialogs.rb:149 -msgid "Boot Loader Options" -msgstr "Boot Loader Options" - -#: src/include/bootloader/grub2/dialogs.rb:190 +#: src/include/bootloader/grub2/dialogs.rb:183 #, fuzzy #| msgid "Secure" msgid "Secure Boot" msgstr "Secure" -#: src/include/bootloader/grub2/dialogs.rb:196 +#: src/include/bootloader/grub2/dialogs.rb:189 #, fuzzy #| msgid "Enable &Quota Support" msgid "Enable &Secure Boot Support" msgstr "Enable &Quota Support" #. TRANSLATORS: place where boot code is installed -#: src/include/bootloader/grub2/dialogs.rb:247 +#: src/include/bootloader/grub2/dialogs.rb:262 #, fuzzy #| msgid "Boot Loader Location" msgid "Boot &Loader Location" msgstr "Boot Loader Location" #. help text -#: src/include/bootloader/grub2/dialogs.rb:266 +#: src/include/bootloader/grub2/dialogs.rb:281 msgid "Choose partition where is boot sequence installed." msgstr "" @@ -470,38 +650,62 @@ #. #. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $ #: src/include/bootloader/grub2/helps.rb:23 +#: src/include/bootloader/routines/section_helps.rb:33 #, 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>" #: src/include/bootloader/grub2/helps.rb:26 +#: src/include/bootloader/routines/section_helps.rb:30 #, fuzzy msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>" msgstr "<p><b>Vga Mode</b> defines the VGA mode for the <i>console</i> the kernel should set when booting</p>" #: src/include/bootloader/grub2/helps.rb:29 +#, fuzzy +msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe 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>" + +#: src/include/bootloader/grub2/helps.rb:32 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>" msgstr "" -#: src/include/bootloader/grub2/helps.rb:32 +#: src/include/bootloader/grub2/helps.rb:35 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 "" #: src/include/bootloader/grub2/helps.rb:38 +msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>" +msgstr "" + +#: src/include/bootloader/grub2/helps.rb:44 +#: src/include/bootloader/routines/section_helps.rb:99 #, fuzzy msgid "O&ptional Kernel Command Line Parameter" msgstr "Optional Kernel Command Line Parameter" -#: src/include/bootloader/grub2/helps.rb:39 +#: src/include/bootloader/grub2/helps.rb:45 #, fuzzy +#| msgid "Distribution:" +msgid "D&istributor" +msgstr "Distribution:" + +#: src/include/bootloader/grub2/helps.rb:46 +#: src/include/bootloader/routines/section_helps.rb:98 +#, fuzzy msgid "&Vga Mode" msgstr "Vga Mode" -#: src/include/bootloader/grub2/helps.rb:40 +#: src/include/bootloader/grub2/helps.rb:47 +#, fuzzy +msgid "&Failsafe Kernel Command Line Parameter" +msgstr "Optional Kernel Command Line Parameter" + +#: src/include/bootloader/grub2/helps.rb:48 msgid "Probe Foreign OS" msgstr "" -#: src/include/bootloader/grub2/helps.rb:41 +#: src/include/bootloader/grub2/helps.rb:49 msgid "Protective MBR flag" msgstr "" @@ -510,21 +714,31 @@ #. %2 is Y resolution (height) in pixels #. %3 is color depth (usually one of 8, 16, 24, 32) #. %4 is the VGA mode ID (hexadecimal number) +#. combo box item +#. %1 is X resolution (width) in pixels +#. %2 is Y resolution (height) in pixels +#. %3 is color depth (usually one of 8, 16, 24, 32) +#. %4 is the VGA mode ID (hexadecimal number) #: src/include/bootloader/grub2/options.rb:58 +#: src/include/bootloader/routines/section_widgets.rb:523 msgid "%1x%2, %3 bits (mode %4)" msgstr "%1x%2, %3 bits (mode %4)" #: src/include/bootloader/grub2/options.rb:68 +#: src/include/bootloader/routines/section_widgets.rb:537 #, fuzzy msgid "Standard 8-pixel font mode." msgstr "Standard Options" #. item of a combo box +#. item of a combo box #: src/include/bootloader/grub2/options.rb:71 +#: src/include/bootloader/routines/section_widgets.rb:540 msgid "Text Mode" msgstr "Text Mode" #: src/include/bootloader/grub2/options.rb:72 +#: src/include/bootloader/routines/section_widgets.rb:541 #, fuzzy #| msgid "&Unspecified" msgid "Unspecified" @@ -553,7 +767,7 @@ #. Init function for console #. @param [String] widget -#: src/include/bootloader/grub2/options.rb:173 +#: src/include/bootloader/grub2/options.rb:174 #, fuzzy #| msgid "Autodetected card" msgid "Autodetect by grub2" @@ -561,71 +775,224 @@ #. FATE: #110038: Serial console #. add or remove console key with value for sections -#: src/include/bootloader/grub2/options.rb:246 +#: src/include/bootloader/grub2/options.rb:249 #, fuzzy msgid "Choose new graphical theme file" msgstr "Graphical Menu File" -#: src/include/bootloader/grub2/options.rb:258 +#: src/include/bootloader/grub2/options.rb:261 #, fuzzy msgid "Use &graphical console" msgstr "Serial Console" -#: src/include/bootloader/grub2/options.rb:265 +#: src/include/bootloader/grub2/options.rb:268 #, fuzzy #| msgid "Conflict Resolution:" msgid "&Console resolution" msgstr "Conflict Resolution:" -#: src/include/bootloader/grub2/options.rb:273 +#: src/include/bootloader/grub2/options.rb:276 #, fuzzy msgid "&Console theme" msgstr "invalid arguments" -#: src/include/bootloader/grub2/options.rb:292 -#, fuzzy -msgid "Use &serial console" -msgstr "Serial Console" - -#: src/include/bootloader/grub2/options.rb:299 -#, fuzzy -msgid "&Console arguments" -msgstr "invalid arguments" - -#. FIXME: this should be better handled by exception and show it properly, but it require too big change now -#: src/include/bootloader/routines/autoinstall.rb:131 +#. FIXME this should be better handled by exception and show it properly, but it require too big change now +#: src/include/bootloader/routines/autoinstall.rb:169 msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly." msgstr "" #. file open popup caption -#: src/include/bootloader/routines/common_options.rb:98 +#. file open popup caption +#. file open popup caption +#: src/include/bootloader/routines/common_options.rb:102 +#: src/include/bootloader/routines/section_widgets.rb:265 +#: src/include/bootloader/routines/section_widgets.rb:279 msgid "Select File" msgstr "Select File" #. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed +#. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239 +#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270 msgid "The boot partition is of type NFS. Bootloader cannot be installed." msgstr "The boot partition is of type NFS. Bootloader cannot be installed." #. dialog caption -#: src/include/bootloader/routines/dialogs.rb:114 +#: src/include/bootloader/routines/dialogs.rb:131 msgid "Boot Loader Settings" msgstr "Boot Loader Settings" #. message -#: src/include/bootloader/routines/dialogs.rb:142 +#: src/include/bootloader/routines/dialogs.rb:159 msgid "There are no options to set for the current boot loader." msgstr "There are no options to set for the current boot loader." +#. heading +#. heading +#. heading +#: src/include/bootloader/routines/dialogs.rb:177 +#: src/include/bootloader/routines/dialogs.rb:255 +#: src/include/bootloader/routines/dialogs.rb:325 +msgid "Kernel Section" +msgstr "Kernel Section" + +#. frame +#. frame +#. frame +#. frame +#. frame +#. frame +#. frame +#. frame +#: src/include/bootloader/routines/dialogs.rb:183 +#: src/include/bootloader/routines/dialogs.rb:261 +#: src/include/bootloader/routines/dialogs.rb:331 +#: src/include/bootloader/routines/dialogs.rb:399 +#: src/include/bootloader/routines/dialogs.rb:474 +#: src/include/bootloader/routines/dialogs.rb:522 +#: src/include/bootloader/routines/dialogs.rb:581 +#: src/include/bootloader/routines/dialogs.rb:636 +msgid "Section Settings" +msgstr "Section Settings" + +#. dialog caption +#. dialog caption +#. dialog caption +#. dialog caption +#. dialog caption +#. dialog caption +#. dialog caption +#. dialog caption +#. dialog caption +#: src/include/bootloader/routines/dialogs.rb:231 +#: src/include/bootloader/routines/dialogs.rb:302 +#: src/include/bootloader/routines/dialogs.rb:370 +#: src/include/bootloader/routines/dialogs.rb:445 +#: src/include/bootloader/routines/dialogs.rb:494 +#: src/include/bootloader/routines/dialogs.rb:542 +#: src/include/bootloader/routines/dialogs.rb:605 +#: src/include/bootloader/routines/dialogs.rb:683 +#: src/include/bootloader/routines/dialogs.rb:721 +msgid "Boot Loader Settings: Section Management" +msgstr "Boot Loader Settings: Section Management" + +#. heading +#. radio button +#: src/include/bootloader/routines/dialogs.rb:393 +#: src/include/bootloader/routines/section_helps.rb:108 +#: src/include/bootloader/routines/section_widgets.rb:585 +msgid "Xen Section" +msgstr "Xen Section" + +#. heading +#. radio button +#: src/include/bootloader/routines/dialogs.rb:468 +#: src/include/bootloader/routines/section_helps.rb:111 +#: src/include/bootloader/routines/section_helps.rb:121 +#: src/include/bootloader/routines/section_widgets.rb:591 +msgid "Menu Section" +msgstr "Menu Section" + +#. heading +#. radio button +#: src/include/bootloader/routines/dialogs.rb:516 +#: src/include/bootloader/routines/section_widgets.rb:593 +#, fuzzy +msgid "Dump Section" +msgstr "Menu Section" + +#. label +#. label +#: src/include/bootloader/routines/dialogs.rb:573 +#: src/include/bootloader/routines/dialogs.rb:628 +msgid "Other System Section" +msgstr "Other System Section" + +#. combobox label +#: src/include/bootloader/routines/dialogs.rb:803 +msgid "&Filename" +msgstr "&Filename" + +#. label. %1 is name of file (eg. /etc/lilo.conf +#: src/include/bootloader/routines/dialogs.rb:811 +msgid "Filename: %1" +msgstr "Filename: %1" + +#. multiline edit header +#: src/include/bootloader/routines/dialogs.rb:828 +msgid "Fi&le Contents" +msgstr "Fi&le Contents" + +#. dialog caption +#: src/include/bootloader/routines/dialogs.rb:836 +msgid "Expert Manual Configuration" +msgstr "Expert Manual Configuration" + +#. sections list widget +#. Refresh and redraw widget wits sections +#. @param [Array Object>}] sects list of current sections +#. menu button +#: src/include/bootloader/routines/global_widgets.rb:114 +#: src/include/bootloader/routines/global_widgets.rb:641 +msgid "Other" +msgstr "Other" + +#: src/include/bootloader/routines/global_widgets.rb:116 +msgid "Image" +msgstr "Image" + +#: src/include/bootloader/routines/global_widgets.rb:134 +msgid "Xen" +msgstr "" + +#: src/include/bootloader/routines/global_widgets.rb:152 +msgid "Floppy" +msgstr "Floppy" + +#: src/include/bootloader/routines/global_widgets.rb:154 +#, fuzzy +msgid "Menu" +msgstr "Boot Menu" + +#: src/include/bootloader/routines/global_widgets.rb:161 +msgid "Dump" +msgstr "" + +#. table header, Def stands for default +#: src/include/bootloader/routines/global_widgets.rb:255 +msgid "Def." +msgstr "Def." + +#. table header +#: src/include/bootloader/routines/global_widgets.rb:257 +msgid "Label" +msgstr "Label" + +#. table header +#: src/include/bootloader/routines/global_widgets.rb:259 +#: src/include/bootloader/routines/global_widgets.rb:746 +msgid "Type" +msgstr "Type" + +#. table header; header for section details, either +#. the specification of the kernel image to load, +#. or the specification of device to boot from +#: src/include/bootloader/routines/global_widgets.rb:263 +msgid "Image / Device" +msgstr "Image / Device" + +#: src/include/bootloader/routines/global_widgets.rb:271 +msgid "Set as De&fault" +msgstr "Set as De&fault" + #. combo box -#: src/include/bootloader/routines/global_widgets.rb:109 +#: src/include/bootloader/routines/global_widgets.rb:312 msgid "&Boot Loader" msgstr "&Boot Loader" #. popup - Continue/Cancel -#: src/include/bootloader/routines/global_widgets.rb:138 +#: src/include/bootloader/routines/global_widgets.rb:343 msgid "" "\n" "If you do not install any boot loader, the system\n" @@ -639,67 +1006,117 @@ "\n" "Proceed?\n" -#. menu button entry -#: src/include/bootloader/routines/global_widgets.rb:175 -msgid "E&dit Configuration Files" -msgstr "E&dit Configuration Files" +#. warning - popup, followed by radio buttons +#: src/include/bootloader/routines/global_widgets.rb:377 +msgid "" +"\n" +"You chose to change your boot loader. When converting \n" +"the configuration, some settings might be lost.\n" +"\n" +"The current configuration will be saved and you can\n" +"restore it if you return to the current boot loader.\n" +"\n" +"Select a course of action:\n" +msgstr "" +"\n" +"You chose to change your boot loader. When converting \n" +"the configuration, some settings might be lost.\n" +"\n" +"The current configuration will be saved and you can\n" +"restore it if you return to the current boot loader.\n" +"\n" +"Select a course of action:\n" +#. radiobutton #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:182 +#: src/include/bootloader/routines/global_widgets.rb:399 +#: src/include/bootloader/routines/global_widgets.rb:593 msgid "&Propose New Configuration" msgstr "&Propose New Configuration" +#. radiobutton +#: src/include/bootloader/routines/global_widgets.rb:406 +msgid "Co&nvert Current Configuration" +msgstr "Co&nvert Current Configuration" + +#. radiobutton +#: src/include/bootloader/routines/global_widgets.rb:415 +msgid "&Start New Configuration from Scratch" +msgstr "&Start New Configuration from Scratch" + +#. radiobutton +#: src/include/bootloader/routines/global_widgets.rb:423 +msgid "&Read Configuration Saved on Disk" +msgstr "&Read Configuration Saved on Disk" + +#. radiobutton +#: src/include/bootloader/routines/global_widgets.rb:433 +msgid "Res&tore Configuration Saved before Conversion" +msgstr "Res&tore Configuration Saved before Conversion" + +#. popup message +#: src/include/bootloader/routines/global_widgets.rb:514 +msgid "Select the boot loader before editing sections." +msgstr "Select the boot loader before editing sections." + +#. pushbutton +#. menu button entry +#: src/include/bootloader/routines/global_widgets.rb:563 +#: src/include/bootloader/routines/global_widgets.rb:586 +msgid "E&dit Configuration Files" +msgstr "E&dit Configuration Files" + #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:189 +#: src/include/bootloader/routines/global_widgets.rb:600 msgid "&Start from Scratch" msgstr "&Start from Scratch" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:197 +#: src/include/bootloader/routines/global_widgets.rb:608 msgid "&Reread Configuration from Disk" msgstr "&Reread Configuration from Disk" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:214 +#: src/include/bootloader/routines/global_widgets.rb:625 msgid "Restore MBR of Hard Disk" msgstr "Restore MBR of Hard Disk" #. menubutton item, keep as short as possible -#: src/include/bootloader/routines/global_widgets.rb:222 +#: src/include/bootloader/routines/global_widgets.rb:633 msgid "Write bootloader boot code to disk" msgstr "Write bootloader boot code to disk" -#. menu button -#: src/include/bootloader/routines/global_widgets.rb:230 -msgid "Other" -msgstr "Other" - #. message popup -#: src/include/bootloader/routines/global_widgets.rb:254 +#: src/include/bootloader/routines/global_widgets.rb:665 msgid "MBR restored successfully." msgstr "MBR restored successfully." #. message popup -#: src/include/bootloader/routines/global_widgets.rb:257 +#: src/include/bootloader/routines/global_widgets.rb:668 msgid "Failed to restore MBR." msgstr "Failed to restore MBR." #. Bootloader::blSave (false, false, false); -#: src/include/bootloader/routines/global_widgets.rb:280 +#: src/include/bootloader/routines/global_widgets.rb:691 #, fuzzy msgid "Writing bootloader settings failed." msgstr "Writing network settings failed." +#. tab header +#: src/include/bootloader/routines/global_widgets.rb:730 +msgid "&Section Management" +msgstr "&Section Management" + +#. tab header +#: src/include/bootloader/routines/global_widgets.rb:740 +msgid "Boot Loader &Installation" +msgstr "Boot Loader &Installation" + #. push button -#: src/include/bootloader/routines/global_widgets.rb:329 +#: src/include/bootloader/routines/global_widgets.rb:818 msgid "Boot &Loader Options" msgstr "Boot &Loader Options" -#. push button -#: src/include/bootloader/routines/global_widgets.rb:342 -msgid "Boot Loader Installation &Details" -msgstr "Boot Loader Installation &Details" - #. help text 1/1 (shown during settings reading progress) #: src/include/bootloader/routines/helps.rb:32 msgid "" @@ -718,9 +1135,18 @@ "<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n" "Please wait...<br></p>" -#. help text 1/2 (%1 may be following sentence, optionally empty) +#. help text, optional part of following #: src/include/bootloader/routines/helps.rb:52 msgid "" +"If you have multiple Linux systems installed,\n" +"YaST can try to find them and merge their menus." +msgstr "" +"If you have multiple Linux systems installed,\n" +"YaST can try to find them and merge their menus." + +#. help text 1/2 (%1 may be following sentence, optionally empty) +#: src/include/bootloader/routines/helps.rb:58 +msgid "" "<P>From <B>Other</B>,\n" "you can manually edit the boot loader configuration files, clear the current \n" "configuration and propose a new configuration, start from scratch, or reread\n" @@ -732,7 +1158,7 @@ "the configuration saved on your disk. %1</P>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:67 +#: src/include/bootloader/routines/helps.rb:73 msgid "" "<P>To edit boot loader configuration files\n" "manually, click <B>Edit Configuration Files</B>.</P>" @@ -741,7 +1167,7 @@ "manually, click <B>Edit Configuration Files</B>.</P>" #. help 1/4 -#: src/include/bootloader/routines/helps.rb:76 +#: src/include/bootloader/routines/helps.rb:83 msgid "" "<P> In the table, each section represents one item\n" "in the boot menu.</P>" @@ -750,7 +1176,7 @@ "in the boot menu.</P>" #. help 2/4 -#: src/include/bootloader/routines/helps.rb:80 +#: src/include/bootloader/routines/helps.rb:87 msgid "" "<P> Press <B>Edit</B> to display the properties of the\n" "selected section.</P>" @@ -759,7 +1185,7 @@ "selected section.</P>" #. help 3/4 -#: src/include/bootloader/routines/helps.rb:84 +#: src/include/bootloader/routines/helps.rb:91 msgid "" "<P> By pressing <b>Set as Default</b>, mark the selected \n" "section as default. When booting, the boot loader will provide \n" @@ -776,7 +1202,7 @@ "menu can be changed using the <B>Up</B> and <B>Down</B> buttons.</P>" #. help 4/4 -#: src/include/bootloader/routines/helps.rb:93 +#: src/include/bootloader/routines/helps.rb:100 msgid "" "<P>Press <B>Add</B> to create a new boot loader section\n" "or <B>Delete</B> to delete the selected section.</P>" @@ -787,7 +1213,7 @@ #. help text for the custom boot manager installation, 1 of 7 #. %1 = name of boot loader (e.g. "LILO") #. this should be per architecture -#: src/include/bootloader/routines/helps.rb:107 +#: src/include/bootloader/routines/helps.rb:115 msgid "" "<p><big><b>Boot Loader Location</b></big><br>\n" "The boot manager (%1) can be installed in the following ways:</p>" @@ -796,7 +1222,7 @@ "The boot manager (%1) can be installed in the following ways:</p>" #. custom bootloader help text, 2 of 7 -#: src/include/bootloader/routines/helps.rb:116 +#: src/include/bootloader/routines/helps.rb:124 msgid "" "<p>- In the <b>Master Boot Record</b> (MBR).\n" "This is not recommended if there is another operating system installed\n" @@ -807,7 +1233,7 @@ "on the computer.</p>" #. custom bootloader help text, 3 of 7 -#: src/include/bootloader/routines/helps.rb:126 +#: src/include/bootloader/routines/helps.rb:134 msgid "" "<p>\n" "- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n" @@ -827,8 +1253,24 @@ "if it is needed or configure your other boot manager\n" "to start &product;.</p>" +#. custom bootloader help text, 4 of 7 +#. this part will only be shown if a floppy drive is attached. +#: src/include/bootloader/routines/helps.rb:151 +msgid "" +"<p>\n" +"- On a <b>Floppy Disk</b>.\n" +"Use this to avoid the risk of interfering with an already existing\n" +"boot mechanism. Enable booting from floppy disk in\n" +"the BIOS of your machine to use this option.</p>" +msgstr "" +"<p>\n" +"- On a <b>Floppy Disk</b>.\n" +"Use this to avoid the risk of interfering with an already existing\n" +"boot mechanism. Enable booting from floppy disk in\n" +"the BIOS of your machine to use this option.</p>" + #. custom bootloader help text, 5 of 7 -#: src/include/bootloader/routines/helps.rb:141 +#: src/include/bootloader/routines/helps.rb:164 msgid "" "<p>\n" "- In some <b>Other</b> partition. Consider your system's restrictions\n" @@ -839,7 +1281,7 @@ "when selecting this option.</p>" #. optional part, only inserted on x86 architectures. 6 of 7 -#: src/include/bootloader/routines/helps.rb:151 +#: src/include/bootloader/routines/helps.rb:174 msgid "" "<p>For example, most PCs have a BIOS\n" "limit that restricts booting to\n" @@ -852,7 +1294,7 @@ "you may or may not be able to boot from a logical partition.</p>" #. custom bootloader help text, 7 of 7 -#: src/include/bootloader/routines/helps.rb:163 +#: src/include/bootloader/routines/helps.rb:186 msgid "" "<p>\n" "Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n" @@ -863,7 +1305,7 @@ "<tt>/dev/sdb</tt>) in the input field.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:176 +#: src/include/bootloader/routines/helps.rb:199 #, fuzzy msgid "" "<p><b>Boot Loader Installation Details</b><br>\n" @@ -875,7 +1317,7 @@ "mapping), click <b>Boot Loader Installation Details</b>.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:187 +#: src/include/bootloader/routines/helps.rb:210 #, fuzzy msgid "" "<p><b>Boot Loader Type</b><br>\n" @@ -887,7 +1329,7 @@ "use <b>Boot Loader</b>.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:198 +#: src/include/bootloader/routines/helps.rb:222 #, fuzzy msgid "" "<p><b>Boot Loader Options</b><br>\n" @@ -899,7 +1341,7 @@ "<b>Boot Loader Options</b>.</p>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:209 +#: src/include/bootloader/routines/helps.rb:233 msgid "" "<P><B>Expert Manual Configuration</B><BR>\n" "Here, manually edit the boot loader configuration.</P>\n" @@ -910,7 +1352,7 @@ "<P>Note: The final configuration file may have different indenting.</P>" #. help text 1/1 -#: src/include/bootloader/routines/helps.rb:220 +#: src/include/bootloader/routines/helps.rb:244 #, fuzzy msgid "" "<p><b>Section Name</b><br>\n" @@ -922,7 +1364,7 @@ "name must be unique.</p>" #. help text 1/5 -#: src/include/bootloader/routines/helps.rb:231 +#: src/include/bootloader/routines/helps.rb:255 msgid "" "<p><big><b>Type of the New Section</b></big><br>\n" "Select the type of the new section to create.</p>" @@ -931,7 +1373,7 @@ "Select the type of the new section to create.</p>" #. help text 2/5 -#: src/include/bootloader/routines/helps.rb:235 +#: src/include/bootloader/routines/helps.rb:259 msgid "" "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n" "section. Then modify the options that should differ from the\n" @@ -942,7 +1384,7 @@ "selected section.</p>" #. help text 3/5 -#: src/include/bootloader/routines/helps.rb:241 +#: src/include/bootloader/routines/helps.rb:265 #, fuzzy msgid "" "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n" @@ -952,7 +1394,7 @@ "to load and start.</p>" #. help text 4/5 -#: src/include/bootloader/routines/helps.rb:245 +#: src/include/bootloader/routines/helps.rb:269 #, fuzzy msgid "" "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n" @@ -962,7 +1404,7 @@ "but to start it in a XEN environment.</p>" #. help text 5/5 -#: src/include/bootloader/routines/helps.rb:249 +#: src/include/bootloader/routines/helps.rb:273 msgid "" "<p>Select <b>Other System (Chainloader)</b> to add a section that \n" "loads and starts a boot sector of a partition of the disk. This is used for\n" @@ -972,7 +1414,7 @@ "loads and starts a boot sector of a partition of the disk. This is used for\n" "booting other operating systems.</p>" -#: src/include/bootloader/routines/helps.rb:254 +#: src/include/bootloader/routines/helps.rb:278 #, fuzzy msgid "" "<p>Select <b>Menu Section</b> to add a section that \n" @@ -984,40 +1426,50 @@ "booting other operating systems.</p>" #. part of summary, %1 is a list of hard disks device names -#: src/include/bootloader/routines/lilolike.rb:108 +#: src/include/bootloader/routines/lilolike.rb:697 msgid "Order of Hard Disks: %1" msgstr "Order of Hard Disks: %1" #. summary string -#: src/include/bootloader/routines/misc.rb:51 +#: src/include/bootloader/routines/misc.rb:48 msgid "Do not install any boot loader" msgstr "Do not install any boot loader" #. combo box item -#: src/include/bootloader/routines/misc.rb:54 +#: src/include/bootloader/routines/misc.rb:50 msgid "Do Not Install Any Boot Loader" msgstr "Do Not Install Any Boot Loader" #. summary string -#: src/include/bootloader/routines/misc.rb:60 +#: src/include/bootloader/routines/misc.rb:55 msgid "Install the default boot loader" msgstr "Install the default boot loader" #. combo box item -#: src/include/bootloader/routines/misc.rb:63 +#: src/include/bootloader/routines/misc.rb:57 msgid "Install Default Boot Loader" msgstr "Install Default Boot Loader" #. summary string -#: src/include/bootloader/routines/misc.rb:68 +#: src/include/bootloader/routines/misc.rb:61 msgid "Boot loader" msgstr "Boot loader" #. combo box item -#: src/include/bootloader/routines/misc.rb:71 +#: src/include/bootloader/routines/misc.rb:63 msgid "Boot Loader" msgstr "Boot Loader" +#. popup, %1 is bootloader name +#: src/include/bootloader/routines/misc.rb:101 +msgid "The %1 boot sector has been written to the floppy disk." +msgstr "The %1 boot sector has been written to the floppy disk." + +#. popup - continuing +#: src/include/bootloader/routines/misc.rb:113 +msgid "Leave the floppy disk in the drive." +msgstr "Leave the floppy disk in the drive." + #. popup message #: src/include/bootloader/routines/popups.rb:35 msgid "" @@ -1036,13 +1488,18 @@ "Really leave the boot loader configuration without saving?\n" "All changes will be lost.\n" +#. yes-no popup question +#: src/include/bootloader/routines/popups.rb:59 +msgid "Really delete section %1?" +msgstr "Really delete section %1?" + #. error popup -#: src/include/bootloader/routines/popups.rb:57 +#: src/include/bootloader/routines/popups.rb:65 msgid "The password must not be empty." msgstr "The password must not be empty." #. error popup -#: src/include/bootloader/routines/popups.rb:66 +#: src/include/bootloader/routines/popups.rb:74 msgid "" "'Password' and 'Retype password'\n" "do not match. Retype the password." @@ -1050,15 +1507,81 @@ "'Password' and 'Retype password'\n" "do not match. Retype the password." +#. message popup, %1 is sectino label +#: src/include/bootloader/routines/popups.rb:88 +msgid "" +"The disk settings have changed.\n" +"Check section %1 settings.\n" +msgstr "" +"The disk settings have changed.\n" +"Check section %1 settings.\n" + +#. message popup +#: src/include/bootloader/routines/popups.rb:100 +msgid "" +"The disk settings have changed and you edited boot loader\n" +"configuration files manually. Check the boot loader settings.\n" +msgstr "" +"The disk settings have changed and you edited boot loader\n" +"configuration files manually. Check the boot loader settings.\n" + #. Confirmation box with yes-no popup. %1 is reason why we need to set #. default location. It is translated on caller side and it is complete #. sentence. -#: src/include/bootloader/routines/popups.rb:82 +#: src/include/bootloader/routines/popups.rb:116 msgid "%1Set default boot loader location?\n" msgstr "%1Set default boot loader location?\n" +#. combobox item +#: src/include/bootloader/routines/popups.rb:128 +msgid "Do Not Create a File System" +msgstr "Do Not Create a File System" + +#. combobox item +#: src/include/bootloader/routines/popups.rb:130 +msgid "Create an ext2 File System" +msgstr "Create an ext2 File System" + +#. combobox item +#: src/include/bootloader/routines/popups.rb:136 +msgid "Create a FAT File System" +msgstr "Create a FAT File System" + +#. label +#: src/include/bootloader/routines/popups.rb:142 +msgid "" +"The boot loader boot sector will be written\n" +"to a floppy disk. Insert a floppy disk\n" +"and confirm with OK.\n" +msgstr "" +"The boot loader boot sector will be written\n" +"to a floppy disk. Insert a floppy disk\n" +"and confirm with OK.\n" + +#. checkbox +#: src/include/bootloader/routines/popups.rb:150 +msgid "&Low Level Format" +msgstr "&Low Level Format" + +#. combobox +#: src/include/bootloader/routines/popups.rb:153 +msgid "&Create File System" +msgstr "&Create File System" + +#. yes-no popup +#: src/include/bootloader/routines/popups.rb:182 +msgid "Low level format failed. Try again?" +msgstr "Low level format failed. Try again?" + +#. error report +#. error report +#: src/include/bootloader/routines/popups.rb:195 +#: src/include/bootloader/routines/popups.rb:207 +msgid "Creating file system failed." +msgstr "Creating file system failed." + #. error popup -#: src/include/bootloader/routines/popups.rb:90 +#: src/include/bootloader/routines/popups.rb:218 msgid "" "The name selected is already used.\n" "Use a different one.\n" @@ -1067,7 +1590,7 @@ "Use a different one.\n" #. yes-no popup -#: src/include/bootloader/routines/popups.rb:101 +#: src/include/bootloader/routines/popups.rb:229 msgid "" "An error occurred during boot loader\n" "installation. Retry boot loader configuration?\n" @@ -1075,9 +1598,14 @@ "An error occurred during boot loader\n" "installation. Retry boot loader configuration?\n" +#. FIXME too generic, but was already translated +#: src/include/bootloader/routines/popups.rb:241 +msgid "Unable to install the boot loader." +msgstr "Unable to install the boot loader." + #. warning popup. %1 is device name, %2 is date/time in form of #. 'date' command output -#: src/include/bootloader/routines/popups.rb:125 +#: src/include/bootloader/routines/popups.rb:283 msgid "" "Warning!\n" "\n" @@ -1100,759 +1628,625 @@ "Continue?\n" #. PushButton -#: src/include/bootloader/routines/popups.rb:147 +#: src/include/bootloader/routines/popups.rb:305 msgid "&Yes, Rewrite" msgstr "&Yes, Rewrite" -#. error report -#: src/include/bootloader/routines/wizards.rb:36 +#. encoding: utf-8 +#. File: +#. include/bootloader/routines/section_helps.ycp +#. +#. Module: +#. Bootloader installation and configuration +#. +#. Summary: +#. Help and label strings for bootloader section widgets +#. +#. Authors: +#. Josef Reidinger +#. +#. $Id$ +#: src/include/bootloader/routines/section_helps.rb:23 +msgid "<p><b>Image Section</b></p>" +msgstr "<p><b>Image Section</b></p>" + +#: src/include/bootloader/routines/section_helps.rb:24 #, fuzzy -msgid "Because of the partitioning, the boot loader cannot be installed properly." +msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>" +msgstr "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b></p>" + +#: src/include/bootloader/routines/section_helps.rb:27 +msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>" +msgstr "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>" + +#: src/include/bootloader/routines/section_helps.rb:36 +#, fuzzy +msgid "" +"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n" +"directly or choose by using <b>Browse</b>.</p>\n" msgstr "" -"Because of the partitioning, the boot loader\n" -"cannot be installed properly." +"<p><b>Initial RAM Disk</b>, if non-empty, defines the initial ramdisk to use. Either enter the path and file name\n" +"directly or choose by using <b>Browse</b></p>" -#. Represents dialog for modification of device map -#: src/lib/bootloader/device_map_dialog.rb:53 +#: src/include/bootloader/routines/section_helps.rb:39 #, fuzzy -msgid "Device map must contain at least one device" -msgstr "A class must contain at least one printer." +msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>" +msgstr "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux</p>" -#. we just go back to original dialog -#: src/lib/bootloader/device_map_dialog.rb:96 +#: src/include/bootloader/routines/section_helps.rb:42 #, fuzzy -msgid "Disk order settings" -msgstr "Filter settings" +msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>" +msgstr "<p>Setting <b>Use Password Protection</p> will require a password to select this section</p>" -#: src/lib/bootloader/device_map_dialog.rb:101 -msgid "D&isks" -msgstr "D&isks" +#: src/include/bootloader/routines/section_helps.rb:45 +msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>" +msgstr "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>" -#. textentry header -#: src/lib/bootloader/device_map_dialog.rb:146 -msgid "&Device" -msgstr "&Device" +#: src/include/bootloader/routines/section_helps.rb:48 +msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>" +msgstr "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>" -#. TRANSLATORS: %s stands for partition -#: src/lib/bootloader/disk_change_detector.rb:47 -msgid "Selected custom bootloader partition %s is not available any more." +#: src/include/bootloader/routines/section_helps.rb:51 +#, fuzzy +msgid "" +"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n" +"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n" msgstr "" +"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n" +"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation</p>" -#. TRANSLATORS the %{path} is path where bootloader stage1 is selected to install and -#. the %{device} is device where it should be, but isn't -#: src/lib/bootloader/disk_change_detector.rb:61 -msgid "Selected bootloader location %{path} is not on %{device} any more." +#: src/include/bootloader/routines/section_helps.rb:54 +#, fuzzy +msgid "" +"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n" +"and start it in a Xen environment.</p>\n" msgstr "" +"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n" +"but to start it in a XEN environment.</p>" -#. Finish client for bootloader configuration -#: src/lib/bootloader/finish_client.rb:28 -msgid "Saving bootloader configuration..." -msgstr "Saving bootloader configuration..." +#: src/include/bootloader/routines/section_helps.rb:57 +msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>" +msgstr "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>" -#. TRANSLATORS: reboot message -#. %1 is replaced with additional message from reIPL -#: src/lib/bootloader/finish_client.rb:145 +#: src/include/bootloader/routines/section_helps.rb:60 +#, fuzzy +msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>" +msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>" + +#: src/include/bootloader/routines/section_helps.rb:63 +msgid "<p><b>Menu Section</b></p>" +msgstr "<p><b>Menu Section</b></p>" + +#: src/include/bootloader/routines/section_helps.rb:64 +msgid "<p><b>Partition of Menu File</b></p>" +msgstr "<p><b>Partition of Menu File</b></p>" + +#: src/include/bootloader/routines/section_helps.rb:65 +#, fuzzy +#| msgid "" +#| "<p><b>Min Object Size</b> specifies the minimum object size below which\n" +#| "will not be saved to the disk.</p>" +msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>" +msgstr "" +"<p><b>Min Object Size</b> specifies the minimum object size below which\n" +"will not be saved to the disk.</p>" + +#: src/include/bootloader/routines/section_helps.rb:68 +msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>" +msgstr "" + +#: src/include/bootloader/routines/section_helps.rb:71 msgid "" -"\n" -"Your system will now shut down.%1\n" -"For details, read the related chapter \n" -"in the documentation. \n" +"<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n" +"<b>Edit</b> and <b>Delete</b></p>" msgstr "" -#. Final message after all packages from CD1 are installed -#. and we're ready to start (boot into) the installed system -#. Message that will be displayed along with information -#. how the boot loader was installed -#: src/lib/bootloader/finish_client.rb:158 -msgid "The system will reboot now..." -msgstr "The system will reboot now..." +#: src/include/bootloader/routines/section_helps.rb:74 +#, fuzzy +msgid "" +"<p><b>Allow attempt to relocate</b>\n" +"Usually specified in global section</p>" +msgstr "" +"<p><b>Allow attempt to relocate</b></p>\n" +"Usually specified in global section</p>" -#. proposal part - bootloader label -#: src/lib/bootloader/proposal_client.rb:94 -msgid "Booting" -msgstr "Booting" +#: src/include/bootloader/routines/section_helps.rb:77 +msgid "" +"<p><b>Force root filesystem to be mounted read-only</b><br>\n" +"Usually specified in global section</p>" +msgstr "" +"<p><b>Force root filesystem to be mounted read-only</b><br>\n" +"Usually specified in global section</p>" -#. menubutton entry -#: src/lib/bootloader/proposal_client.rb:96 -msgid "&Booting" -msgstr "&Booting" +#: src/include/bootloader/routines/section_helps.rb:80 +msgid "" +"<p>Select <b>Dump Section</b> to add a section that specifies how to\n" +"create a system dump either on a DASD disk partition or tape device or to a\n" +"file on a SCSI disk partition.</p>" +msgstr "" +"<p>Select <b>Dump Section</b> to add a section that specifies how to\n" +"create a system dump either on a DASD disk partition or tape device or to a\n" +"file on a SCSI disk partition.</p>" -#. warning text in the summary richtext -#: src/lib/bootloader/proposal_client.rb:174 -msgid "No boot loader is selected for installation. Your system might not be bootable." -msgstr "No boot loader is selected for installation. Your system might not be bootable." +#: src/include/bootloader/routines/section_helps.rb:85 +#, fuzzy +msgid "" +"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n" +"Menu sections represent a list of tasks which are grouped together.</p>\n" +msgstr "" +"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n" +"Menu sections represent a list of tasks which are grouped together</p>" -#. error in the proposal -#: src/lib/bootloader/proposal_client.rb:183 -msgid "Because of the partitioning, the bootloader cannot be installed properly" -msgstr "Because of the partitioning, the bootloader cannot be installed properly" +#: src/include/bootloader/routines/section_helps.rb:88 +msgid "" +"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n" +"Please note that this will also disable AppArmor.</p>" +msgstr "" +#. radio button +#: src/include/bootloader/routines/section_helps.rb:95 +#: src/include/bootloader/routines/section_widgets.rb:583 +msgid "Image Section" +msgstr "Image Section" + +#: src/include/bootloader/routines/section_helps.rb:96 +msgid "&Kernel Image" +msgstr "&Kernel Image" + +#: src/include/bootloader/routines/section_helps.rb:97 +#, fuzzy +msgid "&Root Device" +msgstr "Root Device" + +#: src/include/bootloader/routines/section_helps.rb:100 +msgid "&Initial RAM Disk" +msgstr "&Initial RAM Disk" + +#: src/include/bootloader/routines/section_helps.rb:101 +msgid "Chainloader Section" +msgstr "Chainloader Section" + +#: src/include/bootloader/routines/section_helps.rb:102 +msgid "Use Password Protection" +msgstr "Use Password Protection" + +#: src/include/bootloader/routines/section_helps.rb:103 +#, fuzzy +msgid "&Other System" +msgstr "Other System" + +#: src/include/bootloader/routines/section_helps.rb:104 +#, fuzzy +msgid "Do not &verify Filesystem before Booting" +msgstr "Do not verify Filesystem before Booting" + +#: src/include/bootloader/routines/section_helps.rb:105 +#, fuzzy +msgid "&Activate this Partition when selected for Boot" +msgstr "Activate this Partition when selected for Boot" + +#: src/include/bootloader/routines/section_helps.rb:106 +#, fuzzy +msgid "B&lock Offset for Chainloading" +msgstr "Block Offset for Chainloading" + +#: src/include/bootloader/routines/section_helps.rb:107 +msgid "&Map Section to the First Disk in Device Map" +msgstr "" + +#: src/include/bootloader/routines/section_helps.rb:109 +#, fuzzy +msgid "&Hypervisor" +msgstr "Hypervisor" + +#: src/include/bootloader/routines/section_helps.rb:110 +#, fuzzy +msgid "&Additional Xen Hypervisor Parameters" +msgstr "Additional Xen Hypervisor Parameters" + +#: src/include/bootloader/routines/section_helps.rb:112 +#, fuzzy +msgid "&Partition of Menu File" +msgstr "Partition of Menu File" + +#: src/include/bootloader/routines/section_helps.rb:113 +#, fuzzy +msgid "&Menu Description File" +msgstr "Menu Description File" + +#: src/include/bootloader/routines/section_helps.rb:114 +#, fuzzy +msgid "&Force root filesystem to be mounted read-only" +msgstr "Force root filesystem to be mounted read-only" + +#: src/include/bootloader/routines/section_helps.rb:115 +#, fuzzy +msgid "Allow attempt to &relocate" +msgstr "Allow attempt to relocate" + +#: src/include/bootloader/routines/section_helps.rb:116 +#, fuzzy +msgid "Tar&get Directory for Section" +msgstr "Target Directory for Dump Section" + +#: src/include/bootloader/routines/section_helps.rb:117 +#, fuzzy +msgid "Op&tional Parameter File" +msgstr "Optional Parameter File" + +#: src/include/bootloader/routines/section_helps.rb:118 +msgid "Dump Section (obsolete)" +msgstr "Dump Section (obsolete)" + +#: src/include/bootloader/routines/section_helps.rb:119 +msgid "&Dump Device" +msgstr "&Dump Device" + +#: src/include/bootloader/routines/section_helps.rb:120 +#, fuzzy +msgid "&SCSI Dump Device" +msgstr "SCSI Dump Device" + +#: src/include/bootloader/routines/section_helps.rb:122 +#, fuzzy +msgid "&List of Menu Entries" +msgstr "List of Menu Entries" + +#: src/include/bootloader/routines/section_helps.rb:123 +#, fuzzy +msgid "&Number of Default Entry" +msgstr "Number of Default Entry" + +#: src/include/bootloader/routines/section_helps.rb:124 +#, fuzzy +msgid "&Timeout in seconds" +msgstr "Timeout in seconds" + +#: src/include/bootloader/routines/section_helps.rb:125 +#, fuzzy +msgid "&Show boot menu" +msgstr "Show boot menu" + +#: src/include/bootloader/routines/section_helps.rb:126 +#, fuzzy +msgid "C&opy Image to Boot Partition" +msgstr "Copy Image to Boot Partition" + +#: src/include/bootloader/routines/section_helps.rb:127 +#, fuzzy +msgid "&Skip Section gracefully on Errors" +msgstr "Skip Section gracefully on Errors" + +#: src/include/bootloader/routines/section_helps.rb:128 +#, fuzzy +msgid "Boot &Partition of Other System" +msgstr "Boot Partition of Other System" + +#. Cache for CommonSectionWidgets +#: src/include/bootloader/routines/section_widgets.rb:58 +msgid "Image section must have specified kernel image" +msgstr "" + +#: src/include/bootloader/routines/section_widgets.rb:65 +#, fuzzy +msgid "Image file doesn't exist now. Do you really want use it?" +msgstr "" +"Archive %1 already exists.\n" +"Do you really want to overwrite it?" + +#: src/include/bootloader/routines/section_widgets.rb:82 +#, fuzzy +msgid "Initrd file doesn't exist now. Do you really want use it?" +msgstr "" +"Archive %1 already exists.\n" +"Do you really want to overwrite it?" + +#. string append = BootCommon::current_section["append"]:""; +#: src/include/bootloader/routines/section_widgets.rb:227 +#, fuzzy +msgid "Enable &SELinux" +msgstr "Enable &TLS" + +#. bnc#456362 filter out special chars like diacritics china chars etc. +#: src/include/bootloader/routines/section_widgets.rb:401 +msgid "The name includes unallowable char(s)" +msgstr "" + +#: src/include/bootloader/routines/section_widgets.rb:533 +msgid "Ask for resolution during boot." +msgstr "" + +#. radio button +#: src/include/bootloader/routines/section_widgets.rb:573 +msgid "Clone Selected Section" +msgstr "Clone Selected Section" + +#. radio button (don't translate 'chainloader') +#: src/include/bootloader/routines/section_widgets.rb:587 +msgid "Other System (Chainloader)" +msgstr "Other System (Chainloader)" + +#. frame +#: src/include/bootloader/routines/section_widgets.rb:609 +msgid "Section Type" +msgstr "Section Type" + +#. text entry +#: src/include/bootloader/routines/section_widgets.rb:668 +msgid "Section &Name" +msgstr "Section &Name" + +#. error report +#: src/include/bootloader/routines/wizards.rb:36 +#, fuzzy +msgid "Because of the partitioning, the boot loader cannot be installed properly." +msgstr "" +"Because of the partitioning, the boot loader\n" +"cannot be installed properly." + #. FATE#303643 Enable one-click changes in bootloader proposal #. -#: src/modules/BootGRUB2.rb:168 +#. +#. FIXME identical code in BootGRUB module +#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189 #, fuzzy msgid "Install bootcode into MBR (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:172 +#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193 #, fuzzy msgid "Do not install bootcode into MBR (install</a>)" msgstr "Firewall is disabled (enable</a>)" #. check for separated boot partition, use root otherwise -#: src/modules/BootGRUB2.rb:185 +#. check for separated boot partition, use root otherwise +#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206 #, fuzzy msgid "Install bootcode into /boot partition (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:189 +#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210 #, fuzzy msgid "Do not install bootcode into /boot partition (install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:195 +#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216 #, fuzzy msgid "Install bootcode into \"/\" partition (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:199 +#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220 #, fuzzy msgid "Do not install bootcode into \"/\" partition (install</a>)" msgstr "Firewall is disabled (enable</a>)" -#. no location chosen, so warn user that it is problem unless he is sure -#: src/modules/BootGRUB2.rb:209 -msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location." -msgstr "" - #. TRANSLATORS: title for list of location proposals -#: src/modules/BootGRUB2.rb:217 +#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238 #, fuzzy msgid "Change Location: %s" msgstr "Location: %1" +#. summary text, %1 is bootloader name (eg. LILO) #. Display bootloader summary #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100 +#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248 +#: src/modules/BootGRUB2EFI.rb:96 msgid "Boot Loader Type: %1" msgstr "Boot Loader Type: %1" +#. summary text, location is location description (eg. /dev/hda) +#: src/modules/BootGRUB.rb:718 +msgid " (\"/boot\")" +msgstr "" + #. TRANSLATORS: extended is here for extended partition. Keep translation short. -#: src/modules/BootGRUB2.rb:237 +#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259 msgid " (extended)" msgstr "" +#: src/modules/BootGRUB.rb:730 +msgid " (\"/\")" +msgstr "" + #. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific #. is used in your language, then keep it as it is. -#: src/modules/BootGRUB2.rb:245 +#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267 msgid " (MBR)" msgstr "" -#: src/modules/BootGRUB2.rb:252 +#. FIXME: should we translate all devices to names and add MBR suffixes? +#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274 #, fuzzy msgid "Status Location: %1" msgstr "Location: %1" -#: src/modules/BootGRUB2EFI.rb:108 +#. section name "suffix" for default section +#: src/modules/BootGRUB.rb:768 +msgid " (default)" +msgstr " (default)" + +#: src/modules/BootGRUB.rb:779 +msgid "Sections:<br>%1" +msgstr "Sections:<br>%1" + +#. summary text +#: src/modules/BootGRUB.rb:788 +msgid "Do not install boot loader; just create configuration files" +msgstr "Do not install boot loader; just create configuration files" + +#. menubutton item, keep as short as possible +#: src/modules/BootGRUB.rb:919 +msgid "Propose and &Merge with Existing GRUB Menus" +msgstr "Propose and &Merge with Existing GRUB Menus" + +#. no location chosen, so warn user that it is problem unless he is sure +#: src/modules/BootGRUB2.rb:230 +msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location." +msgstr "" + +#: src/modules/BootGRUB2EFI.rb:104 #, fuzzy #| msgid "Enable &GSS Security" msgid "Enable Secure Boot: %1" msgstr "Enable &GSS Security" #. Check that bootloader is known and supported -#: src/modules/BootSupportCheck.rb:65 +#: src/modules/BootSupportCheck.rb:70 #, fuzzy msgid "Unknown bootloader: %1" msgstr "Unknown Model: %1" #. grub2 is sooo cool... -#: src/modules/BootSupportCheck.rb:99 +#: src/modules/BootSupportCheck.rb:101 msgid "Unsupported combination of hardware platform %1 and bootloader %2" msgstr "" #. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation. -#: src/modules/BootSupportCheck.rb:139 +#: src/modules/BootSupportCheck.rb:140 msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR." msgstr "" #. check if boot device is on raid0 -#: src/modules/BootSupportCheck.rb:167 +#: src/modules/BootSupportCheck.rb:168 #, fuzzy msgid "The boot device is on raid type: %1. System will not boot." msgstr "No boot device was found" #. bnc#501043 added check for valid configuration -#: src/modules/BootSupportCheck.rb:187 +#: src/modules/BootSupportCheck.rb:188 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record" msgstr "" +#. s390 do not have bios boot order (bnc#874106) +#: src/modules/BootSupportCheck.rb:243 +msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\"" +msgstr "" + #. if partitioning worked before upgrade, it will keep working (bnc#886604) -#: src/modules/BootSupportCheck.rb:239 +#: src/modules/BootSupportCheck.rb:263 msgid "Missing ext partition for booting. Cannot install boot code." msgstr "" -#. activate set or there is already activate flag -#: src/modules/BootSupportCheck.rb:248 -msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot." -msgstr "" - -#: src/modules/BootSupportCheck.rb:255 -msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk." -msgstr "" - #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:146 +#: src/modules/Bootloader.rb:170 msgid "Check boot loader" msgstr "Check boot loader" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:148 +#: src/modules/Bootloader.rb:172 msgid "Read partitioning" msgstr "Read partitioning" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:150 +#: src/modules/Bootloader.rb:174 msgid "Load boot loader settings" msgstr "Load boot loader settings" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:154 +#: src/modules/Bootloader.rb:178 msgid "Checking boot loader..." msgstr "Checking boot loader..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:156 +#: src/modules/Bootloader.rb:180 msgid "Reading partitioning..." msgstr "Reading partitioning..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:158 +#: src/modules/Bootloader.rb:182 msgid "Loading boot loader settings..." msgstr "Loading boot loader settings..." #. dialog header -#: src/modules/Bootloader.rb:162 +#: src/modules/Bootloader.rb:186 msgid "Initializing Boot Loader Configuration" msgstr "Initialising Boot Loader Configuration" +#. part of summary, %1 is a part of kernel command line +#: src/modules/Bootloader.rb:307 +msgid "Added Kernel Parameters: %1" +msgstr "Added Kernel Parameters: %1" + #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:281 +#: src/modules/Bootloader.rb:367 msgid "Create initrd" msgstr "Create initrd" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:283 +#: src/modules/Bootloader.rb:369 msgid "Save boot loader configuration files" msgstr "Save boot loader configuration files" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:285 +#: src/modules/Bootloader.rb:371 msgid "Install boot loader" msgstr "Install boot loader" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:289 +#: src/modules/Bootloader.rb:375 msgid "Creating initrd..." msgstr "Creating initrd..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:291 +#: src/modules/Bootloader.rb:377 msgid "Saving boot loader configuration files..." msgstr "Saving boot loader configuration files..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:293 +#: src/modules/Bootloader.rb:379 msgid "Installing boot loader..." msgstr "Installing boot loader..." #. progress line -#: src/modules/Bootloader.rb:299 +#: src/modules/Bootloader.rb:385 msgid "Saving Boot Loader Configuration" msgstr "Saving Boot Loader Configuration" #, fuzzy -#~| msgid "Distribution:" -#~ msgid "D&istributor" -#~ msgstr "Distribution:" +#~| msgid "Set a global option" +#~ msgid "Delete a global option" +#~ msgstr "Set a global option" -#, fuzzy -#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe 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>" +#~ msgid "Set a global option" +#~ msgstr "Set a global option" #, fuzzy -#~ msgid "&Failsafe Kernel Command Line Parameter" -#~ msgstr "Optional Kernel Command Line Parameter" +#~| msgid "Value: %1" +#~ msgid "Value: %s" +#~ msgstr "Value: %1" -#~ msgid "Delete a global option or option of a section" -#~ msgstr "Delete a global option or option of a section" - -#~ msgid "Set a global option or option of a section" -#~ msgstr "Set a global option or option of a section" - -#~ msgid "The name of the section" -#~ msgstr "The name of the section" - -#~ msgid "Section %1 not found." -#~ msgstr "Section %1 not found." - -#~ msgid "Section name must be specified." -#~ msgstr "Section name must be specified." - -#~ msgid "Disk Order" -#~ msgstr "Disk Order" - -#~ msgid "Boot Menu" -#~ msgstr "Boot Menu" - -#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>" -#~ msgstr "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>" - #, fuzzy -#~ msgid "Graphical &Menu File" -#~ msgstr "Graphical Menu File" - -#, fuzzy -#~ msgid "Choose new graphical menu file" -#~ msgstr "Graphical Menu File" - -#, fuzzy -#~ msgid "Enable Acoustic &Signals" -#~ msgstr "&Enable Authentication" - -#~ msgid "&Up" -#~ msgstr "&Up" - -#~ msgid "&Down" -#~ msgstr "&Down" - -#~ msgid "Kernel Section" -#~ msgstr "Kernel Section" - -#~ msgid "Section Settings" -#~ msgstr "Section Settings" - -#~ msgid "Boot Loader Settings: Section Management" -#~ msgstr "Boot Loader Settings: Section Management" - -#~ msgid "Xen Section" -#~ msgstr "Xen Section" - -#~ msgid "Menu Section" -#~ msgstr "Menu Section" - -#, fuzzy -#~ msgid "Dump Section" -#~ msgstr "Menu Section" - -#~ msgid "Other System Section" -#~ msgstr "Other System Section" - -#~ msgid "&Filename" -#~ msgstr "&Filename" - -#~ msgid "Filename: %1" -#~ msgstr "Filename: %1" - -#~ msgid "Fi&le Contents" -#~ msgstr "Fi&le Contents" - -#~ msgid "Expert Manual Configuration" -#~ msgstr "Expert Manual Configuration" - -#~ msgid "Image" -#~ msgstr "Image" - -#~ msgid "Floppy" -#~ msgstr "Floppy" - -#, fuzzy -#~ msgid "Menu" -#~ msgstr "Boot Menu" - -#~ msgid "Def." -#~ msgstr "Def." - -#~ msgid "Label" -#~ msgstr "Label" - -#~ msgid "Type" -#~ msgstr "Type" - -#~ msgid "Image / Device" -#~ msgstr "Image / Device" - -#~ msgid "Set as De&fault" -#~ msgstr "Set as De&fault" - -#~ msgid "" -#~ "\n" -#~ "You chose to change your boot loader. When converting \n" -#~ "the configuration, some settings might be lost.\n" -#~ "\n" -#~ "The current configuration will be saved and you can\n" -#~ "restore it if you return to the current boot loader.\n" -#~ "\n" -#~ "Select a course of action:\n" -#~ msgstr "" -#~ "\n" -#~ "You chose to change your boot loader. When converting \n" -#~ "the configuration, some settings might be lost.\n" -#~ "\n" -#~ "The current configuration will be saved and you can\n" -#~ "restore it if you return to the current boot loader.\n" -#~ "\n" -#~ "Select a course of action:\n" - -#~ msgid "Co&nvert Current Configuration" -#~ msgstr "Co&nvert Current Configuration" - -#~ msgid "&Start New Configuration from Scratch" -#~ msgstr "&Start New Configuration from Scratch" - -#~ msgid "&Read Configuration Saved on Disk" -#~ msgstr "&Read Configuration Saved on Disk" - -#~ msgid "Res&tore Configuration Saved before Conversion" -#~ msgstr "Res&tore Configuration Saved before Conversion" - -#~ msgid "Select the boot loader before editing sections." -#~ msgstr "Select the boot loader before editing sections." - -#~ msgid "&Section Management" -#~ msgstr "&Section Management" - -#~ msgid "Boot Loader &Installation" -#~ msgstr "Boot Loader &Installation" - -#~ msgid "" -#~ "If you have multiple Linux systems installed,\n" -#~ "YaST can try to find them and merge their menus." -#~ msgstr "" -#~ "If you have multiple Linux systems installed,\n" -#~ "YaST can try to find them and merge their menus." - -#~ msgid "" -#~ "<p>\n" -#~ "- On a <b>Floppy Disk</b>.\n" -#~ "Use this to avoid the risk of interfering with an already existing\n" -#~ "boot mechanism. Enable booting from floppy disk in\n" -#~ "the BIOS of your machine to use this option.</p>" -#~ msgstr "" -#~ "<p>\n" -#~ "- On a <b>Floppy Disk</b>.\n" -#~ "Use this to avoid the risk of interfering with an already existing\n" -#~ "boot mechanism. Enable booting from floppy disk in\n" -#~ "the BIOS of your machine to use this option.</p>" - -#~ msgid "The %1 boot sector has been written to the floppy disk." -#~ msgstr "The %1 boot sector has been written to the floppy disk." - -#~ msgid "Leave the floppy disk in the drive." -#~ msgstr "Leave the floppy disk in the drive." - -#~ msgid "Really delete section %1?" -#~ msgstr "Really delete section %1?" - -#~ msgid "" -#~ "The disk settings have changed.\n" -#~ "Check section %1 settings.\n" -#~ msgstr "" -#~ "The disk settings have changed.\n" -#~ "Check section %1 settings.\n" - -#~ msgid "" -#~ "The disk settings have changed and you edited boot loader\n" -#~ "configuration files manually. Check the boot loader settings.\n" -#~ msgstr "" -#~ "The disk settings have changed and you edited boot loader\n" -#~ "configuration files manually. Check the boot loader settings.\n" - -#~ msgid "Do Not Create a File System" -#~ msgstr "Do Not Create a File System" - -#~ msgid "Create an ext2 File System" -#~ msgstr "Create an ext2 File System" - -#~ msgid "Create a FAT File System" -#~ msgstr "Create a FAT File System" - -#~ msgid "" -#~ "The boot loader boot sector will be written\n" -#~ "to a floppy disk. Insert a floppy disk\n" -#~ "and confirm with OK.\n" -#~ msgstr "" -#~ "The boot loader boot sector will be written\n" -#~ "to a floppy disk. Insert a floppy disk\n" -#~ "and confirm with OK.\n" - -#~ msgid "&Low Level Format" -#~ msgstr "&Low Level Format" - -#~ msgid "&Create File System" -#~ msgstr "&Create File System" - -#~ msgid "Low level format failed. Try again?" -#~ msgstr "Low level format failed. Try again?" - -#~ msgid "Creating file system failed." -#~ msgstr "Creating file system failed." - -#~ msgid "Unable to install the boot loader." -#~ msgstr "Unable to install the boot loader." - -#~ msgid "<p><b>Image Section</b></p>" -#~ msgstr "<p><b>Image Section</b></p>" - -#, fuzzy -#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>" -#~ msgstr "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b></p>" - -#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>" -#~ msgstr "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>" - -#, fuzzy -#~ msgid "" -#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n" -#~ "directly or choose by using <b>Browse</b>.</p>\n" -#~ msgstr "" -#~ "<p><b>Initial RAM Disk</b>, if non-empty, defines the initial ramdisk to use. Either enter the path and file name\n" -#~ "directly or choose by using <b>Browse</b></p>" - -#, fuzzy -#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>" -#~ msgstr "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux</p>" - -#, fuzzy -#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>" -#~ msgstr "<p>Setting <b>Use Password Protection</p> will require a password to select this section</p>" - -#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>" -#~ msgstr "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>" - -#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>" -#~ msgstr "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>" - -#, fuzzy -#~ msgid "" -#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n" -#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n" -#~ msgstr "" -#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n" -#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation</p>" - -#, fuzzy -#~ msgid "" -#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n" -#~ "and start it in a Xen environment.</p>\n" -#~ msgstr "" -#~ "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n" -#~ "but to start it in a XEN environment.</p>" - -#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>" -#~ msgstr "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>" - -#, fuzzy -#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>" -#~ msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel</p>" - -#~ msgid "<p><b>Menu Section</b></p>" -#~ msgstr "<p><b>Menu Section</b></p>" - -#~ msgid "<p><b>Partition of Menu File</b></p>" -#~ msgstr "<p><b>Partition of Menu File</b></p>" - -#, fuzzy #~| msgid "" -#~| "<p><b>Min Object Size</b> specifies the minimum object size below which\n" -#~| "will not be saved to the disk.</p>" -#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>" -#~ msgstr "" -#~ "<p><b>Min Object Size</b> specifies the minimum object size below which\n" -#~ "will not be saved to the disk.</p>" - -#, fuzzy +#~| "<p><b>Terminal Definition</b></p><br>\n" +#~| "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" +#~| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" +#~| "command, as <code>serial console</code>. In this case, a terminal in which you\n" +#~| "press any key will be selected as a GRUB terminal.</p>" #~ msgid "" -#~ "<p><b>Allow attempt to relocate</b>\n" -#~ "Usually specified in global section</p>" +#~ "<p><b>Terminal Definition</b></p><br>\n" +#~ "Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n" +#~ "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" +#~ "command, as <code>serial console</code>. In this case, a terminal in which you\n" +#~ "press any key will be selected as a GRUB terminal.</p>" #~ msgstr "" -#~ "<p><b>Allow attempt to relocate</b></p>\n" -#~ "Usually specified in global section</p>" +#~ "<p><b>Terminal Definition</b></p><br>\n" +#~ "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n" +#~ "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n" +#~ "command, as <code>serial console</code>. In this case, a terminal in which you\n" +#~ "press any key will be selected as a GRUB terminal.</p>" -#~ msgid "" -#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n" -#~ "Usually specified in global section</p>" -#~ msgstr "" -#~ "<p><b>Force root filesystem to be mounted read-only</b><br>\n" -#~ "Usually specified in global section</p>" - -#~ msgid "" -#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n" -#~ "create a system dump either on a DASD disk partition or tape device or to a\n" -#~ "file on a SCSI disk partition.</p>" -#~ msgstr "" -#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n" -#~ "create a system dump either on a DASD disk partition or tape device or to a\n" -#~ "file on a SCSI disk partition.</p>" - #, fuzzy #~ msgid "" -#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n" -#~ "Menu sections represent a list of tasks which are grouped together.</p>\n" +#~ "<p><b>Protect Boot Loader with Password</b><br>\n" +#~ "At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>" #~ msgstr "" -#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n" -#~ "Menu sections represent a list of tasks which are grouped together</p>" +#~ "<p><b>Password for the Menu Interface</b><br>\n" +#~ "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" +#~ "it in <b>Retype Password</b>.</p>" -#~ msgid "Image Section" -#~ msgstr "Image Section" - -#~ msgid "&Kernel Image" -#~ msgstr "&Kernel Image" - #, fuzzy -#~ msgid "&Root Device" -#~ msgstr "Root Device" - -#~ msgid "&Initial RAM Disk" -#~ msgstr "&Initial RAM Disk" - -#~ msgid "Chainloader Section" -#~ msgstr "Chainloader Section" - -#~ msgid "Use Password Protection" -#~ msgstr "Use Password Protection" - -#, fuzzy -#~ msgid "&Other System" -#~ msgstr "Other System" - -#, fuzzy -#~ msgid "Do not &verify Filesystem before Booting" -#~ msgstr "Do not verify Filesystem before Booting" - -#, fuzzy -#~ msgid "&Activate this Partition when selected for Boot" -#~ msgstr "Activate this Partition when selected for Boot" - -#, fuzzy -#~ msgid "B&lock Offset for Chainloading" -#~ msgstr "Block Offset for Chainloading" - -#, fuzzy -#~ msgid "&Hypervisor" -#~ msgstr "Hypervisor" - -#, fuzzy -#~ msgid "&Additional Xen Hypervisor Parameters" -#~ msgstr "Additional Xen Hypervisor Parameters" - -#, fuzzy -#~ msgid "&Partition of Menu File" -#~ msgstr "Partition of Menu File" - -#, fuzzy -#~ msgid "&Menu Description File" -#~ msgstr "Menu Description File" - -#, fuzzy -#~ msgid "&Force root filesystem to be mounted read-only" -#~ msgstr "Force root filesystem to be mounted read-only" - -#, fuzzy -#~ msgid "Allow attempt to &relocate" -#~ msgstr "Allow attempt to relocate" - -#, fuzzy -#~ msgid "Tar&get Directory for Section" -#~ msgstr "Target Directory for Dump Section" - -#, fuzzy -#~ msgid "Op&tional Parameter File" -#~ msgstr "Optional Parameter File" - -#~ msgid "Dump Section (obsolete)" -#~ msgstr "Dump Section (obsolete)" - -#~ msgid "&Dump Device" -#~ msgstr "&Dump Device" - -#, fuzzy -#~ msgid "&SCSI Dump Device" -#~ msgstr "SCSI Dump Device" - -#, fuzzy -#~ msgid "&List of Menu Entries" -#~ msgstr "List of Menu Entries" - -#, fuzzy -#~ msgid "&Number of Default Entry" -#~ msgstr "Number of Default Entry" - -#, fuzzy -#~ msgid "&Timeout in seconds" -#~ msgstr "Timeout in seconds" - -#, fuzzy -#~ msgid "&Show boot menu" -#~ msgstr "Show boot menu" - -#, fuzzy -#~ msgid "C&opy Image to Boot Partition" -#~ msgstr "Copy Image to Boot Partition" - -#, fuzzy -#~ msgid "&Skip Section gracefully on Errors" -#~ msgstr "Skip Section gracefully on Errors" - -#, fuzzy -#~ msgid "Boot &Partition of Other System" -#~ msgstr "Boot Partition of Other System" - -#, fuzzy -#~ msgid "Image file doesn't exist now. Do you really want use it?" -#~ msgstr "" -#~ "Archive %1 already exists.\n" -#~ "Do you really want to overwrite it?" - -#, fuzzy -#~ msgid "Initrd file doesn't exist now. Do you really want use it?" -#~ msgstr "" -#~ "Archive %1 already exists.\n" -#~ "Do you really want to overwrite it?" - -#, fuzzy -#~ msgid "Enable &SELinux" -#~ msgstr "Enable &TLS" - -#~ msgid "Clone Selected Section" -#~ msgstr "Clone Selected Section" - -#~ msgid "Other System (Chainloader)" -#~ msgstr "Other System (Chainloader)" - -#~ msgid "Section Type" -#~ msgstr "Section Type" - -#~ msgid "Section &Name" -#~ msgstr "Section &Name" - -#~ msgid " (default)" -#~ msgstr " (default)" - -#~ msgid "Sections:<br>%1" -#~ msgstr "Sections:<br>%1" - -#~ msgid "Do not install boot loader; just create configuration files" -#~ msgstr "Do not install boot loader; just create configuration files" - -#~ msgid "Propose and &Merge with Existing GRUB Menus" -#~ msgstr "Propose and &Merge with Existing GRUB Menus" - -#~ msgid "Added Kernel Parameters: %1" -#~ msgstr "Added Kernel Parameters: %1" - -#, fuzzy #~ msgid "The boot device is on iSCSI disk: %1. System may not boot." #~ msgstr "No boot device was found" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ca-management.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ca-management\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-03-27 19:15+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -1953,14 +1953,14 @@ #. Creating default CA/Certificate #. @return [Boolean] ( success ) -#: src/include/ca-management/new_cert_read_write.rb:1890 +#: src/include/ca-management/new_cert_read_write.rb:1891 msgid "Creating certificate..." msgstr "Creating certificate..." #. Creating server certificate #. Exporting to common server certificate -#: src/include/ca-management/new_cert_read_write.rb:1932 -#: src/include/ca-management/new_cert_read_write.rb:2013 +#: src/include/ca-management/new_cert_read_write.rb:1933 +#: src/include/ca-management/new_cert_read_write.rb:2014 msgid "" "The default certificate can also be created in\n" "the CA Management module.\n" @@ -1969,28 +1969,27 @@ "the CA Management module.\n" #. To translators: ContinueCancel Popup headline -#: src/include/ca-management/popup.rb:50 +#: src/include/ca-management/popup.rb:52 msgid "Finish" msgstr "Finish" #. To translators: ContinueCancel Popup -#: src/include/ca-management/popup.rb:52 +#: src/include/ca-management/popup.rb:54 msgid "Really save configuration ?" msgstr "Really save configuration ?" #. To translators: YesNo Popup headline -#: src/include/ca-management/popup.rb:64 +#: src/include/ca-management/popup.rb:66 msgid "Exit" msgstr "Exit" #. To translators: YesNo Popup -#: src/include/ca-management/popup.rb:66 +#: src/include/ca-management/popup.rb:68 msgid "Really exit configuration without saving ?" msgstr "Really exit configuration without saving ?" -#. Popup displaying openssl error messages -#. @return [void] -#: src/include/ca-management/popup.rb:88 +#. Show description while normal installation only.(bnc#962328) +#: src/include/ca-management/popup.rb:91 msgid "Details" msgstr "Details" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/cio.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -46,13 +46,13 @@ msgstr "Used" #: src/lib/iochannel/channels_dialog.rb:142 +msgid "no" +msgstr "no" + +#: src/lib/iochannel/channels_dialog.rb:142 msgid "yes" msgstr "yes" -#: src/lib/iochannel/channels_dialog.rb:142 -msgid "no" -msgstr "no" - #. filter can be empty if dialog is not yet created #: src/lib/iochannel/channels_dialog.rb:160 #, fuzzy 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/cluster.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -154,7 +154,7 @@ msgstr "Play the test sound when the card is configured" #: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256 -#: src/include/cluster/dialogs.rb:1427 +#: src/include/cluster/dialogs.rb:1429 msgid "The Multicast Address has to be fulfilled" msgstr "" @@ -186,7 +186,7 @@ msgstr "Network &Address:" #: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478 -#: src/include/cluster/dialogs.rb:1363 +#: src/include/cluster/dialogs.rb:1365 #, fuzzy #| msgid "Last IP Address:" msgid "Multicast Address:" @@ -248,149 +248,149 @@ msgstr "" #. Notice, current could be "nil" if the list is empty. -#: src/include/cluster/dialogs.rb:715 +#: src/include/cluster/dialogs.rb:717 #, fuzzy #| msgid "Enable &GSS Security" msgid "Enable Security Auth" msgstr "Enable &GSS Security" -#: src/include/cluster/dialogs.rb:719 +#: src/include/cluster/dialogs.rb:721 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey." msgstr "" -#: src/include/cluster/dialogs.rb:724 +#: src/include/cluster/dialogs.rb:726 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually." msgstr "" -#: src/include/cluster/dialogs.rb:750 +#: src/include/cluster/dialogs.rb:752 msgid "Failed to create /etc/corosync/authkey" msgstr "" -#: src/include/cluster/dialogs.rb:752 +#: src/include/cluster/dialogs.rb:754 msgid "Create /etc/corosync/authkey succeeded" msgstr "" -#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883 +#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885 msgid "Running" msgstr "Running" -#: src/include/cluster/dialogs.rb:815 +#: src/include/cluster/dialogs.rb:817 msgid "Not running" msgstr "Not running" #. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster -#: src/include/cluster/dialogs.rb:851 +#: src/include/cluster/dialogs.rb:853 msgid "Booting" msgstr "Booting" -#: src/include/cluster/dialogs.rb:861 +#: src/include/cluster/dialogs.rb:863 #, fuzzy #| msgid "On -- Start Service when Booting" msgid "On -- Start pacemaker during boot" msgstr "On -- Start Service when Booting" -#: src/include/cluster/dialogs.rb:868 +#: src/include/cluster/dialogs.rb:870 #, fuzzy #| msgid "Off -- Start Service Manually" msgid "Off -- Start pacemaker manually" msgstr "Off -- Start Service Manually" -#: src/include/cluster/dialogs.rb:877 +#: src/include/cluster/dialogs.rb:879 msgid "Switch On and Off" msgstr "Switch On and Off" -#: src/include/cluster/dialogs.rb:882 +#: src/include/cluster/dialogs.rb:884 msgid "Current Status: " msgstr "Current Status: " -#: src/include/cluster/dialogs.rb:891 +#: src/include/cluster/dialogs.rb:893 #, fuzzy #| msgid "Start Squid Now" msgid "Start pacemaker Now" msgstr "Start Squid Now" -#: src/include/cluster/dialogs.rb:892 +#: src/include/cluster/dialogs.rb:894 #, fuzzy #| msgid "Stop Firewall Now" msgid "Stop pacemaker Now" msgstr "Stop Firewall Now" #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed -#: src/include/cluster/dialogs.rb:990 +#: src/include/cluster/dialogs.rb:992 #, fuzzy #| msgid "Main Host" msgid "Sync Host" msgstr "Main Host" -#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006 +#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008 msgid "Add" msgstr "Add" -#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007 +#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009 #, fuzzy #| msgid "Delay" msgid "Del" msgstr "Delay" -#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008 +#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010 msgid "Edit" msgstr "Edit" -#: src/include/cluster/dialogs.rb:1002 +#: src/include/cluster/dialogs.rb:1004 #, fuzzy #| msgid "Select File" msgid "Sync File" msgstr "Select File" -#: src/include/cluster/dialogs.rb:1009 +#: src/include/cluster/dialogs.rb:1011 #, fuzzy #| msgid "Suggested fstab Lines" msgid "Add Suggested Files" msgstr "Suggested fstab Lines" -#: src/include/cluster/dialogs.rb:1018 +#: src/include/cluster/dialogs.rb:1020 msgid "Generate Pre-Shared-Keys" msgstr "" #. remove duplicated elements -#: src/include/cluster/dialogs.rb:1143 +#: src/include/cluster/dialogs.rb:1145 msgid "Csync2 Status Unknown" msgstr "" -#: src/include/cluster/dialogs.rb:1146 +#: src/include/cluster/dialogs.rb:1148 msgid "Turn csync2 ON" msgstr "" -#: src/include/cluster/dialogs.rb:1149 +#: src/include/cluster/dialogs.rb:1151 msgid "Turn csync2 OFF" msgstr "" -#: src/include/cluster/dialogs.rb:1179 +#: src/include/cluster/dialogs.rb:1181 #, fuzzy #| msgid "Enter a user name." msgid "Enter a hostname" msgstr "Enter a user name." -#: src/include/cluster/dialogs.rb:1193 +#: src/include/cluster/dialogs.rb:1195 #, fuzzy #| msgid "Write hostname" msgid "Edit the hostname" msgstr "Write hostname" -#: src/include/cluster/dialogs.rb:1207 +#: src/include/cluster/dialogs.rb:1209 #, fuzzy #| msgid "Enter a new name for the %1 profile." msgid "Enter a filename to synchronize" msgstr "Enter a new name for the %1 profile." -#: src/include/cluster/dialogs.rb:1222 +#: src/include/cluster/dialogs.rb:1224 #, fuzzy #| msgid "Enter the file name" msgid "Edit the filename" msgstr "Enter the file name" #. key file exist -#: src/include/cluster/dialogs.rb:1254 +#: src/include/cluster/dialogs.rb:1256 #, fuzzy #| msgid "" #| "File %1 already exists.\n" @@ -403,50 +403,50 @@ "Do you wish to overwrite it?" #. remove exist key file -#: src/include/cluster/dialogs.rb:1264 +#: src/include/cluster/dialogs.rb:1266 #, fuzzy #| msgid "Parsing the key file failed." msgid "Delete key file %1 failed." msgstr "Parsing the key file failed." #. generate key file -#: src/include/cluster/dialogs.rb:1278 +#: src/include/cluster/dialogs.rb:1280 msgid "" "Key file %1 is generated.\n" "Clicking \"Add Suggested Files\" button adds it to sync list." msgstr "" -#: src/include/cluster/dialogs.rb:1285 +#: src/include/cluster/dialogs.rb:1287 #, fuzzy #| msgid "Image creation failed." msgid "Key generation failed." msgstr "Image creation failed." #. SaveCsync2(); -#: src/include/cluster/dialogs.rb:1347 +#: src/include/cluster/dialogs.rb:1349 msgid "" "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n" "YaST can help to configure some basic aspects of conntrackd.\n" "You need to start it with the ocf:heartbeat:conntrackd." msgstr "" -#: src/include/cluster/dialogs.rb:1358 +#: src/include/cluster/dialogs.rb:1360 msgid "Dedicated Interface:" msgstr "" -#: src/include/cluster/dialogs.rb:1361 +#: src/include/cluster/dialogs.rb:1363 msgid "IP:" msgstr "" -#: src/include/cluster/dialogs.rb:1364 +#: src/include/cluster/dialogs.rb:1366 msgid "Group Number:" msgstr "" -#: src/include/cluster/dialogs.rb:1368 +#: src/include/cluster/dialogs.rb:1370 msgid "Generate /etc/conntrackd/conntrackd.conf" msgstr "" -#: src/include/cluster/dialogs.rb:1435 +#: src/include/cluster/dialogs.rb:1437 #, fuzzy #| msgid "The value for pos must be a positive integer." msgid "The Group Number must be a positive integer" @@ -559,41 +559,41 @@ msgstr "Initialising..." #. Cluster read dialog caption -#: src/modules/Cluster.rb:390 +#: src/modules/Cluster.rb:394 #, fuzzy #| msgid "Initializing Printer Configuration" msgid "Initializing cluster Configuration" msgstr "Initialising Printer Configuration" #. Progress stage 1/3 -#: src/modules/Cluster.rb:406 +#: src/modules/Cluster.rb:410 msgid "Read the database" msgstr "Read the database" #. Progress stage 2/3 -#: src/modules/Cluster.rb:408 +#: src/modules/Cluster.rb:412 msgid "Read the previous settings" msgstr "Read the previous settings" #. Progress stage 3/3 -#: src/modules/Cluster.rb:410 +#: src/modules/Cluster.rb:414 #, fuzzy #| msgid "Read firewall settings" msgid "Read SuSEFirewall Settings" msgstr "Read firewall settings" #. Progress step 1/3 -#: src/modules/Cluster.rb:414 +#: src/modules/Cluster.rb:418 msgid "Reading the database..." msgstr "Reading the database..." #. Progress step 2/3 -#: src/modules/Cluster.rb:416 +#: src/modules/Cluster.rb:420 msgid "Reading the previous settings..." msgstr "Reading the previous settings..." #. Progress step 3/3 -#: src/modules/Cluster.rb:418 +#: src/modules/Cluster.rb:422 #, fuzzy #| msgid "Reading firewall settings..." msgid "Reading SuSEFirewall settings..." @@ -601,71 +601,71 @@ #. Progress finished #. Progress finished -#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522 +#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526 msgid "Finished" msgstr "Finished" -#: src/modules/Cluster.rb:435 +#: src/modules/Cluster.rb:439 #, fuzzy #| msgid "Cannot install required packages." msgid "Cannot install required package" msgstr "Cannot install required packages." #. read database -#: src/modules/Cluster.rb:444 +#: src/modules/Cluster.rb:448 #, fuzzy #| msgid "Change existing configuration" msgid "Cannot load existing configuration" msgstr "Change existing configuration" #. Error message -#: src/modules/Cluster.rb:455 +#: src/modules/Cluster.rb:459 msgid "Cannot read database1." msgstr "Cannot read database1." #. Error message -#: src/modules/Cluster.rb:463 +#: src/modules/Cluster.rb:467 msgid "Cannot read database2." msgstr "Cannot read database2." #. Error message -#: src/modules/Cluster.rb:479 +#: src/modules/Cluster.rb:483 msgid "Cannot detect devices." msgstr "Cannot detect devices." #. Cluster read dialog caption -#: src/modules/Cluster.rb:497 +#: src/modules/Cluster.rb:501 #, fuzzy #| msgid "Saving the Configuration" msgid "Saving cluster Configuration" msgstr "Saving the Configuration" #. Progress stage 1/2 -#: src/modules/Cluster.rb:512 +#: src/modules/Cluster.rb:516 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/Cluster.rb:514 +#: src/modules/Cluster.rb:518 #, fuzzy #| msgid "Save changes to the Profile" msgid "Save changes to SuSEFirewall" msgstr "Save changes to the Profile" #. Progress step 1/2 -#: src/modules/Cluster.rb:518 +#: src/modules/Cluster.rb:522 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/Cluster.rb:520 +#: src/modules/Cluster.rb:524 #, fuzzy #| msgid "Saving changes to the files..." msgid "Saving changes to SuSEFirewall..." msgstr "Saving changes to the files..." #. Error message -#: src/modules/Cluster.rb:532 +#: src/modules/Cluster.rb:536 msgid "Cannot write settings." msgstr "Cannot write settings." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/control-center.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: control-center\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2007-08-16 16:26+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/control.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 19:15+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -18,309 +18,284 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: control/control.openSUSE.glade.translations.glade:3 +#: control/control.SLED.glade.translations.glade:3 #, fuzzy +#| msgid "" +#| "\n" +#| "<p>\n" +#| "The installation has completed successfully.\n" +#| "Your system is ready for use.\n" +#| "Click Finish to log in to the system.\n" +#| "</p>\n" +#| "<p>\n" +#| "Please visit us at http://www.novell.com/linux/.\n" +#| "</p>\n" +#| "\t" msgid "" "\n" -"<p><b>Congratulations!</b></p>\n" -"<p>The installation of openSUSE on your machine is complete.\n" -"After clicking <b>Finish</b>, you can log in to the system.</p>\n" -"<p>Visit us at %1.</p>\n" -"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" -" " +"<p>\n" +"The installation has completed successfully.\n" +"Your system is ready for use.\n" +"Click <b>Finish</b> to log in to the system.\n" +"</p>\n" +"<p>\n" +"Please visit us at http://www.suse.com/.\n" +"</p>\n" +" " msgstr "" "\n" -"<p><b>Congratulations!</b></p>\n" -"<p>The installation of openSUSE on your machine is complete.\n" -"After clicking <b>Finish</b>, you can log in to the system.</p>\n" -"<p>Visit us at %1.</p>\n" -"<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" +"<p>\n" +"The installation has completed successfully.\n" +"Your system is ready for use.\n" +"Click Finish to log in to the system.\n" +"</p>\n" +"<p>\n" +"Please visit us at http://www.openSUSE.org.\n" +"</p>\n" "\t" -#: control/control.openSUSE.glade.translations.glade:10 -msgid "" -"The desktop environment on your computer provides the graphical user\n" -"interface for your computer, as well as a suite of applications for\n" -"email, Web browsing, office productivity, games, and utilities to\n" -"manage your computer.\n" -"\n" -"openSUSE offers a choice of desktop environments. The most widely\n" -"used desktop environments are GNOME and KDE, and they are equally\n" -"supported under openSUSE. Both desktop environments are easy to use,\n" -"highly integrated, and have an attractive look and feel. Each desktop\n" -"environment has a distinct style, so personal taste determines which\n" -"is the most appropriate desktop for you." -msgstr "" - -#: control/control.openSUSE.glade.translations.glade:21 +#: control/control.SLED.glade.translations.glade:15 #, fuzzy -msgid "GNOME Desktop" -msgstr "GNOME desktop" +#| msgid "Mail Server" +msgid "CIM Server" +msgstr "Mail Server" -#: control/control.openSUSE.glade.translations.glade:22 -#, fuzzy -msgid "KDE Desktop" -msgstr "KDE desktop" - -#: control/control.openSUSE.glade.translations.glade:23 -#, fuzzy -msgid "XFCE Desktop" -msgstr "XFCE desktop" - -#: control/control.openSUSE.glade.translations.glade:24 -#, fuzzy -msgid "LXDE Desktop" -msgstr "KDE desktop" - -#: control/control.openSUSE.glade.translations.glade:25 -msgid "Minimal X Window" -msgstr "" - -#: control/control.openSUSE.glade.translations.glade:26 -#, fuzzy -#| msgid "Alternate Desktops" -msgid "Enlightenment Desktop" -msgstr "Alternate Desktops" - -#: control/control.openSUSE.glade.translations.glade:27 -msgid "Minimal Server Selection (Text Mode)" -msgstr "" - -#: 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:70 -#: control/control.openSUSE.glade.translations.glade:71 +#: control/control.SLED.glade.translations.glade:16 +#: control/control.SLED.glade.translations.glade:17 +#: control/control.SLED.glade.translations.glade:22 +#: control/control.SLED.glade.translations.glade:56 +#: control/control.SLED.glade.translations.glade:57 msgid "Installation Settings" msgstr "Installation Settings" -#: control/control.openSUSE.glade.translations.glade:30 +#: control/control.SLED.glade.translations.glade:18 +msgid "Overview" +msgstr "Overview" + +#: control/control.SLED.glade.translations.glade:19 +msgid "Expert" +msgstr "Expert" + +#: control/control.SLED.glade.translations.glade:20 msgid "Live Installation Settings" msgstr "Live Installation Settings" -#: control/control.openSUSE.glade.translations.glade:31 -#: control/control.openSUSE.glade.translations.glade:85 +#: control/control.SLED.glade.translations.glade:21 msgid "Update Settings" msgstr "Update Settings" -#: control/control.openSUSE.glade.translations.glade:33 +#: control/control.SLED.glade.translations.glade:23 msgid "Network Configuration" msgstr "Network Configuration" -#: control/control.openSUSE.glade.translations.glade:34 +#: control/control.SLED.glade.translations.glade:24 msgid "Hardware Configuration" msgstr "Hardware Configuration" -#: control/control.openSUSE.glade.translations.glade:35 -#: control/control.openSUSE.glade.translations.glade:77 -#: control/control.openSUSE.glade.translations.glade:103 +#: control/control.SLED.glade.translations.glade:25 +#: control/control.SLED.glade.translations.glade:63 +#: control/control.SLED.glade.translations.glade:90 msgid "Preparation" msgstr "Preparation" -#: control/control.openSUSE.glade.translations.glade:36 -#: control/control.openSUSE.glade.translations.glade:63 +#: control/control.SLED.glade.translations.glade:26 +#: control/control.SLED.glade.translations.glade:50 +#: control/control.SLED.glade.translations.glade:64 #, fuzzy #| msgid "Saving Network Configuration" msgid "Load linuxrc Network Configuration" msgstr "Saving Network Configuration" -#: control/control.openSUSE.glade.translations.glade:37 -#: control/control.openSUSE.glade.translations.glade:64 +#: control/control.SLED.glade.translations.glade:27 +#: control/control.SLED.glade.translations.glade:51 +#: control/control.SLED.glade.translations.glade:65 #, fuzzy #| msgid "Network Setup" msgid "Network Autosetup" msgstr "Network Setup Method" -#: control/control.openSUSE.glade.translations.glade:38 -#: control/control.openSUSE.glade.translations.glade:65 -#: control/control.openSUSE.glade.translations.glade:78 +#: control/control.SLED.glade.translations.glade:28 +#: control/control.SLED.glade.translations.glade:52 +#: control/control.SLED.glade.translations.glade:66 msgid "Welcome" msgstr "Welcome" -#: control/control.openSUSE.glade.translations.glade:39 +#: control/control.SLED.glade.translations.glade:29 +#: control/control.SLED.glade.translations.glade:53 +#: control/control.SLED.glade.translations.glade:67 #, fuzzy #| msgid "Disk Activation" msgid "Network Activation" msgstr "Disk Activation" -#: control/control.openSUSE.glade.translations.glade:40 -#: control/control.openSUSE.glade.translations.glade:79 +#: control/control.SLED.glade.translations.glade:30 +#: control/control.SLED.glade.translations.glade:68 msgid "Disk Activation" msgstr "Disk Activation" -#: control/control.openSUSE.glade.translations.glade:41 -#: control/control.openSUSE.glade.translations.glade:42 -#: control/control.openSUSE.glade.translations.glade:80 -#: control/control.openSUSE.glade.translations.glade:104 +#: control/control.SLED.glade.translations.glade:31 +#: control/control.SLED.glade.translations.glade:32 +#: control/control.SLED.glade.translations.glade:69 +#: control/control.SLED.glade.translations.glade:91 msgid "System Analysis" msgstr "System Analysis" -#: control/control.openSUSE.glade.translations.glade:43 -#: control/control.openSUSE.glade.translations.glade:67 +#: control/control.SLED.glade.translations.glade:33 +#: control/control.SLED.glade.translations.glade:71 +msgid "Add-On Products" +msgstr "Add-On Products" + +#: control/control.SLED.glade.translations.glade:34 +#: control/control.SLED.glade.translations.glade:54 msgid "Disk" msgstr "Disk" -#: control/control.openSUSE.glade.translations.glade:44 -#: control/control.openSUSE.glade.translations.glade:66 +#: control/control.SLED.glade.translations.glade:35 +#: control/control.SLED.glade.translations.glade:55 msgid "Time Zone" msgstr "Time Zone" -#: control/control.openSUSE.glade.translations.glade:45 -#: control/control.openSUSE.glade.translations.glade:82 -msgid "Online Repositories" -msgstr "Online Repositories" - -#: control/control.openSUSE.glade.translations.glade:46 -#: control/control.openSUSE.glade.translations.glade:83 -msgid "Add-On Products" -msgstr "Add-On Products" - -#: control/control.openSUSE.glade.translations.glade:47 -msgid "Desktop Selection" -msgstr "Desktop Selection" - -#: control/control.openSUSE.glade.translations.glade:48 -#: control/control.openSUSE.glade.translations.glade:49 -#: control/control.openSUSE.glade.translations.glade:68 -#: control/control.openSUSE.glade.translations.glade:69 +#: control/control.SLED.glade.translations.glade:36 +#: control/control.SLED.glade.translations.glade:37 msgid "User Settings" msgstr "User Settings" -#: control/control.openSUSE.glade.translations.glade:50 -#: control/control.openSUSE.glade.translations.glade:62 -msgid "Installation" -msgstr "Installation" - -#: control/control.openSUSE.glade.translations.glade:51 +#: control/control.SLED.glade.translations.glade:38 msgid "Installation Overview" msgstr "Installation Overview" -#: control/control.openSUSE.glade.translations.glade:52 -#: 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:56 -#: control/control.openSUSE.glade.translations.glade:57 -#: 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:72 -#: control/control.openSUSE.glade.translations.glade:73 -#: control/control.openSUSE.glade.translations.glade:74 -#: control/control.openSUSE.glade.translations.glade:75 -#: control/control.openSUSE.glade.translations.glade:76 -#: control/control.openSUSE.glade.translations.glade:96 -#: control/control.openSUSE.glade.translations.glade:97 -#: control/control.openSUSE.glade.translations.glade:98 -#: control/control.openSUSE.glade.translations.glade:99 -#: 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:117 -#: control/control.openSUSE.glade.translations.glade:118 -#: control/control.openSUSE.glade.translations.glade:119 +#: control/control.SLED.glade.translations.glade:39 +#: control/control.SLED.glade.translations.glade:40 +#: control/control.SLED.glade.translations.glade:41 +#: control/control.SLED.glade.translations.glade:42 +#: control/control.SLED.glade.translations.glade:43 +#: control/control.SLED.glade.translations.glade:44 +#: control/control.SLED.glade.translations.glade:45 +#: control/control.SLED.glade.translations.glade:46 +#: control/control.SLED.glade.translations.glade:47 +#: control/control.SLED.glade.translations.glade:48 +#: control/control.SLED.glade.translations.glade:58 +#: control/control.SLED.glade.translations.glade:59 +#: control/control.SLED.glade.translations.glade:60 +#: control/control.SLED.glade.translations.glade:61 +#: control/control.SLED.glade.translations.glade:62 +#: control/control.SLED.glade.translations.glade:83 +#: control/control.SLED.glade.translations.glade:84 +#: control/control.SLED.glade.translations.glade:85 +#: control/control.SLED.glade.translations.glade:86 +#: control/control.SLED.glade.translations.glade:87 +#: control/control.SLED.glade.translations.glade:88 +#: control/control.SLED.glade.translations.glade:89 +#: control/control.SLED.glade.translations.glade:104 +#: control/control.SLED.glade.translations.glade:105 +#: control/control.SLED.glade.translations.glade:106 msgid "Perform Installation" msgstr "Perform Installation" -#: control/control.openSUSE.glade.translations.glade:81 -#: control/control.openSUSE.glade.translations.glade:105 +#: control/control.SLED.glade.translations.glade:49 +msgid "Installation" +msgstr "Installation" + +#: control/control.SLED.glade.translations.glade:70 +#: control/control.SLED.glade.translations.glade:92 msgid "System for Update" msgstr "System for Update" -#: control/control.openSUSE.glade.translations.glade:84 -#: control/control.openSUSE.glade.translations.glade:108 +#: control/control.SLED.glade.translations.glade:72 +#: control/control.SLED.glade.translations.glade:95 msgid "Update" msgstr "Update" -#: control/control.openSUSE.glade.translations.glade:86 -#: control/control.openSUSE.glade.translations.glade:87 -#: control/control.openSUSE.glade.translations.glade:88 -#: control/control.openSUSE.glade.translations.glade:89 -#: control/control.openSUSE.glade.translations.glade:90 -#: control/control.openSUSE.glade.translations.glade:110 -#: control/control.openSUSE.glade.translations.glade:111 -#: control/control.openSUSE.glade.translations.glade:112 -#: control/control.openSUSE.glade.translations.glade:113 -#: control/control.openSUSE.glade.translations.glade:114 -#: control/control.openSUSE.glade.translations.glade:115 -#: control/control.openSUSE.glade.translations.glade:116 -#: control/control.openSUSE.glade.translations.glade:122 -#: control/control.openSUSE.glade.translations.glade:123 +#: control/control.SLED.glade.translations.glade:73 +msgid "Update Summary" +msgstr "Update Summary" + +#: control/control.SLED.glade.translations.glade:74 +#: control/control.SLED.glade.translations.glade:75 +#: control/control.SLED.glade.translations.glade:76 +#: control/control.SLED.glade.translations.glade:77 +#: control/control.SLED.glade.translations.glade:78 +#: control/control.SLED.glade.translations.glade:97 +#: control/control.SLED.glade.translations.glade:98 +#: control/control.SLED.glade.translations.glade:99 +#: control/control.SLED.glade.translations.glade:100 +#: control/control.SLED.glade.translations.glade:101 +#: control/control.SLED.glade.translations.glade:102 +#: control/control.SLED.glade.translations.glade:103 +#: control/control.SLED.glade.translations.glade:109 +#: control/control.SLED.glade.translations.glade:110 msgid "Perform Update" msgstr "Perform Update" -#: control/control.openSUSE.glade.translations.glade:91 -#: control/control.openSUSE.glade.translations.glade:120 -#: control/control.openSUSE.glade.translations.glade:124 -msgid "Configuration" -msgstr "Configuration" - -#: control/control.openSUSE.glade.translations.glade:92 +#: control/control.SLED.glade.translations.glade:79 msgid "Base Installation" msgstr "Base Installation" -#: 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:106 -#: control/control.openSUSE.glade.translations.glade:107 -#: control/control.openSUSE.glade.translations.glade:109 +#: control/control.SLED.glade.translations.glade:80 +#: control/control.SLED.glade.translations.glade:81 +#: control/control.SLED.glade.translations.glade:82 +#: control/control.SLED.glade.translations.glade:93 +#: control/control.SLED.glade.translations.glade:94 +#: control/control.SLED.glade.translations.glade:96 msgid "AutoYaST Settings" msgstr "AutoYaST Settings" -#: control/control.openSUSE.glade.translations.glade:121 -#: control/control.openSUSE.glade.translations.glade:125 +#: control/control.SLED.glade.translations.glade:107 +#: control/control.SLED.glade.translations.glade:111 +msgid "Configuration" +msgstr "Configuration" + +#: control/control.SLED.glade.translations.glade:108 +#: control/control.SLED.glade.translations.glade:112 msgid "System Configuration" msgstr "System Configuration" #, fuzzy -#~| msgid "" -#~| "\n" -#~| "<p>\n" -#~| "The installation has completed successfully.\n" -#~| "Your system is ready for use.\n" -#~| "Click Finish to log in to the system.\n" -#~| "</p>\n" -#~| "<p>\n" -#~| "Please visit us at http://www.novell.com/linux/.\n" -#~| "</p>\n" -#~| "\t" #~ msgid "" #~ "\n" -#~ "<p>\n" -#~ "The installation has completed successfully.\n" -#~ "Your system is ready for use.\n" -#~ "Click Finish to log in to the system.\n" -#~ "</p>\n" -#~ "<p>\n" -#~ "Please visit us at http://www.suse.com/.\n" -#~ "</p>\n" -#~ " " +#~ "<p><b>Congratulations!</b></p>\n" +#~ "<p>The installation of openSUSE on your machine is complete.\n" +#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n" +#~ "<p>Visit us at %1.</p>\n" +#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" +#~ " " #~ msgstr "" #~ "\n" -#~ "<p>\n" -#~ "The installation has completed successfully.\n" -#~ "Your system is ready for use.\n" -#~ "Click Finish to log in to the system.\n" -#~ "</p>\n" -#~ "<p>\n" -#~ "Please visit us at http://www.openSUSE.org.\n" -#~ "</p>\n" +#~ "<p><b>Congratulations!</b></p>\n" +#~ "<p>The installation of openSUSE on your machine is complete.\n" +#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n" +#~ "<p>Visit us at %1.</p>\n" +#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n" #~ "\t" #, fuzzy -#~| msgid "Mail Server" -#~ msgid "CIM Server" -#~ msgstr "Mail Server" +#~ msgid "GNOME Desktop" +#~ msgstr "GNOME desktop" -#~ msgid "Overview" -#~ msgstr "Overview" +#, fuzzy +#~ msgid "KDE Desktop" +#~ msgstr "KDE desktop" -#~ msgid "Expert" -#~ msgstr "Expert" +#, fuzzy +#~ msgid "XFCE Desktop" +#~ msgstr "XFCE desktop" #, fuzzy +#~ msgid "LXDE Desktop" +#~ msgstr "KDE desktop" + +#, fuzzy +#~| msgid "Alternate Desktops" +#~ msgid "Enlightenment Desktop" +#~ msgstr "Alternate Desktops" + +#~ msgid "Online Repositories" +#~ msgstr "Online Repositories" + +#~ msgid "Desktop Selection" +#~ msgstr "Desktop Selection" + +#, fuzzy #~| msgid "Network Services Configuration %1" #~ msgid "Network Services Configuration" #~ msgstr "Network Services Configuration %1" @@ -328,9 +303,6 @@ #~ msgid "Installation Summary" #~ msgstr "Installation Summary" -#~ msgid "Update Summary" -#~ msgstr "Update Summary" - #~ msgid "Add-On Product Installation" #~ msgstr "Add-On Product Installation" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/country.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: country\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 19:17+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -860,8 +860,8 @@ "Invalid date (DD-MM-YYYY) %1.\n" "Enter the correct date.\n" -#. button text -#: timezone/src/include/timezone/dialogs.rb:541 +#. TRANSLATORS: Button label +#: timezone/src/include/timezone/dialogs.rb:535 #, fuzzy #| msgid "E&xpert Settings..." msgid "Other &Settings..." @@ -869,46 +869,46 @@ #. frame label #. frame label -#: timezone/src/include/timezone/dialogs.rb:613 -#: timezone/src/include/timezone/dialogs.rb:910 +#: timezone/src/include/timezone/dialogs.rb:612 +#: timezone/src/include/timezone/dialogs.rb:916 #, fuzzy msgid "Date and Time (NTP is configured)" msgstr "NTP is not configured" #. frame label #. frame label -#: timezone/src/include/timezone/dialogs.rb:615 -#: timezone/src/include/timezone/dialogs.rb:693 -#: timezone/src/include/timezone/dialogs.rb:912 +#: timezone/src/include/timezone/dialogs.rb:614 +#: timezone/src/include/timezone/dialogs.rb:699 +#: timezone/src/include/timezone/dialogs.rb:918 #, fuzzy msgid "Date and Time" msgstr "Change Date and Time" #. check box label -#: timezone/src/include/timezone/dialogs.rb:631 +#: timezone/src/include/timezone/dialogs.rb:630 #, fuzzy msgid "&Hardware Clock Set to UTC" msgstr "&Hardware Clock Set To" #. label text #. label text -#: timezone/src/include/timezone/dialogs.rb:650 -#: timezone/src/include/timezone/dialogs.rb:684 +#: timezone/src/include/timezone/dialogs.rb:656 +#: timezone/src/include/timezone/dialogs.rb:690 msgid "&Region" msgstr "&Region" -#: timezone/src/include/timezone/dialogs.rb:657 -#: timezone/src/include/timezone/dialogs.rb:688 +#: timezone/src/include/timezone/dialogs.rb:663 +#: timezone/src/include/timezone/dialogs.rb:694 msgid "Time &Zone" msgstr "Time &Zone" -#: timezone/src/include/timezone/dialogs.rb:669 +#: timezone/src/include/timezone/dialogs.rb:675 #, fuzzy msgid "Date and Time:" msgstr "Change Date and Time" #. help for timezone screen -#: timezone/src/include/timezone/dialogs.rb:791 +#: timezone/src/include/timezone/dialogs.rb:797 msgid "" "\n" "<p><b><big>Time Zone and Clock Settings</big></b></p>" @@ -917,7 +917,7 @@ "<p><b><big>Time Zone and Clock Settings</big></b></p>" #. help for timezone screen -#: timezone/src/include/timezone/dialogs.rb:793 +#: timezone/src/include/timezone/dialogs.rb:799 msgid "" "<p>\n" "To select the time zone to use in your system, first select the <b>Region</b>.\n" @@ -932,7 +932,7 @@ "</p>\n" #. general help trailer -#: timezone/src/include/timezone/dialogs.rb:810 +#: timezone/src/include/timezone/dialogs.rb:816 msgid "" "<p>\n" "If the current time is not correct, use <b>Change</b> to adjust it.\n" @@ -943,12 +943,12 @@ "</p>" #. Screen title for timezone screen -#: timezone/src/include/timezone/dialogs.rb:820 +#: timezone/src/include/timezone/dialogs.rb:826 msgid "Clock and Time Zone" msgstr "Clock and Time Zone" #. popup text -#: timezone/src/include/timezone/dialogs.rb:945 +#: timezone/src/include/timezone/dialogs.rb:951 msgid "Select a valid time zone." msgstr "Select a valid time zone." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/crowbar.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:16+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -25,19 +25,9 @@ msgid "Configuration of crowbar" msgstr "Configuration of CD creator" -#. radio button item: target repository is common for all available platform -#: src/include/crowbar/complex.rb:90 -msgid "Common for All" -msgstr "" - #. target platform name -#: src/include/crowbar/complex.rb:92 -msgid "SLES 11 SP3" -msgstr "" - -#. target platform name #: src/include/crowbar/complex.rb:94 -msgid "SLES 12" +msgid "SLES 12 SP1" msgstr "" #. combobox label @@ -51,11 +41,11 @@ msgid "" "<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n" "<p>\n" -"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n" +"If repositories are stored at SMT server or SUSE Manager server, it's enough to enter server's URL and the paths\n" " to repositories will be filled automatically.</p>It is also possible to use custom paths. Some examples of how the URL could look like:\n" "</p><p>\n" "<ul>\n" -"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n" +"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n" "<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-s...</i> for SUSE Manager Server.\n" "</p><p>\n" "For detailed description, check the Deployment Guide.\n" @@ -198,32 +188,35 @@ msgstr "&IP Address" #. text entry label -#: src/include/crowbar/complex.rb:520 +#: src/include/crowbar/complex.rb:516 msgid "Name" msgstr "Name" #. text entry label -#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695 +#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704 msgid "URL" msgstr "URL" #. text entry label -#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696 +#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705 #, fuzzy #| msgid "User Found Error" msgid "Ask On Error" msgstr "User Found Error" -#. frame label -#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697 -#: src/include/crowbar/complex.rb:715 +#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706 #, fuzzy #| msgid "Target Name" msgid "Target Platform" msgstr "Target Name" +#. radiobutton label +#: src/include/crowbar/complex.rb:542 +msgid "Architecture" +msgstr "Architecture" + #. error popup -#: src/include/crowbar/complex.rb:580 +#: src/include/crowbar/complex.rb:583 #, fuzzy #| msgid "" #| "Hardware configuration %1 already exists.\n" @@ -236,90 +229,97 @@ "Choose a different one." #. text entry label -#: src/include/crowbar/complex.rb:676 +#: src/include/crowbar/complex.rb:685 #, fuzzy #| msgid "LDAP Server &URL" msgid "Server &URL" msgstr "LDAP Server &URL" #. table header -#: src/include/crowbar/complex.rb:694 +#: src/include/crowbar/complex.rb:703 #, fuzzy #| msgid "Repository &Name:" msgid "Repository Name" msgstr "Repository &Name:" #. checkbox label -#: src/include/crowbar/complex.rb:701 +#: src/include/crowbar/complex.rb:710 #, fuzzy #| msgid "User Found Error" msgid "&Ask On Error" msgstr "User Found Error" #. text entry label -#: src/include/crowbar/complex.rb:707 +#: src/include/crowbar/complex.rb:716 #, fuzzy #| msgid "&Repository URL" msgid "Repository &URL" msgstr "&Repository URL" #. label (hint for user) -#: src/include/crowbar/complex.rb:710 +#: src/include/crowbar/complex.rb:719 msgid "Empty URL means that default value will be used." msgstr "" #. push button label -#: src/include/crowbar/complex.rb:726 +#: src/include/crowbar/complex.rb:722 #, fuzzy #| msgid "Repository" msgid "A&dd Repository" msgstr "Repository" #. combobox item -#: src/include/crowbar/complex.rb:793 +#: src/include/crowbar/complex.rb:792 #, fuzzy +#| msgid "Local NTP Server" +msgid "Local SMT Server" +msgstr "Local NTP Server" + +#. combobox item +#: src/include/crowbar/complex.rb:794 +#, fuzzy #| msgid "Remote WINS Server" msgid "Remote SMT Server" msgstr "Remote WINS Server" #. combobox item -#: src/include/crowbar/complex.rb:795 +#: src/include/crowbar/complex.rb:796 #, fuzzy #| msgid "Master Server" msgid "SUSE Manager Server" msgstr "Master Server" #. combobox item -#: src/include/crowbar/complex.rb:797 +#: src/include/crowbar/complex.rb:798 msgid "Custom" msgstr "Custom" #. text entry label -#: src/include/crowbar/complex.rb:866 +#: src/include/crowbar/complex.rb:854 msgid "User Name" msgstr "User Name" #. text entry label -#: src/include/crowbar/complex.rb:868 +#: src/include/crowbar/complex.rb:856 msgid "Password" msgstr "Password" #. text entry label -#: src/include/crowbar/complex.rb:870 +#: src/include/crowbar/complex.rb:858 #, fuzzy #| msgid "Reenter the &Password" msgid "Repeat the Password" msgstr "Reenter the &Password" #. error popup -#: src/include/crowbar/complex.rb:900 +#: src/include/crowbar/complex.rb:888 #, fuzzy #| msgid "Server name cannot be empty." msgid "User name cannot be empty." msgstr "Server name cannot be empty." #. error popup -#: src/include/crowbar/complex.rb:907 +#: src/include/crowbar/complex.rb:895 msgid "" "The passwords do not match.\n" "Try again." @@ -328,7 +328,7 @@ "Try again." #. error popup -#: src/include/crowbar/complex.rb:915 +#: src/include/crowbar/complex.rb:903 #, fuzzy #| msgid "" #| "Hardware configuration %1 already exists.\n" @@ -341,19 +341,19 @@ "Choose a different one." #. error popup -#: src/include/crowbar/complex.rb:1018 +#: src/include/crowbar/complex.rb:1006 #, fuzzy #| msgid "The entered URL '%1' is invalid" msgid "The interface format '%1' is not valid" msgstr "The entered URL '%1' is invalid" #. Returns broadcast address. Based on current netmask and subnet -#: src/include/crowbar/complex.rb:1076 +#: src/include/crowbar/complex.rb:1064 msgid "disabled" msgstr "disabled" #. error popup -#: src/include/crowbar/complex.rb:1173 +#: src/include/crowbar/complex.rb:1161 #, fuzzy #| msgid "The subnet mask is invalid." msgid "" @@ -363,7 +363,7 @@ #. error popup #. error popup -#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216 +#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204 #, fuzzy #| msgid "The IP address is invalid." msgid "" @@ -372,7 +372,7 @@ msgstr "The IP address is invalid." #. error popup -#: src/include/crowbar/complex.rb:1194 +#: src/include/crowbar/complex.rb:1182 #, fuzzy #| msgid "The remote IP address is invalid." msgid "" @@ -381,14 +381,14 @@ msgstr "The remote IP address is invalid." #. error popup -#: src/include/crowbar/complex.rb:1203 +#: src/include/crowbar/complex.rb:1191 #, fuzzy #| msgid "The format of server address '%1' is not correct." msgid "The router address '%1' is not part of network '%2'." msgstr "The format of server address '%1' is not correct." #. error popup -#: src/include/crowbar/complex.rb:1225 +#: src/include/crowbar/complex.rb:1213 #, fuzzy #| msgid "" #| "IP address %1 does not match\n" @@ -399,27 +399,27 @@ "the current network %2/%3.\n" #. popup message -#: src/include/crowbar/complex.rb:1246 +#: src/include/crowbar/complex.rb:1234 msgid "" "Some address ranges are not part of network '%1'.\n" "Adapt them using 'Edit ranges' button." msgstr "" #. inputfield label -#: src/include/crowbar/complex.rb:1335 +#: src/include/crowbar/complex.rb:1326 #, fuzzy #| msgid "Min&imum IP Address" msgid "Min IP Address" msgstr "Min&imum IP Address" #. inputfield label -#: src/include/crowbar/complex.rb:1342 +#: src/include/crowbar/complex.rb:1333 #, fuzzy #| msgid "Ma&ximum IP Address" msgid "Max IP Address" msgstr "Ma&ximum IP Address" -#: src/include/crowbar/complex.rb:1395 +#: src/include/crowbar/complex.rb:1386 #, fuzzy #| msgid "" #| "IP address %1 does not match\n" @@ -430,56 +430,56 @@ "the current network %2/%3.\n" #. error message -#: src/include/crowbar/complex.rb:1407 +#: src/include/crowbar/complex.rb:1398 msgid "The lowest address must be lower than the highest one." msgstr "The lowest address must be lower than the highest one." #. error message -#: src/include/crowbar/complex.rb:1431 +#: src/include/crowbar/complex.rb:1422 msgid "Ranges '%1' and '%2' are overlapping." msgstr "" #. tab header -#: src/include/crowbar/complex.rb:1499 +#: src/include/crowbar/complex.rb:1490 #, fuzzy #| msgid "User Settings" msgid "&User Settings" msgstr "User Settings" #. label (hint for user) -#: src/include/crowbar/complex.rb:1511 +#: src/include/crowbar/complex.rb:1502 msgid "If no user is present, user 'crowbar' with default password will be used." msgstr "" #. tab header -#: src/include/crowbar/complex.rb:1527 +#: src/include/crowbar/complex.rb:1518 #, fuzzy #| msgid "Network Mode" msgid "N&etwork Mode" msgstr "Network Mode" -#: src/include/crowbar/complex.rb:1535 +#: src/include/crowbar/complex.rb:1526 #, fuzzy #| msgid "Bond Network" msgid "Bastion Network" msgstr "Bond Network" #. tab header -#: src/include/crowbar/complex.rb:1578 +#: src/include/crowbar/complex.rb:1569 #, fuzzy #| msgid "Network" msgid "Net&works" msgstr "Network" #. tab header -#: src/include/crowbar/complex.rb:1614 +#: src/include/crowbar/complex.rb:1605 #, fuzzy #| msgid "Repositories" msgid "Re&positories" msgstr "Repositories" #. popup message %1 is FQDN -#: src/include/crowbar/complex.rb:1731 +#: src/include/crowbar/complex.rb:1722 msgid "" "The Crowbar Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" @@ -488,7 +488,7 @@ msgstr "" #. default dialog caption -#: src/include/crowbar/complex.rb:1749 +#: src/include/crowbar/complex.rb:1740 #, fuzzy #| msgid "CD Creator Configuration Overview" msgid "Crowbar Configuration Overview" @@ -551,44 +551,44 @@ msgstr "Initialising..." #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:142 +#: src/modules/Crowbar.rb:154 #, fuzzy #| msgid "Initializing Scanner Configuration" msgid "Initializing crowbar Configuration" msgstr "Initialising Scanner Configuration" #. Progress stage -#: src/modules/Crowbar.rb:153 +#: src/modules/Crowbar.rb:165 #, fuzzy #| msgid "Read the configuration" msgid "Read the configuraton" msgstr "Read the configuration" #. Progress step -#: src/modules/Crowbar.rb:157 +#: src/modules/Crowbar.rb:169 msgid "Reading the configuration..." msgstr "Reading the configuration..." #. Progress finished #. Progress finished -#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249 +#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261 msgid "Finished" msgstr "Finished" #. Crowbar read dialog caption -#: src/modules/Crowbar.rb:232 +#: src/modules/Crowbar.rb:244 #, fuzzy #| msgid "Saving Proxy Configuration" msgid "Saving crowbar Configuration" msgstr "Saving Proxy Configuration" #. Progress stage 1/2 -#: src/modules/Crowbar.rb:243 +#: src/modules/Crowbar.rb:255 msgid "Write the settings" msgstr "Write the settings" #. Progress step 1/2 -#: src/modules/Crowbar.rb:247 +#: src/modules/Crowbar.rb:259 msgid "Writing the settings..." msgstr "Writing the settings..." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/dhcp-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dhcp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-03-27 19:18+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -59,9 +59,7 @@ msgstr "Manage DHCP subnet options" #. command line help text for an option -#. command line help text for an option #: src/include/dhcp-server/commandline.rb:85 -#: src/include/dhcp-server/commandline.rb:138 msgid "List all defined hosts with a fixed address" msgstr "List all defined hosts with a fixed address" @@ -101,242 +99,249 @@ msgstr "The IP address (or hostname) of the host with a fixed address" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:144 +#: src/include/dhcp-server/commandline.rb:138 msgid "Select the network interface to use" msgstr "Select the network interface to use" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:151 +#: src/include/dhcp-server/commandline.rb:145 msgid "Print the currently used interface and list other available interfaces" msgstr "Print the currently used interface and list other available interfaces" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:157 +#: src/include/dhcp-server/commandline.rb:151 msgid "Print current options" msgstr "Print current options" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:163 +#: src/include/dhcp-server/commandline.rb:157 msgid "Set a global option" msgstr "Set a global option" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:169 +#: src/include/dhcp-server/commandline.rb:163 msgid "Option key (for example, ntp-servers)" msgstr "Option key (for example, ntp-servers)" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:176 +#: src/include/dhcp-server/commandline.rb:170 msgid "Option value (for example, IP address)" msgstr "Option value (for example, IP address)" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:183 +#: src/include/dhcp-server/commandline.rb:177 msgid "Lowest IP address of the dynamic address assigning range" msgstr "Lowest IP address of the dynamic address assigning range" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:190 +#: src/include/dhcp-server/commandline.rb:184 msgid "Highest IP address of the dynamic address assigning range" msgstr "Highest IP address of the dynamic address assigning range" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:197 +#: src/include/dhcp-server/commandline.rb:191 msgid "Default lease time in seconds" msgstr "Default lease time in seconds" #. command line help text for an option -#: src/include/dhcp-server/commandline.rb:204 +#: src/include/dhcp-server/commandline.rb:198 msgid "Maximum lease time in seconds" msgstr "Maximum lease time in seconds" #. status information for command line -#: src/include/dhcp-server/commandline.rb:245 +#: src/include/dhcp-server/commandline.rb:239 msgid "DHCP server is enabled" msgstr "DHCP server is enabled" #. status information for command line -#: src/include/dhcp-server/commandline.rb:247 +#: src/include/dhcp-server/commandline.rb:241 msgid "DHCP server is disabled" msgstr "DHCP server is disabled" #. command-line text output, %1 is host name -#: src/include/dhcp-server/commandline.rb:300 +#: src/include/dhcp-server/commandline.rb:294 msgid "Host: %1" msgstr "Host: %1" #. command-line text output, %1 is hardwarre address #. and hardware type (eg. "ethernet 11:22:33:44:55:66") -#: src/include/dhcp-server/commandline.rb:306 +#: src/include/dhcp-server/commandline.rb:300 msgid "Hardware: %1" msgstr "Hardware: %1" #. command-line text output, %1 is IP address -#: src/include/dhcp-server/commandline.rb:312 +#: src/include/dhcp-server/commandline.rb:306 msgid "IP Address: %1" msgstr "IP Address: %1" #. command-line error report -#: src/include/dhcp-server/commandline.rb:327 +#: src/include/dhcp-server/commandline.rb:321 msgid "Hostname not specified." msgstr "Hostname not specified." #. command-line error report -#: src/include/dhcp-server/commandline.rb:337 +#: src/include/dhcp-server/commandline.rb:331 msgid "Specified host does not exist." msgstr "Specified host does not exist." #. to be eventually pasted to "Selected interfaces: %1" #. to be eventually pasted to "Other interfaces: %1" -#: src/include/dhcp-server/commandline.rb:398 -#: src/include/dhcp-server/commandline.rb:402 +#: src/include/dhcp-server/commandline.rb:392 +#: src/include/dhcp-server/commandline.rb:396 msgid "None" msgstr "None" #. command-line text output, %1 is list of network interfaces -#: src/include/dhcp-server/commandline.rb:406 +#: src/include/dhcp-server/commandline.rb:400 msgid "Selected Interfaces: %1" msgstr "Selected Interfaces: %1" #. command-line text output, %1 is list of network interfaces -#: src/include/dhcp-server/commandline.rb:409 +#: src/include/dhcp-server/commandline.rb:403 msgid "Other Interfaces: %1" msgstr "Other Interfaces: %1" #. command-line error report -#: src/include/dhcp-server/commandline.rb:417 +#: src/include/dhcp-server/commandline.rb:411 msgid "Specified interface does not exist." msgstr "Specified interface does not exist." #. command-line error report -#: src/include/dhcp-server/commandline.rb:426 +#: src/include/dhcp-server/commandline.rb:420 msgid "Operation with the interface not specified." msgstr "Operation with the interface not specified." #. command-line error report -#: src/include/dhcp-server/commandline.rb:452 +#: src/include/dhcp-server/commandline.rb:446 msgid "Option key must be set." msgstr "Option key must be set." #. command-line error report -#: src/include/dhcp-server/commandline.rb:457 +#: src/include/dhcp-server/commandline.rb:451 msgid "Value must be set." msgstr "Value must be set." #. command-line output text, %1 and %1 are IP addresses -#: src/include/dhcp-server/commandline.rb:501 +#: src/include/dhcp-server/commandline.rb:495 msgid "Address Range: %1-%2" msgstr "Address Range: %1-%2" #. command-line output text, %1 is integer -#: src/include/dhcp-server/commandline.rb:510 +#: src/include/dhcp-server/commandline.rb:504 msgid "Default Lease Time: %1" msgstr "Default Lease Time: %1" #. command-line output text, %1 is integer -#: src/include/dhcp-server/commandline.rb:518 +#: src/include/dhcp-server/commandline.rb:512 msgid "Maximum Lease Time: %1" msgstr "Maximum Lease Time: %1" #. yes-no popup -#: src/include/dhcp-server/dialogs.rb:52 +#: src/include/dhcp-server/dialogs.rb:57 msgid "Saving the configuration failed. Change the settings?" msgstr "Saving the configuration failed. Change the settings?" +#. Restart only if it's already running +#: src/include/dhcp-server/dialogs.rb:76 +#, fuzzy +#| msgid "Saving the Configuration" +msgid "Saving the configuration failed" +msgstr "Saving the Configuration" + #. dialog caption -#: src/include/dhcp-server/dialogs.rb:84 +#: src/include/dhcp-server/dialogs.rb:118 msgid "DHCP Server Configuration" msgstr "DHCP Server Configuration" #. dialog caption #. Initialize the widget #. @param [String] id any widget id -#: src/include/dhcp-server/dialogs.rb:116 -#: src/include/dhcp-server/widgets.rb:541 +#: src/include/dhcp-server/dialogs.rb:150 +#: src/include/dhcp-server/widgets.rb:477 msgid "Global Options" msgstr "Global Options" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:151 +#: src/include/dhcp-server/dialogs.rb:185 msgid "Subnet Configuration" msgstr "Subnet Configuration" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:185 +#: src/include/dhcp-server/dialogs.rb:219 msgid "Host with Fixed Address" msgstr "Host with Fixed Address" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:222 +#: src/include/dhcp-server/dialogs.rb:256 msgid "Shared Network" msgstr "Shared Network" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:256 +#: src/include/dhcp-server/dialogs.rb:290 msgid "Pool of Addresses" msgstr "Pool of Addresses" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:291 +#: src/include/dhcp-server/dialogs.rb:324 msgid "Group-Specific Options" msgstr "Group-Specific Options" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:325 +#: src/include/dhcp-server/dialogs.rb:358 msgid "Class" msgstr "Class" #. radio button -#: src/include/dhcp-server/dialogs.rb:374 +#: src/include/dhcp-server/dialogs.rb:406 msgid "&Subnet" msgstr "&Subnet" #. radio button -#: src/include/dhcp-server/dialogs.rb:376 +#: src/include/dhcp-server/dialogs.rb:408 msgid "&Host" msgstr "&Host" #. radio button -#: src/include/dhcp-server/dialogs.rb:378 +#: src/include/dhcp-server/dialogs.rb:410 msgid "Shared &Network" msgstr "Shared &Network" #. radio button -#: src/include/dhcp-server/dialogs.rb:380 +#: src/include/dhcp-server/dialogs.rb:412 msgid "&Group" msgstr "&Group" #. radio button -#: src/include/dhcp-server/dialogs.rb:382 +#: src/include/dhcp-server/dialogs.rb:414 msgid "&Pool of Addresses" msgstr "&Pool of Addresses" #. radio button -#: src/include/dhcp-server/dialogs.rb:384 +#: src/include/dhcp-server/dialogs.rb:416 msgid "&Class" msgstr "&Class" #. frame -#: src/include/dhcp-server/dialogs.rb:399 +#: src/include/dhcp-server/dialogs.rb:431 msgid "Declaration Types" msgstr "Declaration Types" #. dialog caption -#: src/include/dhcp-server/dialogs.rb:407 +#: src/include/dhcp-server/dialogs.rb:439 msgid "Declaration Type" msgstr "Declaration Type" #. dialog caption #. dialog caption -#: src/include/dhcp-server/dialogs.rb:453 -#: src/include/dhcp-server/dialogs.rb:493 +#: src/include/dhcp-server/dialogs.rb:485 +#: src/include/dhcp-server/dialogs.rb:525 msgid "Interface Configuration" msgstr "Interface Configuration" #. dialog caption #. item of a menu button -#: src/include/dhcp-server/dialogs.rb:522 -#: src/include/dhcp-server/widgets.rb:1118 +#: src/include/dhcp-server/dialogs.rb:554 +#: src/include/dhcp-server/widgets.rb:1106 msgid "TSIG Key Management" msgstr "TSIG Key Management" @@ -361,192 +366,152 @@ msgstr "Seconds" #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:93 +#: src/include/dhcp-server/dialogs2.rb:94 msgid "DHCP Server: Start-Up" msgstr "DHCP Server: Start-Up" #. dialog caption #. tree item #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:95 -#: src/include/dhcp-server/dialogs2.rb:97 -#: src/include/dhcp-server/dialogs2.rb:181 +#: src/include/dhcp-server/dialogs2.rb:96 +#: src/include/dhcp-server/dialogs2.rb:98 +#: src/include/dhcp-server/dialogs2.rb:182 msgid "Start-Up" msgstr "Start-Up" #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:115 +#: src/include/dhcp-server/dialogs2.rb:116 msgid "DHCP Server: Card Selection" msgstr "DHCP Server: Card Selection" #. dialog caption #. tree item -#: src/include/dhcp-server/dialogs2.rb:117 -#: src/include/dhcp-server/dialogs2.rb:119 +#: src/include/dhcp-server/dialogs2.rb:118 +#: src/include/dhcp-server/dialogs2.rb:120 msgid "Card Selection" msgstr "Card Selection" #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:129 +#: src/include/dhcp-server/dialogs2.rb:130 msgid "DHCP Server: Global Settings" msgstr "DHCP Server: Global Settings" #. dialog caption #. tree item -#: src/include/dhcp-server/dialogs2.rb:133 -#: src/include/dhcp-server/dialogs2.rb:135 +#: src/include/dhcp-server/dialogs2.rb:134 +#: src/include/dhcp-server/dialogs2.rb:136 msgid "Global Settings" msgstr "Global Settings" #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:141 +#: src/include/dhcp-server/dialogs2.rb:142 msgid "DHCP Server: Dynamic DHCP" msgstr "DHCP Server: Dynamic DHCP" #. dialog caption #. tree item -#: src/include/dhcp-server/dialogs2.rb:143 -#: src/include/dhcp-server/dialogs2.rb:145 +#: src/include/dhcp-server/dialogs2.rb:144 +#: src/include/dhcp-server/dialogs2.rb:146 msgid "Dynamic DHCP" msgstr "Dynamic DHCP" #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:151 +#: src/include/dhcp-server/dialogs2.rb:152 msgid "DHCP Server: Host Management" msgstr "DHCP Server: Host Management" #. tree item -#: src/include/dhcp-server/dialogs2.rb:155 +#: src/include/dhcp-server/dialogs2.rb:156 msgid "Host Management" msgstr "Host Management" #. dialog caption -#: src/include/dhcp-server/dialogs2.rb:160 +#: src/include/dhcp-server/dialogs2.rb:161 msgid "DHCP Server: Expert Settings" msgstr "DHCP Server: Expert Settings" #. tree item -#: src/include/dhcp-server/dialogs2.rb:164 +#: src/include/dhcp-server/dialogs2.rb:165 msgid "Expert Settings" msgstr "Expert Settings" #. radio button -#: src/include/dhcp-server/dialogs2.rb:205 +#: src/include/dhcp-server/dialogs2.rb:206 msgid "When &Booting" msgstr "When &Booting" #. radio button -#: src/include/dhcp-server/dialogs2.rb:207 +#: src/include/dhcp-server/dialogs2.rb:208 msgid "&Manually" msgstr "&Manually" #. part of help text - radio button label, NO SHORTCUT!!! -#: src/include/dhcp-server/dialogs2.rb:211 +#: src/include/dhcp-server/dialogs2.rb:212 msgid "When Booting" msgstr "When Booting" #. part of help text - radio button label, NO SHORTCUT!!! -#: src/include/dhcp-server/dialogs2.rb:213 +#: src/include/dhcp-server/dialogs2.rb:214 msgid "Manually" msgstr "Manually" -#. label - service status -#: src/include/dhcp-server/dialogs2.rb:221 -msgid "DHCP server is running" -msgstr "DHCP server is running" - -#. label - service status -#: src/include/dhcp-server/dialogs2.rb:225 -msgid "DHCP server is not running" -msgstr "DHCP server is not running" - -#. push button -#: src/include/dhcp-server/dialogs2.rb:229 -msgid "&Start DHCP Server Now" -msgstr "&Start DHCP Server Now" - -#. push button -#: src/include/dhcp-server/dialogs2.rb:233 -msgid "S&top DHCP Server Now" -msgstr "S&top DHCP Server Now" - -#. push button -#: src/include/dhcp-server/dialogs2.rb:241 -msgid "Save Settings and Restart DHCP Server &Now" -msgstr "Save Settings and Restart DHCP Server &Now" - -#. part of help text - push button label, NO SHORTCUT!!! -#: src/include/dhcp-server/dialogs2.rb:247 -msgid "Start DHCP Server Now" -msgstr "Start DHCP Server Now" - -#. part of help text - push button label, NO SHORTCUT!!! -#: src/include/dhcp-server/dialogs2.rb:249 -msgid "Stop DHCP Server Now" -msgstr "Stop DHCP Server Now" - -#. part of help text - push button label, NO SHORTCUT!!! -#: src/include/dhcp-server/dialogs2.rb:251 -msgid "Save Settings and Restart DHCP Server Now" -msgstr "Save Settings and Restart DHCP Server Now" - -#: src/include/dhcp-server/dialogs2.rb:371 +#: src/include/dhcp-server/dialogs2.rb:334 #, fuzzy #| msgid "DHCP Server Start-Up Arguments" msgid "DHCP Server Start-up Arguments" msgstr "DHCP Server Start-Up Arguments" #. Table - listing available network cards -#: src/include/dhcp-server/dialogs2.rb:443 +#: src/include/dhcp-server/dialogs2.rb:404 msgid "Network Cards for DHCP Server" msgstr "Network Cards for DHCP Server" #. TRANSLATORS: table header item -#: src/include/dhcp-server/dialogs2.rb:449 +#: src/include/dhcp-server/dialogs2.rb:410 msgid "Selected" msgstr "Selected" #. TRANSLATORS: table header item -#: src/include/dhcp-server/dialogs2.rb:451 +#: src/include/dhcp-server/dialogs2.rb:412 msgid "Interface Name" msgstr "Interface Name" #. TRANSLATORS: table header item -#: src/include/dhcp-server/dialogs2.rb:453 +#: src/include/dhcp-server/dialogs2.rb:414 msgid "Device Name" msgstr "Device Name" #. TRANSLATORS: table header item #. Table header item - IP of the host -#: src/include/dhcp-server/dialogs2.rb:455 -#: src/include/dhcp-server/dialogs2.rb:1650 +#: src/include/dhcp-server/dialogs2.rb:416 +#: src/include/dhcp-server/dialogs2.rb:1602 msgid "IP" msgstr "IP" #. TRANSLATORS: a push-button -#: src/include/dhcp-server/dialogs2.rb:462 +#: src/include/dhcp-server/dialogs2.rb:423 msgid "&Select" msgstr "&Select" #. TRANSLATORS: a push-button -#: src/include/dhcp-server/dialogs2.rb:464 +#: src/include/dhcp-server/dialogs2.rb:425 msgid "&Deselect" msgstr "&Deselect" #. TRANSLATORS: Table items; Informs that the IP is a DHCP Address -#: src/include/dhcp-server/dialogs2.rb:533 +#: src/include/dhcp-server/dialogs2.rb:494 msgid "DHCP address" msgstr "DHCP address" #. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces, #. currently no one is selected -#: src/include/dhcp-server/dialogs2.rb:608 +#: src/include/dhcp-server/dialogs2.rb:569 msgid "At least one network interface must be selected." msgstr "At least one network interface must be selected." #. TRANSLATORS: popup error, DHCP Server requires selected interface to have #. at least minimal configuration -#: src/include/dhcp-server/dialogs2.rb:616 +#: src/include/dhcp-server/dialogs2.rb:577 #, fuzzy #| msgid "" #| "The selected network interface has currently no configuration (no assigned IP address \n" @@ -562,60 +527,60 @@ #. configuration will be saved in ldap? #. check box -#: src/include/dhcp-server/dialogs2.rb:632 -#: src/include/dhcp-server/widgets.rb:1079 +#: src/include/dhcp-server/dialogs2.rb:593 +#: src/include/dhcp-server/widgets.rb:1058 msgid "&LDAP Support" msgstr "&LDAP Support" #. FATE #227, comments #5 and #17 -#: src/include/dhcp-server/dialogs2.rb:639 +#: src/include/dhcp-server/dialogs2.rb:600 msgid "DHCP Server &Name (optional)" msgstr "DHCP Server &Name (optional)" #. Textentry with name of the domain -#: src/include/dhcp-server/dialogs2.rb:652 +#: src/include/dhcp-server/dialogs2.rb:613 msgid "&Domain Name" msgstr "&Domain Name" #. Textentry with IP address of primary name server -#: src/include/dhcp-server/dialogs2.rb:654 +#: src/include/dhcp-server/dialogs2.rb:615 msgid "&Primary Name Server IP" msgstr "&Primary Name Server IP" #. Textentry with IP address of secondary name server -#: src/include/dhcp-server/dialogs2.rb:657 +#: src/include/dhcp-server/dialogs2.rb:618 msgid "&Secondary Name Server IP" msgstr "&Secondary Name Server IP" #. Textentry with IP address of default router -#: src/include/dhcp-server/dialogs2.rb:660 +#: src/include/dhcp-server/dialogs2.rb:621 msgid "Default &Gateway (Router) " msgstr "Default &Gateway (Router) " #. Textentry with IP address of time server -#: src/include/dhcp-server/dialogs2.rb:665 +#: src/include/dhcp-server/dialogs2.rb:626 msgid "NTP &Time Server" msgstr "NTP &Time Server" #. Textentry with IP address of print server -#: src/include/dhcp-server/dialogs2.rb:667 +#: src/include/dhcp-server/dialogs2.rb:628 msgid "&Print Server" msgstr "&Print Server" #. Textentry with IP address of WINS (Windows Internet Naming Service) server -#: src/include/dhcp-server/dialogs2.rb:669 +#: src/include/dhcp-server/dialogs2.rb:630 msgid "&WINS Server" msgstr "&WINS Server" #. Textentry with default lease time of IP address from dhcp server -#: src/include/dhcp-server/dialogs2.rb:674 +#: src/include/dhcp-server/dialogs2.rb:635 msgid "Default &Lease Time" msgstr "Default &Lease Time" #. Units for defaultleasetime #. Combobox - type of units for lease time -#: src/include/dhcp-server/dialogs2.rb:683 -#: src/include/dhcp-server/dialogs2.rb:1139 +#: src/include/dhcp-server/dialogs2.rb:644 +#: src/include/dhcp-server/dialogs2.rb:1097 msgid "&Units" msgstr "&Units" @@ -623,48 +588,48 @@ #. error popup #. error popup #. error popup -#: src/include/dhcp-server/dialogs2.rb:1017 -#: src/include/dhcp-server/dialogs2.rb:1029 -#: src/include/dhcp-server/dialogs2.rb:1041 -#: src/include/dhcp-server/dialogs2.rb:1053 +#: src/include/dhcp-server/dialogs2.rb:975 +#: src/include/dhcp-server/dialogs2.rb:987 +#: src/include/dhcp-server/dialogs2.rb:999 +#: src/include/dhcp-server/dialogs2.rb:1011 msgid "The specified value is not a valid hostname or IP address." msgstr "The specified value is not a valid hostname or IP address." #. frame -#: src/include/dhcp-server/dialogs2.rb:1067 +#: src/include/dhcp-server/dialogs2.rb:1025 msgid "Subnet Information" msgstr "Subnet Information" #. TRANSLATORS: informative text entry (filled up, disabled) -#: src/include/dhcp-server/dialogs2.rb:1073 +#: src/include/dhcp-server/dialogs2.rb:1031 msgid "Current &Network" msgstr "Current &Network" #. TRANSLATORS: informative text entry (filled up, disabled) -#: src/include/dhcp-server/dialogs2.rb:1078 +#: src/include/dhcp-server/dialogs2.rb:1036 msgid "Current Net&mask" msgstr "Current Net&mask" #. TRANSLATORS: informative text entry (filled up, disabled) -#: src/include/dhcp-server/dialogs2.rb:1083 +#: src/include/dhcp-server/dialogs2.rb:1041 msgid "Netmask Bi&ts" msgstr "Netmask Bi&ts" #. text entry #. TRANSLATORS: text entry -#: src/include/dhcp-server/dialogs2.rb:1090 +#: src/include/dhcp-server/dialogs2.rb:1048 #: src/include/dhcp-server/dns-server-dialogs.rb:81 msgid "Min&imum IP Address" msgstr "Min&imum IP Address" #. text entry #. TRANSLATORS: text entry -#: src/include/dhcp-server/dialogs2.rb:1095 +#: src/include/dhcp-server/dialogs2.rb:1053 #: src/include/dhcp-server/dns-server-dialogs.rb:83 msgid "Ma&ximum IP Address" msgstr "Ma&ximum IP Address" -#: src/include/dhcp-server/dialogs2.rb:1103 +#: src/include/dhcp-server/dialogs2.rb:1061 msgid "IP Address Range" msgstr "IP Address Range" @@ -672,10 +637,10 @@ #. TRANSLATORS: text entry #. TRANSLATORS: text entry #. TRANSLATORS: text entry -#: src/include/dhcp-server/dialogs2.rb:1109 +#: src/include/dhcp-server/dialogs2.rb:1067 #: src/include/dhcp-server/dns-server-dialogs.rb:93 -#: src/include/dhcp-server/dns-server-management.rb:356 -#: src/include/dhcp-server/dns-server-management.rb:917 +#: src/include/dhcp-server/dns-server-management.rb:355 +#: src/include/dhcp-server/dns-server-management.rb:915 msgid "&First IP Address" msgstr "&First IP Address" @@ -683,61 +648,61 @@ #. TRANSLATORS: text entry #. TRANSLATORS: text entry #. TRANSLATORS: text entry -#: src/include/dhcp-server/dialogs2.rb:1114 +#: src/include/dhcp-server/dialogs2.rb:1072 #: src/include/dhcp-server/dns-server-dialogs.rb:95 -#: src/include/dhcp-server/dns-server-management.rb:358 -#: src/include/dhcp-server/dns-server-management.rb:919 +#: src/include/dhcp-server/dns-server-management.rb:357 +#: src/include/dhcp-server/dns-server-management.rb:917 msgid "&Last IP Address" msgstr "&Last IP Address" #. checkbox -#: src/include/dhcp-server/dialogs2.rb:1118 -#: src/include/dhcp-server/options.rb:1094 +#: src/include/dhcp-server/dialogs2.rb:1076 +#: src/include/dhcp-server/options.rb:1093 msgid "Allow Dynamic &BOOTP" msgstr "Allow Dynamic &BOOTP" #. frame label -#: src/include/dhcp-server/dialogs2.rb:1124 +#: src/include/dhcp-server/dialogs2.rb:1082 msgid "Lease Time" msgstr "Lease Time" #. Textentry label - lease time for IPs in the range -#: src/include/dhcp-server/dialogs2.rb:1130 +#: src/include/dhcp-server/dialogs2.rb:1088 msgid "&Default" msgstr "&Default" #. TextEntryLabel - max. time for leasing of IPs from the range -#: src/include/dhcp-server/dialogs2.rb:1148 +#: src/include/dhcp-server/dialogs2.rb:1106 msgid "&Maximum" msgstr "&Maximum" #. Combobox - type of units for max lease time -#: src/include/dhcp-server/dialogs2.rb:1158 +#: src/include/dhcp-server/dialogs2.rb:1116 msgid "Uni&ts" msgstr "Uni&ts" #. zone is not maintained by the DNS server #. zone is maintained and it is a 'master' -#: src/include/dhcp-server/dialogs2.rb:1360 -#: src/include/dhcp-server/dialogs2.rb:1369 +#: src/include/dhcp-server/dialogs2.rb:1318 +#: src/include/dhcp-server/dialogs2.rb:1327 msgid "Create New DNS Zone from Scratch" msgstr "Create New DNS Zone from Scratch" -#: src/include/dhcp-server/dialogs2.rb:1371 +#: src/include/dhcp-server/dialogs2.rb:1329 msgid "Edit Current DNS Zone" msgstr "Edit Current DNS Zone" #. zone is maintained but it is not a 'master' -#: src/include/dhcp-server/dialogs2.rb:1377 +#: src/include/dhcp-server/dialogs2.rb:1335 msgid "Get Current Zone Information" msgstr "Get Current Zone Information" -#: src/include/dhcp-server/dialogs2.rb:1385 +#: src/include/dhcp-server/dialogs2.rb:1343 msgid "&Synchronize DNS Server..." msgstr "&Synchronize DNS Server..." #. Show DNS Zone Information -#: src/include/dhcp-server/dialogs2.rb:1414 +#: src/include/dhcp-server/dialogs2.rb:1372 #, fuzzy msgid "" "DNS zone %1 is not a master zone.\n" @@ -748,8 +713,8 @@ #. A popup error text #. A popup error text -#: src/include/dhcp-server/dialogs2.rb:1547 -#: src/include/dhcp-server/dialogs2.rb:1555 +#: src/include/dhcp-server/dialogs2.rb:1499 +#: src/include/dhcp-server/dialogs2.rb:1507 msgid "Enter values for both ends of the IP address range." msgstr "Enter values for both ends of the IP address range." @@ -757,8 +722,8 @@ #. %1 is the tested IP which should match network %2 and netmask %3 #. TRANSLATORS: popup error message #. %1 is the tested IP which should match network %2 and netmask %3 -#: src/include/dhcp-server/dialogs2.rb:1594 -#: src/include/dhcp-server/dialogs2.rb:1617 +#: src/include/dhcp-server/dialogs2.rb:1546 +#: src/include/dhcp-server/dialogs2.rb:1569 msgid "" "The dynamic DHCP address range must be in the same network as the DHCP server.\n" "IP %1 does not match the network %2/%3." @@ -767,127 +732,127 @@ "IP %1 does not match the network %2/%3." #. Label of the registered hosts table -#: src/include/dhcp-server/dialogs2.rb:1642 +#: src/include/dhcp-server/dialogs2.rb:1594 msgid "Registered Host" msgstr "Registered Host" #. Table header item - Name of the host -#: src/include/dhcp-server/dialogs2.rb:1648 +#: src/include/dhcp-server/dialogs2.rb:1600 msgid "Name" msgstr "Name" #. MAC address of the host -#: src/include/dhcp-server/dialogs2.rb:1652 +#: src/include/dhcp-server/dialogs2.rb:1604 msgid "Hardware Address" msgstr "Hardware Address" #. Network type of the host -#: src/include/dhcp-server/dialogs2.rb:1654 +#: src/include/dhcp-server/dialogs2.rb:1606 msgid "Type" msgstr "Type" #. Frame label - configuration of particular host -#: src/include/dhcp-server/dialogs2.rb:1661 +#: src/include/dhcp-server/dialogs2.rb:1613 msgid "List Setup" msgstr "List Setup" #. Textentry label - name of the host -#: src/include/dhcp-server/dialogs2.rb:1669 +#: src/include/dhcp-server/dialogs2.rb:1621 msgid "&Name" msgstr "&Name" #. Textentry label - IP address of the host #. TRANSLATORS: text entry -#: src/include/dhcp-server/dialogs2.rb:1674 -#: src/include/dhcp-server/dns-server-management.rb:229 +#: src/include/dhcp-server/dialogs2.rb:1626 +#: src/include/dhcp-server/dns-server-management.rb:228 msgid "&IP Address" msgstr "&IP Address" #. Textentry label - hardware (mac) address of the host -#: src/include/dhcp-server/dialogs2.rb:1682 +#: src/include/dhcp-server/dialogs2.rb:1634 msgid "&Hardware Address" msgstr "&Hardware Address" #. Radiobutton label - network type of the host -#: src/include/dhcp-server/dialogs2.rb:1689 +#: src/include/dhcp-server/dialogs2.rb:1641 msgid "&Ethernet" msgstr "&Ethernet" -#: src/include/dhcp-server/dialogs2.rb:1691 +#: src/include/dhcp-server/dialogs2.rb:1643 msgid "&Token Ring" msgstr "&Token Ring" #. Pushbutton label - change host in list -#: src/include/dhcp-server/dialogs2.rb:1706 +#: src/include/dhcp-server/dialogs2.rb:1658 msgid "C&hange in List" msgstr "C&hange in List" #. Pushbutton label - delete host from list -#: src/include/dhcp-server/dialogs2.rb:1709 +#: src/include/dhcp-server/dialogs2.rb:1661 msgid "Dele&te from List" msgstr "Dele&te from List" #. now, fill the dialog #. combo box entry, networking technology name -#: src/include/dhcp-server/dialogs2.rb:1810 -#: src/include/dhcp-server/options.rb:1039 +#: src/include/dhcp-server/dialogs2.rb:1762 +#: src/include/dhcp-server/options.rb:1038 msgid "Ethernet" msgstr "Ethernet" #. combo box entry, networking technology name -#: src/include/dhcp-server/dialogs2.rb:1811 -#: src/include/dhcp-server/options.rb:1041 +#: src/include/dhcp-server/dialogs2.rb:1763 +#: src/include/dhcp-server/options.rb:1040 msgid "Token Ring" msgstr "Token Ring" #. error popup #. error popup -#: src/include/dhcp-server/dialogs2.rb:1885 -#: src/include/dhcp-server/options.rb:935 +#: src/include/dhcp-server/dialogs2.rb:1837 +#: src/include/dhcp-server/options.rb:934 msgid "The hardware address is invalid.\n" msgstr "The hardware address is invalid.\n" #. error popup -#: src/include/dhcp-server/dialogs2.rb:1931 +#: src/include/dhcp-server/dialogs2.rb:1883 msgid "The hardware address must be unique." msgstr "The hardware address must be unique." #. error popup -#: src/include/dhcp-server/dialogs2.rb:1941 +#: src/include/dhcp-server/dialogs2.rb:1893 msgid "The hostname cannot be empty." msgstr "The hostname cannot be empty." #. error popup, %1 is host name -#: src/include/dhcp-server/dialogs2.rb:1951 +#: src/include/dhcp-server/dialogs2.rb:1903 msgid "A host named %1 already exists." msgstr "A host named %1 already exists." #. error popup #. FIXME: text? -#: src/include/dhcp-server/dialogs2.rb:1969 -#: src/include/dhcp-server/dialogs2.rb:2033 +#: src/include/dhcp-server/dialogs2.rb:1921 +#: src/include/dhcp-server/dialogs2.rb:1985 msgid "Enter a host IP." msgstr "Enter a host IP." #. error popup -#: src/include/dhcp-server/dialogs2.rb:1984 +#: src/include/dhcp-server/dialogs2.rb:1936 msgid "The hardware address must be defined." msgstr "The hardware address must be defined." #. error popup #. yes-no popup -#: src/include/dhcp-server/dialogs2.rb:2005 -#: src/include/dhcp-server/dialogs2.rb:2020 +#: src/include/dhcp-server/dialogs2.rb:1957 +#: src/include/dhcp-server/dialogs2.rb:1972 msgid "Select a host first." msgstr "Select a host first." #. checking new MAC -#: src/include/dhcp-server/dialogs2.rb:2047 +#: src/include/dhcp-server/dialogs2.rb:1999 msgid "The input value must be defined." msgstr "The input value must be defined." #. yes-no popup -#: src/include/dhcp-server/dialogs2.rb:2086 +#: src/include/dhcp-server/dialogs2.rb:2038 msgid "" "If you enter the expert settings, you cannot return \n" "to this dialog. You may be able to display this dialog \n" @@ -908,15 +873,15 @@ "Continue?" #. remove leading '-' -#: src/include/dhcp-server/dialogs2.rb:2133 +#: src/include/dhcp-server/dialogs2.rb:2085 msgid "\"-%1\" is not a valid DHCP server commandline option" msgstr "\"-%1\" is not a valid DHCP server commandline option" -#: src/include/dhcp-server/dialogs2.rb:2144 +#: src/include/dhcp-server/dialogs2.rb:2096 msgid "DHCP server commandline option \"-%1\" requires an argument" msgstr "DHCP server commandline option \"-%1\" requires an argument" -#: src/include/dhcp-server/dialogs2.rb:2155 +#: src/include/dhcp-server/dialogs2.rb:2107 #, fuzzy #| msgid "" #| "You have specified an alternate configuration file for the DHCP server.\n" @@ -944,7 +909,7 @@ "Really continue?\n" #. dialog caption, %1 is step number -#: src/include/dhcp-server/dialogs2.rb:2236 +#: src/include/dhcp-server/dialogs2.rb:2179 msgid "DHCP Server Wizard (%1 of 4)" msgstr "DHCP Server Wizard (%1 of 4)" @@ -1249,7 +1214,7 @@ #. TRANSLATORS: popup error #. TRANSLATORS: popup error #: src/include/dhcp-server/dns-server-dialogs.rb:228 -#: src/include/dhcp-server/dns-server-management.rb:455 +#: src/include/dhcp-server/dns-server-management.rb:454 msgid "The last IP address must be higher than the first one." msgstr "The last IP address must be higher than the first one." @@ -1281,7 +1246,7 @@ #. TRANSLATORS: popup error, followed by a newline and a valid hostname description #. TRANSLATORS: popup error, followed by a newline and a valid hostname description #: src/include/dhcp-server/dns-server-dialogs.rb:453 -#: src/include/dhcp-server/dns-server-management.rb:256 +#: src/include/dhcp-server/dns-server-management.rb:255 msgid "Invalid hostname." msgstr "Invalid hostname." @@ -1292,9 +1257,9 @@ #. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description #: src/include/dhcp-server/dns-server-dialogs.rb:462 #: src/include/dhcp-server/dns-server-dialogs.rb:490 -#: src/include/dhcp-server/dns-server-management.rb:265 -#: src/include/dhcp-server/dns-server-management.rb:394 -#: src/include/dhcp-server/dns-server-management.rb:402 +#: src/include/dhcp-server/dns-server-management.rb:264 +#: src/include/dhcp-server/dns-server-management.rb:393 +#: src/include/dhcp-server/dns-server-management.rb:401 msgid "Invalid IP address." msgstr "Invalid IP address." @@ -1312,44 +1277,44 @@ "IP addresses (%2-%3) defined in the DHCP server.\n" #. TRANSLATORS: busy message -#: src/include/dhcp-server/dns-server-management.rb:157 +#: src/include/dhcp-server/dns-server-management.rb:156 msgid "Regenerating DNS zone entries..." msgstr "Regenerating DNS zone entries..." #. TRANSLATORS: dialog frame label -#: src/include/dhcp-server/dns-server-management.rb:224 +#: src/include/dhcp-server/dns-server-management.rb:223 msgid "Adding a New DNS Record" msgstr "Adding a New DNS Record" #. TRANSLATORS: text entry #. TRANSLATORS: text entry -#: src/include/dhcp-server/dns-server-management.rb:227 +#: src/include/dhcp-server/dns-server-management.rb:226 #: src/include/dhcp-server/dns-server-wizard.rb:148 msgid "&Hostname" msgstr "&Hostname" #. TRANSLATORS: busy message #. %1 is the first IP address of the range, %2 is the last one -#: src/include/dhcp-server/dns-server-management.rb:317 +#: src/include/dhcp-server/dns-server-management.rb:316 msgid "Adding DHCP range %1-%2 to the DNS server..." msgstr "Adding DHCP range %1-%2 to the DNS server..." #. TRANSLATORS: dialog frame label #. TRANSLATORS: menu entry -#: src/include/dhcp-server/dns-server-management.rb:353 -#: src/include/dhcp-server/dns-server-management.rb:955 +#: src/include/dhcp-server/dns-server-management.rb:352 +#: src/include/dhcp-server/dns-server-management.rb:953 msgid "Removing DNS Records Matching Range" msgstr "Removing DNS Records Matching Range" #. TRANSLATORS: busy message #. %1 is the first IP address of the range, %2 is the last one -#: src/include/dhcp-server/dns-server-management.rb:465 +#: src/include/dhcp-server/dns-server-management.rb:464 msgid "Removing records in the range %1-%2 from the DNS server..." msgstr "Removing records in the range %1-%2 from the DNS server..." #. TRANSLATORS: popup error, %1 is the zone name #. please, do not translate 'master' (exact DNS definition) -#: src/include/dhcp-server/dns-server-management.rb:556 +#: src/include/dhcp-server/dns-server-management.rb:555 msgid "" "Zone %1 is not of the type master.\n" "The DNS server cannot write any records to it.\n" @@ -1358,7 +1323,7 @@ "The DNS server cannot write any records to it.\n" #. TRANSLATORS: popup question, %1 is a DNS zone name -#: src/include/dhcp-server/dns-server-management.rb:570 +#: src/include/dhcp-server/dns-server-management.rb:569 msgid "" "Zone %1 does not yet exist in the current DNS server configuration.\n" "Create it?\n" @@ -1368,18 +1333,18 @@ #. TRANSLATORS: popup error, %1 is a zone name #. TRANSLATORS: error message, %1 is a zone name -#: src/include/dhcp-server/dns-server-management.rb:590 +#: src/include/dhcp-server/dns-server-management.rb:589 #: src/include/dhcp-server/dns-server-wizard.rb:1107 msgid "Cannot create zone %1." msgstr "Cannot create zone %1." #. TRANSLATORS: busy message -#: src/include/dhcp-server/dns-server-management.rb:815 +#: src/include/dhcp-server/dns-server-management.rb:813 msgid "Synchronizing DNS reverse records..." msgstr "Synchronizing DNS reverse records..." #. TRANSLATORS: popup question - canceling dns synchronization with dhcp -#: src/include/dhcp-server/dns-server-management.rb:860 +#: src/include/dhcp-server/dns-server-management.rb:858 #, fuzzy #| msgid "" #| "If you cancel, all changes made in the DNS server will be lost.\n" @@ -1392,62 +1357,62 @@ "Really cancel this operation?\n" #. TRANSLATORS: text entry -#: src/include/dhcp-server/dns-server-management.rb:909 +#: src/include/dhcp-server/dns-server-management.rb:907 msgid "&Domain" msgstr "&Domain" #. TRANSLATORS: text entry -#: src/include/dhcp-server/dns-server-management.rb:911 +#: src/include/dhcp-server/dns-server-management.rb:909 msgid "&Network" msgstr "&Network" #. TRANSLATORS: text entry -#: src/include/dhcp-server/dns-server-management.rb:913 +#: src/include/dhcp-server/dns-server-management.rb:911 msgid "Net&mask" msgstr "Net&mask" #. TRANSLATORS: table label -#: src/include/dhcp-server/dns-server-management.rb:923 +#: src/include/dhcp-server/dns-server-management.rb:921 msgid "DNS Zone Records" msgstr "DNS Zone Records" #. TRANSLATORS: table header item -#: src/include/dhcp-server/dns-server-management.rb:928 +#: src/include/dhcp-server/dns-server-management.rb:926 msgid "Hostname" msgstr "Hostname" #. TRANSLATORS: table header item -#: src/include/dhcp-server/dns-server-management.rb:930 +#: src/include/dhcp-server/dns-server-management.rb:928 msgid "Assigned IP" msgstr "Assigned IP" #. TRANSLATORS: push button -#: src/include/dhcp-server/dns-server-management.rb:937 +#: src/include/dhcp-server/dns-server-management.rb:935 msgid "&Add..." msgstr "&Add..." #. TRANSLATORS: menu button -#: src/include/dhcp-server/dns-server-management.rb:945 +#: src/include/dhcp-server/dns-server-management.rb:943 msgid "&Special Tasks" msgstr "&Special Tasks" #. TRANSLATORS: menu entry -#: src/include/dhcp-server/dns-server-management.rb:953 +#: src/include/dhcp-server/dns-server-management.rb:951 msgid "Add New Range of DNS Records" msgstr "Add New Range of DNS Records" #. TRANSLATORS: menu entry -#: src/include/dhcp-server/dns-server-management.rb:959 +#: src/include/dhcp-server/dns-server-management.rb:957 msgid "Run Wizard to Rewrite the DNS Zone from Scratch" msgstr "Run Wizard to Rewrite the DNS Zone from Scratch" #. TRANSLATORS: checkbox, %1 is a zone name -#: src/include/dhcp-server/dns-server-management.rb:1031 +#: src/include/dhcp-server/dns-server-management.rb:1029 msgid "Synchronize with Reverse Zone %1" msgstr "Synchronize with Reverse Zone %1" #. TRANSLATORS: dialog caption -#: src/include/dhcp-server/dns-server-management.rb:1084 +#: src/include/dhcp-server/dns-server-management.rb:1082 msgid "DHCP Server: DNS Server Synchronization" msgstr "DHCP Server: DNS Server Synchronization" @@ -1750,8 +1715,7 @@ "Please wait...</p>" #. help text 1/2 -#. help text 1/2 -#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233 +#: src/include/dhcp-server/helps.rb:24 msgid "" "<p><b><big>Network Interfaces</big></b><br>\n" "Select the network interfaces to which the DHCP server should listen from\n" @@ -1778,20 +1742,9 @@ "This option is only available if the firewall\n" "is enabled.</p>" -#. help text 1/5 +#. help text 2/5 #: src/include/dhcp-server/helps.rb:39 msgid "" -"<p><b><big>DHCP Server</big></b></p>\n" -"<p>To run the DHCP server every time your computer is started, set\n" -"<b>Start DHCP Server</b>.</p>" -msgstr "" -"<p><b><big>DHCP Server</big></b></p>\n" -"<p>To run the DHCP server every time your computer is started, set\n" -"<b>Start DHCP Server</b>.</p>" - -#. help text 2/5 -#: src/include/dhcp-server/helps.rb:45 -msgid "" "<p>\n" "To run the DHCP server in chroot jail, set\n" "<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n" @@ -1803,7 +1756,7 @@ "is more secure and strongly recommended.</p>" #. help text 3/5 -#: src/include/dhcp-server/helps.rb:52 +#: src/include/dhcp-server/helps.rb:46 msgid "" "<p>\n" "To store the DHCP configuration in LDAP,\n" @@ -1814,7 +1767,7 @@ "enable <b>LDAP Support</b>.</p>" #. help text 4/5 -#: src/include/dhcp-server/helps.rb:58 +#: src/include/dhcp-server/helps.rb:52 msgid "" "<p><b>Configured Declarations</b> shows the configuration options in use.\n" "To modify an existing declaration, select it and click <b>Edit</b>.\n" @@ -1829,7 +1782,7 @@ "To delete a declaration, select it and click <b>Delete</b>.</p>" #. help text 5/5 -#: src/include/dhcp-server/helps.rb:66 +#: src/include/dhcp-server/helps.rb:60 msgid "" "<p><b><big>Advanced Functions</big></b><br>\n" "Use <b>Advanced</b> to display the log of the DHCP server,\n" @@ -1844,7 +1797,7 @@ "dynamic DNS updates.</p>" #. help text 1/3, alt. 1 -#: src/include/dhcp-server/helps.rb:74 +#: src/include/dhcp-server/helps.rb:68 msgid "" "<p><b><big>Subnet Configuration</big></b><br>\n" "Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>" @@ -1853,7 +1806,7 @@ "Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>" #. help text 1/3, alt. 1 -#: src/include/dhcp-server/helps.rb:78 +#: src/include/dhcp-server/helps.rb:72 msgid "" "<p><b><big>Host with Fixed Address</big></b><br>\n" "Set the name of the host for which to set the fixed address or other\n" @@ -1864,7 +1817,7 @@ "special options in <b>Hostname</b>.</p>" #. help text 1/3, alt. 3 -#: src/include/dhcp-server/helps.rb:84 +#: src/include/dhcp-server/helps.rb:78 msgid "" "<p><b><big>Group-Specific Options</big></b><br>\n" "Set the name of the group of declarations in <b>Group Name</b>. \n" @@ -1877,7 +1830,7 @@ "The name does not affect bhaviour of the DHCP server.</p>" #. help text 1/3, alt. 4 -#: src/include/dhcp-server/helps.rb:91 +#: src/include/dhcp-server/helps.rb:85 msgid "" "<p><b><big>Pool of Addresses</big></b><br>\n" "Set the name of the pool of addresses in <b>Pool Name</b>. \n" @@ -1890,7 +1843,7 @@ "The name does not affect bhaviour of the DHCP server.</p>" #. help text 1/3, alt. 5 -#: src/include/dhcp-server/helps.rb:98 +#: src/include/dhcp-server/helps.rb:92 msgid "" "<p><b><big>Shared Network</big></b><br>\n" "Set the name for the shared network in <b>Shared Network Name</b>. \n" @@ -1903,7 +1856,7 @@ "The name does not affect bhaviour of the DHCP server.</p>" #. help text 1/3, alt. 6 -#: src/include/dhcp-server/helps.rb:105 +#: src/include/dhcp-server/helps.rb:99 msgid "" "<p><b><big>Class</big></b><br>\n" "Set the name of the class of hosts in <b>Class Name</b>.</p>" @@ -1912,7 +1865,7 @@ "Set the name of the class of hosts in <b>Class Name</b>.</p>" #. help text 2/3 -#: src/include/dhcp-server/helps.rb:109 +#: src/include/dhcp-server/helps.rb:103 msgid "" "<p>\n" "To edit DHCP options, choose the appropriate\n" @@ -1927,7 +1880,7 @@ "an option, select it and click <b>Delete</b>.</p>" #. help text 3/3 -#: src/include/dhcp-server/helps.rb:117 +#: src/include/dhcp-server/helps.rb:111 msgid "" "<p>\n" "To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>" @@ -1936,7 +1889,7 @@ "To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>" #. help text 1/4 -#: src/include/dhcp-server/helps.rb:121 +#: src/include/dhcp-server/helps.rb:115 msgid "" "<p><b><big>Enabling Dynamic DNS</big></b><br>\n" "To enable Dynamic DNS updates for this subnet, set\n" @@ -1947,7 +1900,7 @@ "<b>Enable Dynamic DNS for This Subnet</b>.</p>" #. help text 2/4 -#: src/include/dhcp-server/helps.rb:127 +#: src/include/dhcp-server/helps.rb:121 msgid "" "<p><b><big>TSIG Key</big></b><br>\n" "To make Dynamic DNS updates, the authentication key must be set. Use\n" @@ -1962,7 +1915,7 @@ "and reverse zone.</p>" #. help text 3/4 -#: src/include/dhcp-server/helps.rb:135 +#: src/include/dhcp-server/helps.rb:129 msgid "" "<p><b><big>Global DHCP Server Settings</big></b><br>\n" "Global settings of DHCP server must be updated to make Dynamic\n" @@ -1975,7 +1928,7 @@ "<b>Update Global Dynamic DNS Settings</b>.</p>" #. help text 4/4 -#: src/include/dhcp-server/helps.rb:142 +#: src/include/dhcp-server/helps.rb:136 msgid "" "<p><b><big>Zones to Update</big></b><br>\n" "Specify forward and reverse zones to update. For both, also specify \n" @@ -1988,7 +1941,7 @@ "server, you can leave the fields empty.</p>" #. help text -#: src/include/dhcp-server/helps.rb:149 +#: src/include/dhcp-server/helps.rb:143 msgid "" "<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n" "Here you can specify parameters that you want DHCP Server to be started with \n" @@ -2001,7 +1954,7 @@ "consult dhcpd manual page. If left blank, default values will be used.</p>" #. Wizard Installation - Step 1 (version for expert UI) -#: src/include/dhcp-server/helps.rb:156 +#: src/include/dhcp-server/helps.rb:150 #, fuzzy msgid "" "<p><b><big>Network Card Selection</big></b><br>\n" @@ -2011,7 +1964,7 @@ "Select one or more of listed network cards to use for the DHCP server.</p>" #. Optional field - used with LDAP support -#: src/include/dhcp-server/helps.rb:160 +#: src/include/dhcp-server/helps.rb:154 #, fuzzy msgid "" "Optionally, you can also specify <b>DHCP Server Name</b>\n" @@ -2021,7 +1974,7 @@ "(the name of dhcpServer LDAP object), if it is different from your hostname." #. Wizard Installation - Step 2 1/9 -#: src/include/dhcp-server/helps.rb:164 +#: src/include/dhcp-server/helps.rb:158 msgid "" "<p><b><big>Global Settings</big></b><br>\n" "Here, make several DHCP settings.</p>" @@ -2031,7 +1984,7 @@ #. Wizard Installation - Step 2 2/9 #. Wizard Installation - Step 2 3/9 (2 is removed) -#: src/include/dhcp-server/helps.rb:171 +#: src/include/dhcp-server/helps.rb:165 msgid "" "<p><b>Domain Name</b> sets the domain for which the DHCP server\n" "leases IPs to clients.</p>" @@ -2040,7 +1993,7 @@ "leases IPs to clients.</p>" #. Wizard Installation - Step 2 4/9 -#: src/include/dhcp-server/helps.rb:175 +#: src/include/dhcp-server/helps.rb:169 msgid "" "<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n" "offer these name servers to the DHCP clients.\n" @@ -2051,7 +2004,7 @@ "These values must be IP addresses.</p>" #. Wizard Installation - Step 2 5/9 -#: src/include/dhcp-server/helps.rb:181 +#: src/include/dhcp-server/helps.rb:175 msgid "" "<p><b>Default Gateway</b> inserts this\n" "value as the default route in the routing table of clients.</p>" @@ -2060,7 +2013,7 @@ "value as the default route in the routing table of clients.</p>" #. Wizard Installation - Step 2 6/9 -#: src/include/dhcp-server/helps.rb:185 +#: src/include/dhcp-server/helps.rb:179 msgid "" "<p><b>Time Server</b> tells clients to use this server\n" "for time synchronization.</p>" @@ -2069,12 +2022,12 @@ "for time synchronization.</p>" #. Wizard Installation - Step 2 7/9 -#: src/include/dhcp-server/helps.rb:189 +#: src/include/dhcp-server/helps.rb:183 msgid "<p><b>Print Server</b> offers this server as the default print server.</p>" msgstr "<p><b>Print Server</b> offers this server as the default print server.</p>" #. Wizard Installation - Step 2 8/9 -#: src/include/dhcp-server/helps.rb:193 +#: src/include/dhcp-server/helps.rb:187 msgid "" "<p><b>WINS Server</b> offers this server as the WINS server\n" "(Windows Internet Naming Service).</p>" @@ -2083,7 +2036,7 @@ "(Windows Internet Naming Service).</p>" #. Wizard Installation - Step 2 9/9 -#: src/include/dhcp-server/helps.rb:197 +#: src/include/dhcp-server/helps.rb:191 msgid "" "<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n" "and the client must ask for an IP again.</p>" @@ -2092,7 +2045,7 @@ "and the client must ask for an IP again.</p>" #. Wizard Installation - Step 3 1/4 -#: src/include/dhcp-server/helps.rb:201 +#: src/include/dhcp-server/helps.rb:195 #, fuzzy msgid "" "<p><b><big>Subnet Information</big></b></br>\n" @@ -2106,7 +2059,7 @@ "</p>" #. Wizard Installation - Step 3 2/4 -#: src/include/dhcp-server/helps.rb:208 +#: src/include/dhcp-server/helps.rb:202 #, fuzzy #| msgid "" #| "<p><b><big>IP Address Range</big></b><br>\n" @@ -2131,7 +2084,7 @@ "assigned to BOOTP clients as well as DHCP clients</p>.\n" #. Wizard Installation - Step 3 3/4 -#: src/include/dhcp-server/helps.rb:217 +#: src/include/dhcp-server/helps.rb:211 msgid "" "<p><b><big>Lease Time</big></b><br>\n" "Set the <b>Default</b> lease time for the current IP address range,\n" @@ -2142,7 +2095,7 @@ "which sets the optimal IP refreshing time for clients.<br></p>" #. Wizard Installation - Step 3 4/4 -#: src/include/dhcp-server/helps.rb:223 +#: src/include/dhcp-server/helps.rb:217 msgid "" "<p><b>Maximum</b> (optional value) sets the maximum time period\n" "for which this IP is blocked for the client on the DHCP server.</p>" @@ -2151,7 +2104,7 @@ "for which this IP is blocked for the client on the DHCP server.</p>" #. Help text -#: src/include/dhcp-server/helps.rb:227 +#: src/include/dhcp-server/helps.rb:221 msgid "" "<p><b><big>Expert Configuration</big></b><br>\n" "To enter the complete configuration of the DHCP server, click\n" @@ -2162,7 +2115,7 @@ "<b>DHCP Server Expert Configuration</b>.</p>" #. host management help 1/3 -#: src/include/dhcp-server/helps.rb:239 +#: src/include/dhcp-server/helps.rb:227 msgid "" "<p><b><big>Host Management</big></b><br>\n" "Use this dialog to edit hosts with static address binding.</p>" @@ -2171,7 +2124,7 @@ "Use this dialogue to edit hosts with static address binding.</p>" #. host management help 1/3 -#: src/include/dhcp-server/helps.rb:243 +#: src/include/dhcp-server/helps.rb:231 msgid "" "<p>To add a new new host, set its <b>Name</b>,\n" "<b>Hardware Address</b>, and <b>IP Address</b>\n" @@ -2186,17 +2139,17 @@ "change all values, and click <b>Change in List</b>.</p>" #. host management help 1/3 -#: src/include/dhcp-server/helps.rb:251 +#: src/include/dhcp-server/helps.rb:239 msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>" msgstr "<p>To remove a host, select it and click <b>Delete from List</b>.</p>" #. help text 1/7 -#: src/include/dhcp-server/helps.rb:263 +#: src/include/dhcp-server/helps.rb:251 msgid "<p>Select the type of declaration to add.</p>" msgstr "<p>Select the type of declaration to add.</p>" #. help text 2/7, optional -#: src/include/dhcp-server/helps.rb:269 +#: src/include/dhcp-server/helps.rb:257 msgid "" "<p>To add a network declaration,\n" "select <b>Subnet</b>.</p>" @@ -2205,7 +2158,7 @@ "select <b>Subnet</b>.</p>" #. help text 3/7, optional -#: src/include/dhcp-server/helps.rb:276 +#: src/include/dhcp-server/helps.rb:264 msgid "" "<p>To add a host that needs special parameters\n" "(usually a fixed address), select <b>Host</b>.</p>" @@ -2214,7 +2167,7 @@ "(usually a fixed address), select <b>Host</b>.</p>" #. help text 4/7, optional -#: src/include/dhcp-server/helps.rb:285 +#: src/include/dhcp-server/helps.rb:273 msgid "" "<p>To add a shared network (physical network with\n" "multiple logical networks), select <b>Shared Network</b>.</p>" @@ -2223,7 +2176,7 @@ "multiple logical networks), select <b>Shared Network</b>.</p>" #. help text 5/7, optional -#: src/include/dhcp-server/helps.rb:294 +#: src/include/dhcp-server/helps.rb:282 msgid "" "<p>To add a group of other declarations (usually\n" "if they should share some settings), select <b>Group</b>.</p>" @@ -2232,7 +2185,7 @@ "if they should share some settings), select <b>Group</b>.</p>" #. help text 6/7, optional -#: src/include/dhcp-server/helps.rb:303 +#: src/include/dhcp-server/helps.rb:291 msgid "" "<p>To add a pool of addresses that will be treated\n" "differently than other address pools although they are in the same\n" @@ -2243,7 +2196,7 @@ "subnet, select <b>Pool of Addresses</b>.</p>" #. help text 7/7, optional -#: src/include/dhcp-server/helps.rb:314 +#: src/include/dhcp-server/helps.rb:302 msgid "" "<p>To create a condition class that can be used for\n" "handling clients differently depending on the class to which they belong,\n" @@ -2256,23 +2209,23 @@ #. selection box #. selection box #. selection box -#: src/include/dhcp-server/options.rb:454 -#: src/include/dhcp-server/options.rb:475 -#: src/include/dhcp-server/options.rb:568 -#: src/include/dhcp-server/options.rb:781 -#: src/include/dhcp-server/options.rb:857 +#: src/include/dhcp-server/options.rb:453 +#: src/include/dhcp-server/options.rb:474 +#: src/include/dhcp-server/options.rb:567 +#: src/include/dhcp-server/options.rb:780 +#: src/include/dhcp-server/options.rb:856 msgid "A&ddresses" msgstr "A&ddresses" #. popup message -#: src/include/dhcp-server/options.rb:470 +#: src/include/dhcp-server/options.rb:469 msgid "The entered address is not valid." msgstr "The entered address is not valid." #. message popup #. message popup -#: src/include/dhcp-server/options.rb:490 -#: src/include/dhcp-server/options.rb:543 +#: src/include/dhcp-server/options.rb:489 +#: src/include/dhcp-server/options.rb:542 msgid "At least one address must be specified." msgstr "At least one address must be specified." @@ -2282,94 +2235,94 @@ #. @param [String] key string option key #. @param [Hash] event map event to be handled #. selection box -#: src/include/dhcp-server/options.rb:512 -#: src/include/dhcp-server/options.rb:528 -#: src/include/dhcp-server/options.rb:819 +#: src/include/dhcp-server/options.rb:511 +#: src/include/dhcp-server/options.rb:527 +#: src/include/dhcp-server/options.rb:818 msgid "&Values" msgstr "&Values" #. message popup -#: src/include/dhcp-server/options.rb:563 +#: src/include/dhcp-server/options.rb:562 msgid "The entered addresses are not valid." msgstr "The entered addresses are not valid." #. message popup -#: src/include/dhcp-server/options.rb:583 +#: src/include/dhcp-server/options.rb:582 msgid "At least one address pair must be specified." msgstr "At least one address pair must be specified." #. table item, means switched on #. table item, means switched on -#: src/include/dhcp-server/options.rb:620 -#: src/include/dhcp-server/options.rb:661 +#: src/include/dhcp-server/options.rb:619 +#: src/include/dhcp-server/options.rb:660 msgid "On" msgstr "On" #. table item, means switched off #. table item, means switched off -#: src/include/dhcp-server/options.rb:623 -#: src/include/dhcp-server/options.rb:664 +#: src/include/dhcp-server/options.rb:622 +#: src/include/dhcp-server/options.rb:663 msgid "Off" msgstr "Off" #. popup message -#: src/include/dhcp-server/options.rb:694 +#: src/include/dhcp-server/options.rb:693 msgid "A value must be specified." msgstr "A value must be specified." #. text entry -#: src/include/dhcp-server/options.rb:786 +#: src/include/dhcp-server/options.rb:785 msgid "&New Address" msgstr "&New Address" #. int field -#: src/include/dhcp-server/options.rb:824 +#: src/include/dhcp-server/options.rb:823 msgid "&New Value" msgstr "&New Value" #. label (in role of help text) -#: src/include/dhcp-server/options.rb:861 +#: src/include/dhcp-server/options.rb:860 msgid "Separate multiple addresses with spaces." msgstr "Separate multiple addresses with spaces." #. push button -#: src/include/dhcp-server/options.rb:864 +#: src/include/dhcp-server/options.rb:863 msgid "&Add Address Pair" msgstr "&Add Address Pair" #. popup message -#: src/include/dhcp-server/options.rb:1008 +#: src/include/dhcp-server/options.rb:1007 msgid "The lowest address must be lower than the highest one." msgstr "The lowest address must be lower than the highest one." #. label -- help text -#: src/include/dhcp-server/options.rb:1024 +#: src/include/dhcp-server/options.rb:1023 msgid "If you change this, also update the syslog configuration." msgstr "If you change this, also update the syslog configuration." #. combo box -#: src/include/dhcp-server/options.rb:1036 +#: src/include/dhcp-server/options.rb:1035 msgid "&Hardware Type" msgstr "&Hardware Type" #. test entry, MAC better not to be translated, #. translation would decrease the understandability -#: src/include/dhcp-server/options.rb:1046 +#: src/include/dhcp-server/options.rb:1045 msgid "&MAC Address" msgstr "&MAC Address" #. text entry -#: src/include/dhcp-server/options.rb:1089 +#: src/include/dhcp-server/options.rb:1088 msgid "&Lowest IP Address" msgstr "&Lowest IP Address" #. text entry -#: src/include/dhcp-server/options.rb:1091 +#: src/include/dhcp-server/options.rb:1090 msgid "&Highest IP Address" msgstr "&Highest IP Address" #. Yes-No popup -#: src/include/dhcp-server/widgets.rb:174 +#: src/include/dhcp-server/widgets.rb:191 msgid "" "If you leave the DHCP server configuration without saving,\n" "all changes will be lost. Really leave?" @@ -2378,7 +2331,7 @@ "all changes will be lost. Really leave?" #. yes-no popup -#: src/include/dhcp-server/widgets.rb:355 +#: src/include/dhcp-server/widgets.rb:311 msgid "" "The port in firewall is not open. The DHCP server\n" "will not be able to serve your network.\n" @@ -2389,7 +2342,7 @@ "Continue?" #. TRANSLATORS: popup error message, %1 is list of network interfaces -#: src/include/dhcp-server/widgets.rb:383 +#: src/include/dhcp-server/widgets.rb:339 msgid "" "The network interfaces listed below are not mentioned in any firewall zone.\n" "%1\n" @@ -2400,7 +2353,7 @@ "Run the YaST firewall configuration to assign them to a zone." #. TRANSLATORS: popup error message, %1 a network interface name -#: src/include/dhcp-server/widgets.rb:398 +#: src/include/dhcp-server/widgets.rb:354 msgid "" "Network interface %1 is not mentioned in any firewall zone.\n" "Run the YaST firewall configuration to assign it to a zone." @@ -2410,8 +2363,8 @@ #. popup message #. popup message -#: src/include/dhcp-server/widgets.rb:424 -#: src/include/dhcp-server/widgets.rb:653 +#: src/include/dhcp-server/widgets.rb:374 +#: src/include/dhcp-server/widgets.rb:588 msgid "" "This function is not available during\n" "preparation for autoinstallation." @@ -2419,199 +2372,190 @@ "This function is not available during\n" "preparation for autoinstallation." -#. menubutton entry, try to keep short -#: src/include/dhcp-server/widgets.rb:445 -msgid "Restart DHCP Server" -msgstr "Restart DHCP Server" - -#. menubutton entry, try to keep short -#: src/include/dhcp-server/widgets.rb:450 -msgid "Save Settings and Restart DHCP Server" -msgstr "Save Settings and Restart DHCP Server" - #. tree widget #. tree widget -#: src/include/dhcp-server/widgets.rb:548 -#: src/include/dhcp-server/widgets.rb:1097 +#: src/include/dhcp-server/widgets.rb:484 +#: src/include/dhcp-server/widgets.rb:1076 msgid "&Configured Declarations" msgstr "&Configured Declarations" #. push button -#: src/include/dhcp-server/widgets.rb:637 +#: src/include/dhcp-server/widgets.rb:572 msgid "&Dynamic DNS" msgstr "&Dynamic DNS" #. combo box #. combo box -#: src/include/dhcp-server/widgets.rb:733 -#: src/include/dhcp-server/widgets.rb:1239 +#: src/include/dhcp-server/widgets.rb:668 +#: src/include/dhcp-server/widgets.rb:1219 msgid "Forward Zone TSIG &Key" msgstr "Forward Zone TSIG &Key" #. combo box #. combo box -#: src/include/dhcp-server/widgets.rb:742 -#: src/include/dhcp-server/widgets.rb:1246 +#: src/include/dhcp-server/widgets.rb:677 +#: src/include/dhcp-server/widgets.rb:1226 msgid "Reverse Zone TSIG &Key" msgstr "Reverse Zone TSIG &Key" #. popup headline -#: src/include/dhcp-server/widgets.rb:861 +#: src/include/dhcp-server/widgets.rb:796 msgid "Select File with Authentication Key" msgstr "Select File with Authentication Key" -#. check box -#: src/include/dhcp-server/widgets.rb:1060 -msgid "&Start DHCP Server" -msgstr "&Start DHCP Server" +#. FIXME CWM should be able to handle virtual widgets +#: src/include/dhcp-server/widgets.rb:1042 +#, fuzzy +#| msgid "Apply Changes to Dialog" +msgid "Apply Changes" +msgstr "Apply Changes to Dialogue" #. check box -#: src/include/dhcp-server/widgets.rb:1070 +#: src/include/dhcp-server/widgets.rb:1049 msgid "&Run DHCP Server in Chroot Jail" msgstr "&Run DHCP Server in Chroot Jail" -#. menu button -#: src/include/dhcp-server/widgets.rb:1111 +#: src/include/dhcp-server/widgets.rb:1099 msgid "Ad&vanced" msgstr "Ad&vanced" #. item of a menu button -#: src/include/dhcp-server/widgets.rb:1114 +#: src/include/dhcp-server/widgets.rb:1102 msgid "Display &Log" msgstr "Display &Log" #. item of a menu button -#: src/include/dhcp-server/widgets.rb:1116 +#: src/include/dhcp-server/widgets.rb:1104 msgid "&Interface Configuration" msgstr "&Interface Configuration" #. text entry -#: src/include/dhcp-server/widgets.rb:1136 +#: src/include/dhcp-server/widgets.rb:1116 msgid "&Network Address" msgstr "&Network Address" #. text entry -#: src/include/dhcp-server/widgets.rb:1138 +#: src/include/dhcp-server/widgets.rb:1118 msgid "Network &Mask" msgstr "Network &Mask" #. text entry -#: src/include/dhcp-server/widgets.rb:1156 +#: src/include/dhcp-server/widgets.rb:1136 msgid "Group &Name" msgstr "Group &Name" #. text entry -#: src/include/dhcp-server/widgets.rb:1164 +#: src/include/dhcp-server/widgets.rb:1144 msgid "Pool &Name" msgstr "Pool &Name" #. text entry -#: src/include/dhcp-server/widgets.rb:1172 +#: src/include/dhcp-server/widgets.rb:1152 msgid "Shared Network &Name" msgstr "Shared Network &Name" #. text entry -#: src/include/dhcp-server/widgets.rb:1180 +#: src/include/dhcp-server/widgets.rb:1160 msgid "Class &Name" msgstr "Class &Name" #. multi selection box -#: src/include/dhcp-server/widgets.rb:1190 +#: src/include/dhcp-server/widgets.rb:1170 msgid "Available Interfaces" msgstr "Available Interfaces" #. check box -#: src/include/dhcp-server/widgets.rb:1205 +#: src/include/dhcp-server/widgets.rb:1185 msgid "Open &Firewall for Selected Interfaces" msgstr "Open &Firewall for Selected Interfaces" #. check box -#: src/include/dhcp-server/widgets.rb:1231 +#: src/include/dhcp-server/widgets.rb:1211 msgid "&Enable Dynamic DNS for This Subnet" msgstr "&Enable Dynamic DNS for This Subnet" #. check box -#: src/include/dhcp-server/widgets.rb:1253 +#: src/include/dhcp-server/widgets.rb:1233 msgid "&Update Global Dynamic DNS Settings" msgstr "&Update Global Dynamic DNS Settings" #. text entry -#: src/include/dhcp-server/widgets.rb:1263 +#: src/include/dhcp-server/widgets.rb:1243 msgid "&Zone" msgstr "&Zone" #. text entry -#: src/include/dhcp-server/widgets.rb:1290 +#: src/include/dhcp-server/widgets.rb:1270 msgid "&Primary DNS Server" msgstr "&Primary DNS Server" #. text entry -#: src/include/dhcp-server/widgets.rb:1296 +#: src/include/dhcp-server/widgets.rb:1276 msgid "Re&verse Zone" msgstr "Re&verse Zone" #. text entry -#: src/include/dhcp-server/widgets.rb:1305 +#: src/include/dhcp-server/widgets.rb:1285 msgid "Pr&imary DNS Server" msgstr "Pr&imary DNS Server" #. push button -#: src/include/dhcp-server/widgets.rb:1335 +#: src/include/dhcp-server/widgets.rb:1315 msgid "DHCP Server &Expert Configuration..." msgstr "DHCP Server &Expert Configuration..." #. Dhcp-server read dialog caption -#: src/modules/DhcpServer.pm:1388 +#: src/modules/DhcpServer.pm:1401 msgid "Initializing DHCP Server Configuration" msgstr "Initialising DHCP Server Configuration" #. progress stage -#: src/modules/DhcpServer.pm:1392 +#: src/modules/DhcpServer.pm:1405 msgid "Check the environment" msgstr "Check the environment" #. progress stage -#: src/modules/DhcpServer.pm:1394 +#: src/modules/DhcpServer.pm:1407 msgid "Read firewall settings" msgstr "Read firewall settings" #. progress stage -#: src/modules/DhcpServer.pm:1396 +#: src/modules/DhcpServer.pm:1409 msgid "Read DHCP server settings" msgstr "Read DHCP server settings" #. progress stage -#: src/modules/DhcpServer.pm:1398 +#: src/modules/DhcpServer.pm:1411 msgid "Read DNS server settings" msgstr "Read DNS server settings" #. progress step -#: src/modules/DhcpServer.pm:1402 +#: src/modules/DhcpServer.pm:1415 msgid "Checking the environment..." msgstr "Checking the environment..." #. progress step -#: src/modules/DhcpServer.pm:1404 +#: src/modules/DhcpServer.pm:1417 msgid "Reading firewall settings..." msgstr "Reading firewall settings..." #. progress step -#: src/modules/DhcpServer.pm:1406 +#: src/modules/DhcpServer.pm:1419 msgid "Reading DHCP server settings..." msgstr "Reading DHCP server settings..." #. progress step -#: src/modules/DhcpServer.pm:1408 +#: src/modules/DhcpServer.pm:1421 msgid "Reading DNS server settings..." msgstr "Reading DNS server settings..." #. progress step -#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638 +#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651 msgid "Finished" msgstr "Finished" #. TRANSLATORS: error report popup -#: src/modules/DhcpServer.pm:1440 +#: src/modules/DhcpServer.pm:1453 msgid "" "This server needs at least one\n" "configured network device (besides loopback) to\n" @@ -2628,7 +2572,7 @@ "Aborting now." #. error report -#: src/modules/DhcpServer.pm:1475 +#: src/modules/DhcpServer.pm:1488 msgid "" "Cannot determine hostname. LDAP-based configuration of \n" "DHCP server will not be available." @@ -2637,7 +2581,7 @@ "DHCP server will not be available." #. yes-no popup -#: src/modules/DhcpServer.pm:1543 +#: src/modules/DhcpServer.pm:1556 msgid "" "The DHCP server does not seem to have been\n" "configured yet. Create a new configuration?" @@ -2646,87 +2590,87 @@ "configured yet. Create a new configuration?" #. Dhcp-server read dialog caption */ -#: src/modules/DhcpServer.pm:1616 +#: src/modules/DhcpServer.pm:1629 msgid "Saving DHCP Server Configuration" msgstr "Saving DHCP Server Configuration" #. progress stage -#: src/modules/DhcpServer.pm:1621 +#: src/modules/DhcpServer.pm:1634 msgid "Write DHCP server settings" msgstr "Write DHCP server settings" #. progress stage -#: src/modules/DhcpServer.pm:1623 +#: src/modules/DhcpServer.pm:1636 msgid "Write firewall settings" msgstr "Write firewall settings" #. progress stage -#: src/modules/DhcpServer.pm:1625 +#: src/modules/DhcpServer.pm:1638 msgid "Restart DHCP server" msgstr "Restart DHCP server" #. progress stage -#: src/modules/DhcpServer.pm:1627 +#: src/modules/DhcpServer.pm:1640 msgid "Write DNS server settings" msgstr "Write DNS server settings" #. progress step -#: src/modules/DhcpServer.pm:1630 +#: src/modules/DhcpServer.pm:1643 msgid "Writing DHCP server settings..." msgstr "Writing DHCP server settings..." #. progress step -#: src/modules/DhcpServer.pm:1632 +#: src/modules/DhcpServer.pm:1645 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. progress step -#: src/modules/DhcpServer.pm:1634 +#: src/modules/DhcpServer.pm:1647 msgid "Restarting DHCP server..." msgstr "Restarting DHCP server..." #. progress step -#: src/modules/DhcpServer.pm:1636 +#: src/modules/DhcpServer.pm:1649 msgid "Writing DNS server settings..." msgstr "Writing DNS server settings..." #. error report -#: src/modules/DhcpServer.pm:1749 +#: src/modules/DhcpServer.pm:1762 msgid "Error occurred while restarting the DHCP daemon." msgstr "Error occurred while restarting the DHCP daemon." #. summary string -#: src/modules/DhcpServer.pm:1888 +#: src/modules/DhcpServer.pm:1901 msgid "The DHCP server is started at boot time" msgstr "The DHCP server is started at boot time" #. summary string -#: src/modules/DhcpServer.pm:1893 +#: src/modules/DhcpServer.pm:1906 msgid "The DHCP server is not started at boot time" msgstr "The DHCP server is not started at boot time" #. summary string, %1 is list of network interfaces -#: src/modules/DhcpServer.pm:1901 +#: src/modules/DhcpServer.pm:1914 msgid "Listen On: %1" msgstr "Listen On: %1" #. summary string, %1 is IP address range -#: src/modules/DhcpServer.pm:1920 +#: src/modules/DhcpServer.pm:1933 msgid "Dynamic Address Range: %1" msgstr "Dynamic Address Range: %1" #. error message -#: src/modules/DhcpServer.pm:2313 +#: src/modules/DhcpServer.pm:2328 msgid "Invalid LDAP configuration. Cannot use LDAP." msgstr "Invalid LDAP configuration. Cannot use LDAP." #. error report -#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594 +#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609 msgid "Support for multiple dhcpServiceDN not implemented." msgstr "Support for multiple dhcpServiceDN not implemented." #. error report -#: src/modules/DhcpServer.pm:2559 +#: src/modules/DhcpServer.pm:2574 msgid "DHCP service DN is not defined." msgstr "DHCP service DN is not defined." @@ -2734,27 +2678,69 @@ #. Error report, %1 is LDAP record key #. Error report #. error report, %1 is LDAP record key -#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708 -#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847 +#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723 +#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862 msgid "Error occurred while creating %1." msgstr "Error occurred while creating %1." #. error report, %1 is LDAP record key -#: src/modules/DhcpServer.pm:2739 +#: src/modules/DhcpServer.pm:2754 msgid "Error occurred while updating %1." msgstr "Error occurred while updating %1." #. error report, %1=ldap domain, %2=dhcp server -#: src/modules/DhcpServer.pm:2810 +#: src/modules/DhcpServer.pm:2825 msgid "Error occurred while creating cn=%2,ou=DHCP,%1." msgstr "Error occurred while creating cn=%2,ou=DHCP,%1." #. error report, /etc/dhcpd.conf is filename -#: src/modules/DhcpServer.pm:2907 +#: src/modules/DhcpServer.pm:2922 msgid "Error occurred while writing /etc/dhcpd.conf." msgstr "Error occurred while writing /etc/dhcpd.conf." +#~ msgid "DHCP server is running" +#~ msgstr "DHCP server is running" + +#~ msgid "DHCP server is not running" +#~ msgstr "DHCP server is not running" + +#~ msgid "&Start DHCP Server Now" +#~ msgstr "&Start DHCP Server Now" + +#~ msgid "S&top DHCP Server Now" +#~ msgstr "S&top DHCP Server Now" + +#~ msgid "Save Settings and Restart DHCP Server &Now" +#~ msgstr "Save Settings and Restart DHCP Server &Now" + +#~ msgid "Start DHCP Server Now" +#~ msgstr "Start DHCP Server Now" + +#~ msgid "Stop DHCP Server Now" +#~ msgstr "Stop DHCP Server Now" + +#~ msgid "Save Settings and Restart DHCP Server Now" +#~ msgstr "Save Settings and Restart DHCP Server Now" + #~ msgid "" +#~ "<p><b><big>DHCP Server</big></b></p>\n" +#~ "<p>To run the DHCP server every time your computer is started, set\n" +#~ "<b>Start DHCP Server</b>.</p>" +#~ msgstr "" +#~ "<p><b><big>DHCP Server</big></b></p>\n" +#~ "<p>To run the DHCP server every time your computer is started, set\n" +#~ "<b>Start DHCP Server</b>.</p>" + +#~ msgid "Restart DHCP Server" +#~ msgstr "Restart DHCP Server" + +#~ msgid "Save Settings and Restart DHCP Server" +#~ msgstr "Save Settings and Restart DHCP Server" + +#~ msgid "&Start DHCP Server" +#~ msgstr "&Start DHCP Server" + +#~ msgid "" #~ "IP address %1 does not match\n" #~ "the current network %2/%3\n" #~ msgstr "" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/dns-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dns-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2007-08-16 16:32+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -426,8 +426,8 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings #: src/include/dns-server/cmdline.rb:846 -#: src/include/dns-server/dialog-main.rb:443 -#: src/include/dns-server/dialog-main.rb:446 +#: src/include/dns-server/dialog-main.rb:441 +#: src/include/dns-server/dialog-main.rb:444 msgid "Forwarders" msgstr "Forwarders" @@ -560,8 +560,8 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings #: src/include/dns-server/dialog-installwizard.rb:79 -#: src/include/dns-server/dialog-main.rb:517 -#: src/include/dns-server/dialog-main.rb:520 +#: src/include/dns-server/dialog-main.rb:515 +#: src/include/dns-server/dialog-main.rb:518 msgid "DNS Zones" msgstr "DNS Zones" @@ -583,7 +583,7 @@ #. check box #. TRANSLATORS: checkbox label, turning LDAP support on or off #: src/include/dns-server/dialog-installwizard.rb:175 -#: src/include/dns-server/dialog-main.rb:291 +#: src/include/dns-server/dialog-main.rb:289 msgid "&LDAP Support Active" msgstr "&LDAP Support Active" @@ -608,12 +608,12 @@ msgstr "DNS Server &Expert Configuration..." #. Dialog label DNS - expert settings -#: src/include/dns-server/dialog-main.rb:261 +#: src/include/dns-server/dialog-main.rb:259 msgid "DNS Server" msgstr "DNS Server" #. FIXME: new startup -#: src/include/dns-server/dialog-main.rb:419 +#: src/include/dns-server/dialog-main.rb:417 #, fuzzy #| msgid "Apply Changes to Dialog" msgid "Apply Changes" @@ -621,21 +621,21 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:425 -#: src/include/dns-server/dialog-main.rb:428 +#: src/include/dns-server/dialog-main.rb:423 +#: src/include/dns-server/dialog-main.rb:426 msgid "Start-Up" msgstr "Start-Up" #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:456 -#: src/include/dns-server/dialog-main.rb:459 +#: src/include/dns-server/dialog-main.rb:454 +#: src/include/dns-server/dialog-main.rb:457 msgid "Basic Options" msgstr "Basic Options" #. Dialog Label - DNS - expert settings +#: src/include/dns-server/dialog-main.rb:467 #: src/include/dns-server/dialog-main.rb:469 -#: src/include/dns-server/dialog-main.rb:471 msgid "Logging" msgstr "Logging" @@ -643,8 +643,8 @@ #. Tree Menu Item - DNS - expert settings #. multi selection box #. multi selection box -#: src/include/dns-server/dialog-main.rb:482 -#: src/include/dns-server/dialog-main.rb:485 +#: src/include/dns-server/dialog-main.rb:480 +#: src/include/dns-server/dialog-main.rb:483 #: src/include/dns-server/dialog-masterzone.rb:163 #: src/include/dns-server/dialog-masterzone.rb:2729 msgid "ACLs" @@ -652,8 +652,8 @@ #. Dialog Label - DNS - expert settings #. Tree Menu Item - DNS - expert settings -#: src/include/dns-server/dialog-main.rb:499 -#: src/include/dns-server/dialog-main.rb:502 +#: src/include/dns-server/dialog-main.rb:497 +#: src/include/dns-server/dialog-main.rb:500 msgid "TSIG Keys" msgstr "TSIG Keys" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/docker.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/drbd.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -245,7 +245,7 @@ msgstr "" #: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72 -#: src/include/drbd/helps.rb:85 +#: src/include/drbd/helps.rb:86 #, fuzzy msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>" msgstr "<p><b><big>Connection Configuration</big></b></p>" @@ -265,10 +265,11 @@ "\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n" "\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n" "\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n" +"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n" "\t\t" msgstr "" -#: src/include/drbd/helps.rb:88 +#: src/include/drbd/helps.rb:89 msgid "" "\n" "\t\t<p><b>Protocol</b></p>\n" @@ -294,13 +295,13 @@ "\t\t" msgstr "" -#: src/include/drbd/helps.rb:112 +#: src/include/drbd/helps.rb:113 #, fuzzy #| msgid "<p><b><big>Connection Configuration</big></b></p>" msgid "<p><b><big>LVM Configuration</big></b></p>" msgstr "<p><b><big>Connection Configuration</big></b></p>" -#: src/include/drbd/helps.rb:115 +#: src/include/drbd/helps.rb:116 msgid "" "\n" "\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n" @@ -309,21 +310,23 @@ "\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. Disable cache when for network storage, like nfs. </p>\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" "\n" +"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n" +"\n" "\t\t" msgstr "" -#: src/include/drbd/helps.rb:130 +#: src/include/drbd/helps.rb:133 #, fuzzy msgid "<p><b><big>Global Configuration of DRBD</big></b></p>" msgstr "<p><b><big>Connection Configuration</big></b></p>" -#: src/include/drbd/helps.rb:133 +#: src/include/drbd/helps.rb:136 msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>" msgstr "" -#: src/include/drbd/helps.rb:136 +#: src/include/drbd/helps.rb:139 msgid "" "<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n" " far. You might want to disable this if you have the console\n" @@ -333,7 +336,7 @@ " set it to 0 to disable redrawing completely. </p>" msgstr "" -#: src/include/drbd/helps.rb:144 +#: src/include/drbd/helps.rb:147 msgid "" "<p><b>Minor Count:</b>\n" " use this if you want to define more resources later\n" @@ -343,7 +346,7 @@ msgstr "" #. Summary dialog help 1/3 -#: src/include/drbd/helps.rb:152 +#: src/include/drbd/helps.rb:155 #, fuzzy msgid "" "<p><b><big>DRBD Configuration</big></b><br>\n" @@ -353,7 +356,7 @@ "Configure squid here.<br></p>\n" #. Summary dialog help 2/3 -#: src/include/drbd/helps.rb:156 +#: src/include/drbd/helps.rb:159 #, fuzzy #| msgid "" #| "<p><b><big>Adding a Kdump:</big></b><br>\n" @@ -372,7 +375,7 @@ "Then press <b>Configure</b>.</p>\n" #. Summary dialog help 3/3 -#: src/include/drbd/helps.rb:163 +#: src/include/drbd/helps.rb:166 msgid "" "<p><b><big>Editing or Deleting:</big></b><br>\n" "If you press <b>Edit</b>, an additional dialog in which to change\n" @@ -383,7 +386,7 @@ "the configuration opens.</p>\n" #. Ovreview dialog help 1/3 -#: src/include/drbd/helps.rb:169 +#: src/include/drbd/helps.rb:172 #, fuzzy msgid "" "<p><b><big>DRBD Configuration Overview</big></b><br>\n" @@ -395,7 +398,7 @@ "edit their configurations.<br></p>\n" #. Ovreview dialog help 2/3 -#: src/include/drbd/helps.rb:175 +#: src/include/drbd/helps.rb:178 #, fuzzy #| msgid "" #| "<p><b><big>Adding a Kdump:</big></b><br>\n" @@ -408,7 +411,7 @@ "Press <b>Add</b> to configure a kdump.</p>" #. Ovreview dialog help 3/3 -#: src/include/drbd/helps.rb:179 +#: src/include/drbd/helps.rb:182 #, fuzzy #| msgid "" #| "<p><b><big>Editing or Deleting:</big></b><br>\n" @@ -424,7 +427,7 @@ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n" #. Configure1 dialog help 1/2 -#: src/include/drbd/helps.rb:185 +#: src/include/drbd/helps.rb:188 msgid "" "<p><b><big>Configuration Part One</big></b><br>\n" "Press <b>Next</b> to continue.\n" @@ -436,7 +439,7 @@ #. Configure1 dialog help 2/2 #. Configure2 dialog help 2/2 -#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203 +#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206 msgid "" "<p><b><big>Selecting Something</big></b><br>\n" "It is not possible. You must code it first. :-)\n" @@ -447,7 +450,7 @@ "</p>" #. Configure2 dialog help 1/2 -#: src/include/drbd/helps.rb:197 +#: src/include/drbd/helps.rb:200 msgid "" "<p><b><big>Configuration Part Two</big></b><br>\n" "Press <b>Next</b> to continue.\n" @@ -458,60 +461,123 @@ "<br></p>\n" #. Default is always true (auto) -#: src/include/drbd/lvm_conf.rb:36 +#: src/include/drbd/lvm_conf.rb:44 #, fuzzy msgid "LVM Filter Configuration of DRBD" msgstr "Global Configuration" -#: src/include/drbd/lvm_conf.rb:44 +#: src/include/drbd/lvm_conf.rb:52 msgid "Modify LVM Device filter Automatically" msgstr "" -#: src/include/drbd/lvm_conf.rb:54 +#: src/include/drbd/lvm_conf.rb:62 #, fuzzy #| msgid "Device type" msgid "Device Filter" msgstr "Device type" -#: src/include/drbd/lvm_conf.rb:64 +#: 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:73 +#: src/include/drbd/lvm_conf.rb:81 #, fuzzy #| msgid "Enable Microphone." msgid "Enable LVM Cache" msgstr "Enable Microphone." +#: src/include/drbd/lvm_conf.rb:86 +msgid "Warning! Should disable LVM cache for using drbd." +msgstr "" + +#: src/include/drbd/lvm_conf.rb:97 +msgid "Use lvmetad for LVM" +msgstr "" + +#: src/include/drbd/lvm_conf.rb:106 +msgid "Use LVM metad" +msgstr "" + +#: src/include/drbd/lvm_conf.rb:111 +msgid "Warning! Should not use lvmetad for cluster." +msgstr "" + #. encoding: utf-8 -#: src/include/drbd/resource_conf.rb:134 +#: src/include/drbd/resource_conf.rb:143 #, fuzzy msgid "Resource Name" msgstr "Resource Sets" -#. Update new add disk used of drbd res for LVM filter -#. Ignore the removed disk -#: src/include/drbd/resource_conf.rb:326 +#: src/include/drbd/resource_conf.rb:150 +msgid "Nodes" +msgstr "Nodes" + +#: src/include/drbd/resource_conf.rb:153 +msgid "Add" +msgstr "Add" + +#: src/include/drbd/resource_conf.rb:154 +msgid "Edit" +msgstr "Edit" + +#: src/include/drbd/resource_conf.rb:155 +msgid "Delete" +msgstr "Delete" + +#: src/include/drbd/resource_conf.rb:187 +#, fuzzy +#| msgid "&Save" +msgid "Save" +msgstr "&Save" + +#. Since n_name can't be edit, so set direct is OK +#: src/include/drbd/resource_conf.rb:329 msgid "Protocol" msgstr "Protocol" -#. myHelp("basic_conf"); -#: src/include/drbd/resource_conf.rb:572 +#. return `cancel or a string +#: src/include/drbd/resource_conf.rb:569 +msgid "OK" +msgstr "OK" + +#: src/include/drbd/resource_conf.rb:570 +msgid "Cancel" +msgstr "Cancel" + +#: src/include/drbd/resource_conf.rb:584 #, fuzzy -#| msgid "Scheme name must be set." -msgid "Node names must be different." -msgstr "Scheme name must be set." +#| msgid "Host name cannot be empty." +msgid "Node name can not be empty." +msgstr "Host name cannot be empty." -#: src/include/drbd/resource_conf.rb:578 +#. myHelp("basic_conf"); +#: src/include/drbd/resource_conf.rb:687 msgid "Node names must not include \".\" , using the local hostname." msgstr "" -#: src/include/drbd/resource_conf.rb:608 +#: src/include/drbd/resource_conf.rb:707 msgid "Please fill out all fields." msgstr "" +#: src/include/drbd/resource_conf.rb:716 +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:751 +#, fuzzy +#| msgid "Enter the module name." +msgid "Enter the node name:" +msgstr "Enter the module name." + +#: src/include/drbd/resource_conf.rb:757 +#, fuzzy +#| msgid "Scheme name must be set." +msgid "Node name must be different." +msgstr "Scheme name must be set." + #. encoding: utf-8 #. Package: Configuration of heartbeat #. Authors: Martin Lazar @@ -622,83 +688,83 @@ #. #. Representation of the configuration of drbd. #. Input and output routines. -#: src/modules/Drbd.rb:110 +#: src/modules/Drbd.rb:115 msgid "Failed to merge separated DRBD conf files\n" msgstr "" -#: src/modules/Drbd.rb:132 +#: src/modules/Drbd.rb:137 #, 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:185 +#: src/modules/Drbd.rb:192 #, 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:193 +#: src/modules/Drbd.rb:200 #, fuzzy msgid "Read global settings" msgstr "Read global Samba settings" -#: src/modules/Drbd.rb:194 +#: src/modules/Drbd.rb:201 msgid "Read resources" msgstr "Read resources" -#: src/modules/Drbd.rb:195 +#: src/modules/Drbd.rb:202 #, fuzzy #| msgid "LVM configuration" msgid "Read LVM configurations" msgstr "LVM configuration" -#: src/modules/Drbd.rb:196 +#: src/modules/Drbd.rb:203 msgid "Read daemon status" msgstr "Read daemon status" -#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204 +#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211 #, fuzzy #| msgid "Read firewall settings" msgid "Read SuSEFirewall Settings" msgstr "Read firewall settings" -#: src/modules/Drbd.rb:200 +#: src/modules/Drbd.rb:207 #, fuzzy msgid "Reading global settings..." msgstr "Reading global Samba settings..." -#: src/modules/Drbd.rb:201 +#: src/modules/Drbd.rb:208 msgid "Reading resources..." msgstr "Reading resources..." -#: src/modules/Drbd.rb:202 +#: src/modules/Drbd.rb:209 #, fuzzy #| msgid "Reading the configuration..." msgid "Reading LVM configurations..." msgstr "Reading the configuration..." -#: src/modules/Drbd.rb:203 +#: src/modules/Drbd.rb:210 msgid "Reading daemon status..." msgstr "Reading daemon status..." -#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629 +#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662 msgid "Finished" msgstr "Finished" #. new_map = remove(new_map, key); -#: src/modules/Drbd.rb:497 +#: src/modules/Drbd.rb:515 #, fuzzy #| msgid "Failed to save ipsec.conf:" msgid "Failed to backup drbd.conf" msgstr "Failed to save ipsec.conf:" -#: src/modules/Drbd.rb:506 +#: src/modules/Drbd.rb:524 msgid "Failed to clean drbd.conf for drbdadm test" msgstr "" -#: src/modules/Drbd.rb:530 +#: src/modules/Drbd.rb:548 #, fuzzy #| msgid "Configuration of Resource Groups" msgid "" @@ -706,12 +772,12 @@ "%2" msgstr "Configuration of Resource Groups" -#: src/modules/Drbd.rb:549 +#: src/modules/Drbd.rb:567 msgid "Failed to bring drbd.conf back" msgstr "" #. DRBD write dialog caption -#: src/modules/Drbd.rb:605 +#: src/modules/Drbd.rb:638 #, fuzzy msgid "Writing DRBD Configuration" msgstr "Writing NFS Configuration" @@ -720,57 +786,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:617 +#: src/modules/Drbd.rb:650 msgid "Write global settings" msgstr "Write global settings" -#: src/modules/Drbd.rb:618 +#: src/modules/Drbd.rb:651 msgid "Write resources" msgstr "Write resources" -#: src/modules/Drbd.rb:619 +#: src/modules/Drbd.rb:652 #, fuzzy #| msgid "Write configuration" msgid "Write LVM configurations" msgstr "Write configuration" -#: src/modules/Drbd.rb:620 +#: src/modules/Drbd.rb:653 #, fuzzy msgid "Set daemon status" msgstr "Read daemon status" -#: src/modules/Drbd.rb:621 +#: src/modules/Drbd.rb:654 #, fuzzy #| msgid "Write the firewall settings" msgid "Write the SuSEfirewall settings" msgstr "Write the firewall settings" -#: src/modules/Drbd.rb:624 +#: src/modules/Drbd.rb:657 msgid "Writing global settings..." msgstr "Writing global settings..." -#: src/modules/Drbd.rb:625 +#: src/modules/Drbd.rb:658 msgid "Writing resources..." msgstr "Writing resources..." -#: src/modules/Drbd.rb:626 +#: src/modules/Drbd.rb:659 #, fuzzy #| msgid "Writing configuration..." msgid "Writing LVM configurations..." msgstr "Writing configuration..." -#: src/modules/Drbd.rb:627 +#: src/modules/Drbd.rb:660 #, fuzzy msgid "Setting daemon status..." msgstr "Reading daemon status..." -#: src/modules/Drbd.rb:628 +#: src/modules/Drbd.rb:661 #, fuzzy #| msgid "Writing the firewall settings..." msgid "Writing the SuSEFirewall settings" msgstr "Writing the firewall settings..." -#: src/modules/Drbd.rb:639 +#: src/modules/Drbd.rb:672 #, 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/fcoe-client.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/firewall-services.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: firewall-services\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:38+0200\n" +"POT-Creation-Date: 2016-05-06 17:00+0200\n" "PO-Revision-Date: 2007-08-16 16:37+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/firewall.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: firewall\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2007-08-16 16:36+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/firstboot.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: firstboot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2007-08-16 16:37+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -116,13 +116,13 @@ msgstr "Label" #: src/clients/firstboot_config.rb:68 +msgid "Status" +msgstr "Status" + +#: src/clients/firstboot_config.rb:68 msgid "Module Name" msgstr "Module Name" -#: src/clients/firstboot_config.rb:68 -msgid "Status" -msgstr "Status" - #. translators: dialog text #: src/clients/firstboot_desktop.rb:90 msgid "" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/fonts.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -21,63 +21,63 @@ #. in case of changing profiles, please reflect #. edits in test/data/sysconfig.fonts-config.* #. otherwise testsuite will fail -#: src/lib/fonts/fonts-config-state.rb:58 +#: src/lib/fonts/fonts-config-state.rb:59 #, fuzzy #| msgid "Bitmap Editors" msgid "Bitmap Fonts" msgstr "Bitmap Editors" -#: src/lib/fonts/fonts-config-state.rb:103 +#: src/lib/fonts/fonts-config-state.rb:104 msgid "Unlike 'outline fonts' (fonts described mathematically via curves; chosen in the rest of profiles), 'bitmap fonts' represents group of fonts, which contain bitmap for each glyph and size. Thus, only several sizes exist for each font. They are very fast to render, because there's no need to compute the bitmap and are considered more readable especially on small sizes (even, some outline fonts contains so called 'embedded bitmaps', bitmap versions of itself, for small sizes). Bitmap fonts are rendered black and white, not smoothed." msgstr "" -#: src/lib/fonts/fonts-config-state.rb:106 +#: src/lib/fonts/fonts-config-state.rb:107 msgid "Black and White Rendering" msgstr "" -#: src/lib/fonts/fonts-config-state.rb:123 +#: src/lib/fonts/fonts-config-state.rb:124 msgid "Fonts rendered without antialiasing (grayscale smoothing), black and white. In contrast with smoothed fonts, they are much more readable without any drawback of smoothing (fuzzy or uneven stems etc.). In connection with good hinted fonts (e. g. Liberation 1 fonts), this setting can give bitmap quality fonts while maintaining scalability." msgstr "" -#: src/lib/fonts/fonts-config-state.rb:126 +#: src/lib/fonts/fonts-config-state.rb:127 msgid "Black and White Rendering for Monospaced Fonts" msgstr "" -#: src/lib/fonts/fonts-config-state.rb:143 +#: src/lib/fonts/fonts-config-state.rb:144 msgid "Monospaced fonts rendered not smoothed, other fonts (sans-serif, sans and unspecified) will use default setting. Default family preference list is used." msgstr "" -#: src/lib/fonts/fonts-config-state.rb:146 +#: src/lib/fonts/fonts-config-state.rb:147 msgid "Default" msgstr "Default" -#: src/lib/fonts/fonts-config-state.rb:163 +#: src/lib/fonts/fonts-config-state.rb:164 msgid "Fonts are smoothed with antialiasing. Unlike black and white rendered fonts, this setting can produce 'beautiful' fonts sometimes to the detriment of readability. TrueType fonts, which are known to have good hinting instructions are rendered with bytecode interpreter, otherwise FreeType autohinter is used on the 'hintslight' hinting level. Using font native hinting instructions produces glyphs displayed with thiner stems. Default family preference list is used (nowdays TrueType fonts with good instructions are prefered)." msgstr "" -#: src/lib/fonts/fonts-config-state.rb:166 +#: src/lib/fonts/fonts-config-state.rb:167 #, fuzzy #| msgid "Fonts" msgid "CFF Fonts" msgstr "Fonts" -#: src/lib/fonts/fonts-config-state.rb:206 +#: src/lib/fonts/fonts-config-state.rb:207 msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs." msgstr "" -#: src/lib/fonts/fonts-config-state.rb:209 +#: src/lib/fonts/fonts-config-state.rb:210 msgid "Exclusive Autohinter Rendering" msgstr "" -#: src/lib/fonts/fonts-config-state.rb:226 +#: src/lib/fonts/fonts-config-state.rb:227 msgid "Unlike in default profile, even for good hinted fonts, FreeType's autohinter is used (on the 'hintslight' level). That leads to thicker, but sometimes fuzzier (and therefore less readable), glyphs. Default family preference list is used." msgstr "" -#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818 +#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818 msgid "Subpixel Rendering" msgstr "" -#: src/lib/fonts/fonts-config-state.rb:254 +#: src/lib/fonts/fonts-config-state.rb:255 msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library." msgstr "" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ftp-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ftp-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/geo-cluster.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2014-05-19 09:34+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -61,8 +61,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:465 -#: src/include/geo-cluster/dialogs.rb:814 +#: src/include/geo-cluster/dialogs.rb:470 +#: src/include/geo-cluster/dialogs.rb:819 #: src/include/geo-cluster/wizards.rb:46 #: src/include/geo-cluster/wizards.rb:141 #, fuzzy @@ -123,17 +123,17 @@ msgstr "arbitrator ip" #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85 -#: src/include/geo-cluster/dialogs.rb:804 +#: src/include/geo-cluster/dialogs.rb:809 msgid "Add" msgstr "Add" #: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86 -#: src/include/geo-cluster/dialogs.rb:805 +#: src/include/geo-cluster/dialogs.rb:810 msgid "Edit" msgstr "Edit" #: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87 -#: src/include/geo-cluster/dialogs.rb:806 +#: src/include/geo-cluster/dialogs.rb:811 msgid "Delete" msgstr "Delete" @@ -142,18 +142,16 @@ msgstr "site" #: src/include/geo-cluster/dialogs.rb:93 -#: src/include/geo-cluster/dialogs.rb:235 +#: src/include/geo-cluster/dialogs.rb:240 msgid "ticket" msgstr "ticket" #: src/include/geo-cluster/dialogs.rb:106 -#, fuzzy -#| msgid "Authentication" -msgid "Authentification" +msgid "Authentication" msgstr "Authentication" #: src/include/geo-cluster/dialogs.rb:108 -#: src/include/geo-cluster/dialogs.rb:156 +#: src/include/geo-cluster/dialogs.rb:161 #, fuzzy #| msgid "Cancel" msgid "Ca&ncel" @@ -161,9 +159,9 @@ #. return `cancel or a string #: src/include/geo-cluster/dialogs.rb:109 -#: src/include/geo-cluster/dialogs.rb:157 -#: src/include/geo-cluster/dialogs.rb:177 -#: src/include/geo-cluster/dialogs.rb:254 +#: src/include/geo-cluster/dialogs.rb:162 +#: src/include/geo-cluster/dialogs.rb:182 +#: src/include/geo-cluster/dialogs.rb:259 msgid "OK" msgstr "OK" @@ -176,195 +174,201 @@ #: src/include/geo-cluster/dialogs.rb:128 #, fuzzy #| msgid "Authentication Key" -msgid "Authentification file" +msgid "Authentication file" msgstr "Authentication Key" #: src/include/geo-cluster/dialogs.rb:132 -msgid "A relative path will be saved in /etc/booth, or using absolute path directly." -msgstr "" +#, fuzzy +#| msgid "The kernel will be written to slot B." +msgid "The file will be written to /etc/booth." +msgstr "The kernel will be written to slot B." #: src/include/geo-cluster/dialogs.rb:137 -msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>." +msgid "To write it to a different directory, enter an absolute path." msgstr "" #: src/include/geo-cluster/dialogs.rb:142 -msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually." +msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>." msgstr "" -#: src/include/geo-cluster/dialogs.rb:146 +#: src/include/geo-cluster/dialogs.rb:147 +msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually." +msgstr "" + +#: src/include/geo-cluster/dialogs.rb:151 #, fuzzy #| msgid "Authentication Key" -msgid "Generate Authentification Key File" +msgid "Generate Authentication Key File" msgstr "Authentication Key" -#: src/include/geo-cluster/dialogs.rb:154 +#: src/include/geo-cluster/dialogs.rb:159 #, fuzzy #| msgid "&Basics" msgid "Basic" msgstr "&Basics" -#: src/include/geo-cluster/dialogs.rb:178 -#: src/include/geo-cluster/dialogs.rb:255 +#: src/include/geo-cluster/dialogs.rb:183 +#: src/include/geo-cluster/dialogs.rb:260 msgid "Cancel" msgstr "Cancel" -#: src/include/geo-cluster/dialogs.rb:192 +#: src/include/geo-cluster/dialogs.rb:197 #, fuzzy #| msgid "Enter a valid e-mail address" msgid "Please enter a valid ip address" msgstr "Enter a valid e-mail address." -#: src/include/geo-cluster/dialogs.rb:233 +#: src/include/geo-cluster/dialogs.rb:238 msgid "Enter ticket and timeout" msgstr "Enter ticket and timeout" -#: src/include/geo-cluster/dialogs.rb:239 +#: src/include/geo-cluster/dialogs.rb:244 msgid "timeout" msgstr "timeout" -#: src/include/geo-cluster/dialogs.rb:241 +#: src/include/geo-cluster/dialogs.rb:246 #, fuzzy #| msgid "NFS entries" msgid "retries" msgstr "NFS entries" -#: src/include/geo-cluster/dialogs.rb:243 +#: src/include/geo-cluster/dialogs.rb:248 #, fuzzy #| msgid "Height" msgid "weights" msgstr "Height" -#: src/include/geo-cluster/dialogs.rb:245 +#: src/include/geo-cluster/dialogs.rb:250 #, fuzzy #| msgid "Expired" msgid "expire" msgstr "Expired" -#: src/include/geo-cluster/dialogs.rb:247 +#: src/include/geo-cluster/dialogs.rb:252 #, fuzzy #| msgid "Required patterns" msgid "acquire-after" msgstr "Required patterns" -#: src/include/geo-cluster/dialogs.rb:249 +#: src/include/geo-cluster/dialogs.rb:254 msgid "before-acquire-handler" msgstr "" -#: src/include/geo-cluster/dialogs.rb:286 +#: src/include/geo-cluster/dialogs.rb:291 #, fuzzy #| msgid "timeout is no valid" msgid "timeout is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:288 +#: src/include/geo-cluster/dialogs.rb:293 #, fuzzy #| msgid "timeout is no valid" msgid "expire is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:290 +#: src/include/geo-cluster/dialogs.rb:295 #, fuzzy #| msgid "timeout is no valid" msgid "acquireafter is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:292 +#: src/include/geo-cluster/dialogs.rb:297 #, fuzzy #| msgid "timeout is no valid" msgid "retries is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:294 +#: src/include/geo-cluster/dialogs.rb:299 msgid "retries values lower than 3 is illegal" msgstr "" -#: src/include/geo-cluster/dialogs.rb:296 +#: src/include/geo-cluster/dialogs.rb:301 #, fuzzy #| msgid "timeout is no valid" msgid "weights is invalid" msgstr "timeout is no valid" -#: src/include/geo-cluster/dialogs.rb:298 +#: src/include/geo-cluster/dialogs.rb:303 #, fuzzy #| msgid "ticket can not be null" msgid "ticket can not be empty" msgstr "ticket can not be null" #. fill confs with global_files -#: src/include/geo-cluster/dialogs.rb:407 +#: src/include/geo-cluster/dialogs.rb:412 #: src/include/geo-cluster/wizards.rb:48 msgid "Firewall Configuration" msgstr "Firewall Configuration" #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:554 +#: src/include/geo-cluster/dialogs.rb:559 #, fuzzy #| msgid "Enter an IP address of your site" msgid "Enter an IP address of your arbitrator" msgstr "Enter an IP address of your site" -#: src/include/geo-cluster/dialogs.rb:565 +#: src/include/geo-cluster/dialogs.rb:570 #, fuzzy #| msgid "Edit IP address of your site" msgid "Edit IP address of your arbitrator" msgstr "Edit IP address of your site" -#: src/include/geo-cluster/dialogs.rb:581 +#: src/include/geo-cluster/dialogs.rb:586 msgid "Enter an IP address of your site" msgstr "Enter an IP address of your site" -#: src/include/geo-cluster/dialogs.rb:592 +#: src/include/geo-cluster/dialogs.rb:597 msgid "Edit IP address of your site" msgstr "Edit IP address of your site" -#: src/include/geo-cluster/dialogs.rb:614 +#: src/include/geo-cluster/dialogs.rb:619 #, fuzzy #| msgid "Zone name %1 already exists." msgid "Ticket name already exist!" msgstr "Zone name %1 already exists." -#. Validation check before switch to authentification -#. Still fall to :authentification or :ok -#: src/include/geo-cluster/dialogs.rb:646 +#. Validation check before switch to authentication +#. Still fall to :authentication or :ok +#: src/include/geo-cluster/dialogs.rb:651 #, fuzzy #| msgid "Error: Configuration name cannot be empty." msgid "Configuration name can not be empty." msgstr "Error: Configuration name cannot be empty." -#: src/include/geo-cluster/dialogs.rb:649 +#: src/include/geo-cluster/dialogs.rb:654 #, fuzzy #| msgid "Error: Configuration name cannot be empty." msgid "Configuration name can not be duplicated." msgstr "Error: Configuration name cannot be empty." #. "5405d4" will show like "5405" -#: src/include/geo-cluster/dialogs.rb:657 +#: src/include/geo-cluster/dialogs.rb:662 #, fuzzy #| msgid "Key is invalid." msgid "port is invalid!" msgstr "Key is invalid." -#: src/include/geo-cluster/dialogs.rb:663 +#: src/include/geo-cluster/dialogs.rb:668 #, fuzzy #| msgid "Software to be installed:" msgid "transport have to be filled!" msgstr "Software to be installed:" #. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == "" -#: src/include/geo-cluster/dialogs.rb:669 +#: src/include/geo-cluster/dialogs.rb:674 #, fuzzy #| msgid "Software to be installed:" msgid "arbitrator have to be filled!" msgstr "Software to be installed:" -#: src/include/geo-cluster/dialogs.rb:674 +#: src/include/geo-cluster/dialogs.rb:679 #, fuzzy #| msgid "Software to be installed:" msgid "site have to be filled!" msgstr "Software to be installed:" -#: src/include/geo-cluster/dialogs.rb:679 +#: src/include/geo-cluster/dialogs.rb:684 #, fuzzy #| msgid "ticket can not be null" msgid "ticket have to be filled!" @@ -372,20 +376,26 @@ #. Validation check before switch to basic #. Still fall to :basic or :ok -#: src/include/geo-cluster/dialogs.rb:733 +#: src/include/geo-cluster/dialogs.rb:738 #, fuzzy #| msgid "Failed to create the new map." -msgid "Failed to create authentification file " +msgid "Failed to create authentication file " msgstr "Failed to create the new map." -#: src/include/geo-cluster/dialogs.rb:736 +#: src/include/geo-cluster/dialogs.rb:741 #, fuzzy -#| msgid "Set the authentication for proxy" -msgid "Succeed to created authentification file " -msgstr "Set the authentication for proxy" +#| msgid "Authentication Key" +msgid "Authentication file " +msgstr "Authentication Key" +#: src/include/geo-cluster/dialogs.rb:741 +#, fuzzy +#| msgid "Archive created successfully" +msgid " created successfully." +msgstr "Archive created successfully" + #. GeoCluster choose configure dialog caption -#: src/include/geo-cluster/dialogs.rb:795 +#: src/include/geo-cluster/dialogs.rb:800 #, fuzzy #| msgid "GeoCluster Configuration" msgid "GeoCluster Configuration Select" @@ -393,7 +403,7 @@ #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); -#: src/include/geo-cluster/dialogs.rb:801 +#: src/include/geo-cluster/dialogs.rb:806 #, fuzzy #| msgid "Read configuration file" msgid "Choose configuration file:" @@ -402,7 +412,7 @@ #: src/include/geo-cluster/wizards.rb:47 #, fuzzy #| msgid "TV Station Configuration" -msgid "Authentification Configuration" +msgid "Authentication Configuration" msgstr "TV Station Configuration" #. Initialization dialog contents @@ -559,6 +569,16 @@ msgstr "Configuration summary ..." #, fuzzy +#~| msgid "Authentication" +#~ msgid "Authentification" +#~ msgstr "Authentication" + +#, fuzzy +#~| msgid "Set the authentication for proxy" +#~ msgid "Succeed to created authentification file " +#~ msgstr "Set the authentication for proxy" + +#, fuzzy #~| msgid "Software to be installed:" #~ msgid "site have to be filled" #~ msgstr "Software to be installed:" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/http-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: http-server.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/inetd.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2003-09-09 10:54+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: English \n" @@ -102,11 +102,11 @@ msgid "The 'id' option cannot be combined with other options." msgstr "The 'id' option cannot be combined with other options." -#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356 +#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353 msgid "Status" msgstr "Status" -#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357 +#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354 msgid "Service" msgstr "Service" @@ -118,15 +118,15 @@ msgid "Prot." msgstr "Prot." -#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360 +#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357 msgid "Wait" msgstr "Wait" -#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361 +#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358 msgid "User" msgstr "User" -#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362 +#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359 msgid "Server" msgstr "Server" @@ -141,12 +141,12 @@ msgstr "Off" #. determine wait mode (convert to string) -#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855 +#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851 #: src/include/inetd/routines.rb:211 msgid "Yes" msgstr "Yes" -#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855 +#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851 #: src/include/inetd/routines.rb:213 msgid "No" msgstr "No" @@ -162,127 +162,127 @@ #. Translators: In autoinstallation mode: #. The package name is stored in %1. This is Popup::ContinueCancel. -#: src/include/inetd/dialogs.rb:164 +#: src/include/inetd/dialogs.rb:160 msgid "Package %1 will be installed during the write process." msgstr "Package %1 will be installed during the write process." #. if (true) { // for debugging #. Translators: The package name is stored in %1. This is Popup::Message. -#: src/include/inetd/dialogs.rb:183 +#: src/include/inetd/dialogs.rb:179 msgid "Package %1 was not installed. The service cannot be edited." msgstr "Package %1 was not installed. The service cannot be edited." #. Translators: The package name is stored in %1 -#: src/include/inetd/dialogs.rb:205 +#: src/include/inetd/dialogs.rb:201 msgid "Package %1 was successfully installed." msgstr "Package %1 was successfully installed." #. This is main inetd module dialog. #. @return dialog result -#: src/include/inetd/dialogs.rb:303 +#: src/include/inetd/dialogs.rb:299 msgid "&Activate All Services" msgstr "&Activate All Services" -#: src/include/inetd/dialogs.rb:304 +#: src/include/inetd/dialogs.rb:300 msgid "&Deactivate All Services" msgstr "&Deactivate All Services" #. Translators: Initial and target state of xinetd (or inetd) -#: src/include/inetd/dialogs.rb:339 +#: src/include/inetd/dialogs.rb:334 msgid "D&isable" msgstr "D&isable" -#: src/include/inetd/dialogs.rb:340 +#: src/include/inetd/dialogs.rb:336 msgid "Enab&le" msgstr "Enab&le" #. Main dialog edit inetd.conf #. Translators: Name of table with services (echo, chargen, ...) -#: src/include/inetd/dialogs.rb:347 +#: src/include/inetd/dialogs.rb:344 msgid "Currently Available Services" msgstr "Currently Available Services" #. `opt(`notify), #. `opt(`keepSorting), -#: src/include/inetd/dialogs.rb:355 +#: src/include/inetd/dialogs.rb:352 msgid "Ch" msgstr "Ch" -#: src/include/inetd/dialogs.rb:358 +#: src/include/inetd/dialogs.rb:355 msgid "Type " msgstr "Type " -#: src/include/inetd/dialogs.rb:359 +#: src/include/inetd/dialogs.rb:356 msgid "Protocol" msgstr "Protocol" -#: src/include/inetd/dialogs.rb:363 +#: src/include/inetd/dialogs.rb:360 msgid "Server / Args" msgstr "Server / Args" #. Translators: Add service -#: src/include/inetd/dialogs.rb:373 +#: src/include/inetd/dialogs.rb:370 msgid "&Add" msgstr "&Add" #. Translators: Edit service -#: src/include/inetd/dialogs.rb:376 +#: src/include/inetd/dialogs.rb:373 msgid "&Edit" msgstr "&Edit" #. Translators: Delete service -#: src/include/inetd/dialogs.rb:379 +#: src/include/inetd/dialogs.rb:376 msgid "&Delete" msgstr "&Delete" #. Translators: Change service status -#: src/include/inetd/dialogs.rb:387 +#: src/include/inetd/dialogs.rb:384 msgid "&Toggle Status (On or Off)" msgstr "&Toggle Status (On or Off)" -#: src/include/inetd/dialogs.rb:399 +#: src/include/inetd/dialogs.rb:396 msgid "Status for All &Services" msgstr "Status for All &Services" #. Inetd configure dialog caption -#: src/include/inetd/dialogs.rb:413 +#: src/include/inetd/dialogs.rb:410 msgid "Network Service Configuration (xinetd)" msgstr "Network Service Configuration (xinetd)" #. execute dialog #. Translators: Caption for EditOrCreateServiceDlg() -#: src/include/inetd/dialogs.rb:504 +#: src/include/inetd/dialogs.rb:498 msgid "Add a New Service Entry" msgstr "Add a New Service Entry" #. Translators: Popup::Error -#: src/include/inetd/dialogs.rb:534 +#: src/include/inetd/dialogs.rb:528 msgid "Cannot delete the service. It is not installed." msgstr "Cannot delete the service. It is not installed." #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:558 +#: src/include/inetd/dialogs.rb:552 msgid "To delete a service, select one in the main dialog" msgstr "To delete a service, select one in the main dialogue" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:605 +#: src/include/inetd/dialogs.rb:599 msgid "To activate or deactivate a service, select one in the main dialog." msgstr "To activate or deactivate a service, select one in the main dialogue." #. y2milestone("Current line %1", current_line); #. Translators: Caption of EditOrCreateServiceDlg() -#: src/include/inetd/dialogs.rb:742 +#: src/include/inetd/dialogs.rb:736 msgid "Edit a service entry" msgstr "Edit a service entry" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:757 +#: src/include/inetd/dialogs.rb:751 msgid "To edit a service, select one in the main dialog" msgstr "To edit a service, select one in the main dialogue" #. Translators: Popup::Warning -#: src/include/inetd/dialogs.rb:788 +#: src/include/inetd/dialogs.rb:782 msgid "" "All services are marked as disabled (locked).\n" "Internet super-server will be disabled." @@ -291,54 +291,54 @@ "Internet super-server will be disabled." #. service name -#: src/include/inetd/dialogs.rb:811 +#: src/include/inetd/dialogs.rb:807 msgid "&Service" msgstr "&Service" -#: src/include/inetd/dialogs.rb:813 +#: src/include/inetd/dialogs.rb:809 msgid "RPC Versio&n" msgstr "RPC Versio&n" #. service status (running or stopped) -#: src/include/inetd/dialogs.rb:819 +#: src/include/inetd/dialogs.rb:815 msgid "Service is acti&ve." msgstr "Service is acti&ve." #. service socket type -#: src/include/inetd/dialogs.rb:832 +#: src/include/inetd/dialogs.rb:828 msgid "Socket T&ype" msgstr "Socket T&ype" #. for protocol option - ediatble ComboBox -#: src/include/inetd/dialogs.rb:843 +#: src/include/inetd/dialogs.rb:839 msgid "&Protocol" msgstr "&Protocol" #. for flags (wait/nowait) - noneditable ComboBox -#: src/include/inetd/dialogs.rb:854 +#: src/include/inetd/dialogs.rb:850 msgid "&Wait" msgstr "&Wait" #. user and group ComboBoxes -#: src/include/inetd/dialogs.rb:864 +#: src/include/inetd/dialogs.rb:860 msgid "&User" msgstr "&User" -#: src/include/inetd/dialogs.rb:866 +#: src/include/inetd/dialogs.rb:862 msgid "&Group" msgstr "&Group" #. Server arguments -#: src/include/inetd/dialogs.rb:869 +#: src/include/inetd/dialogs.rb:865 msgid "S&erver" msgstr "S&erver" -#: src/include/inetd/dialogs.rb:870 +#: src/include/inetd/dialogs.rb:866 msgid "Server Argumen&ts" msgstr "Server Argumen&ts" #. Comment above the service line in inetd.conf -#: src/include/inetd/dialogs.rb:872 +#: src/include/inetd/dialogs.rb:868 msgid "Co&mment" msgstr "Co&mment" @@ -352,14 +352,14 @@ #. It does not get the NIS entries. #. "+" is filtered out. #. @return [Array] groups -#: src/include/inetd/dialogs.rb:918 src/include/inetd/dialogs.rb:956 -#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000 +#: src/include/inetd/dialogs.rb:914 src/include/inetd/dialogs.rb:952 +#: src/include/inetd/dialogs.rb:957 src/include/inetd/dialogs.rb:996 #: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353 msgid "--default--" msgstr "--default--" #. Translators: Popup::Message -#: src/include/inetd/dialogs.rb:946 +#: src/include/inetd/dialogs.rb:942 msgid "" "Service is empty.\n" "Enter valid values.\n" @@ -368,12 +368,12 @@ "Enter valid values.\n" #. Error message -#: src/include/inetd/dialogs.rb:952 +#: src/include/inetd/dialogs.rb:948 msgid "Service name contains disallowed character \"/\"." msgstr "" #. Translators: sformat-ed() 3 strings -#: src/include/inetd/dialogs.rb:960 +#: src/include/inetd/dialogs.rb:956 msgid "The user %1 is reserved for internal server processes only." msgstr "The user %1 is reserved for internal server processes only." @@ -653,57 +653,57 @@ msgstr "Initialising ..." #. Inetd read dialog caption -#: src/modules/Inetd.rb:188 +#: src/modules/Inetd.rb:185 msgid "Initializing inetd Configuration" msgstr "Initialising inetd Configuration" -#: src/modules/Inetd.rb:196 +#: src/modules/Inetd.rb:193 msgid "Read the Configuration" msgstr "Read the Configuration" -#: src/modules/Inetd.rb:197 +#: src/modules/Inetd.rb:194 msgid "Reading the configuration..." msgstr "Reading the configuration..." #. read database -#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278 -#: src/modules/Inetd.rb:306 +#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276 +#: src/modules/Inetd.rb:340 msgid "Finished" msgstr "Finished" #. Inetd read dialog caption -#: src/modules/Inetd.rb:269 +#: src/modules/Inetd.rb:267 msgid "Saving inetd Configuration" msgstr "Saving inetd Configuration" -#: src/modules/Inetd.rb:277 +#: src/modules/Inetd.rb:275 msgid "Write the settings" msgstr "Write the settings" -#: src/modules/Inetd.rb:278 +#: src/modules/Inetd.rb:276 msgid "Writing the settings..." msgstr "Writing the settings..." #. in future: catch errors -#: src/modules/Inetd.rb:303 +#: src/modules/Inetd.rb:337 msgid "Cannot write settings!" msgstr "Cannot write settings!" #. "enabled" defaults to true -#: src/modules/Inetd.rb:598 +#: src/modules/Inetd.rb:607 msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>" msgstr "<p><ul><i>All services are marked as stopped.</i></ul></p>" #. Translators: Summary head, if nothing configured -#: src/modules/Inetd.rb:609 +#: src/modules/Inetd.rb:618 msgid "Network services" msgstr "Network services" #. Translators: Summary head, if something configured -#: src/modules/Inetd.rb:613 +#: src/modules/Inetd.rb:623 msgid "Network services are managed via %1" msgstr "Network services are managed via %1" -#: src/modules/Inetd.rb:616 +#: src/modules/Inetd.rb:627 msgid "These services will be enabled" msgstr "These services will be enabled" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/installation.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installation.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-27 10:52+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-05-16 13:44+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -39,7 +39,7 @@ #. dialog caption #. TRANSLATORS: progress message #: src/include/installation/inst_inc_all.rb:64 -#: src/lib/installation/clients/inst_installation_options.rb:154 +#: src/lib/installation/clients/inst_installation_options.rb:151 msgid "Initializing..." msgstr "Initialising..." @@ -236,21 +236,21 @@ #. Text for confirmation popup before the update really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 #: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222 -#: src/lib/installation/proposal_runner.rb:136 +#: src/lib/installation/proposal_runner.rb:133 msgid "<p>Go back and check the settings if you are unsure.</p>" msgstr "<p>Go back and check the settings if you are unsure.</p>" #. Heading for confirmation popup before the update really starts #. Heading for confirmation popup before the update really starts #: src/include/installation/misc.rb:210 -#: src/lib/installation/proposal_runner.rb:124 +#: src/lib/installation/proposal_runner.rb:121 msgid "Confirm Update" msgstr "Confirm Update" #. Text for confirmation popup before the update really starts 1/3 #. Text for confirmation popup before the update really starts 1/3 #: src/include/installation/misc.rb:214 -#: src/lib/installation/proposal_runner.rb:128 +#: src/lib/installation/proposal_runner.rb:125 #, fuzzy #| msgid "<p>All information required to perform an update is now complete.</p>" msgid "<p>Information required to perform an update is now complete.</p>" @@ -259,7 +259,7 @@ #. Text for confirmation popup before the update really starts 2/3 #. Text for confirmation popup before the update really starts 2/3 #: src/include/installation/misc.rb:216 -#: src/lib/installation/proposal_runner.rb:130 +#: src/lib/installation/proposal_runner.rb:127 #, fuzzy msgid "" "\n" @@ -273,7 +273,7 @@ #. Label for the button that confirms startint the installation #. Label for the button that confirms startint the installation #: src/include/installation/misc.rb:225 -#: src/lib/installation/proposal_runner.rb:139 +#: src/lib/installation/proposal_runner.rb:136 msgid "Start &Update" msgstr "Start &Update" @@ -314,56 +314,7 @@ msgstr "Starting service %1..." #. progress step title -#: src/lib/installation/clients/clone_finish.rb:43 -msgid "Generating AutoYaST profile if needed..." -msgstr "" - -#. TRANSLATORS: help text -#: src/lib/installation/clients/clone_proposal.rb:39 -#, fuzzy -msgid "" -"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n" -"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" -"needs a profile to know what the installed system should look like. If this option is\n" -"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>" -msgstr "" -"<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n" -"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" -"needs a profile to know what the installed system should look like. If this option is\n" -"selected, a profile of the current system is stored in /root/autoyast.xml.</p>\n" - -#: src/lib/installation/clients/clone_proposal.rb:60 -msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" -msgstr "" - -#. this is a heading -#: src/lib/installation/clients/clone_proposal.rb:71 -#, fuzzy -#| msgid "Writing the system configuration" -msgid "Clone System Configuration" -msgstr "Writing the system configuration" - -#. this is a menu entry -#: src/lib/installation/clients/clone_proposal.rb:73 -#, fuzzy -#| msgid "&Skip Configuration" -msgid "&Clone System Configuration" -msgstr "&Skip Configuration" - -#. TRANSLATORS: Installation overview -#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/lib/installation/clients/clone_proposal.rb:101 -msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)." -msgstr "" - -#. TRANSLATORS: Installation overview -#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/lib/installation/clients/clone_proposal.rb:110 -msgid "The AutoYaST profile will not be saved (write it</a>)." -msgstr "" - -#. progress step title -#: src/lib/installation/clients/copy_files_finish.rb:81 +#: src/lib/installation/clients/copy_files_finish.rb:82 msgid "Copying files to installed system..." msgstr "Copying files to installed system..." @@ -558,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:304 +#: src/lib/installation/clients/inst_system_analysis.rb:306 msgid "Unknown Product" msgstr "Unknown Product" @@ -587,56 +538,28 @@ "Select whether to run an online update now.\n" "You may skip this step and run an online update later.\n" -#. ---------------------------------------------------------------------- -#. Build dialog -#. ---------------------------------------------------------------------- -#. heading text -#: src/lib/installation/clients/inst_complex_welcome.rb:65 +#. This client shows main dialog for choosing the language, +#. keyboard and accepting the license. +#: src/lib/installation/clients/inst_complex_welcome.rb:33 msgid "Language, Keyboard and License Agreement" msgstr "" -#. combo box label -#. combobox -#. TRANSLATORS: Combo box -#: src/lib/installation/clients/inst_complex_welcome.rb:71 -#: src/lib/installation/clients/inst_release_notes.rb:217 -#: src/lib/installation/clients/inst_release_notes.rb:431 -msgid "&Language" -msgstr "&Language" - -#. combo box label -#: src/lib/installation/clients/inst_complex_welcome.rb:79 -msgid "&Keyboard Layout" -msgstr "&Keyboard Layout" - -#. bnc #359456 -#. TRANSLATORS: check-box -#: src/lib/installation/clients/inst_complex_welcome.rb:91 +#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660) +#. Assure that relnotes have been downloaded first +#. exit codes (see "man curl"): +#. 7 = Failed to connect to host. +#. 28 = Operation timeout. +#. push button +#: src/lib/installation/clients/inst_complex_welcome.rb:161 +#: src/lib/installation/clients/inst_download_release_notes.rb:126 +#: src/lib/installation/clients/inst_system_analysis.rb:304 #, fuzzy -msgid "I &Agree to the License Terms." -msgstr "Yes, I Agree to the License Agreement" +#| msgid "Release Notes" +msgid "Re&lease Notes..." +msgstr "Release Notes" -#. this type of contents will be shown only for initial installation dialog -#: src/lib/installation/clients/inst_complex_welcome.rb:110 -#, fuzzy -#| msgid "Keyboard &test:" -msgid "K&eyboard Test" -msgstr "Keyboard &test:" - -#. TRANSLATORS: dialog caption -#: src/lib/installation/clients/inst_complex_welcome.rb:119 -#: src/lib/installation/clients/inst_complex_welcome.rb:299 -msgid "License Agreement" -msgstr "License Agreement" - -#. TRANSLATORS: button label -#: src/lib/installation/clients/inst_complex_welcome.rb:141 -#, fuzzy -msgid "License &Translations..." -msgstr "PTR: Reverse Translation" - #. help text for initial (first time) language screen -#: src/lib/installation/clients/inst_complex_welcome.rb:153 +#: src/lib/installation/clients/inst_complex_welcome.rb:169 #, fuzzy msgid "" "<p>\n" @@ -651,7 +574,7 @@ #. help text, continued #. Describes the #ICW_B1 button -#: src/lib/installation/clients/inst_complex_welcome.rb:161 +#: src/lib/installation/clients/inst_complex_welcome.rb:177 msgid "" "<p>\n" "The license must be accepted before the installation continues.\n" @@ -660,7 +583,7 @@ msgstr "" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:168 +#: src/lib/installation/clients/inst_complex_welcome.rb:184 msgid "" "<p>\n" "Click <b>Next</b> to proceed to the next dialog.\n" @@ -671,7 +594,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:174 +#: src/lib/installation/clients/inst_complex_welcome.rb:190 msgid "" "<p>\n" "Nothing will happen to your computer until you confirm\n" @@ -684,7 +607,7 @@ "</p>\n" #. help text, continued -#: src/lib/installation/clients/inst_complex_welcome.rb:181 +#: src/lib/installation/clients/inst_complex_welcome.rb:197 #, fuzzy msgid "" "<p>\n" @@ -697,24 +620,52 @@ "installation process.\n" "</p>\n" -#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660) -#. Assure that relnotes have been downloaded first -#. exit codes (see "man curl"): -#. 7 = Failed to connect to host. -#. 28 = Operation timeout. -#. push button -#: src/lib/installation/clients/inst_complex_welcome.rb:211 -#: src/lib/installation/clients/inst_download_release_notes.rb:126 -#: src/lib/installation/clients/inst_system_analysis.rb:302 +#. TRANSLATORS: dialog caption +#: src/lib/installation/clients/inst_complex_welcome.rb:213 +#: src/lib/installation/clients/inst_complex_welcome.rb:415 +msgid "License Agreement" +msgstr "License Agreement" + +#. combo box label +#. combobox +#. TRANSLATORS: Combo box +#: src/lib/installation/clients/inst_complex_welcome.rb:237 +#: src/lib/installation/clients/inst_release_notes.rb:217 +#: src/lib/installation/clients/inst_release_notes.rb:431 +msgid "&Language" +msgstr "&Language" + +#. combo box label +#: src/lib/installation/clients/inst_complex_welcome.rb:247 +msgid "&Keyboard Layout" +msgstr "&Keyboard Layout" + +#. TRANSLATORS: check-box +#: src/lib/installation/clients/inst_complex_welcome.rb:261 #, fuzzy -#| msgid "Release Notes" -msgid "Re&lease Notes..." -msgstr "Release Notes" +msgid "I &Agree to the License Terms." +msgstr "Yes, I Agree to the License Agreement" -#: src/lib/installation/clients/inst_complex_welcome.rb:323 +#. Report error about missing license acceptance +#. !/usr/bin/env rspec +#: src/lib/installation/clients/inst_complex_welcome.rb:287 +#: test/inst_complex_welcome_test.rb:106 msgid "You must accept the license to install this product" msgstr "" +#. this type of contents will be shown only for initial installation dialog +#: src/lib/installation/clients/inst_complex_welcome.rb:406 +#, fuzzy +#| msgid "Keyboard &test:" +msgid "K&eyboard Test" +msgstr "Keyboard &test:" + +#. TRANSLATORS: button label +#: src/lib/installation/clients/inst_complex_welcome.rb:436 +#, fuzzy +msgid "License &Translations..." +msgstr "PTR: Reverse Translation" + #. TRANSLATORS: check box, see #ZMD #: src/lib/installation/clients/inst_congratulate.rb:107 #, fuzzy @@ -825,7 +776,7 @@ msgstr "SuSEfirewall2 package is not installed, firewall will be disabled." #. OEM image if target disk is defined -#: src/lib/installation/clients/inst_deploy_image.rb:46 +#: src/lib/installation/clients/inst_deploy_image.rb:49 msgid "The system will reboot now..." msgstr "The system will reboot now..." @@ -834,8 +785,8 @@ #. twice more steps #. FIXME: 2 minutes #. own workflow for OEM image deployment -#: src/lib/installation/clients/inst_deploy_image.rb:106 -#: src/lib/installation/clients/inst_deploy_image.rb:351 +#: src/lib/installation/clients/inst_deploy_image.rb:109 +#: src/lib/installation/clients/inst_deploy_image.rb:354 #: src/lib/installation/clients/inst_prepareprogress.rb:110 #: src/lib/installation/clients/inst_prepareprogress.rb:152 #, fuzzy @@ -844,7 +795,7 @@ #. BNC #444209 #. false == error -#: src/lib/installation/clients/inst_deploy_image.rb:167 +#: src/lib/installation/clients/inst_deploy_image.rb:170 #, fuzzy msgid "" "Deploying images has failed.\n" @@ -854,30 +805,30 @@ "Aborting the installation." #. TRANSLATORS: pop-up message -#: src/lib/installation/clients/inst_deploy_image.rb:199 +#: src/lib/installation/clients/inst_deploy_image.rb:202 msgid "" "Debugging has been turned on.\n" "YaST will open a software manager for you to check the current status of packages." msgstr "" #. unknown image -#: src/lib/installation/clients/inst_deploy_image.rb:375 +#: src/lib/installation/clients/inst_deploy_image.rb:378 #, fuzzy msgid "Downloading image at speed %1/s" msgstr "Downloading image %1..." -#: src/lib/installation/clients/inst_deploy_image.rb:380 +#: src/lib/installation/clients/inst_deploy_image.rb:383 #, fuzzy msgid "Downloading image %1 at speed %2/s" msgstr "Downloading image %1..." #. reset the label -#: src/lib/installation/clients/inst_deploy_image.rb:442 +#: src/lib/installation/clients/inst_deploy_image.rb:445 #, fuzzy msgid "Deploying image..." msgstr "Downloading image..." -#: src/lib/installation/clients/inst_deploy_image.rb:445 +#: src/lib/installation/clients/inst_deploy_image.rb:448 #, fuzzy msgid "Deploying image %1..." msgstr "Downloading image..." @@ -904,38 +855,39 @@ msgstr "" #. popup label -#: src/lib/installation/clients/inst_disks_activate.rb:60 +#: 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:76 +#: src/lib/installation/clients/inst_disks_activate.rb:81 msgid "Disk Activation" msgstr "Disk Activation" -#: src/lib/installation/clients/inst_disks_activate.rb:86 +#: 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:92 +#: 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:98 +#: 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:110 +#: src/lib/installation/clients/inst_disks_activate.rb:117 msgid "Configure &iSCSI Disks" msgstr "Configure &iSCSI Disks" -#: src/lib/installation/clients/inst_disks_activate.rb:111 +#. Finish +#: src/lib/installation/clients/inst_disks_activate.rb:178 #, fuzzy -#| msgid "Saving network configuration..." -msgid "Change Net&work Configuration" -msgstr "Saving network configuration..." +#| msgid "Network Configuration" +msgid "Net&work Configuration..." +msgstr "Network Configuration" #. TRANSLATORS: dialog caption #: src/lib/installation/clients/inst_doit.rb:56 @@ -954,7 +906,7 @@ #. bug #302384 #: src/lib/installation/clients/inst_download_release_notes.rb:134 #: src/lib/installation/clients/inst_initialization.rb:56 -#: src/lib/installation/clients/inst_installation_options.rb:152 +#: src/lib/installation/clients/inst_installation_options.rb:149 msgid "Initializing" msgstr "Initialising" @@ -997,55 +949,55 @@ msgstr "Preinstallation Scripts" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:204 +#: src/lib/installation/clients/inst_finish.rb:203 msgid "Copy files to installed system" msgstr "Copy files to installed system" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:211 +#: src/lib/installation/clients/inst_finish.rb:210 msgid "Save configuration" msgstr "Save configuration" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:218 +#: src/lib/installation/clients/inst_finish.rb:217 msgid "Save installation settings" msgstr "Save installation settings" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:227 +#: src/lib/installation/clients/inst_finish.rb:226 msgid "Install boot manager" msgstr "Install boot manager" #. progress stage -#: src/lib/installation/clients/inst_finish.rb:234 +#: src/lib/installation/clients/inst_finish.rb:233 msgid "Prepare system for initial boot" msgstr "Prepare system for initial boot" #. merge steps from add-on products #. bnc #438678 -#: src/lib/installation/clients/inst_finish.rb:338 +#: src/lib/installation/clients/inst_finish.rb:337 #, fuzzy msgid "Checking stage: %1..." msgstr "Checking for binary %1..." #. a fallback busy message -#: src/lib/installation/clients/inst_finish.rb:425 +#: src/lib/installation/clients/inst_finish.rb:424 #, fuzzy msgid "Calling step %1..." msgstr "Saving queue %1..." #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log -#: src/lib/installation/clients/inst_finish.rb:445 +#: src/lib/installation/clients/inst_finish.rb:444 msgid " * %1" msgstr "" #. Anything else -#: src/lib/installation/clients/inst_finish.rb:482 +#: src/lib/installation/clients/inst_finish.rb:481 msgid "Finished" msgstr "Finished" #. get the latest errors -#: src/lib/installation/clients/inst_finish.rb:614 +#: src/lib/installation/clients/inst_finish.rb:613 msgid "Installation Error" msgstr "Installation Error" @@ -1073,26 +1025,26 @@ msgstr "Preparing the 1st system configuration..." #. dialog caption -#: src/lib/installation/clients/inst_installation_options.rb:83 +#: src/lib/installation/clients/inst_installation_options.rb:80 #, fuzzy #| msgid "Installation Settings" msgid "Installation Options" msgstr "Installation Settings" #. check box -#: src/lib/installation/clients/inst_installation_options.rb:181 +#: src/lib/installation/clients/inst_installation_options.rb:177 msgid "&Add Online Repositories Before Installation" msgstr "&Add Online Repositories Before Installation" #. check box -#: src/lib/installation/clients/inst_installation_options.rb:193 +#: src/lib/installation/clients/inst_installation_options.rb:189 #, fuzzy #| msgid "In&clude Add-On Products from Separate Media" msgid "In&clude Add-on Products from Separate Media" msgstr "In&clude Add-On Products from Separate Media" #. help text for installation method -#: src/lib/installation/clients/inst_installation_options.rb:204 +#: src/lib/installation/clients/inst_installation_options.rb:200 #, fuzzy #| msgid "" #| "<p><big><b>Installation Mode</b></big><br>\n" @@ -1103,7 +1055,7 @@ "Select what to do:</p>" #. help text for installation option -#: src/lib/installation/clients/inst_installation_options.rb:207 +#: src/lib/installation/clients/inst_installation_options.rb:203 #, fuzzy msgid "" "<p>\n" @@ -1115,7 +1067,7 @@ "<b>Add Online Repositories Before Installation</b>.</p>\n" #. help text for installation method -#: src/lib/installation/clients/inst_installation_options.rb:213 +#: src/lib/installation/clients/inst_installation_options.rb:209 #, fuzzy #| msgid "" #| "<p>\n" @@ -1131,7 +1083,7 @@ "<b>Include Add-On Products from Separate Media</b>.</p>\n" #. help text: additional help for installation -#: src/lib/installation/clients/inst_installation_options.rb:216 +#: src/lib/installation/clients/inst_installation_options.rb:212 msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>" msgstr "" @@ -1417,7 +1369,7 @@ 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:240 +#: src/lib/installation/clients/inst_system_analysis.rb:242 #, fuzzy #| msgid "" #| "No hard disks were found for the installation.\n" @@ -1430,7 +1382,7 @@ "Please check your hardware!\n" #. pop-up error report -#: src/lib/installation/clients/inst_system_analysis.rb:254 +#: src/lib/installation/clients/inst_system_analysis.rb:256 #, fuzzy #| msgid "" #| "No hard disks were found for the installation.\n" @@ -1443,7 +1395,7 @@ "No hard disks were found for the installation.\n" "Please check your hardware!\n" -#: src/lib/installation/clients/inst_system_analysis.rb:264 +#: src/lib/installation/clients/inst_system_analysis.rb:266 msgid "" "No hard disks were found for the installation.\n" "During an automatic installation, they might be detected later.\n" @@ -1451,7 +1403,7 @@ msgstr "" #. pop-up error report -#: src/lib/installation/clients/inst_system_analysis.rb:275 +#: src/lib/installation/clients/inst_system_analysis.rb:277 #, fuzzy #| msgid "" #| "No hard disks and no hard disk controllers were\n" @@ -1468,7 +1420,7 @@ "Check your hardware.\n" #. popup message -#: src/lib/installation/clients/inst_system_analysis.rb:320 +#: src/lib/installation/clients/inst_system_analysis.rb:322 #, fuzzy msgid "" "Failed to initialize the software repositories.\n" @@ -1477,6 +1429,36 @@ "Failed to initialise repositories.\n" "Aborting the installation." +#. TRANSLATORS: %s is an URL +#: src/lib/installation/clients/inst_update_installer.rb:184 +#, fuzzy +#| msgid "The /var partition %1 could not be mounted.\n" +msgid "" +"A valid update could not be found at\n" +"%s.\n" +"\n" +msgstr "The /var partition %1 could not be mounted.\n" + +#. TRANSLATORS: %s is an URL +#: src/lib/installation/clients/inst_update_installer.rb:190 +#, fuzzy +#| msgid "Could not set patterns: %1." +msgid "" +"Could not fetch update from\n" +"%s.\n" +"\n" +msgstr "Could not set patterns: %1." + +#. TRANSLATORS: %s is an URL +#: src/lib/installation/clients/inst_update_installer.rb:215 +msgid "" +"Downloading installer updates from \n" +"%s\n" +"failed.\n" +"\n" +"Would you like to check your network configuration?" +msgstr "" + #. TRANSLATORS: Table item status (repository) #: src/lib/installation/clients/inst_upgrade_urls.rb:109 #, fuzzy @@ -1533,8 +1515,8 @@ #. menu button #. menu button #: src/lib/installation/clients/inst_upgrade_urls.rb:247 -#: src/lib/installation/proposal_runner.rb:659 -#: src/lib/installation/proposal_runner.rb:783 +#: src/lib/installation/proposal_runner.rb:647 +#: src/lib/installation/proposal_runner.rb:762 msgid "&Change..." msgstr "&Change..." @@ -1781,7 +1763,7 @@ msgstr "Setting up linker cache" #. progress step title -#: src/lib/installation/clients/network_finish.rb:68 +#: src/lib/installation/clients/network_finish.rb:60 msgid "Saving network configuration..." msgstr "Saving network configuration..." @@ -1915,34 +1897,22 @@ msgstr "Searching for Linux partitions..." #. question in a popup box -#: src/lib/installation/proposal_runner.rb:207 +#: src/lib/installation/proposal_runner.rb:204 msgid "Really reset everything to default values?" msgstr "Really reset everything to default values?" #. explain consequences of a decision -#: src/lib/installation/proposal_runner.rb:209 +#: src/lib/installation/proposal_runner.rb:206 msgid "You will lose all changes." msgstr "You will lose all changes." -#. while input loop -#: src/lib/installation/proposal_runner.rb:251 -#, fuzzy -msgid "Location of Stored Configuration" -msgstr "&Use Following Configuration" - -#. force write, so it always write profile even if user do not want -#. to store profile after installation -#: src/lib/installation/proposal_runner.rb:257 -msgid "Failed to store configuration. Details can be found in log." -msgstr "" - #. message show when user has disabled the configuration -#: src/lib/installation/proposal_runner.rb:268 +#: src/lib/installation/proposal_runner.rb:252 msgid "Skipping configuration upon user request" msgstr "Skipping configuration upon user request" #. error message is a popup -#: src/lib/installation/proposal_runner.rb:288 +#: src/lib/installation/proposal_runner.rb:272 msgid "" "The proposal contains an error that must be\n" "resolved before continuing.\n" @@ -1951,26 +1921,26 @@ "resolved before continuing.\n" #. busy message -#: src/lib/installation/proposal_runner.rb:394 +#: 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:398 -#: src/lib/installation/proposal_runner.rb:687 +#: 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:500 +#: 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:539 +#: src/lib/installation/proposal_runner.rb:526 msgid "" "Configuration saved.\n" "There were errors." @@ -1983,48 +1953,40 @@ #. Translators: About 40 characters max, #. use newlines for longer translations. #. radio button -#: src/lib/installation/proposal_runner.rb:634 +#: src/lib/installation/proposal_runner.rb:621 msgid "&Skip Configuration" msgstr "&Skip Configuration" #. radio button -#: src/lib/installation/proposal_runner.rb:643 +#: src/lib/installation/proposal_runner.rb:630 msgid "&Use Following Configuration" msgstr "&Use Following Configuration" -#. menu button -#: src/lib/installation/proposal_runner.rb:667 -#: src/lib/installation/proposal_runner.rb:778 -#, fuzzy -#| msgid "&Skip Configuration" -msgid "&Export Configuration" -msgstr "&Skip 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:713 +#: 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:717 +#: 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:777 +#: src/lib/installation/proposal_runner.rb:757 msgid "&Reset to defaults" msgstr "&Reset to defaults" #. FATE #120373 -#: src/lib/installation/proposal_runner.rb:800 +#: src/lib/installation/proposal_runner.rb:779 msgid "&Update" msgstr "&Update" -#: src/lib/installation/proposal_runner.rb:800 +#: src/lib/installation/proposal_runner.rb:779 msgid "&Install" msgstr "&Install" @@ -2065,7 +2027,7 @@ #. Help text for installation proposal #. General part ("You can change values...") is added as the next paragraph. -#: src/lib/installation/proposal_store.rb:417 +#: src/lib/installation/proposal_store.rb:426 #, fuzzy msgid "" "<p>\n" @@ -2079,7 +2041,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:425 +#: src/lib/installation/proposal_store.rb:434 #, fuzzy msgid "" "<p>\n" @@ -2092,7 +2054,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:434 +#: src/lib/installation/proposal_store.rb:443 msgid "" "<p>\n" "Put the network settings into effect by pressing <b>Next</b>.\n" @@ -2104,7 +2066,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:442 +#: src/lib/installation/proposal_store.rb:451 msgid "" "<p>\n" "Put the service settings into effect by pressing <b>Next</b>.\n" @@ -2116,7 +2078,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:450 +#: src/lib/installation/proposal_store.rb:459 msgid "" "<p>\n" "Put the hardware settings into effect by pressing <b>Next</b>.\n" @@ -2127,12 +2089,12 @@ "</p>\n" #. Proposal in uml module -#: src/lib/installation/proposal_store.rb:457 +#: 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:459 +#: 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>" @@ -2143,7 +2105,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:473 +#: src/lib/installation/proposal_store.rb:482 msgid "" "<p>\n" "To use the settings as displayed, press <b>Next</b>.\n" @@ -2162,6 +2124,18 @@ msgid "Enabling remote administration..." msgstr "Remote Administration" +#. skip forward or backward +#: src/lib/installation/select_system_role.rb:48 +#, fuzzy +#| msgid "System log" +msgid "System Role" +msgstr "System log" + +#. A Continue-Cancel popup +#: src/lib/installation/select_system_role.rb:82 +msgid "Changing the system role may undo adjustments you may have done." +msgstr "" + #. Writes configuration #. #. It creates a snapshot when no second stage is required and @@ -2169,12 +2143,73 @@ #. #. @return [TrueClass,FalseClass] True if snapshot was created; #. otherwise it returns false. -#: src/lib/installation/snapshots_finish.rb:40 +#: src/lib/installation/snapshots_finish.rb:41 #, fuzzy #| msgid "Copying root filesystem..." msgid "Creating root filesystem snapshot..." msgstr "Copying root filesystem..." +#. 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." + +#. 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." + +#. 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" + +#: src/lib/transfer/file_from_url.rb:208 +msgid "Reading file on %1 failed.\n" +msgstr "Reading file on %1 failed.\n" + +#. autoyast tried to mount the CD but had no success. +#. autoyast tried to mount a NFS directory which failed +#. autoyast tried to mount a NFS directory which failed +#: 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." + +#. 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." + +#. 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" + +#. this is workaround for bnc#849767 +#. because of changes in autoyast startup this code is now +#. called much sooner (before Storage stuff is initialized) +#. call dummy method to trigger Storage initialization +#: src/lib/transfer/file_from_url.rb:519 +msgid "%1 is not mounted and mount failed" +msgstr "" + +#. 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" + +#. 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." + +#. the user wanted autoyast to fetch it's profile via an unknown protocol +#: src/lib/transfer/file_from_url.rb:568 +msgid "Unknown protocol %1." +msgstr "Unknown protocol %1." + #. checking whether images are supported #. BNC #409927 #. Checking files for signatures @@ -2214,6 +2249,42 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#, fuzzy +#~ msgid "" +#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n" +#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" +#~ "needs a profile to know what the installed system should look like. If this option is\n" +#~ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>" +#~ msgstr "" +#~ "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n" +#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" +#~ "needs a profile to know what the installed system should look like. If this option is\n" +#~ "selected, a profile of the current system is stored in /root/autoyast.xml.</p>\n" + +#, fuzzy +#~| msgid "Writing the system configuration" +#~ msgid "Clone System Configuration" +#~ msgstr "Writing the system configuration" + +#, fuzzy +#~| msgid "&Skip Configuration" +#~ msgid "&Clone System Configuration" +#~ msgstr "&Skip Configuration" + +#, fuzzy +#~| msgid "Saving network configuration..." +#~ msgid "Change Net&work Configuration" +#~ msgstr "Saving network configuration..." + +#, fuzzy +#~ msgid "Location of Stored Configuration" +#~ msgstr "&Use Following Configuration" + +#, fuzzy +#~| msgid "&Skip Configuration" +#~ msgid "&Export Configuration" +#~ msgstr "&Skip Configuration" + #~ msgid "ERROR: Missing Title" #~ msgstr "ERROR: Missing Title" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/instserver.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -63,25 +63,25 @@ msgstr "Change Media" #. %1 is the current cd number -#: src/include/instserver/dialogs.rb:230 +#: src/include/instserver/dialogs.rb:241 msgid "Insert CD %1 then press continue." msgstr "Insert CD %1 then press continue." -#: src/include/instserver/dialogs.rb:235 +#: src/include/instserver/dialogs.rb:246 msgid "Select ISO image %1 then press continue." msgstr "Select ISO image %1 then press continue." #. %2 is the product name and version -#: src/include/instserver/dialogs.rb:241 +#: src/include/instserver/dialogs.rb:252 msgid "Insert CD %1 of %2." msgstr "Insert CD %1 of %2." -#: src/include/instserver/dialogs.rb:242 +#: src/include/instserver/dialogs.rb:253 msgid "Select ISO image %1 of %2." msgstr "Select ISO image %1 of %2." #. popup request, %1 is CD medium name -#: src/include/instserver/dialogs.rb:281 +#: src/include/instserver/dialogs.rb:292 #, fuzzy msgid "" "Insert\n" @@ -91,12 +91,12 @@ "'%1'" #. popup request, %1 is ISO name -#: src/include/instserver/dialogs.rb:310 +#: src/include/instserver/dialogs.rb:321 msgid "Select %1" msgstr "Select %1" #. add-on medium (e.g. service pack) doesn't match configured repository -#: src/include/instserver/dialogs.rb:551 +#: src/include/instserver/dialogs.rb:573 msgid "" "The medium requires product %1, which is not provided\n" "by the current repository.\n" @@ -109,63 +109,63 @@ "Select the base product medium first." #. else, we create CD1, CD2, etc. (for code10 always) -#: src/include/instserver/dialogs.rb:669 +#: src/include/instserver/dialogs.rb:697 msgid "Copying CD contents to local directory" msgstr "Copying CD contents to local directory" -#: src/include/instserver/dialogs.rb:670 +#: src/include/instserver/dialogs.rb:698 msgid "This may take a while..." msgstr "This may take a while..." #. TODO: report more details (stderr) #. rename the directory -#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341 +#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361 msgid "Error while moving repository content." msgstr "Error while moving repository content." #. Instserver configuration dialog caption #. Instserver configuration dialog caption -#: src/include/instserver/dialogs.rb:949 -#: src/include/instserver/dialogs.rb:1162 +#: src/include/instserver/dialogs.rb:978 +#: src/include/instserver/dialogs.rb:1191 msgid "Repository Configuration" msgstr "Repository Configuration" #. Instserver configure1 dialog contents -#: src/include/instserver/dialogs.rb:965 +#: src/include/instserver/dialogs.rb:994 msgid "Read &CD or DVD Medium" msgstr "Read &CD or DVD Medium" -#: src/include/instserver/dialogs.rb:971 +#: src/include/instserver/dialogs.rb:1000 msgid "Data &Source" msgstr "Data &Source" -#: src/include/instserver/dialogs.rb:979 +#: src/include/instserver/dialogs.rb:1008 msgid "Use &ISO Images" msgstr "Use &ISO Images" -#: src/include/instserver/dialogs.rb:988 +#: src/include/instserver/dialogs.rb:1017 msgid "Di&rectory with CD Images:" msgstr "Di&rectory with CD Images:" -#: src/include/instserver/dialogs.rb:991 -#: src/include/instserver/dialogs.rb:1371 +#: src/include/instserver/dialogs.rb:1020 +#: src/include/instserver/dialogs.rb:1400 msgid "Select &Directory" msgstr "Select &Directory" #. abort? #. abort? -#: src/include/instserver/dialogs.rb:1034 -#: src/include/instserver/dialogs.rb:1440 +#: src/include/instserver/dialogs.rb:1063 +#: src/include/instserver/dialogs.rb:1469 msgid "Select Directory" msgstr "Select Directory" #. abort? -#: src/include/instserver/dialogs.rb:1051 -#: src/include/instserver/dialogs.rb:1215 +#: src/include/instserver/dialogs.rb:1080 +#: src/include/instserver/dialogs.rb:1244 msgid "Installation server name missing." msgstr "Installation server name missing." -#: src/include/instserver/dialogs.rb:1066 +#: src/include/instserver/dialogs.rb:1095 msgid "" "Contents already exist in this directory.\n" "Not copying CDs." @@ -174,7 +174,7 @@ "Not copying CDs." #. for translators: popup question (prefer more shorter lines than few long lines) -#: src/include/instserver/dialogs.rb:1094 +#: src/include/instserver/dialogs.rb:1123 msgid "" "Add an additional product (Service Pack, Additional\n" "Package CD, etc.) to the repository?" @@ -183,20 +183,20 @@ "Package CD, etc.) to the repository?" #. Instserver configure1 dialog contents -#: src/include/instserver/dialogs.rb:1170 +#: src/include/instserver/dialogs.rb:1199 msgid "Repository &Name:" msgstr "Repository &Name:" -#: src/include/instserver/dialogs.rb:1175 +#: src/include/instserver/dialogs.rb:1204 msgid "A&nnounce as Installation Service with SLP" msgstr "A&nnounce as Installation Service with SLP" -#: src/include/instserver/dialogs.rb:1223 +#: src/include/instserver/dialogs.rb:1252 msgid "Invalid repository name." msgstr "Invalid repository name." #. an error message - entered repository name already exists -#: src/include/instserver/dialogs.rb:1231 +#: src/include/instserver/dialogs.rb:1260 msgid "" "Repository '%1' already exists,\n" "enter another name." @@ -205,7 +205,7 @@ "enter another name." #. create directory only for a new repository -#: src/include/instserver/dialogs.rb:1244 +#: src/include/instserver/dialogs.rb:1273 #, fuzzy msgid "" "Error while creating <tt>repository</tt> directory.\n" @@ -219,7 +219,7 @@ "is writable and try again." #. confirm removal of a repository, the action is done immediately and cannot be reverted -#: src/include/instserver/dialogs.rb:1263 +#: src/include/instserver/dialogs.rb:1292 msgid "" "Repository '%1' has been marked to delete.\n" "When adding a new repository with the same name\n" @@ -229,88 +229,88 @@ msgstr "" #. Instserver server dialog caption -#: src/include/instserver/dialogs.rb:1347 +#: src/include/instserver/dialogs.rb:1376 #, fuzzy msgid "Initial Setup -- Initial Setup" msgstr "Initial Setup -- Servers" -#: src/include/instserver/dialogs.rb:1363 +#: src/include/instserver/dialogs.rb:1392 msgid "Do Not Configure Any Net&work Services" msgstr "Do Not Configure Any Net&work Services" -#: src/include/instserver/dialogs.rb:1368 +#: src/include/instserver/dialogs.rb:1397 msgid "Di&rectory to Contain Repositories:" msgstr "Di&rectory to Contain Repositories:" #. radio button label -#: src/include/instserver/dialogs.rb:1383 +#: src/include/instserver/dialogs.rb:1412 msgid "&Configure as HTTP Repository" msgstr "&Configure as HTTP Repository" #. radio button label -#: src/include/instserver/dialogs.rb:1391 +#: src/include/instserver/dialogs.rb:1420 msgid "&Configure as FTP Repository" msgstr "&Configure as FTP Repository" #. radio button label -#: src/include/instserver/dialogs.rb:1399 +#: src/include/instserver/dialogs.rb:1428 msgid "&Configure as NFS Repository" msgstr "&Configure as NFS Repository" -#: src/include/instserver/dialogs.rb:1451 +#: src/include/instserver/dialogs.rb:1480 msgid "Directory path for the installation server missing." msgstr "Directory path for the installation server missing." #. Instserver configure2 dialog caption -#: src/include/instserver/dialogs.rb:1478 +#: src/include/instserver/dialogs.rb:1507 msgid "Installation Server -- NFS" msgstr "Installation Server -- NFS" #. Instserver nfs dialog contents -#: src/include/instserver/dialogs.rb:1496 +#: src/include/instserver/dialogs.rb:1525 msgid "&Host Wild Card" msgstr "&Host Wild Card" -#: src/include/instserver/dialogs.rb:1498 +#: src/include/instserver/dialogs.rb:1527 msgid "&Options" msgstr "&Options" #. store the firewall setting, (activation is in SetupNFS()) -#: src/include/instserver/dialogs.rb:1556 +#: src/include/instserver/dialogs.rb:1585 msgid "Error occurred while configuring NFS." msgstr "Error occurred while configuring NFS." #. Instserver configure2 dialog caption -#: src/include/instserver/dialogs.rb:1588 +#: src/include/instserver/dialogs.rb:1617 msgid "Installation Server -- FTP" msgstr "Installation Server -- FTP" #. Instserver nfs dialog contents -#: src/include/instserver/dialogs.rb:1596 +#: src/include/instserver/dialogs.rb:1625 msgid "&FTP Server Root Directory:" msgstr "&FTP Server Root Directory:" -#: src/include/instserver/dialogs.rb:1598 +#: src/include/instserver/dialogs.rb:1627 msgid "&Directory Alias:" msgstr "&Directory Alias:" #. store the firewall setting, (activation is in SetupFTP()) -#: src/include/instserver/dialogs.rb:1655 +#: src/include/instserver/dialogs.rb:1684 msgid "Error occurred while configuring FTP." msgstr "Error occurred while configuring FTP." #. Instserver configure2 dialog caption -#: src/include/instserver/dialogs.rb:1675 +#: src/include/instserver/dialogs.rb:1704 msgid "Installation Server -- HTTP" msgstr "Installation Server -- HTTP" #. Instserver nfs dialog contents -#: src/include/instserver/dialogs.rb:1691 +#: src/include/instserver/dialogs.rb:1720 msgid "&Directory Alias" msgstr "&Directory Alias" #. store the firewall setting, (activation is in SetupHTTP()) -#: src/include/instserver/dialogs.rb:1748 +#: src/include/instserver/dialogs.rb:1777 msgid "Error creating HTTPD configuration." msgstr "Error creating HTTPD configuration." @@ -654,7 +654,7 @@ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n" #. Read service data using _auto -#: src/modules/Instserver.rb:306 +#: src/modules/Instserver.rb:308 msgid "" "The FTP installation server requires an FTP server package. The vsftpd package\n" "will now be installed.\n" @@ -681,82 +681,82 @@ #. @param string directory #. @param [String] options #. @return [Boolean] -#: src/modules/Instserver.rb:569 +#: src/modules/Instserver.rb:570 msgid "" "Directory is already exported via NFS.\n" "Leave NFS exports unmodified?\n" msgstr "" #. Instserver read dialog caption -#: src/modules/Instserver.rb:1155 +#: src/modules/Instserver.rb:1152 msgid "Initializing Configuration" msgstr "Initialising Configuration" #. Progress stage 1/2 -#: src/modules/Instserver.rb:1165 +#: src/modules/Instserver.rb:1166 msgid "Read configuration file" msgstr "Read configuration file" #. Progress stage 2/2 -#: src/modules/Instserver.rb:1167 +#: src/modules/Instserver.rb:1168 #, fuzzy msgid "Search for a new repository" msgstr "Look for a new repository" #. Progress step 1/2 -#: src/modules/Instserver.rb:1171 +#: src/modules/Instserver.rb:1172 msgid "Reading configuration file..." msgstr "Reading configuration file..." #. Progress step 2/2 -#: src/modules/Instserver.rb:1173 +#: src/modules/Instserver.rb:1174 #, fuzzy msgid "Searching for a new repository..." msgstr "Looking for a new repository..." #. Progress finished #. Progress finished -#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260 +#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278 msgid "Finished" msgstr "Finished" -#. TRANSLATORS: Error message -#: src/modules/Instserver.rb:1188 +#. Error message +#: src/modules/Instserver.rb:1224 msgid "Cannot read current settings." msgstr "Cannot read current settings." #. Instserver read dialog caption -#: src/modules/Instserver.rb:1240 +#: src/modules/Instserver.rb:1254 msgid "Saving Installation Server Configuration" msgstr "Saving Installation Server Configuration" #. Progress stage 1/2 -#: src/modules/Instserver.rb:1250 +#: src/modules/Instserver.rb:1268 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/Instserver.rb:1252 +#: src/modules/Instserver.rb:1270 msgid "Run SuSEconfig" msgstr "Run SuSEconfig" #. Progress step 1/2 -#: src/modules/Instserver.rb:1256 +#: src/modules/Instserver.rb:1274 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/Instserver.rb:1258 +#: src/modules/Instserver.rb:1276 msgid "Running SuSEconfig..." msgstr "Running SuSEconfig..." #. Error message -#: src/modules/Instserver.rb:1274 +#: src/modules/Instserver.rb:1292 msgid "Cannot write settings." msgstr "Cannot write settings." #. Configuration summary text for autoyast -#: src/modules/Instserver.rb:1441 +#: src/modules/Instserver.rb:1465 msgid "Configured Repositories" msgstr "Configured Repositories" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/iplb.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-client.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2007-08-16 19:20+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -120,10 +120,8 @@ msgstr "Edit" #: src/include/iscsi-client/dialogs.rb:161 -#, fuzzy -#| msgid "Disconnected" -msgid "Disconnect" -msgstr "Disconnected" +msgid "Log Out" +msgstr "Log Out" #: src/include/iscsi-client/dialogs.rb:186 msgid "Connected" @@ -134,6 +132,9 @@ msgstr "Discovery" #: src/include/iscsi-client/dialogs.rb:193 +msgid "Log In" +msgstr "Log In" + #: src/include/iscsi-client/dialogs.rb:223 msgid "Connect" msgstr "Connect" @@ -216,8 +217,8 @@ #. dialog for all targets from portal (connected/disconnected) #. authentification dialog for add/discovery target #: src/include/iscsi-client/dialogs.rb:404 -#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122 -#: src/include/iscsi-client/helps.rb:129 +#: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119 +#: src/include/iscsi-client/helps.rb:126 msgid "<h1>iSCSI Initiator</h1>" msgstr "<h1>iSCSI Initiator</h1>" @@ -336,27 +337,34 @@ #. table of connected targets #: src/include/iscsi-client/helps.rb:90 -msgid "<p>List of current sessions.</p><p>Use the <b>Add</b> button to get additional targets. A discovery is started to detect new targets and the start-up mode of already connected targets keeps unchanged.<br>Use <b>Disconnect</b> to cancel the connection and with it remove the target from the list.<br>To change the start-up status, press <b>Edit</b>.</p>" +#, fuzzy +msgid "" +"List of current sessions. To add a new target, select it and press <b>Add</b>.\n" +"To remove it, press <b>Log Out</b>.\n" +"To change the start-up status, press <b>Toggle</b>.\n" msgstr "" +"List of current sessions. To add a new target, press <b>Add</b>.\n" +"To remove one, select it and press <b>Log Out</b>.\n" +"To change start-up status, press <b>Toggle</b>.\n" #. Warning #. Warning -#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117 +#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114 msgid "<h1>Warning</h1>" msgstr "<h1>Warning</h1>" -#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118 +#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115 msgid "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n" msgstr "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n" -#: src/include/iscsi-client/helps.rb:103 +#: src/include/iscsi-client/helps.rb:100 #, fuzzy msgid "" -"<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" +"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n" "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>" msgstr "<p><b>InitiatorName</b> is value from /etc/initiatorname.iscsi. In case you have iBFT this value will be replaced from there and you are not able to change it (do it in BIOS Setup).</p>" -#: src/include/iscsi-client/helps.rb:106 +#: src/include/iscsi-client/helps.rb:103 #, fuzzy msgid "" "If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method,\n" @@ -365,14 +373,9 @@ "If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of default SendTargets method,\n" "fill IP address of iSNS server and port. Default port should be 3205." -#: src/include/iscsi-client/helps.rb:111 -#, fuzzy -#| msgid "" -#| "Enter the <b>IP Address</b> of the discovered server.\n" -#| "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" -#| "select <b>No Authentication</b>.\n" +#: src/include/iscsi-client/helps.rb:108 msgid "" -"Enter the <b>IP Address</b> of the iSCSI target server.\n" +"Enter the <b>IP Address</b> of the discovered server.\n" "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" "select <b>No Authentication</b>.\n" msgstr "" @@ -380,10 +383,14 @@ "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" "select <b>No Authentication</b>.\n" -#: src/include/iscsi-client/helps.rb:125 +#: src/include/iscsi-client/helps.rb:122 msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. " msgstr "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. " +#: src/include/iscsi-client/helps.rb:129 +msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." +msgstr "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." + #: src/include/iscsi-client/helps.rb:132 #, fuzzy msgid "<h1>Startup</h1>" @@ -399,22 +406,12 @@ "starts up.</p>\n" msgstr "" -#: src/include/iscsi-client/helps.rb:141 -#, fuzzy -#| msgid "Authentication" -msgid "<h1>Authentication</h1>" -msgstr "Authentication" - +#. list of discovered targets #: src/include/iscsi-client/helps.rb:142 -msgid "<p>The default setting here is <i>No Authentication</i>. Uncheck the checkbox if authentication is needed for security reasons. Enter <b>Username</b> and <b>Password</b> for 'Incoming Authentication', 'Outgoing Authentication' or for both.</p><p><b>Please note:</b><br>'Incoming Authentication' here correlates to 'Outgoing Authentication' on iSCSI target server side and the other way round.</p>" -msgstr "" +msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." +msgstr "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." -#. list of discovered targets -#: src/include/iscsi-client/helps.rb:151 -msgid "<p>This screen shows the list of discovered targets.</p><p>Use the <b>Discovery</b> button to get available iSCSI targets from a server specified by IP address.<br><b>Connect</b> to a target to establih the connection. If login was successful the column <i>Connected</i> shows status 'True' and the target will appear on the <i>Connected Targets</i> screen.<br>To remove a target use the <b>Delete</b> button.<br> <b>Hint:</b> Removing of targets is only possible for not connected onces. If required, <b>Disconnect</b> at <i>Connected Targets</i> first.</p><p><b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery of targets which possibly will change the start-up mode of already connected targets (to default 'manual'). Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want to add new targets without changing the start-up mode.</p>" -msgstr "" - -#: src/include/iscsi-client/helps.rb:167 +#: src/include/iscsi-client/helps.rb:145 msgid "<h1>iBTF</h1>" msgstr "<h1>iBTF</h1>" @@ -468,24 +465,16 @@ msgstr "Port field can't be empty" #. regexp for "cz.suse" or just "suse", "cz.su-se" -#: src/include/iscsi-client/widgets.rb:428 +#: src/include/iscsi-client/widgets.rb:423 #, fuzzy -#| msgid "Initiator Name" -msgid "Incorrect Initiator Name" -msgstr "Initiator Name" - -#: src/include/iscsi-client/widgets.rb:429 -#, fuzzy msgid "" -"\n" +"Incorrect InitiatorName.\n" "The correct syntax is\n" "iqn.yyyy-mm.reversed.domain.name[:identifier]\n" "or eui.yyyy-mm.reversed.domain.name[:identifier]\n" "\n" "Example:\n" "iqn.2007-04.cz.server:storage.disk.sdb\n" -"\n" -"Do you want to use the name?\n" msgstr "" "Incorrect InitiatorName\n" "Correct syntax is\n" @@ -495,12 +484,12 @@ "iqn.2007-04.cz.server:storage.disk.sdb\n" #. brackets needed around IPv6 -#: src/include/iscsi-client/widgets.rb:635 +#: src/include/iscsi-client/widgets.rb:625 msgid "Insert the IP address." msgstr "Insert the IP address." #. validate port number -#: src/include/iscsi-client/widgets.rb:641 +#: src/include/iscsi-client/widgets.rb:631 msgid "Insert the port." msgstr "Insert the port." @@ -508,37 +497,37 @@ #. ******************* target table ************************* #. initialize dialog for all targets from portal (connected/disconnected) #. enable/disable connect button according target is or not already connected -#: src/include/iscsi-client/widgets.rb:754 -#: src/include/iscsi-client/widgets.rb:859 -#: src/include/iscsi-client/widgets.rb:887 +#: src/include/iscsi-client/widgets.rb:733 +#: src/include/iscsi-client/widgets.rb:838 +#: src/include/iscsi-client/widgets.rb:866 msgid "True" msgstr "True" -#: src/include/iscsi-client/widgets.rb:754 -#: src/include/iscsi-client/widgets.rb:859 +#: src/include/iscsi-client/widgets.rb:733 +#: src/include/iscsi-client/widgets.rb:838 msgid "False" msgstr "False" #. check if not already connected #. check if not already connected -#: src/include/iscsi-client/widgets.rb:792 -#: src/include/iscsi-client/widgets.rb:912 +#: src/include/iscsi-client/widgets.rb:771 +#: src/include/iscsi-client/widgets.rb:891 #, fuzzy msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption." msgstr "The target with this TargetName is already connected. Make sure that Multipathing is enabled to prevent data corruption." -#: src/include/iscsi-client/widgets.rb:795 -#: src/include/iscsi-client/widgets.rb:915 +#: src/include/iscsi-client/widgets.rb:774 +#: src/include/iscsi-client/widgets.rb:894 msgid "Continue" msgstr "Continue" -#: src/include/iscsi-client/widgets.rb:796 -#: src/include/iscsi-client/widgets.rb:916 +#: src/include/iscsi-client/widgets.rb:775 +#: src/include/iscsi-client/widgets.rb:895 msgid "Cancel" msgstr "Cancel" #. check if is not already connected -#: src/include/iscsi-client/widgets.rb:906 +#: src/include/iscsi-client/widgets.rb:885 msgid "The target is already connected." msgstr "The target is already connected." @@ -631,7 +620,7 @@ msgstr "all" #. } -#: src/modules/IscsiClientLib.rb:698 +#: src/modules/IscsiClientLib.rb:694 #, fuzzy msgid "" "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n" @@ -643,40 +632,45 @@ "Old initiatorname will be replaced by value from iBFT and create a backup.\n" "If you want to use different initiatorname change it in BIOS." -#. change startup status (manual/onboot) for target -#: src/modules/IscsiClientLib.rb:1013 -#, fuzzy -#| msgid "Image creation failed." -msgid "Target connection failed.\n" -msgstr "Image creation failed." - #. do discovery first -#: src/modules/IscsiClientLib.rb:1156 +#: src/modules/IscsiClientLib.rb:1147 msgid "Configuration summary..." msgstr "Configuration summary..." -#~ msgid "Log Out" -#~ msgstr "Log Out" +#, fuzzy +#~| msgid "Disconnected" +#~ msgid "Disconnect" +#~ msgstr "Disconnected" -#~ msgid "Log In" -#~ msgstr "Log In" - #, fuzzy +#~| msgid "" +#~| "Enter the <b>IP Address</b> of the discovered server.\n" +#~| "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" +#~| "select <b>No Authentication</b>.\n" #~ msgid "" -#~ "List of current sessions. To add a new target, select it and press <b>Add</b>.\n" -#~ "To remove it, press <b>Log Out</b>.\n" -#~ "To change the start-up status, press <b>Toggle</b>.\n" +#~ "Enter the <b>IP Address</b> of the iSCSI target server.\n" +#~ "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" +#~ "select <b>No Authentication</b>.\n" #~ msgstr "" -#~ "List of current sessions. To add a new target, press <b>Add</b>.\n" -#~ "To remove one, select it and press <b>Log Out</b>.\n" -#~ "To change start-up status, press <b>Toggle</b>.\n" +#~ "Enter the <b>IP Address</b> of the discovered server.\n" +#~ "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n" +#~ "select <b>No Authentication</b>.\n" -#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." -#~ msgstr "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>." +#, fuzzy +#~| msgid "Authentication" +#~ msgid "<h1>Authentication</h1>" +#~ msgstr "Authentication" -#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." -#~ msgstr "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target." +#, fuzzy +#~| msgid "Initiator Name" +#~ msgid "Incorrect Initiator Name" +#~ msgstr "Initiator Name" +#, fuzzy +#~| msgid "Image creation failed." +#~ msgid "Target connection failed.\n" +#~ msgstr "Image creation failed." + #~ msgid "Toggle Start-Up" #~ msgstr "Toggle Start-Up" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/iscsi-lio-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -53,7 +53,7 @@ #. third tab - targets / luns #. targets dialog #: src/include/iscsi-lio-server/dialogs.rb:89 -#: src/include/iscsi-lio-server/dialogs.rb:320 +#: src/include/iscsi-lio-server/dialogs.rb:321 #: src/modules/IscsiLioServer.rb:443 msgid "Targets" msgstr "Targets" @@ -70,7 +70,7 @@ #: src/include/iscsi-lio-server/dialogs.rb:128 #: src/include/iscsi-lio-server/dialogs.rb:189 -#: src/include/iscsi-lio-server/dialogs.rb:320 +#: src/include/iscsi-lio-server/dialogs.rb:321 #, fuzzy #| msgid "Write groups" msgid "Portal group" @@ -114,133 +114,140 @@ msgstr "Path" #: src/include/iscsi-lio-server/dialogs.rb:154 -#: src/include/iscsi-lio-server/dialogs.rb:198 -#: src/include/iscsi-lio-server/dialogs.rb:237 -#: src/include/iscsi-lio-server/dialogs.rb:325 -#: src/include/iscsi-lio-server/dialogs.rb:372 +#: src/include/iscsi-lio-server/dialogs.rb:199 +#: src/include/iscsi-lio-server/dialogs.rb:238 +#: src/include/iscsi-lio-server/dialogs.rb:326 +#: src/include/iscsi-lio-server/dialogs.rb:373 #: src/include/iscsi-lio-server/widgets.rb:442 msgid "Add" msgstr "Add" #: src/include/iscsi-lio-server/dialogs.rb:155 -#: src/include/iscsi-lio-server/dialogs.rb:238 -#: src/include/iscsi-lio-server/dialogs.rb:326 -#: src/include/iscsi-lio-server/dialogs.rb:373 +#: src/include/iscsi-lio-server/dialogs.rb:239 +#: src/include/iscsi-lio-server/dialogs.rb:327 +#: src/include/iscsi-lio-server/dialogs.rb:374 msgid "Edit" msgstr "Edit" #: src/include/iscsi-lio-server/dialogs.rb:156 -#: src/include/iscsi-lio-server/dialogs.rb:201 -#: src/include/iscsi-lio-server/dialogs.rb:239 -#: src/include/iscsi-lio-server/dialogs.rb:327 -#: src/include/iscsi-lio-server/dialogs.rb:374 +#: src/include/iscsi-lio-server/dialogs.rb:202 +#: src/include/iscsi-lio-server/dialogs.rb:240 +#: src/include/iscsi-lio-server/dialogs.rb:328 +#: src/include/iscsi-lio-server/dialogs.rb:375 #: src/include/iscsi-lio-server/widgets.rb:443 msgid "Delete" msgstr "Delete" -#: src/include/iscsi-lio-server/dialogs.rb:193 +#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization) +#: src/include/iscsi-lio-server/dialogs.rb:194 #, fuzzy -#| msgid "Clients" -msgid "Client" -msgstr "Clients" +#| msgid "Initiator Name" +msgid "Initiator" +msgstr "Initiator Name" -#: src/include/iscsi-lio-server/dialogs.rb:193 -msgid "Lun Mapping" +#: src/include/iscsi-lio-server/dialogs.rb:194 +msgid "LUN Mapping" msgstr "" -#: src/include/iscsi-lio-server/dialogs.rb:193 +#: src/include/iscsi-lio-server/dialogs.rb:194 #, fuzzy #| msgid "Authors" msgid "Auth" msgstr "Authors" -#: src/include/iscsi-lio-server/dialogs.rb:199 +#: src/include/iscsi-lio-server/dialogs.rb:200 #, fuzzy #| msgid "Edit " msgid "Edit LUN" msgstr "Edit " -#: src/include/iscsi-lio-server/dialogs.rb:200 +#: src/include/iscsi-lio-server/dialogs.rb:201 #, fuzzy #| msgid "Edit &SOA" msgid "Edit Auth" msgstr "Edit &SOA" -#: src/include/iscsi-lio-server/dialogs.rb:202 +#: src/include/iscsi-lio-server/dialogs.rb:203 msgid "Copy" msgstr "" #. enable/disable none/incoming/outgoing authentication -#: src/include/iscsi-lio-server/dialogs.rb:216 +#: src/include/iscsi-lio-server/dialogs.rb:217 #: src/include/iscsi-lio-server/widgets.rb:207 #: src/modules/IscsiLioServer.rb:434 msgid "No Authentication" msgstr "No Authentication" -#: src/include/iscsi-lio-server/dialogs.rb:225 +#: src/include/iscsi-lio-server/dialogs.rb:226 #: src/include/iscsi-lio-server/widgets.rb:218 #: src/modules/IscsiLioServer.rb:437 msgid "Incoming Authentication" msgstr "Incoming Authentication" #. dialog to add/modify user and password -#: src/include/iscsi-lio-server/dialogs.rb:232 -#: src/include/iscsi-lio-server/dialogs.rb:253 +#: src/include/iscsi-lio-server/dialogs.rb:233 +#: src/include/iscsi-lio-server/dialogs.rb:254 #: src/include/iscsi-lio-server/widgets.rb:223 #: src/include/iscsi-lio-server/widgets.rb:236 #: src/include/iscsi-lio-server/widgets.rb:721 msgid "Username" msgstr "Username" -#: src/include/iscsi-lio-server/dialogs.rb:232 -#: src/include/iscsi-lio-server/dialogs.rb:254 +#: src/include/iscsi-lio-server/dialogs.rb:233 +#: src/include/iscsi-lio-server/dialogs.rb:255 #: src/include/iscsi-lio-server/widgets.rb:224 #: src/include/iscsi-lio-server/widgets.rb:237 #: src/include/iscsi-lio-server/widgets.rb:722 msgid "Password" msgstr "Password" -#: src/include/iscsi-lio-server/dialogs.rb:248 +#: src/include/iscsi-lio-server/dialogs.rb:249 #: src/include/iscsi-lio-server/widgets.rb:231 #: src/modules/IscsiLioServer.rb:440 msgid "Outgoing Authentication" msgstr "Outgoing Authentication" #. radio button (starting LIO target service - option 1) -#: src/include/iscsi-lio-server/dialogs.rb:274 +#: src/include/iscsi-lio-server/dialogs.rb:275 msgid "When &Booting" msgstr "When &Booting" #. radio button (starting LIO target service - option 2) -#: src/include/iscsi-lio-server/dialogs.rb:278 +#: src/include/iscsi-lio-server/dialogs.rb:279 msgid "&Manually" msgstr "&Manually" #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") -#: src/include/iscsi-lio-server/dialogs.rb:284 +#: src/include/iscsi-lio-server/dialogs.rb:285 #: src/modules/IscsiLioServer.rb:429 msgid "When Booting" msgstr "When Booting" #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&") -#: src/include/iscsi-lio-server/dialogs.rb:286 +#: src/include/iscsi-lio-server/dialogs.rb:287 #: src/modules/IscsiLioServer.rb:431 msgid "Manually" msgstr "Manually" +#: src/include/iscsi-lio-server/dialogs.rb:321 +#, fuzzy +#| msgid "Test Status" +msgid "TPG Status" +msgstr "Test Status" + #. dialog for expert settings -#: src/include/iscsi-lio-server/dialogs.rb:369 +#: src/include/iscsi-lio-server/dialogs.rb:370 msgid "Key" msgstr "Key" -#: src/include/iscsi-lio-server/dialogs.rb:369 +#: src/include/iscsi-lio-server/dialogs.rb:370 msgid "Value" msgstr "Value" #. Summary dialog #. @return dialog result #. Main dialog - tabbed -#: src/include/iscsi-lio-server/dialogs.rb:430 +#: src/include/iscsi-lio-server/dialogs.rb:431 #, fuzzy #| msgid "iSCSI Target Overview" msgid "iSCSI LIO Target Overview" @@ -248,33 +255,34 @@ #. expert dialog #. LUN details -#: src/include/iscsi-lio-server/dialogs.rb:438 -#: src/include/iscsi-lio-server/helps.rb:178 -#: src/include/iscsi-lio-server/helps.rb:183 +#: src/include/iscsi-lio-server/dialogs.rb:439 +#: src/include/iscsi-lio-server/helps.rb:179 +#: src/include/iscsi-lio-server/helps.rb:184 msgid "<h1>iSCSI Target</h1>" msgstr "<h1>iSCSI Target</h1>" #. dialog for add target -#: src/include/iscsi-lio-server/dialogs.rb:473 +#: src/include/iscsi-lio-server/dialogs.rb:474 msgid "Add iSCSI Target" msgstr "Add iSCSI Target" -#. discovery authentication dialog -#: src/include/iscsi-lio-server/dialogs.rb:507 +#. dialog for modifying initiator setup for a target +#. (includes authentication) +#: src/include/iscsi-lio-server/dialogs.rb:509 #, fuzzy #| msgid "Modify iSCSI Target" -msgid "Modify iSCSI Target Client Setup" +msgid "Modify iSCSI Target Initiator Setup" msgstr "Modify iSCSI Target" #. edit target dialog -#: src/include/iscsi-lio-server/dialogs.rb:541 +#: src/include/iscsi-lio-server/dialogs.rb:543 #, fuzzy #| msgid "Modify iSCSI Target" msgid "Modify iSCSI Target Lun Setup" msgstr "Modify iSCSI Target" #. expert target dialog -#: src/include/iscsi-lio-server/dialogs.rb:574 +#: src/include/iscsi-lio-server/dialogs.rb:576 msgid "iSCSI Target Expert Settings" msgstr "iSCSI Target Expert Settings" @@ -440,7 +448,10 @@ #. target client setup. #: src/include/iscsi-lio-server/helps.rb:124 -msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>" +msgid "" +"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n" +" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n" +" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>" msgstr "" #: src/include/iscsi-lio-server/helps.rb:130 @@ -448,17 +459,19 @@ #| msgid "" #| "Select the type of authentication. Use <b>No Authentication</b> or one of <b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert <b>User</b> and <b>Password</b>. \n" #| "For incoming authentication, it is possible to <b>Add</b> more pairs and <b>Edit</b> and <b>Delete</b> them." -msgid "<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>" +msgid "" +"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different values for incoming and outgoing authentication.\n" +" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>" msgstr "" "Select the type of authentication. Use <b>No Authentication</b> or one of <b>Incoming</b> and <b>Outgoing</b> (can be both together). Then insert <b>User</b> and <b>Password</b>. \n" "For incoming authentication, it is possible to <b>Add</b> more pairs and <b>Edit</b> and <b>Delete</b> them." -#: src/include/iscsi-lio-server/helps.rb:136 -msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>" +#: src/include/iscsi-lio-server/helps.rb:137 +msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>" msgstr "" #. target dialog -#: src/include/iscsi-lio-server/helps.rb:138 +#: src/include/iscsi-lio-server/helps.rb:139 #, fuzzy #| msgid "" #| "List of offered targets. Create a new target by clicking <b>Add</b>. \n" @@ -472,14 +485,14 @@ #. edit target #. add target -#: src/include/iscsi-lio-server/helps.rb:143 -#: src/include/iscsi-lio-server/helps.rb:159 +#: src/include/iscsi-lio-server/helps.rb:144 +#: src/include/iscsi-lio-server/helps.rb:160 #, fuzzy #| msgid "<h1>iSCSI Target</h1>" msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>" msgstr "<h1>iSCSI Target</h1>" -#: src/include/iscsi-lio-server/helps.rb:146 +#: src/include/iscsi-lio-server/helps.rb:147 msgid "" "It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n" "You have to provide <b>path</b> to either block devices or file. \n" @@ -488,19 +501,19 @@ "does not provide a name for LUN, it is generated automatically." msgstr "" -#: src/include/iscsi-lio-server/helps.rb:153 -#: src/include/iscsi-lio-server/helps.rb:172 +#: src/include/iscsi-lio-server/helps.rb:154 +#: src/include/iscsi-lio-server/helps.rb:173 msgid "" "<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n" "and port the service will be available. Default for port number is 3260.\n" "Only ip addresses assigned to one of the network cards are possible." msgstr "" -#: src/include/iscsi-lio-server/helps.rb:162 +#: src/include/iscsi-lio-server/helps.rb:163 msgid "Create a new target. Replace template values with the correct values." msgstr "" -#: src/include/iscsi-lio-server/helps.rb:165 +#: src/include/iscsi-lio-server/helps.rb:166 msgid "" "It is possible to make arbitary block devices or files available under a lun.\n" "You have to provide <b>path</b> to either block devices or file. \n" @@ -509,11 +522,11 @@ "does not provide a name for LUN, it is generated automatically." msgstr "" -#: src/include/iscsi-lio-server/helps.rb:179 +#: src/include/iscsi-lio-server/helps.rb:180 msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options." msgstr "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options." -#: src/include/iscsi-lio-server/helps.rb:184 +#: src/include/iscsi-lio-server/helps.rb:185 #, fuzzy #| msgid "" #| "Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes). \n" @@ -550,7 +563,7 @@ #: src/include/iscsi-lio-server/widgets.rb:251 #, fuzzy #| msgid "The selected option is already present" -msgid "Selected Lun is already in use!" +msgid "Selected LUN is already in use!" msgstr "The selected option is already present" #: src/include/iscsi-lio-server/widgets.rb:260 @@ -585,9 +598,9 @@ #: src/include/iscsi-lio-server/widgets.rb:436 #, fuzzy -#| msgid "Clients" -msgid "Client Lun" -msgstr "Clients" +#| msgid "Initiator Name" +msgid "Initiator LUN" +msgstr "Initiator Name" #: src/include/iscsi-lio-server/widgets.rb:436 #, fuzzy @@ -613,9 +626,9 @@ #: src/include/iscsi-lio-server/widgets.rb:619 #, fuzzy -#| msgid "Clients" -msgid "Client name:" -msgstr "Clients" +#| msgid "Initiator Name" +msgid "Initiator name:" +msgstr "Initiator Name" #: src/include/iscsi-lio-server/widgets.rb:622 #, fuzzy @@ -627,24 +640,26 @@ #: src/include/iscsi-lio-server/widgets.rb:695 #, fuzzy #| msgid "Alias name must not be empty." -msgid "Client name must not be empty!" +msgid "Initiator name must not be empty!" msgstr "Alias name must not be empty." #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing -#. client name. It's allowed to have several LUNs accessable for same client. +#. initiator name. It's allowed to have several LUNs accessable for same initiator. #. TODO: verify whether it's necessary to check @changed_lun here? #: src/include/iscsi-lio-server/widgets.rb:644 #: src/include/iscsi-lio-server/widgets.rb:701 #, fuzzy #| msgid "Alias with name %1 already exists" -msgid "Client name already exists!" +msgid "Initiator name already exists!" msgstr "Alias with name %1 already exists" -#. Copy exisiting LUN, i.e. give additional client access to the LUN +#. Copy exisiting LUN, i.e. give additional initiator access to the LUN #. (which is allowed, makes sense e.g. with multipath) #: src/include/iscsi-lio-server/widgets.rb:678 -msgid "New client name:" -msgstr "" +#, fuzzy +#| msgid "Initiator Name" +msgid "New initiator name:" +msgstr "Initiator Name" #: src/include/iscsi-lio-server/widgets.rb:724 msgid "OK" @@ -654,20 +669,32 @@ msgid "Cancel" msgstr "Cancel" +#. create items from targets +#: src/include/iscsi-lio-server/widgets.rb:785 +msgid "Enabled" +msgstr "Enabled" + +#: src/include/iscsi-lio-server/widgets.rb:785 +#: src/include/iscsi-lio-server/widgets.rb:1263 +#: src/include/iscsi-lio-server/widgets.rb:1366 +#: src/include/iscsi-lio-server/widgets.rb:1403 +msgid "Disabled" +msgstr "Disabled" + #. remove a item #. **************** Edit Dialog ***************************** #. init values for modifying target (read it from stored map) -#: src/include/iscsi-lio-server/widgets.rb:820 -#: src/include/iscsi-lio-server/widgets.rb:934 -#: src/include/iscsi-lio-server/widgets.rb:1288 +#: src/include/iscsi-lio-server/widgets.rb:822 +#: src/include/iscsi-lio-server/widgets.rb:936 +#: src/include/iscsi-lio-server/widgets.rb:1290 msgid "Really delete the selected item?" msgstr "Really delete the selected item?" -#: src/include/iscsi-lio-server/widgets.rb:1002 +#: src/include/iscsi-lio-server/widgets.rb:1004 msgid "Problem creating target %1 with tpg %2" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1024 +#: src/include/iscsi-lio-server/widgets.rb:1026 #, fuzzy #| msgid "" #| "Problem with resetting resource group:\n" @@ -677,87 +704,101 @@ "Problem with resetting resource group:\n" "%1\n" -#: src/include/iscsi-lio-server/widgets.rb:1045 +#: src/include/iscsi-lio-server/widgets.rb:1047 #, fuzzy #| msgid "Error while removing %1\n" msgid "Problem removing lun %1" msgstr "Error while removing %1\n" -#: src/include/iscsi-lio-server/widgets.rb:1070 +#: src/include/iscsi-lio-server/widgets.rb:1072 msgid "Problem setting lun %1 (name:%2) to path %3" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1084 +#: src/include/iscsi-lio-server/widgets.rb:1086 msgid "Problem setting auth on %1:%2 to %3" msgstr "" #. validate function checks if target/tpg are unique and not empty -#: src/include/iscsi-lio-server/widgets.rb:1198 +#: src/include/iscsi-lio-server/widgets.rb:1200 msgid "The target cannot be empty." msgstr "The target cannot be empty." -#: src/include/iscsi-lio-server/widgets.rb:1202 +#: src/include/iscsi-lio-server/widgets.rb:1204 #, fuzzy #| msgid "The target cannot be empty." msgid "The target portal group cannot be empty." msgstr "The target cannot be empty." -#: src/include/iscsi-lio-server/widgets.rb:1213 +#: src/include/iscsi-lio-server/widgets.rb:1215 msgid "The target already exists." msgstr "The target already exists." -#: src/include/iscsi-lio-server/widgets.rb:1233 +#: src/include/iscsi-lio-server/widgets.rb:1235 msgid "Incoming" msgstr "Incoming" -#: src/include/iscsi-lio-server/widgets.rb:1236 +#: src/include/iscsi-lio-server/widgets.rb:1238 msgid "Outgoing" msgstr "Outgoing" -#: src/include/iscsi-lio-server/widgets.rb:1238 +#: src/include/iscsi-lio-server/widgets.rb:1240 msgid "None" msgstr "None" -#: src/include/iscsi-lio-server/widgets.rb:1261 -#: src/include/iscsi-lio-server/widgets.rb:1364 -#: src/include/iscsi-lio-server/widgets.rb:1401 -msgid "Disabled" -msgstr "Disabled" - -#: src/include/iscsi-lio-server/widgets.rb:1450 +#: src/include/iscsi-lio-server/widgets.rb:1452 msgid "" -"There isn't any client specified.\n" -"To allow a client login to the target, please\n" +"There isn't any initiator specified.\n" +"To allow an initiator login to the target, please\n" "use the 'Add' button and enter the name\n" "(see /etc/iscsi/initiatorname.iscsi on initiator).\n" -"Really want to continue without client access?" +"Really want to continue without initiator access?" msgstr "" -#: src/include/iscsi-lio-server/widgets.rb:1464 -msgid "Problem removing lun %4 for client %3 in %1:%2" +#: src/include/iscsi-lio-server/widgets.rb:1466 +#, fuzzy +#| msgid "" +#| "Error occurred while creating directory %1:\n" +#| "%2" +msgid "Problem removing LUN %4 for initiator %3 in %1:%2" msgstr "" +"Error occurred while creating directory %1:\n" +"%2" -#: src/include/iscsi-lio-server/widgets.rb:1479 -msgid "Problem adding lun %4:%5 for client %3 in %1:%2" +#: src/include/iscsi-lio-server/widgets.rb:1481 +#, fuzzy +#| msgid "" +#| "Error occurred while creating directory %1:\n" +#| "%2" +msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2" msgstr "" +"Error occurred while creating directory %1:\n" +"%2" -#: src/include/iscsi-lio-server/widgets.rb:1500 -msgid "Problem removing client %3 from %1:%2" +#: src/include/iscsi-lio-server/widgets.rb:1502 +#, fuzzy +#| msgid "" +#| "Error occurred while creating directory %1:\n" +#| "%2" +msgid "Problem removing initiator %3 from %1:%2" msgstr "" +"Error occurred while creating directory %1:\n" +"%2" -#: src/include/iscsi-lio-server/widgets.rb:1524 +#: src/include/iscsi-lio-server/widgets.rb:1526 #, fuzzy #| msgid "" #| "Error occurred while creating directory %1:\n" #| "%2" -msgid "Problem creating client %3 for %1:%2" +msgid "Problem creating initiator %3 for %1:%2" msgstr "" "Error occurred while creating directory %1:\n" "%2" -#: src/include/iscsi-lio-server/widgets.rb:1559 -msgid "Problem changing auth for client %3 in %1:%2" -msgstr "" +#: src/include/iscsi-lio-server/widgets.rb:1561 +#, fuzzy +#| msgid "Incoming Authentication" +msgid "Problem changing auth for initiator %3 in %1:%2" +msgstr "Incoming Authentication" #. Initialization dialog caption #: src/include/iscsi-lio-server/wizards.rb:110 @@ -772,11 +813,11 @@ msgstr "Initialising..." #. scope link IPv6 -#: src/modules/IscsiLioData.rb:1424 +#: src/modules/IscsiLioData.rb:1428 msgid "Cannot save lio setup" msgstr "" -#: src/modules/IscsiLioData.rb:1428 +#: src/modules/IscsiLioData.rb:1432 msgid "Cannot save tcm setup" msgstr "" @@ -886,6 +927,26 @@ msgid "Configuration summary..." msgstr "Configuration summary..." +#, fuzzy +#~| msgid "Clients" +#~ msgid "Client" +#~ msgstr "Clients" + +#, fuzzy +#~| msgid "Modify iSCSI Target" +#~ msgid "Modify iSCSI Target Client Setup" +#~ msgstr "Modify iSCSI Target" + +#, fuzzy +#~| msgid "Clients" +#~ msgid "Client Lun" +#~ msgstr "Clients" + +#, fuzzy +#~| msgid "Clients" +#~ msgid "Client name:" +#~ msgstr "Clients" + #~ msgid "Run SuSEconfig" #~ msgstr "Run SuSEconfig" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/isns.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/journal.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/kdump.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:16+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2007-08-16 19:49+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -390,10 +390,8 @@ #. Force value to false, so it's actually rewritten #. TRANSLATORS: CommandLine printed text -#. start kdump at boot #. delete crashkernel parameter from bootloader -#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487 -#: src/modules/Kdump.rb:500 +#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:496 #, fuzzy msgid "To apply changes a reboot is necessary." msgstr "To apply this change reboot is needed." @@ -1262,158 +1260,185 @@ #. several ranges and ask user about rewritting #. #. "KdumpMemory" -#: src/include/kdump/uifunctions.rb:1449 +#: src/include/kdump/uifunctions.rb:1454 msgid "Kernel option includes several ranges or redundant values. Rewrite it?" msgstr "" #. T: Checkbox label -#: src/include/kdump/uifunctions.rb:1482 +#: src/include/kdump/uifunctions.rb:1487 msgid "Use &Firmware-Assisted Dump" msgstr "" +#. Function validates options in +#. "Dump Format" +#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed" +#: src/include/kdump/uifunctions.rb:1849 +#, fuzzy +#| msgid "" +#| "This module must be run as root.\n" +#| "If you continue now, the module may not function properly.\n" +#| "For example, some settings can be read improperly\n" +#| "and it is unlikely that settings can be written.\n" +msgid "" +"Kdump is not supported on this system.\n" +"If you continue now, the module may not function properly.\n" +"For example, some settings will not be correctly read\n" +"and the resulting configuration will probably be useless.\n" +msgstr "" +"This module must be run as root.\n" +"If you continue now, the module may not function properly.\n" +"For example, some settings can be read improperly\n" +"and it is unlikely that settings can be written.\n" + +#: src/include/kdump/uifunctions.rb:1855 +#, fuzzy +#| msgid "Currently not supported." +msgid "Kdump not supported" +msgstr "Currently not supported." + #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:412 +#: 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:514 +#: src/modules/Kdump.rb:506 msgid "Initializing kdump Configuration" msgstr "Initialising kdump Configuration" #. Progress stage 1/4 #. Progress step 1/4 -#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531 +#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523 msgid "Reading the config file..." msgstr "Reading the config file..." #. Progress stage 3/4 -#: src/modules/Kdump.rb:525 +#: src/modules/Kdump.rb:517 #, fuzzy msgid "Reading kernel boot options..." msgstr "Read kernel boot options" #. Progress stage 4/4 -#: src/modules/Kdump.rb:527 +#: src/modules/Kdump.rb:519 msgid "Calculating memory limits..." msgstr "" #. Progress step 2/4 -#: src/modules/Kdump.rb:533 +#: src/modules/Kdump.rb:525 msgid "Reading partitions of disks..." msgstr "Reading partitions of disks..." #. Progress finished 3/4 -#: src/modules/Kdump.rb:535 +#: src/modules/Kdump.rb:527 #, fuzzy #| msgid "Reading available memory..." msgid "Reading available memory and calibrating usage..." msgstr "Reading available memory..." #. Error message -#: src/modules/Kdump.rb:547 +#: src/modules/Kdump.rb:539 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "Cannot read config file /etc/sysconfig/kdump" #. Error message -#: src/modules/Kdump.rb:555 +#: src/modules/Kdump.rb:547 #, fuzzy msgid "Cannot read kernel boot options." msgstr "Cannot read kernel boot options" #. Error message -#: src/modules/Kdump.rb:563 +#: src/modules/Kdump.rb:555 #, fuzzy msgid "Cannot read available memory." msgstr "Cannot read available memory" #. Kdump read dialog caption -#: src/modules/Kdump.rb:589 +#: src/modules/Kdump.rb:581 msgid "Saving kdump Configuration" msgstr "Saving kdump Configuration" #. Progress stage 1/2 -#: src/modules/Kdump.rb:618 +#: src/modules/Kdump.rb:610 msgid "Write the settings" msgstr "Write the settings" #. Progress stage 2/2 -#: src/modules/Kdump.rb:620 +#: src/modules/Kdump.rb:612 msgid "Update boot options" msgstr "Update boot options" #. Progress step 1/2 -#: src/modules/Kdump.rb:624 +#: src/modules/Kdump.rb:616 msgid "Writing the settings..." msgstr "Writing the settings..." #. Progress step 2/2 -#: src/modules/Kdump.rb:626 +#: src/modules/Kdump.rb:618 msgid "Updating boot options..." msgstr "Updating boot options..." #. Progress finished -#: src/modules/Kdump.rb:628 +#: src/modules/Kdump.rb:620 msgid "Finished" msgstr "Finished" #. Error message -#: src/modules/Kdump.rb:638 +#: src/modules/Kdump.rb:630 msgid "Cannot write settings." msgstr "Cannot write settings." #. Error message -#: src/modules/Kdump.rb:647 +#: src/modules/Kdump.rb:639 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:758 +#: src/modules/Kdump.rb:750 #, fuzzy msgid "Kdump status: %1" msgstr "Kdump runlevel: %1" -#: src/modules/Kdump.rb:759 +#: src/modules/Kdump.rb:751 msgid "enabled" msgstr "enabled" -#: src/modules/Kdump.rb:759 +#: src/modules/Kdump.rb:751 msgid "disabled" msgstr "disabled" -#: src/modules/Kdump.rb:766 +#: src/modules/Kdump.rb:758 #, fuzzy msgid "Value(s) of crashkernel option: %1" msgstr "Empty value for option: %1" -#: src/modules/Kdump.rb:773 +#: src/modules/Kdump.rb:765 #, fuzzy msgid "Dump format: %1" msgstr "Dump Format: %1" -#: src/modules/Kdump.rb:780 +#: src/modules/Kdump.rb:772 #, fuzzy msgid "Target of dumps: %1" msgstr "Numbers of old dumps: %1" -#: src/modules/Kdump.rb:787 +#: src/modules/Kdump.rb:779 #, 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:879 +#: src/modules/Kdump.rb:871 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:974 +#: src/modules/Kdump.rb:958 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/languages_db.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ldap-client.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ldap.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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/live-installer.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/live-installer.en_GB.po 2016-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/live-installer.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2007-08-16 19:57+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -41,15 +41,15 @@ #. #. Progress::NextStage (); #. Progress::Title (_("Evaluating filesystems to copy...")); -#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58 +#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59 msgid "Evaluating filesystems to copy..." msgstr "Evaluating filesystems to copy..." -#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61 +#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62 msgid "Copying root filesystem..." msgstr "Copying root filesystem..." -#: src/clients/inst_live_doit.rb:62 +#: src/clients/inst_live_doit.rb:63 #, fuzzy msgid "Copying live image..." msgstr "Copying the packages..." @@ -57,12 +57,12 @@ #. Copy all the symlinks as needed #. @param [Hash{String => String}] symlinks a map of resolved symlinks #. @return [Boolean] true on success -#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154 +#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151 msgid "Copying %1..." msgstr "Copying %1..." #. need to set some lower limit - roughly estimated maximum size of the last file which could have failed -#: src/clients/inst_live_doit.rb:222 +#: src/clients/inst_live_doit.rb:226 msgid "" "Copying the live image to hard disk failed.\n" "\n" @@ -72,72 +72,54 @@ msgstr "" #. generic error report -#: src/clients/inst_live_doit.rb:250 +#: src/clients/inst_live_doit.rb:254 #, fuzzy msgid "Copying the live image to hard disk failed." msgstr "Copying the Live Image to Hard Disk" #. dialog caption -#: src/clients/inst_live_simple_proposal.rb:45 -#: src/clients/inst_live_simple_proposal.rb:211 +#: src/clients/inst_live_simple_proposal.rb:44 +#: src/clients/inst_live_simple_proposal.rb:179 msgid "Installation Settings" msgstr "Installation Settings" #. label -#: src/clients/inst_live_simple_proposal.rb:47 +#: src/clients/inst_live_simple_proposal.rb:46 msgid "Analyzing the system..." msgstr "Analysing the system..." #. partitioning summary -#: src/clients/inst_live_simple_proposal.rb:111 +#: src/clients/inst_live_simple_proposal.rb:110 msgid "Use %1%% of disk %2 for Linux" msgstr "Use %1%% of disk %2 for Linux" -#: src/clients/inst_live_simple_proposal.rb:120 +#: src/clients/inst_live_simple_proposal.rb:119 msgid "Do not use disk %1" msgstr "Do not use disk %1" -#: src/clients/inst_live_simple_proposal.rb:127 +#: src/clients/inst_live_simple_proposal.rb:126 msgid "Partitioning" msgstr "Partitioning" #. end of partitioning summary -#. bootloader summary -#: src/clients/inst_live_simple_proposal.rb:143 -msgid "System start-up" -msgstr "System start-up" - -#: src/clients/inst_live_simple_proposal.rb:149 -msgid "Ask whether to boot Linux or existing system" -msgstr "Ask whether to boot Linux or existing system" - -#: src/clients/inst_live_simple_proposal.rb:150 -msgid "Boot only Linux" -msgstr "Boot only Linux" - -#: src/clients/inst_live_simple_proposal.rb:158 -msgid "System start time-out: %1 seconds" -msgstr "System start time-out: %1 seconds" - -#. end of bootloader summary #. keyboard entry -#: src/clients/inst_live_simple_proposal.rb:167 +#: src/clients/inst_live_simple_proposal.rb:135 msgid "Keyboard" msgstr "Keyboard" #. end of keyboard entry #. timezone entry -#: src/clients/inst_live_simple_proposal.rb:177 +#: src/clients/inst_live_simple_proposal.rb:145 msgid "Time Zone" msgstr "Time Zone" #. end of timezone entry -#: src/clients/inst_live_simple_proposal.rb:187 +#: src/clients/inst_live_simple_proposal.rb:155 msgid "Change Installation Settings" msgstr "Change Installation Settings" #. help text 1/3 -#: src/clients/inst_live_simple_proposal.rb:192 +#: src/clients/inst_live_simple_proposal.rb:160 msgid "" "<p>\n" "Use <b>Accept</b> to perform a new installation with the values displayed.</p>" @@ -146,7 +128,7 @@ "Use <b>Accept</b> to perform a new installation with the values displayed.</p>" #. help text 2/3 -#: src/clients/inst_live_simple_proposal.rb:196 +#: src/clients/inst_live_simple_proposal.rb:164 #, fuzzy msgid "" "<p>\n" @@ -158,7 +140,7 @@ "or by using the <b>Change Installation Settings</b> button.</p>" #. help text 3/3 -#: src/clients/inst_live_simple_proposal.rb:202 +#: src/clients/inst_live_simple_proposal.rb:170 #, fuzzy msgid "" "<p>\n" @@ -257,7 +239,7 @@ msgstr "" #. progress step title -#: src/clients/live_copy_files_finish.rb:76 +#: src/clients/live_copy_files_finish.rb:75 msgid "Copying files to installed system..." msgstr "Copying files to installed system..." @@ -281,6 +263,18 @@ msgid "Saving time zone..." msgstr "Saving time zone..." +#~ msgid "System start-up" +#~ msgstr "System start-up" + +#~ msgid "Ask whether to boot Linux or existing system" +#~ msgstr "Ask whether to boot Linux or existing system" + +#~ msgid "Boot only Linux" +#~ msgstr "Boot only Linux" + +#~ msgid "System start time-out: %1 seconds" +#~ msgstr "System start time-out: %1 seconds" + #~ msgid "Installation settings" #~ msgstr "Installation settings" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/mail.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-05-21 15:49+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/multipath.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/network.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2009-10-08 07:09+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -250,7 +250,7 @@ #. Command line output Headline #. configuration of hosts -#: src/clients/host.rb:123 +#: src/clients/host.rb:114 msgid "Host Configuration Summary:" msgstr "Host Configuration Summary:" @@ -535,7 +535,7 @@ #. in case keep_install_network is set to true (in AY) #. we'll keep values from installation #. and merge with XML data (bnc#712864) -#: src/clients/lan_auto.rb:136 +#: src/clients/lan_auto.rb:108 #, fuzzy msgid "Configuration Error: uninitialized interface." msgstr "Configuration Error : uninitialised interface!" @@ -632,7 +632,7 @@ #. Commandline help title #. Main routing dialog #. @return dialog result -#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468 +#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480 msgid "Routing Configuration" msgstr "Routing Configuration" @@ -823,13 +823,13 @@ #. interface summary: WiFi without encryption #. interface summary: WiFi without encryption -#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363 +#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367 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:1365 +#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369 msgid "Change." msgstr "Change." @@ -1147,7 +1147,7 @@ #. Table header label #. Table header label #: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75 -#: src/include/network/services/host.rb:128 +#: src/include/network/services/host.rb:129 msgid "IP Address" msgstr "IP Address" @@ -1155,7 +1155,7 @@ #. PushButton label #. PushButton label #: src/include/network/lan/address.rb:106 -#: src/include/network/services/host.rb:139 +#: src/include/network/services/host.rb:140 #: src/include/network/services/routing.rb:100 msgid "Ad&d" msgstr "Ad&d" @@ -1165,7 +1165,7 @@ #. PushButton label #. Pushbutton label #: src/include/network/lan/address.rb:108 -#: src/include/network/services/host.rb:141 +#: src/include/network/services/host.rb:142 #: src/include/network/services/routing.rb:102 #: src/include/network/summary.rb:69 msgid "&Edit" @@ -1176,7 +1176,7 @@ #. PushButton label #. Pushbutton label #: src/include/network/lan/address.rb:110 -#: src/include/network/services/host.rb:143 +#: src/include/network/services/host.rb:144 #: src/include/network/services/routing.rb:104 #: src/include/network/summary.rb:71 msgid "De&lete" @@ -1225,7 +1225,7 @@ msgstr "Unknown group" #: src/include/network/lan/address.rb:191 -#: src/include/network/lan/address.rb:1297 +#: src/include/network/lan/address.rb:1315 #, fuzzy msgid "Bridged Devices" msgstr "Modem Devices" @@ -1276,7 +1276,7 @@ #. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty()); #. else #: src/include/network/lan/address.rb:283 -#: src/include/network/lan/address.rb:798 +#: src/include/network/lan/address.rb:816 msgid "No Link and IP Setup (Bonding Slaves)" msgstr "" @@ -1314,7 +1314,7 @@ #. TextEntry label #: src/include/network/lan/address.rb:325 #: src/include/network/lan/virtual.rb:213 -#: src/include/network/services/host.rb:341 +#: src/include/network/services/host.rb:334 msgid "&IP Address" msgstr "&IP Address" @@ -1342,7 +1342,7 @@ msgstr "&S/390" #. validate device type, misdetection -#: src/include/network/lan/address.rb:1018 +#: src/include/network/lan/address.rb:1036 msgid "" "You have changed the interface type from the one\n" "that has been detected. This only makes sense\n" @@ -1353,13 +1353,13 @@ "if you know that the detection is wrong." #. Popup text -#: src/include/network/lan/address.rb:1038 +#: src/include/network/lan/address.rb:1056 msgid "Configuration %1 already present." msgstr "Configuration %1 already present." #. If firewall is active and interface in no zone, nothing #. gets through (#62309) so warn and redirect to details -#: src/include/network/lan/address.rb:1062 +#: src/include/network/lan/address.rb:1080 msgid "" "The firewall is active, but this interface is not\n" "in any zone. All its traffic would be blocked.\n" @@ -1373,21 +1373,21 @@ #. @param [String] key the widget being validated #. @param [Hash] event the event being handled #. @return whether valid -#: src/include/network/lan/address.rb:1082 +#: src/include/network/lan/address.rb:1100 msgid "No valid IP address." msgstr "No valid IP address." -#: src/include/network/lan/address.rb:1089 +#: src/include/network/lan/address.rb:1107 #, fuzzy msgid "No valid netmask or prefix length." msgstr "No valid Netmask." -#: src/include/network/lan/address.rb:1097 +#: src/include/network/lan/address.rb:1115 msgid "Invalid hostname." msgstr "Invalid hostname." #. There'll be no 127.0.0.2 -> remind user to define some hostname -#: src/include/network/lan/address.rb:1105 +#: src/include/network/lan/address.rb:1123 msgid "" "No hostname has been specified. We recommend to associate \n" "a hostname with a static IP, otherwise the machine name will \n" @@ -1397,7 +1397,7 @@ msgstr "" #. Popup text -#: src/include/network/lan/address.rb:1124 +#: src/include/network/lan/address.rb:1142 msgid "" "Duplicate IP address detected.\n" "Really continue?\n" @@ -1407,55 +1407,55 @@ #. @param [Array<String>] types network card types #. @return their descriptions for CWM -#: src/include/network/lan/address.rb:1177 +#: src/include/network/lan/address.rb:1195 msgid "&General" msgstr "&General" #. TODO: "MANDATORY", -#: src/include/network/lan/address.rb:1188 +#: src/include/network/lan/address.rb:1206 msgid "Device Activation" msgstr "Device Activation" -#: src/include/network/lan/address.rb:1192 +#: src/include/network/lan/address.rb:1210 msgid "Firewall Zone" msgstr "Firewall Zone" -#: src/include/network/lan/address.rb:1197 +#: src/include/network/lan/address.rb:1215 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:1207 +#: src/include/network/lan/address.rb:1225 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:1274 +#: src/include/network/lan/address.rb:1292 msgid "&Address" msgstr "&Address" #. Address tab help -#: src/include/network/lan/address.rb:1277 +#: src/include/network/lan/address.rb:1295 msgid "<p>Configure your IP address.</p>" msgstr "<p>Configure your IP address.</p>" -#: src/include/network/lan/address.rb:1283 +#: src/include/network/lan/address.rb:1301 msgid "&Hardware" msgstr "&Hardware" -#: src/include/network/lan/address.rb:1290 +#: src/include/network/lan/address.rb:1308 #, fuzzy msgid "&Bond Slaves" msgstr "Bond &Slaves" -#: src/include/network/lan/address.rb:1304 +#: src/include/network/lan/address.rb:1322 msgid "&Wireless" msgstr "&Wireless" #. Combo box label - when to activate device (e.g. on boot, manually, never,..) -#: src/include/network/lan/address.rb:1388 +#: src/include/network/lan/address.rb:1406 #, fuzzy #| msgid "Swap &Priority" msgid "Ifplugd Priority" @@ -1463,7 +1463,7 @@ #. Device activation main help. The individual parts will be #. substituted as %1 -#: src/include/network/lan/address.rb:1394 +#: src/include/network/lan/address.rb:1412 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" @@ -1473,13 +1473,13 @@ msgstr "" #. Address dialog caption -#: src/include/network/lan/address.rb:1476 +#: src/include/network/lan/address.rb:1494 msgid "Network Card Setup" msgstr "Network Card Setup" # bnc#384167 #. remove all aliases (bnc#590167) -#: src/include/network/lan/bridge.rb:103 +#: src/include/network/lan/bridge.rb:86 #, fuzzy msgid "" "At least one selected device is already configured.\n" @@ -1810,12 +1810,12 @@ "the interface will no longer be managed by NetworkManager.\n" #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867) -#: src/include/network/lan/complex.rb:456 +#: src/include/network/lan/complex.rb:454 msgid "Device you select has STARTMODE=nfsroot. Really delete?" msgstr "" #. Network setup method dialog caption -#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363 +#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363 msgid "Network Setup Method" msgstr "Network Setup Method" @@ -1824,7 +1824,7 @@ #. it is basically useful if user aborts dialog and he has done some #. changes already. Calling this function may results in confirmation #. popup. -#: src/include/network/lan/complex.rb:519 +#: src/include/network/lan/complex.rb:517 msgid "Network Settings" msgstr "Network Settings" @@ -2840,7 +2840,7 @@ #. Popup::Error text #. Popup::Error text #: src/include/network/lan/virtual.rb:257 -#: src/include/network/services/host.rb:386 +#: src/include/network/services/host.rb:379 msgid "The IP address is invalid." msgstr "The IP address is invalid." @@ -3106,47 +3106,47 @@ msgstr "&WEP Keys" #. Popup text -#: src/include/network/lan/wireless.rb:560 +#: src/include/network/lan/wireless.rb:561 msgid "WPA authentication mode is only possible in managed operating mode." msgstr "WPA authentication mode is only possible in managed operating mode." #. Popup text #. modes: combination of operation and authentication -#: src/include/network/lan/wireless.rb:571 +#: src/include/network/lan/wireless.rb:572 msgid "Specify the network name for this mode." msgstr "Specify the network name for this mode." #. Popup text -#: src/include/network/lan/wireless.rb:578 +#: src/include/network/lan/wireless.rb:579 msgid "The network name must be shorter than 32 characters." msgstr "The network name must be shorter than 32 characters." #. Error popup -#: src/include/network/lan/wireless.rb:598 +#: src/include/network/lan/wireless.rb:599 msgid "The passphrase must have between 8 and 63 characters (inclusively)." msgstr "The passphrase must have between 8 and 63 characters (inclusively)." #. Error popup -#: src/include/network/lan/wireless.rb:609 +#: src/include/network/lan/wireless.rb:610 msgid "The key must have %1 hexadecimal digits." msgstr "The key must have %1 hexadecimal digits." #. Popup text #. Popup text -#: src/include/network/lan/wireless.rb:621 -#: src/include/network/lan/wireless.rb:939 +#: src/include/network/lan/wireless.rb:622 +#: src/include/network/lan/wireless.rb:941 msgid "The encryption key is invalid." msgstr "The encryption key is invalid." #. error #. Popup text -#: src/include/network/lan/wireless.rb:629 +#: src/include/network/lan/wireless.rb:630 msgid "The encryption key must be specified for this authentication mode." msgstr "The encryption key must be specified for this authentication mode." #. warning only #. Popup text -#: src/include/network/lan/wireless.rb:636 +#: src/include/network/lan/wireless.rb:637 msgid "" "Using no encryption is a security risk.\n" "Really continue?\n" @@ -3156,13 +3156,13 @@ #. Wireless expert dialog caption #. Frame label -#: src/include/network/lan/wireless.rb:694 -#: src/include/network/lan/wireless.rb:775 +#: src/include/network/lan/wireless.rb:695 +#: src/include/network/lan/wireless.rb:776 msgid "Wireless Expert Settings" msgstr "Wireless Expert Settings" #. Wireless expert dialog help 1/5 -#: src/include/network/lan/wireless.rb:697 +#: src/include/network/lan/wireless.rb:698 msgid "" "<p>Here, set additional configuration parameters\n" "(rarely needed).</p>" @@ -3171,7 +3171,7 @@ "(rarely needed).</p>" #. Wireless expert dialog help 2/5 -#: src/include/network/lan/wireless.rb:701 +#: src/include/network/lan/wireless.rb:702 msgid "" "<p>To use your wireless LAN card in master or ad-hoc mode,\n" "set the <b>Channel</b> the card should use here. This is not needed\n" @@ -3184,7 +3184,7 @@ "points in that case.</p>\n" #. Wireless expert dialog help 3/5 -#: src/include/network/lan/wireless.rb:708 +#: src/include/network/lan/wireless.rb:709 msgid "" "<p>In some rare cases, you may want to set a transmission\n" "<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>" @@ -3193,7 +3193,7 @@ "<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>" #. Wireless expert dialog help 4/5 -#: src/include/network/lan/wireless.rb:712 +#: src/include/network/lan/wireless.rb:713 msgid "" "<p>In an environment with multiple <b>Access Points</b>, you may want to\n" "define the one to which to connect by entering its MAC address.</p>" @@ -3202,7 +3202,7 @@ "define the one to which to connect by entering its MAC address.</p>" #. Wireless expert dialog help 5/5 -#: src/include/network/lan/wireless.rb:716 +#: src/include/network/lan/wireless.rb:717 msgid "" "<p><b>Use Power Management</b> enables power saving mechanisms.\n" "This is generally a good idea, especially if you are a laptop user and may\n" @@ -3214,59 +3214,59 @@ #. Combobox item #. Combobox item -#: src/include/network/lan/wireless.rb:744 -#: src/include/network/lan/wireless.rb:766 +#: src/include/network/lan/wireless.rb:745 +#: src/include/network/lan/wireless.rb:767 msgid "Automatic" msgstr "Automatic" #. Combobox label -#: src/include/network/lan/wireless.rb:781 +#: src/include/network/lan/wireless.rb:782 msgid "&Channel" msgstr "&Channel" #. Combobox label -#: src/include/network/lan/wireless.rb:784 +#: src/include/network/lan/wireless.rb:785 msgid "B&it Rate" msgstr "B&it Rate" #. Text entry label -#: src/include/network/lan/wireless.rb:790 +#: src/include/network/lan/wireless.rb:791 msgid "&Access Point" msgstr "&Access Point" #. CheckBox label -#: src/include/network/lan/wireless.rb:798 +#: src/include/network/lan/wireless.rb:799 msgid "Use &Power Management" msgstr "Use &Power Management" -#: src/include/network/lan/wireless.rb:807 +#: src/include/network/lan/wireless.rb:808 #, fuzzy #| msgid "EAP &Mode" msgid "AP ScanMode" msgstr "EAP &Mode" #. Translators: popup dialog heading -#: src/include/network/lan/wireless.rb:897 +#: src/include/network/lan/wireless.rb:899 msgid "Enter Encryption Key" msgstr "Enter Encryption Key" #. Translators: text entry label -#: src/include/network/lan/wireless.rb:901 +#: src/include/network/lan/wireless.rb:903 msgid "&Key" msgstr "&Key" #. Translators: popup title -#: src/include/network/lan/wireless.rb:925 +#: src/include/network/lan/wireless.rb:927 msgid "Help" msgstr "Help" #. Wireless keys dialog caption -#: src/include/network/lan/wireless.rb:974 +#: src/include/network/lan/wireless.rb:976 msgid "Wireless Keys" msgstr "Wireless Keys" #. Wireless keys dialog help 1/3 -#: src/include/network/lan/wireless.rb:977 +#: src/include/network/lan/wireless.rb:979 msgid "" "<p>In this dialog, define your WEP keys used\n" "to encrypt your data before it is transmitted. You can have up to four keys,\n" @@ -3281,7 +3281,7 @@ "one key.</p>" #. Wireless keys dialog help 2/3 -#: src/include/network/lan/wireless.rb:985 +#: src/include/network/lan/wireless.rb:987 msgid "" "<p><b>Key Length</b> defines the bit length of your WEP keys.\n" "Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n" @@ -3296,50 +3296,50 @@ "value to 64.</p>" #. Frame label -#: src/include/network/lan/wireless.rb:1010 +#: src/include/network/lan/wireless.rb:1012 msgid "WEP Keys" msgstr "WEP Keys" #. ComboBox label -#: src/include/network/lan/wireless.rb:1016 +#: src/include/network/lan/wireless.rb:1018 msgid "&Key Length" msgstr "&Key Length" #. Table header label #. Abbreviation of Number -#: src/include/network/lan/wireless.rb:1024 +#: src/include/network/lan/wireless.rb:1026 msgid "No." msgstr "No." #. Table header label -#: src/include/network/lan/wireless.rb:1026 +#: src/include/network/lan/wireless.rb:1028 msgid "Key" msgstr "Key" #. Table header label -#: src/include/network/lan/wireless.rb:1028 +#: src/include/network/lan/wireless.rb:1030 msgid "Default" msgstr "Default" #. PushButton label -#: src/include/network/lan/wireless.rb:1038 +#: src/include/network/lan/wireless.rb:1040 msgid "&Set as Default" msgstr "&Set as Default" #. file browser dialog headline -#: src/include/network/lan/wireless.rb:1210 +#: src/include/network/lan/wireless.rb:1213 msgid "Choose a Certificate" msgstr "Choose a Certificate" #. validated in ValidateWpaEap -#: src/include/network/lan/wireless.rb:1255 +#: src/include/network/lan/wireless.rb:1258 msgid "" "Not using a Certificate Authority (CA) certificate can result in connections\n" "to insecure, rogue wireless networks. Continue without CA ?" msgstr "" #. error popup text -#: src/include/network/lan/wireless.rb:1283 +#: src/include/network/lan/wireless.rb:1286 msgid "" "Enter either the identity and password\n" "or the client certificate." @@ -3348,47 +3348,47 @@ "or the client certificate." #. dialog caption -#: src/include/network/lan/wireless.rb:1329 +#: src/include/network/lan/wireless.rb:1332 msgid "WPA-EAP" msgstr "WPA-EAP" #. combo box item, any of EAP authentication methods -#: src/include/network/lan/wireless.rb:1351 +#: src/include/network/lan/wireless.rb:1354 msgid "Any" msgstr "Any" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1355 +#: src/include/network/lan/wireless.rb:1358 msgid "MD5" msgstr "MD5" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1357 +#: src/include/network/lan/wireless.rb:1360 msgid "GTC" msgstr "GTC" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1359 +#: src/include/network/lan/wireless.rb:1362 msgid "CHAP" msgstr "CHAP" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1361 +#: src/include/network/lan/wireless.rb:1364 msgid "PAP" msgstr "PAP" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1363 +#: src/include/network/lan/wireless.rb:1366 msgid "MSCHAPv1" msgstr "MSCHAPv1" #. combo box item, an EAP authentication method -#: src/include/network/lan/wireless.rb:1367 +#: src/include/network/lan/wireless.rb:1370 msgid "MSCHAPv2" msgstr "MSCHAPv2" #. dialog caption -#: src/include/network/lan/wireless.rb:1390 +#: src/include/network/lan/wireless.rb:1393 msgid "WPA-EAP Details" msgstr "WPA-EAP Details" @@ -3436,12 +3436,12 @@ msgstr "Remote Administration Settings" #. Popup text -#: src/include/network/routines.rb:144 +#: src/include/network/routines.rb:129 msgid "These packages need to be installed:" msgstr "These packages need to be installed:" #. Popup text -#: src/include/network/routines.rb:162 +#: src/include/network/routines.rb:147 msgid "" "The required packages are not installed.\n" "The configuration will be aborted.\n" @@ -3453,111 +3453,61 @@ "\n" "Try again?\n" -#. Table field (Unknown device) -#: src/include/network/routines.rb:255 +#. Create a list of items for UI from the given hardware list. +#. +#. This list is used when selecting <ol> +#. <li> detected unconfigured cards, +#. there we want to see the link status </li> +#. <li> undetected cards manually. there is no link status there +#. and it won't be displayed. all is ok. </li> +#. </ol> +#. @param [Array<Hash>] l given list for conversion +#. @param [Fixnum] selected selected item (0 for the first) +#. @return a list of items +#: src/include/network/routines.rb:195 msgid "Unknown" msgstr "Unknown" -#. Popup headline -#: src/include/network/routines.rb:279 -msgid "Configuration Successfully Saved" -msgstr "Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:284 -msgid "DNS Configuration Successfully Saved" -msgstr "DNS Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:286 -msgid "DSL Configuration Successfully Saved" -msgstr "DSL Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:288 -msgid "Hosts Configuration Successfully Saved" -msgstr "Hosts Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:292 -msgid "ISDN Configuration Successfully Saved" -msgstr "ISDN Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:296 -msgid "Network Card Configuration Successfully Saved" -msgstr "Network Card Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:300 -msgid "Modem Configuration Successfully Saved" -msgstr "Modem Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:304 -msgid "Proxy Configuration Successfully Saved" -msgstr "Proxy Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:308 -msgid "Provider Configuration Successfully Saved" -msgstr "Provider Configuration Successfully Saved" - -#. Popup headline -#: src/include/network/routines.rb:312 -msgid "Routing Configuration Successfully Saved" -msgstr "Routing Configuration Successfully Saved" - -#. Popup text -#: src/include/network/routines.rb:321 -msgid "Configure mail now?" -msgstr "Configure mail now?" - -#. Popup text -#: src/include/network/routines.rb:326 -msgid "Run configuration of %1?" -msgstr "Run configuration of %1?" - #. Disables all widgets which cannot be configured with current network service #. #. see bnc#433084 #. if listed any items, disable them, if show_popup, show warning popup #. #. returns true if items were disabled -#: src/include/network/routines.rb:1004 +#: src/include/network/routines.rb:807 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:1064 +#: src/include/network/routines.rb:867 msgid "Network Cards" msgstr "Network Cards" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1068 +#: src/include/network/routines.rb:871 msgid "Modems" msgstr "Modems" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1072 +#: src/include/network/routines.rb:875 msgid "ISDN Cards" msgstr "ISDN Cards" #. Confirmation: label text (detecting hardware: xxx) -#: src/include/network/routines.rb:1076 +#: src/include/network/routines.rb:879 msgid "DSL Devices" msgstr "DSL Devices" -#: src/include/network/routines.rb:1081 +#: src/include/network/routines.rb:884 msgid "All Network Devices" msgstr "All Network Devices" #. validation error popup #. Popup::Error text #: src/include/network/services/dns.rb:92 -#: src/include/network/services/host.rb:398 +#: src/include/network/services/host.rb:391 msgid "The hostname is invalid." msgstr "The hostname is invalid." @@ -3633,8 +3583,8 @@ #. Frame label #. dialog caption #: src/include/network/services/dns.rb:234 -#: src/include/network/services/dns.rb:684 -#: src/include/network/services/dns.rb:697 +#: src/include/network/services/dns.rb:677 +#: src/include/network/services/dns.rb:690 msgid "Hostname and Domain Name" msgstr "Hostname and Domain Name" @@ -3661,28 +3611,28 @@ #. @param [String] key the widget being validated #. @param [Hash] event the event being handled #. @return whether valid -#: src/include/network/services/dns.rb:496 +#: src/include/network/services/dns.rb:495 msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?" msgstr "" #. Popup::Error text -#: src/include/network/services/dns.rb:520 +#: src/include/network/services/dns.rb:513 msgid "The search list can have at most %1 domains." msgstr "The search list can have at most %1 domains." #. Popup::Error text -#: src/include/network/services/dns.rb:526 +#: src/include/network/services/dns.rb:519 msgid "The search list can have at most %1 characters." msgstr "The search list can have at most %1 characters." #. Popup::Error text -#: src/include/network/services/dns.rb:535 +#: src/include/network/services/dns.rb:528 msgid "The search domain '%1' is invalid." msgstr "The search domain '%1' is invalid." #. Standalone dialog only - embedded one is handled separately #. via CWMTab -#: src/include/network/services/dns.rb:725 +#: src/include/network/services/dns.rb:718 msgid "Hostname and Name Server Configuration" msgstr "Hostname and Name Server Configuration" @@ -3716,27 +3666,27 @@ "<b>Host Aliases</b>, separated by spaces.</p>\n" #. Frame label -#: src/include/network/services/host.rb:118 +#: src/include/network/services/host.rb:119 msgid "Current Hosts" msgstr "Current Hosts" #. Table header label -#: src/include/network/services/host.rb:130 +#: src/include/network/services/host.rb:131 msgid "Hostnames" msgstr "Hostnames" #. Table header label -#: src/include/network/services/host.rb:132 +#: src/include/network/services/host.rb:133 msgid "Host Aliases" msgstr "Host Aliases" #. TextEntry label -#: src/include/network/services/host.rb:351 +#: src/include/network/services/host.rb:344 msgid "Hos&t Aliases" msgstr "Hos&t Aliases" #. Popup::Error text -#: src/include/network/services/host.rb:414 +#: src/include/network/services/host.rb:407 msgid "Alias name \"%1\" is invalid." msgstr "Alias name \"%1\" is invalid." @@ -3780,43 +3730,43 @@ #. @param [Yast::Term] entry edited entry #. @param [Array] devs available devices #. @return route or nil, if canceled -#: src/include/network/services/routing.rb:161 +#: src/include/network/services/routing.rb:163 msgid "&Destination" msgstr "&Destination" -#: src/include/network/services/routing.rb:167 +#: src/include/network/services/routing.rb:172 #, fuzzy #| msgid "Net&mask" msgid "Ge&nmask" msgstr "Net&mask" -#: src/include/network/services/routing.rb:175 +#: src/include/network/services/routing.rb:182 msgid "&Gateway" msgstr "&Gateway" -#: src/include/network/services/routing.rb:181 +#: src/include/network/services/routing.rb:191 #, fuzzy msgid "De&vice" msgstr "Device" #. Popup::Error text -#: src/include/network/services/routing.rb:240 +#: src/include/network/services/routing.rb:252 msgid "Destination is invalid." msgstr "Destination is invalid." #. Popup::Error text -#: src/include/network/services/routing.rb:248 +#: src/include/network/services/routing.rb:260 msgid "Gateway IP address is invalid." msgstr "Gateway IP address is invalid." #. Popup::Error text -#: src/include/network/services/routing.rb:256 +#: src/include/network/services/routing.rb:268 msgid "Subnetmask is invalid." msgstr "Subnetmask is invalid." #. #178538 - disable routing dialog when NetworkManager is used #. but instead of default route (#299448) - NM reads it -#: src/include/network/services/routing.rb:414 +#: src/include/network/services/routing.rb:426 msgid "The default gateway is invalid." msgstr "The default gateway is invalid." @@ -4082,7 +4032,7 @@ msgstr "IPv6 Protocol Settings" #. enable ipv6 support -#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810 +#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783 msgid "Enable IPv6" msgstr "Enable IPv6" @@ -4183,7 +4133,7 @@ #. Progress stage 2 #. Progress stage 10 -#: src/modules/DNS.rb:379 src/modules/Lan.rb:534 +#: src/modules/DNS.rb:379 src/modules/Lan.rb:533 msgid "Update configuration" msgstr "Update configuration" @@ -4206,7 +4156,7 @@ #. Progress step 2/3 #. Progress step 10 -#: src/modules/DNS.rb:411 src/modules/Lan.rb:622 +#: src/modules/DNS.rb:411 src/modules/Lan.rb:621 msgid "Updating configuration..." msgstr "Updating configuration..." @@ -4219,357 +4169,350 @@ msgstr "Updating /etc/resolv.conf..." #. Summary text -#: src/modules/DNS.rb:538 +#: src/modules/DNS.rb:543 msgid "Hostname: Set by DHCP" msgstr "Hostname: Set by DHCP" #. Summary text -#: src/modules/DNS.rb:544 +#: src/modules/DNS.rb:549 msgid "Hostname: %1" msgstr "Hostname: %1" -#: src/modules/DNS.rb:552 +#: src/modules/DNS.rb:557 msgid "Hostname will not be written to /etc/hosts" msgstr "Hostname will not be written to /etc/hosts" #. Summary text -#: src/modules/DNS.rb:573 +#: src/modules/DNS.rb:578 msgid "Name Servers: %1" msgstr "Name Servers: %1" #. Summary text -#: src/modules/DNS.rb:583 +#: src/modules/DNS.rb:588 msgid "Search List: %1" msgstr "Search List: %1" #. Check if there is anything to do -#: src/modules/Host.rb:138 +#: src/modules/Host.rb:165 msgid "Update /etc/hosts" msgstr "Update /etc/hosts" -#: src/modules/Host.rb:140 +#: src/modules/Host.rb:167 msgid "Saving Hostname Configuration" msgstr "Saving Hostname Configuration" #. sleep for longer time, so that progress does not disappear right afterwards -#: src/modules/Host.rb:145 +#: src/modules/Host.rb:172 #, fuzzy msgid "Updating /etc/hosts ..." msgstr "Updating /etc/hosts..." #. Read dialog caption -#: src/modules/Lan.rb:272 +#: src/modules/Lan.rb:271 msgid "Initializing Network Configuration" msgstr "Initialising Network Configuration" #. Progress stage 1/9 -#: src/modules/Lan.rb:285 +#: src/modules/Lan.rb:284 msgid "Detect network devices" msgstr "Detect network devices" #. Progress stage 2/9 -#: src/modules/Lan.rb:287 +#: src/modules/Lan.rb:286 msgid "Read driver information" msgstr "Read driver information" #. Progress stage 3/9 - multiple devices may be present, really plural -#: src/modules/Lan.rb:289 +#: src/modules/Lan.rb:288 msgid "Read device configuration" msgstr "Read device configuration" #. Progress stage 4/9 -#: src/modules/Lan.rb:291 +#: src/modules/Lan.rb:290 msgid "Read network configuration" msgstr "Read network configuration" #. Progress stage 5/9 -#: src/modules/Lan.rb:293 +#: src/modules/Lan.rb:292 msgid "Read firewall settings" msgstr "Read firewall settings" #. Progress stage 6/9 -#: src/modules/Lan.rb:295 +#: src/modules/Lan.rb:294 msgid "Read hostname and DNS configuration" msgstr "Read hostname and DNS configuration" #. Progress stage 7/9 -#: src/modules/Lan.rb:297 +#: src/modules/Lan.rb:296 msgid "Read installation information" msgstr "Read installation information" #. Progress stage 8/9 -#: src/modules/Lan.rb:299 +#: src/modules/Lan.rb:298 msgid "Read routing configuration" msgstr "Read routing configuration" #. Progress stage 9/9 -#: src/modules/Lan.rb:301 +#: src/modules/Lan.rb:300 msgid "Detect current status" msgstr "Detect current status" #. Progress step 1/9 -#: src/modules/Lan.rb:315 +#: src/modules/Lan.rb:314 #, fuzzy msgid "Detecting ndiswrapper..." msgstr "Detecting hardware..." #. modprobe ndiswrapper before hwinfo when needed (#343893) -#: src/modules/Lan.rb:334 +#: src/modules/Lan.rb:333 msgid "" "Detected a ndiswrapper configuration,\n" "but the kernel module was not modprobed.\n" "Do you want to modprobe ndiswrapper?\n" msgstr "" -#: src/modules/Lan.rb:342 +#: src/modules/Lan.rb:341 msgid "" "ndiswrapper kernel module has not been loaded.\n" "Check configuration manually.\n" msgstr "" #. Progress step 2/9 -#: src/modules/Lan.rb:356 +#: src/modules/Lan.rb:355 msgid "Detecting network devices..." msgstr "Detecting network devices..." #. Progress step 3/9 - multiple devices may be present, really plural -#: src/modules/Lan.rb:364 +#: src/modules/Lan.rb:363 msgid "Reading device configuration..." msgstr "Reading device configuration..." #. Progress step 4/9 -#: src/modules/Lan.rb:370 +#: src/modules/Lan.rb:369 msgid "Reading network configuration..." msgstr "Reading network configuration..." #. Progress step 5/9 -#: src/modules/Lan.rb:379 +#: src/modules/Lan.rb:378 msgid "Reading firewall settings..." msgstr "Reading firewall settings..." #. Progress step 6/9 -#: src/modules/Lan.rb:387 +#: src/modules/Lan.rb:386 msgid "Reading hostname and DNS configuration..." msgstr "Reading hostname and DNS configuration..." #. Progress step 7/9 -#: src/modules/Lan.rb:394 +#: src/modules/Lan.rb:393 msgid "Reading installation information..." msgstr "Reading installation information..." #. Progress step 8/9 -#: src/modules/Lan.rb:400 +#: src/modules/Lan.rb:399 msgid "Reading routing configuration..." msgstr "Reading routing configuration..." #. Progress step 9/9 -#: src/modules/Lan.rb:406 +#: src/modules/Lan.rb:405 msgid "Detecting current status..." msgstr "Detecting current status..." #. Final progress step #. Final progress step -#: src/modules/Lan.rb:412 src/modules/Lan.rb:643 +#: src/modules/Lan.rb:411 src/modules/Lan.rb:642 msgid "Finished" msgstr "Finished" #. (a specialization used when a parameterless function is needed) #. @return Read(`cache) -#: src/modules/Lan.rb:438 +#: src/modules/Lan.rb:437 #, fuzzy msgid "To apply this change, a reboot is needed." msgstr "To apply this change reboot is needed." #. Write dialog caption -#: src/modules/Lan.rb:506 +#: src/modules/Lan.rb:505 msgid "Saving Network Configuration" msgstr "Saving Network Configuration" #. Progress stage 2 -#: src/modules/Lan.rb:513 +#: src/modules/Lan.rb:512 msgid "Write drivers information" msgstr "Write drivers information" #. Progress stage 3 - multiple devices may be present,really plural -#: src/modules/Lan.rb:515 +#: src/modules/Lan.rb:514 msgid "Write device configuration" msgstr "Write device configuration" #. Progress stage 4 -#: src/modules/Lan.rb:517 +#: src/modules/Lan.rb:516 msgid "Write network configuration" msgstr "Write network configuration" #. Progress stage 5 -#: src/modules/Lan.rb:519 +#: src/modules/Lan.rb:518 msgid "Write routing configuration" msgstr "Write routing configuration" #. Progress stage 6 -#: src/modules/Lan.rb:521 +#: src/modules/Lan.rb:520 msgid "Write hostname and DNS configuration" msgstr "Write hostname and DNS configuration" #. Progress stage 7 -#: src/modules/Lan.rb:523 +#: src/modules/Lan.rb:522 msgid "Set up network services" msgstr "Set up network services" #. Progress stage 8 #. Progress stage 1 -#: src/modules/Lan.rb:527 src/modules/Remote.rb:293 +#: src/modules/Lan.rb:526 src/modules/Remote.rb:197 msgid "Write firewall settings" msgstr "Write firewall settings" #. Progress stage 9 -#: src/modules/Lan.rb:531 +#: src/modules/Lan.rb:530 msgid "Activate network services" msgstr "Activate network services" #. Progress step 2 -#: src/modules/Lan.rb:547 +#: src/modules/Lan.rb:546 msgid "Writing /etc/modprobe.conf..." msgstr "Writing /etc/modprobe.conf..." #. Progress step 3 - multiple devices may be present, really plural -#: src/modules/Lan.rb:552 +#: src/modules/Lan.rb:551 msgid "Writing device configuration..." msgstr "Writing device configuration..." #. Progress step 4 -#: src/modules/Lan.rb:558 +#: src/modules/Lan.rb:557 msgid "Writing network configuration..." msgstr "Writing network configuration..." #. Progress step 5 -#: src/modules/Lan.rb:564 +#: src/modules/Lan.rb:563 msgid "Writing routing configuration..." msgstr "Writing routing configuration..." #. Progress step 6 -#: src/modules/Lan.rb:572 +#: src/modules/Lan.rb:571 msgid "Writing hostname and DNS configuration..." msgstr "Writing hostname and DNS configuration..." #. Progress step 7 -#: src/modules/Lan.rb:585 +#: src/modules/Lan.rb:584 msgid "Setting up network services..." msgstr "Setting up network services..." #. Progress step 8 -#: src/modules/Lan.rb:593 src/modules/Remote.rb:307 +#: src/modules/Lan.rb:592 src/modules/Remote.rb:211 msgid "Writing firewall settings..." msgstr "Writing firewall settings..." #. Progress step 9 -#: src/modules/Lan.rb:603 +#: src/modules/Lan.rb:602 msgid "Activating network services..." msgstr "Activating network services..." -#: src/modules/Lan.rb:639 +#: src/modules/Lan.rb:638 #, fuzzy msgid "No network running" msgstr "Network Settings" -#. Import data -#. @param [Hash] settings settings to be imported -#. @return true on success -#: src/modules/Lan.rb:698 -msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used." -msgstr "" - #. Create a textual summary for the general network settings #. proposal (NetworkManager + ipv6) #. @return [rich text, links] -#: src/modules/Lan.rb:782 +#: src/modules/Lan.rb:755 msgid "Network Mode" msgstr "Network Mode" #. network mode: the interfaces are controlled by the user -#: src/modules/Lan.rb:787 +#: src/modules/Lan.rb:760 msgid "Interfaces controlled by NetworkManager" msgstr "Interfaces controlled by NetworkManager" #. disable NetworkManager applet -#: src/modules/Lan.rb:789 +#: src/modules/Lan.rb:762 msgid "Disable NetworkManager" msgstr "Disable NetworkManager" #. network mode -#: src/modules/Lan.rb:793 +#: src/modules/Lan.rb:766 msgid "Traditional network setup with NetControl - ifup" msgstr "Traditional network setup with NetControl - ifup" #. enable NetworkManager applet #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager -#: src/modules/Lan.rb:796 +#: src/modules/Lan.rb:769 msgid "Enable NetworkManager" msgstr "Enable NetworkManager" #. ipv6 support is enabled -#: src/modules/Lan.rb:802 +#: src/modules/Lan.rb:775 msgid "Support for IPv6 protocol is enabled" msgstr "Support for IPv6 protocol is enabled" #. disable ipv6 support -#: src/modules/Lan.rb:804 +#: src/modules/Lan.rb:777 msgid "Disable IPv6" msgstr "Disable IPv6" #. ipv6 support is disabled -#: src/modules/Lan.rb:808 +#: src/modules/Lan.rb:781 msgid "Support for IPv6 protocol is disabled" msgstr "Support for IPv6 protocol is disabled" #. translators: a possible value for: IPoIB device mode -#: src/modules/LanItems.rb:193 +#: src/modules/LanItems.rb:199 #, fuzzy msgid "connected" msgstr "(not connected)" -#: src/modules/LanItems.rb:194 +#: src/modules/LanItems.rb:200 msgid "datagram" msgstr "" #. summary description of STARTMODE=auto #. summary description of STARTMODE=auto #. summary description of STARTMODE=hotplug -#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264 -#: src/modules/LanItems.rb:1268 +#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268 +#: src/modules/LanItems.rb:1272 msgid "Started automatically at boot" msgstr "Started automatically at boot" #. summary description of STARTMODE=ifplugd -#: src/modules/LanItems.rb:1272 +#: src/modules/LanItems.rb:1276 msgid "Started automatically on cable connection" msgstr "Started automatically on cable connection" #. summary description of STARTMODE=managed -#: src/modules/LanItems.rb:1276 +#: src/modules/LanItems.rb:1280 msgid "Managed by NetworkManager" msgstr "Managed by NetworkManager" #. summary description of STARTMODE=off -#: src/modules/LanItems.rb:1280 +#: src/modules/LanItems.rb:1284 msgid "Will not be started at all" msgstr "Will not be started at all" -#: src/modules/LanItems.rb:1286 +#: src/modules/LanItems.rb:1290 msgid "Started manually" msgstr "Started manually" #. do nothing -#: src/modules/LanItems.rb:1298 +#: src/modules/LanItems.rb:1302 #, fuzzy msgid "IP address assigned using" msgstr "IP address assigned using DHCP" -#: src/modules/LanItems.rb:1302 +#: src/modules/LanItems.rb:1306 #, fuzzy msgid "IP address: %s/%s" msgstr "IP Address: %1" -#: src/modules/LanItems.rb:1305 +#: src/modules/LanItems.rb:1309 #, fuzzy #| msgid "IP address: %1, subnet mask %2" msgid "IP address: %s, subnet mask %s" @@ -4577,64 +4520,64 @@ #. FIXME: side effect: sets @type. No reason for that. It should only build item #. overview. Check and remove. -#: src/modules/LanItems.rb:1329 +#: src/modules/LanItems.rb:1333 msgid "Not configured" msgstr "Not configured" #. display it only if we need it, don't duplicate "ifcfg_name" above -#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411 +#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415 #, fuzzy #| msgid "Device Name: %1" msgid "Device Name: %s" msgstr "Device Name: %1" -#: src/modules/LanItems.rb:1372 +#: src/modules/LanItems.rb:1376 #, fuzzy #| msgid "Bond slaves" msgid "Bonding slaves" msgstr "Bond slaves" -#: src/modules/LanItems.rb:1386 +#: src/modules/LanItems.rb:1390 msgid "enslaved in %s" msgstr "" -#: src/modules/LanItems.rb:1387 +#: src/modules/LanItems.rb:1391 msgid "Bonding master" msgstr "" -#: src/modules/LanItems.rb:1401 +#: src/modules/LanItems.rb:1405 #, fuzzy msgid "Not connected" msgstr "(not connected)" -#: src/modules/LanItems.rb:1402 +#: src/modules/LanItems.rb:1406 msgid "No hwinfo" msgstr "" -#: src/modules/LanItems.rb:1417 +#: src/modules/LanItems.rb:1421 #, 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:1423 +#: src/modules/LanItems.rb:1427 #, 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:1430 +#: src/modules/LanItems.rb:1434 #, fuzzy msgid "Needed firmware" msgstr "Needed Information" -#: src/modules/LanItems.rb:1430 +#: src/modules/LanItems.rb:1434 msgid "unknown" msgstr "unknown" #. Package containing SuSEfirewall2 services has to be installed before #. reading SuSEFirewall, otherwise exception is thrown by firewall -#: src/modules/Remote.rb:243 +#: src/modules/Remote.rb:159 #, fuzzy #| msgid "SuSEfirewall2 package is not installed, firewall will be disabled." msgid "" @@ -4643,37 +4586,37 @@ msgstr "SuSEfirewall2 package is not installed, firewall will be disabled." #. Progress stage 2 -#: src/modules/Remote.rb:295 +#: src/modules/Remote.rb:199 msgid "Configure display manager" msgstr "Configure display manager" #. Progress stage 3 -#: src/modules/Remote.rb:300 +#: src/modules/Remote.rb:204 msgid "Restart the services" msgstr "Restart the services" -#: src/modules/Remote.rb:303 +#: src/modules/Remote.rb:207 msgid "Saving Remote Administration Configuration" msgstr "Saving Remote Administration Configuration" -#: src/modules/Remote.rb:312 +#: src/modules/Remote.rb:216 msgid "Configuring display manager..." msgstr "Configuring display manager..." -#: src/modules/Remote.rb:316 +#: src/modules/Remote.rb:220 msgid "Restarting the service..." msgstr "Restarting the service..." #. Enable xinetd #. Enable XDM -#: src/modules/Remote.rb:342 src/modules/Remote.rb:350 +#: src/modules/Remote.rb:246 src/modules/Remote.rb:254 #, fuzzy #| msgid "Enabling service 'uml' failed." msgid "Enabling service %{service} has failed" msgstr "Enabling service 'uml' failed." #. Do this only if package xinetd is installed (#256385) -#: src/modules/Remote.rb:377 +#: src/modules/Remote.rb:281 msgid "" "Your display manager must be restarted.\n" "To take the changes in remote administration into account, \n" @@ -4681,30 +4624,30 @@ msgstr "" #. description in proposal -#: src/modules/Remote.rb:408 +#: src/modules/Remote.rb:312 msgid "Remote administration is enabled." msgstr "Remote administration is enabled." -#: src/modules/Remote.rb:408 +#: src/modules/Remote.rb:312 msgid "Remote administration is disabled." msgstr "Remote administration is disabled." #. Progress stage 1 -#: src/modules/Routing.rb:261 +#: src/modules/Routing.rb:264 msgid "Write IP forwarding settings" msgstr "Write IP forwarding settings" #. Progress stage 2 -#: src/modules/Routing.rb:263 +#: src/modules/Routing.rb:266 msgid "Write routing settings" msgstr "Write routing settings" -#: src/modules/Routing.rb:266 +#: src/modules/Routing.rb:269 msgid "Saving Routing Configuration" msgstr "Saving Routing Configuration" #. Progress stage 1/2 -#: src/modules/Routing.rb:271 +#: src/modules/Routing.rb:274 msgid "Writing IP forwarding settings..." msgstr "Writing IP forwarding settings..." @@ -4713,25 +4656,25 @@ #. sysconfig does not support restarting routes only, #. so we let our caller do it together with other things #. Progress stage 2/2 -#: src/modules/Routing.rb:281 +#: src/modules/Routing.rb:284 msgid "Writing routing settings..." msgstr "Writing routing settings..." #. Summary text -#: src/modules/Routing.rb:434 +#: src/modules/Routing.rb:454 #, fuzzy #| msgid "Gateway: %1" msgid "Gateway: %s" msgstr "Gateway: %1" #. Summary text -#: src/modules/Routing.rb:438 +#: src/modules/Routing.rb:458 #, fuzzy msgid "IP Forwarding for IPv4: %s" msgstr "IP Forwarding: on" #. Summary text -#: src/modules/Routing.rb:442 +#: src/modules/Routing.rb:462 #, fuzzy msgid "IP Forwarding for IPv6: %s" msgstr "IP Forwarding: on" @@ -4752,6 +4695,42 @@ msgid "(Unprotected)" msgstr "(Unprotected)" +#~ msgid "Configuration Successfully Saved" +#~ msgstr "Configuration Successfully Saved" + +#~ msgid "DNS Configuration Successfully Saved" +#~ msgstr "DNS Configuration Successfully Saved" + +#~ msgid "DSL Configuration Successfully Saved" +#~ msgstr "DSL Configuration Successfully Saved" + +#~ msgid "Hosts Configuration Successfully Saved" +#~ msgstr "Hosts Configuration Successfully Saved" + +#~ msgid "ISDN Configuration Successfully Saved" +#~ msgstr "ISDN Configuration Successfully Saved" + +#~ msgid "Network Card Configuration Successfully Saved" +#~ msgstr "Network Card Configuration Successfully Saved" + +#~ msgid "Modem Configuration Successfully Saved" +#~ msgstr "Modem Configuration Successfully Saved" + +#~ msgid "Proxy Configuration Successfully Saved" +#~ msgstr "Proxy Configuration Successfully Saved" + +#~ msgid "Provider Configuration Successfully Saved" +#~ msgstr "Provider Configuration Successfully Saved" + +#~ msgid "Routing Configuration Successfully Saved" +#~ msgstr "Routing Configuration Successfully Saved" + +#~ msgid "Configure mail now?" +#~ msgstr "Configure mail now?" + +#~ msgid "Run configuration of %1?" +#~ msgstr "Run configuration of %1?" + #~ msgid "Device boot protocol" #~ msgstr "Device boot protocol" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nfs.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2003-09-09 10:54+0200\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nfs_server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2007-08-16 20:05+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -81,27 +81,27 @@ msgstr "Yes/No option for enabling/disabling secure NFS" #. summary text -#: src/clients/nfs_server.rb:196 +#: src/clients/nfs_server.rb:202 msgid "NFS server is enabled" msgstr "NFS server is enabled" #. summary text -#: src/clients/nfs_server.rb:199 +#: src/clients/nfs_server.rb:205 msgid "NFS server is disabled" msgstr "NFS server is disabled" #. error message -#: src/clients/nfs_server.rb:215 +#: src/clients/nfs_server.rb:221 msgid "Required packages (%1) are not installed." msgstr "Required packages (%1) are not installed." #. error #. error -#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285 +#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291 msgid "No mount point specified." msgstr "No mount point specified." -#: src/clients/nfs_server.rb:260 +#: src/clients/nfs_server.rb:266 msgid "" "The exports table already\n" "contains this directory." @@ -112,12 +112,12 @@ #. CLI action handler. #. @param [Hash] options command options #. @return whether successful -#: src/clients/nfs_server.rb:319 +#: src/clients/nfs_server.rb:325 #, fuzzy msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command." msgstr "Domain can not be set without enabling NFSv4. Please use 'set enablev4' command." -#: src/clients/nfs_server.rb:330 +#: src/clients/nfs_server.rb:336 #, fuzzy msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options." msgstr "Command set must be used as in 'set option=value'. Please use 'set help' to know the options." @@ -188,49 +188,60 @@ "Probably there is spurious whitespace in the configuration file." #. text entry label -#: src/include/nfs_server/ui.rb:58 +#: src/include/nfs_server/ui.rb:68 msgid "&Directory to Export" msgstr "&Directory to Export" #. button label -#: src/include/nfs_server/ui.rb:64 +#: src/include/nfs_server/ui.rb:74 msgid "&Browse..." msgstr "&Browse..." -#: src/include/nfs_server/ui.rb:87 +#: src/include/nfs_server/ui.rb:97 #, fuzzy msgid "Enter a non-empty export path. For example, /exports." msgstr "Please enter a non-empty export path. Eg: /exports" #. error popup message -#: src/include/nfs_server/ui.rb:95 +#: src/include/nfs_server/ui.rb:105 msgid "The exports table already contains this directory." msgstr "The exports table already contains this directory." +#. message popup; %1, %2 are package names +#: src/include/nfs_server/ui.rb:113 +msgid "" +"The user mode NFS server (%1) cannot export directories\n" +"with spaces in their names.\n" +"Use the kernel-based server (%2) to do that." +msgstr "" +"The user mode NFS server (%1) cannot export directories\n" +"with spaces in their names.\n" +"Use the kernel-based server (%2) to do that." + #. the dir does not exist -#: src/include/nfs_server/ui.rb:101 +#: src/include/nfs_server/ui.rb:126 msgid "The directory does not exist. Create it?" msgstr "The directory does not exist. Create it?" #. title in the file selection dialog -#: src/include/nfs_server/ui.rb:111 +#: src/include/nfs_server/ui.rb:136 msgid "Select the Directory to Export" msgstr "Select the Directory to Export" #. text entry label -#: src/include/nfs_server/ui.rb:168 +#: src/include/nfs_server/ui.rb:193 msgid "&Host Wild Card" msgstr "&Host Wild Card" #. text entry label -#: src/include/nfs_server/ui.rb:170 +#: src/include/nfs_server/ui.rb:195 msgid "O&ptions" msgstr "O&ptions" #. check to see if user has changed options entry in the dialogue #. thrown due to a "Add Hosts" (as opposed to editing existing ones). #. If yes, suggest the user with a suitable default option set. -#: src/include/nfs_server/ui.rb:222 +#: src/include/nfs_server/ui.rb:250 #, fuzzy #| msgid "" #| "'fsid=0'is not a valid option unless \n" @@ -243,7 +254,7 @@ "NFSv4 is enabled (previous page)" #. error popup message -#: src/include/nfs_server/ui.rb:240 +#: src/include/nfs_server/ui.rb:268 msgid "" "Options for this wild card\n" "are already set." @@ -253,13 +264,13 @@ #. Opening NFS server dialog #. @return `back, `abort, `next `or finish -#: src/include/nfs_server/ui.rb:272 +#: src/include/nfs_server/ui.rb:300 #, fuzzy msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'." msgstr "Unable to read /etc/idmapd.conf file. Defaulting the domain to 'localdomain'" #. Help, part 1 of 2 -#: src/include/nfs_server/ui.rb:295 +#: src/include/nfs_server/ui.rb:323 msgid "" "<P>Here, choose whether to start an NFS server on your computer\n" "and export some of your directories to others.</P>" @@ -268,7 +279,7 @@ "and export some of your directories to others.</P>" #. Help, part 2 of 2 -#: src/include/nfs_server/ui.rb:302 +#: src/include/nfs_server/ui.rb:330 msgid "" "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n" "a configuration dialog in which to specify the directories to export.</P>" @@ -276,7 +287,7 @@ "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n" "a configuration dialogue in which to specify the directories to export.</P>" -#: src/include/nfs_server/ui.rb:311 +#: src/include/nfs_server/ui.rb:339 #, fuzzy msgid "" "<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n" @@ -288,7 +299,7 @@ "it as localdomain or refer to man page for idmapd and idmapd.conf if you are not sure.</P>" #. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm -#: src/include/nfs_server/ui.rb:321 +#: src/include/nfs_server/ui.rb:349 #, fuzzy msgid "" "<P>If the server and client must authenticate using GSS library, check the\n" @@ -298,44 +309,44 @@ "checkbox. For being able to use GSS API, currently you need to have kerberos and gssapi (nfs-utils > 1.0.7) on your system</P>" #. frame label -#: src/include/nfs_server/ui.rb:331 +#: src/include/nfs_server/ui.rb:359 msgid "NFS Server" msgstr "NFS Server" #. radio button label -#: src/include/nfs_server/ui.rb:342 +#: src/include/nfs_server/ui.rb:370 msgid "&Start" msgstr "&Start" #. radio button label -#: src/include/nfs_server/ui.rb:351 +#: src/include/nfs_server/ui.rb:379 msgid "Do &Not Start" msgstr "Do &Not Start" #. frame label -#: src/include/nfs_server/ui.rb:369 +#: src/include/nfs_server/ui.rb:397 msgid "Enable NFSv4" msgstr "Enable NFSv4" -#: src/include/nfs_server/ui.rb:376 +#: src/include/nfs_server/ui.rb:404 msgid "Enable NFS&v4" msgstr "Enable NFS&v4" -#: src/include/nfs_server/ui.rb:381 +#: src/include/nfs_server/ui.rb:409 msgid "Enter NFSv4 do&main name:" msgstr "Enter NFSv4 do&main name:" -#: src/include/nfs_server/ui.rb:391 +#: src/include/nfs_server/ui.rb:419 msgid "Enable &GSS Security" msgstr "Enable &GSS Security" #. dialog title -#: src/include/nfs_server/ui.rb:411 +#: src/include/nfs_server/ui.rb:439 msgid "NFS Server Configuration" msgstr "NFS Server Configuration" #. Help, part 1 of 4 -#: src/include/nfs_server/ui.rb:487 +#: src/include/nfs_server/ui.rb:515 msgid "" "<P>The upper box contains all the directories to export.\n" "If a directory is selected, the lower box shows the hosts allowed to\n" @@ -346,7 +357,7 @@ "mount this directory.</P>\n" #. Help, part 2 of 4 -#: src/include/nfs_server/ui.rb:495 +#: src/include/nfs_server/ui.rb:524 msgid "" "<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n" "It can be a single host, groups, wild cards, or\n" @@ -356,64 +367,69 @@ "It can be a single host, groups, wild cards, or\n" "IP networks.</P>\n" -#. Help, part 3 of 4 -#: src/include/nfs_server/ui.rb:503 +#. Help, part 3 of 4, variant for kernel space server +#: src/include/nfs_server/ui.rb:536 #, fuzzy msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>" msgstr "<p>Enter an asterisk (<tt>*</tt>) to specify all hosts.</p>" +#. Help, part 3 of 4, variant for user space server +#: src/include/nfs_server/ui.rb:544 +msgid "<p>Leave the field empty to specify all hosts.</p>" +msgstr "<p>Leave the field empty to specify all hosts.</p>" + #. Help, part 4 of 4 -#: src/include/nfs_server/ui.rb:509 +#: src/include/nfs_server/ui.rb:551 msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n" msgstr "<P>Refer to <tt>man exports</tt> for more information.</P>\n" #. push button label -#: src/include/nfs_server/ui.rb:524 +#: src/include/nfs_server/ui.rb:567 msgid "Add &Directory" msgstr "Add &Directory" #. push button label -#: src/include/nfs_server/ui.rb:526 +#: src/include/nfs_server/ui.rb:569 msgid "&Edit" msgstr "&Edit" #. push button label -#: src/include/nfs_server/ui.rb:528 +#: src/include/nfs_server/ui.rb:571 msgid "De&lete" msgstr "De&lete" #. table header -#: src/include/nfs_server/ui.rb:541 +#: src/include/nfs_server/ui.rb:584 msgid "Host Wild Card" msgstr "Host Wild Card" #. table header -#: src/include/nfs_server/ui.rb:543 +#: src/include/nfs_server/ui.rb:586 msgid "Options" msgstr "Options" #. push button label -#: src/include/nfs_server/ui.rb:554 +#: src/include/nfs_server/ui.rb:597 msgid "Add &Host" msgstr "Add &Host" #. push button label -#: src/include/nfs_server/ui.rb:556 +#: src/include/nfs_server/ui.rb:599 msgid "Ed&it" msgstr "Ed&it" #. push button label -#: src/include/nfs_server/ui.rb:558 +#: src/include/nfs_server/ui.rb:601 msgid "Dele&te" msgstr "Dele&te" #. dialog title -#: src/include/nfs_server/ui.rb:565 +#: src/include/nfs_server/ui.rb:608 msgid "Directories to Export" msgstr "Directories to Export" #. not fatal - write other dirs. -#: src/modules/NfsServer.rb:158 +#: src/modules/NfsServer.rb:181 msgid "" "Unable to create a missing directory:\n" "%1" @@ -422,7 +438,7 @@ "%1" #. error popup message -#: src/modules/NfsServer.rb:170 +#: src/modules/NfsServer.rb:193 msgid "" "Unable to write to /etc/exports.\n" "No changes will be made to the\n" @@ -433,63 +449,79 @@ "exported directories.\n" #. dialog label -#: src/modules/NfsServer.rb:192 +#: src/modules/NfsServer.rb:228 msgid "Writing NFS Server Configuration" msgstr "Writing NFS Server Configuration" #. progress stage label -#: src/modules/NfsServer.rb:197 +#: src/modules/NfsServer.rb:233 msgid "Save /etc/exports" msgstr "Save /etc/exports" #. progress stage label -#: src/modules/NfsServer.rb:199 +#: src/modules/NfsServer.rb:235 msgid "Restart services" msgstr "Restart services" #. progress step label -#: src/modules/NfsServer.rb:203 +#: src/modules/NfsServer.rb:239 msgid "Saving /etc/exports..." msgstr "Saving /etc/exports..." #. progress step label -#: src/modules/NfsServer.rb:205 +#: src/modules/NfsServer.rb:241 msgid "Restarting services..." msgstr "Restarting services..." #. final progress step label -#: src/modules/NfsServer.rb:207 +#: src/modules/NfsServer.rb:243 msgid "Finished" msgstr "Finished" #. help text -#: src/modules/NfsServer.rb:215 +#: src/modules/NfsServer.rb:251 msgid "Writing NFS server settings. Please wait..." msgstr "Writing NFS server settings. Please wait..." #. Independent of @ref start because of Heartbeat (#27001). -#: src/modules/NfsServer.rb:229 +#: src/modules/NfsServer.rb:265 msgid "Unable to write to idmapd.conf." msgstr "Unable to write to idmapd.conf." -#. FIXME svcgssd is gone! (only nfsserver is left) -#: src/modules/NfsServer.rb:266 +#: src/modules/NfsServer.rb:314 #, fuzzy -msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct." -msgstr "Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is fine." +#| msgid "Unable to start idmapd. Please check your domain setting." +msgid "Unable to start idmapd. Check your domain setting." +msgstr "Unable to start idmapd. Please check your domain setting." -#: src/modules/NfsServer.rb:275 +#: src/modules/NfsServer.rb:321 #, fuzzy #| msgid "Unable to restart idmapd" -msgid "Unable to restart 'svcgssd' service." +msgid "Unable to restart idmapd." msgstr "Unable to restart idmapd" -#: src/modules/NfsServer.rb:283 +#: src/modules/NfsServer.rb:328 +#, fuzzy +#| msgid "Unable to stop idmapd" +msgid "Unable to stop idmapd." +msgstr "Unable to stop idmapd" + +#. FIXME svcgssd is gone! (only nfsserver is left) +#: src/modules/NfsServer.rb:339 +#, fuzzy +msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct." +msgstr "Unable to start svcgssd. Please ensure your kerberos and gssapi (nfs-utils) set up is fine." + +#: src/modules/NfsServer.rb:349 +msgid "'svcgssd' is already running. Unable to restart it." +msgstr "'svcgssd' is already running. Unable to restart it." + +#: src/modules/NfsServer.rb:357 msgid "'svcgssd' is running. Unable to stop it." msgstr "'svcgssd' is running. Unable to stop it." #. error popup message -#: src/modules/NfsServer.rb:299 +#: src/modules/NfsServer.rb:376 msgid "" "Unable to restart the NFS server.\n" "Your changes will be active after reboot.\n" @@ -498,46 +530,21 @@ "Your changes will be active after reboot.\n" #. summary header; directories exported by NFS -#: src/modules/NfsServer.rb:322 +#: src/modules/NfsServer.rb:399 msgid "NFS Exports" msgstr "NFS Exports" #. add information reg NFSv4 support, domain and security -#: src/modules/NfsServer.rb:340 +#: src/modules/NfsServer.rb:417 #, fuzzy msgid "The NFSv4 domain for idmapping is %1." msgstr "And the NFSv4 domain for idmapping is %1." -#~ msgid "" -#~ "The user mode NFS server (%1) cannot export directories\n" -#~ "with spaces in their names.\n" -#~ "Use the kernel-based server (%2) to do that." -#~ msgstr "" -#~ "The user mode NFS server (%1) cannot export directories\n" -#~ "with spaces in their names.\n" -#~ "Use the kernel-based server (%2) to do that." - -#~ msgid "<p>Leave the field empty to specify all hosts.</p>" -#~ msgstr "<p>Leave the field empty to specify all hosts.</p>" - #, fuzzy -#~| msgid "Unable to start idmapd. Please check your domain setting." -#~ msgid "Unable to start idmapd. Check your domain setting." -#~ msgstr "Unable to start idmapd. Please check your domain setting." - -#, fuzzy #~| msgid "Unable to restart idmapd" -#~ msgid "Unable to restart idmapd." +#~ msgid "Unable to restart 'svcgssd' service." #~ msgstr "Unable to restart idmapd" -#, fuzzy -#~| msgid "Unable to stop idmapd" -#~ msgid "Unable to stop idmapd." -#~ msgstr "Unable to stop idmapd" - -#~ msgid "'svcgssd' is already running. Unable to restart it." -#~ msgstr "'svcgssd' is already running. Unable to restart it." - #~ msgid "Directories" #~ msgstr "Directories" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nis.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/nis_server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/ntp-client.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2007-08-16 20:07+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -82,7 +82,7 @@ msgstr "&Configure..." #. Otherwise, prompt user for confirming pkg installation -#: src/clients/ntp-client_proposal.rb:380 +#: src/clients/ntp-client_proposal.rb:381 #, fuzzy msgid "" "Synchronization with NTP server is not possible\n" @@ -92,13 +92,13 @@ "without having package %1 installed." #. Only if network is running try to synchronize the ntp server -#: src/clients/ntp-client_proposal.rb:392 +#: src/clients/ntp-client_proposal.rb:393 #, fuzzy msgid "Synchronizing with NTP server..." msgstr "Synchronise with NTP Server" #. update time widgets -#: src/clients/ntp-client_proposal.rb:438 +#: src/clients/ntp-client_proposal.rb:439 #, fuzzy #| msgid "Connection to the LDAP server cannot be established." msgid "Connection to selected NTP server failed." @@ -106,7 +106,7 @@ #. Translators: yes-no popup, #. ntpdate is a command, %1 is the server address -#: src/clients/ntp-client_proposal.rb:469 +#: src/clients/ntp-client_proposal.rb:470 msgid "" "Test query to server '%1' failed.\n" "If server is not yet accessible or network is not configured\n" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/oneclickinstall.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/online-update-configuration.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/online-update.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/opensuse_mirror.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/packager.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-06 16:04+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2007-08-16 20:13+0100\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -211,8 +211,8 @@ #. force minimum width #. table header - name of the repo #. table header - name of the repo -#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703 -#: src/clients/repositories.rb:716 +#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:674 +#: src/clients/repositories.rb:687 #: src/include/packager/key_manager_dialogs.rb:306 msgid "Name" msgstr "Name" @@ -435,7 +435,7 @@ #. TRANSLATORS: dialog help #. TRANSLATORS: dialog help #: src/clients/inst_productsources.rb:1380 -#: src/include/packager/repositories_include.rb:93 +#: src/include/packager/repositories_include.rb:91 #, fuzzy msgid "<p>The repository manager is downloading repository details...</p>" msgstr "" @@ -517,7 +517,7 @@ #. re-initialize package information #. force reinitialization -#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739 +#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744 msgid "Installing Packages..." msgstr "Installing Packages..." @@ -554,8 +554,8 @@ #. dialog caption #. dialog caption #. dialog caption -#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845 -#: src/modules/AddOnProduct.rb:684 +#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810 +#: src/modules/AddOnProduct.rb:682 msgid "Initializing..." msgstr "Initialising..." @@ -586,109 +586,92 @@ msgstr "Saving package manager configuration..." #. default (minimal) priority of a repository -#: src/clients/repositories.rb:58 +#: src/clients/repositories.rb:55 msgid "&Priority" msgstr "&Priority" -#: src/clients/repositories.rb:60 +#: src/clients/repositories.rb:57 #, fuzzy msgid "Keep Downloaded Packages" msgstr "Downloading Package" #. Command line help text for the repository module, %1 is "zypper" -#: src/clients/repositories.rb:75 +#: src/clients/repositories.rb:72 #, fuzzy msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead." msgstr "This YaST2 module does not support the command line interface." #. pad to 3 characters -#: src/clients/repositories.rb:169 +#: src/clients/repositories.rb:166 msgid "Default" msgstr "Default" #. unkown name (alias) of the source #. get the editable propertis from 'source' parameter, #. get the fixed propertis from the package manager -#: src/clients/repositories.rb:199 src/clients/repositories.rb:264 +#: src/clients/repositories.rb:195 src/clients/repositories.rb:260 #, fuzzy msgid "Unknown Name" msgstr "Unknown mode" #. displaye only repositories from the selected service -#: src/clients/repositories.rb:334 src/clients/repositories.rb:335 -#: src/clients/repositories.rb:377 src/clients/repositories.rb:383 -#: src/modules/SourceManager.rb:436 +#: src/clients/repositories.rb:326 src/clients/repositories.rb:362 +#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436 msgid "Unknown" msgstr "Unknown" #. label to be used instead of URL if not found -#: src/clients/repositories.rb:337 src/clients/repositories.rb:376 -#: src/modules/AddOnProduct.rb:1336 +#: src/clients/repositories.rb:328 src/clients/repositories.rb:361 +#: src/modules/AddOnProduct.rb:1334 msgid "URL: %1" msgstr "URL: %1" -#. TRANSLATORS: Raw URL is the address without expanding repo variables -#. e.g. Raw URL = http://something/$arch -> URL = http://something/x86_64 -#: src/clients/repositories.rb:342 -#, fuzzy -#| msgid "URL: %1" -msgid "Raw URL: %s" -msgstr "URL: %1" - #. heading - in case repo name not found -#: src/clients/repositories.rb:372 +#: src/clients/repositories.rb:357 #, fuzzy msgid "Unknown Repository Name" msgstr "Unknown port name %1." #. label, %1 is repo category (eg. YUM) -#: src/clients/repositories.rb:382 +#: src/clients/repositories.rb:367 #, fuzzy msgid "Category: %1" msgstr "Gateway: %1" #. label, %1 is repo category (eg. YUM) -#: src/clients/repositories.rb:392 +#: src/clients/repositories.rb:377 msgid "Service: %1" msgstr "Service: %1" #. #176013 -#: src/clients/repositories.rb:640 +#: src/clients/repositories.rb:625 #, fuzzy msgid "All repositories" msgstr "Available Repositories" -#: src/clients/repositories.rb:643 +#: src/clients/repositories.rb:628 msgid "All services" msgstr "All services" -#: src/clients/repositories.rb:652 +#: src/clients/repositories.rb:637 #, fuzzy msgid "Service '%1'" msgstr "Service %1" -#. TRANSLATORS: Item in selection box that allow user to see only -#. repositories not associated with service. Sometimes called also -#. third party as they are usually repositories not provided by SUSE -#. within product subscription. -#: src/clients/repositories.rb:669 -msgid "Only repositories not provided by a service" -msgstr "" - #. combobox label -#: src/clients/repositories.rb:681 +#: src/clients/repositories.rb:652 msgid "View" msgstr "View" #. table header - priority of the repository - keep the translation as short as possible! -#: src/clients/repositories.rb:696 +#: src/clients/repositories.rb:667 msgid "Priority" msgstr "Priority" #. table header - is the repo enabled? - keep the translation as short as possible! #. table header - is the repo enabled? - keep the translation as short as possible! #. status info, to be used inside summary -#: src/clients/repositories.rb:698 src/clients/repositories.rb:711 +#: src/clients/repositories.rb:669 src/clients/repositories.rb:682 #: src/modules/SourceManager.rb:393 msgid "Enabled" msgstr "Enabled" @@ -697,113 +680,113 @@ #. keep the translation as short as possible! #. table header - is autorefresh enabled for the repo? #. keep the translation as short as possible! -#: src/clients/repositories.rb:701 src/clients/repositories.rb:714 +#: src/clients/repositories.rb:672 src/clients/repositories.rb:685 #, fuzzy msgid "Autorefresh" msgstr "&Skip Refresh" #. table header - service to which the repo belongs -#: src/clients/repositories.rb:705 +#: src/clients/repositories.rb:676 msgid "Service" msgstr "Service" #. table header - URL of the repo #. table header - URL of the repo -#: src/clients/repositories.rb:707 src/clients/repositories.rb:718 +#: src/clients/repositories.rb:678 src/clients/repositories.rb:689 msgid "URL" msgstr "URL" #. push button - change URL of the selected repository -#: src/clients/repositories.rb:818 +#: src/clients/repositories.rb:789 msgid "&Replace..." msgstr "&Replace..." #. push button - refresh the selected repository now -#: src/clients/repositories.rb:820 +#: src/clients/repositories.rb:791 #, fuzzy msgid "Re&fresh Selected" msgstr "Registered Host" #. push button - disable/enable the selected repository -#: src/clients/repositories.rb:822 +#: src/clients/repositories.rb:793 #, fuzzy msgid "Status &on or off" msgstr "&Toggle Status (On or Off)" #. push button - disable/enable automatic refresh of the selected repository -#: src/clients/repositories.rb:824 +#: src/clients/repositories.rb:795 #, fuzzy #| msgid "Refre&sh On or Off" msgid "Refre&sh on or off" msgstr "Refre&sh On or Off" #. push button - set name of the selected repository -#: src/clients/repositories.rb:826 +#: src/clients/repositories.rb:797 #, fuzzy msgid "Set &Name..." msgstr "Section &Name" #. label -#: src/clients/repositories.rb:833 +#: src/clients/repositories.rb:804 #, fuzzy msgid "Properties" msgstr "Archive Properties" #. check box -#: src/clients/repositories.rb:838 +#: src/clients/repositories.rb:809 msgid "&Enabled" msgstr "&Enabled" #. check box -#: src/clients/repositories.rb:844 +#: src/clients/repositories.rb:815 #, fuzzy msgid "Automatically &Refresh" msgstr "&Automatically Retrieve DNS" #. push button label -#: src/clients/repositories.rb:882 +#: src/clients/repositories.rb:853 #, fuzzy msgid "&GPG Keys..." msgstr "GPG Key" #. menu button label -#: src/clients/repositories.rb:887 +#: src/clients/repositories.rb:858 msgid "Refresh" msgstr "Refresh" #. menu button label -#: src/clients/repositories.rb:891 +#: src/clients/repositories.rb:862 #, fuzzy #| msgid "Refresh Patterns" msgid "Refresh all Autor&efreshed" msgstr "Refresh Patterns" #. menu button label -#: src/clients/repositories.rb:893 +#: src/clients/repositories.rb:864 #, fuzzy #| msgid "Firewall enabled" msgid "Refresh all &Enabled" msgstr "Firewall enabled" #. dialog caption -#: src/clients/repositories.rb:900 +#: src/clients/repositories.rb:871 #, fuzzy msgid "Configured Software Repositories" msgstr "Configured Catalogues" #. help -#: src/clients/repositories.rb:903 +#: src/clients/repositories.rb:874 #, fuzzy msgid "" "<p>\n" "Manage configured software repositories and services.</p>\n" msgstr "<p>In this dialogue, change various boot settings.</p>" -#: src/clients/repositories.rb:909 +#: src/clients/repositories.rb:880 msgid "<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator.</P>" msgstr "" -#: src/clients/repositories.rb:916 +#: src/clients/repositories.rb:887 #, fuzzy msgid "" "<p>\n" @@ -816,7 +799,7 @@ "Press <b>Add</b> to configure a repository.</p>" #. help, continued -#: src/clients/repositories.rb:928 +#: src/clients/repositories.rb:899 #, fuzzy msgid "" "<p>\n" @@ -830,7 +813,7 @@ "</p>\n" #. help, continued -#: src/clients/repositories.rb:939 +#: src/clients/repositories.rb:910 #, fuzzy msgid "" "<p>\n" @@ -852,7 +835,7 @@ "</p>\n" #. help, continued -#: src/clients/repositories.rb:955 +#: src/clients/repositories.rb:926 msgid "" "<p>\n" "<b>Modifying Status of a Repository or a Service</b><br>\n" @@ -862,31 +845,31 @@ msgstr "" #. help text, continued -#: src/clients/repositories.rb:967 +#: src/clients/repositories.rb:938 msgid "" "<P><B>Priority of a Repository</B><BR>\n" "Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used.</P>\n" msgstr "" #. help text, continued -#: src/clients/repositories.rb:975 +#: src/clients/repositories.rb:946 msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>" msgstr "" #. help text, continued -#: src/clients/repositories.rb:983 +#: src/clients/repositories.rb:954 msgid "" "<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n" "packages in a local cache so they can be reused later when the packages are\n" "reinstalled. If not checked, the downloaded packages are deleted after installation.</P>" msgstr "" -#: src/clients/repositories.rb:989 +#: src/clients/repositories.rb:960 msgid "<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>" msgstr "" #. popup message part 1 -#: src/clients/repositories.rb:1034 +#: src/clients/repositories.rb:1005 #, fuzzy msgid "" "Unable to save changes to the repository\n" @@ -897,7 +880,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:1329 +#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310 msgid "Details:" msgstr "Details:" @@ -905,19 +888,19 @@ #. popup message part 3 #. end of popup message, question #. end of popup message, question -#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337 +#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312 msgid "Try again?" msgstr "Try again?" #. popup headline -#: src/clients/repositories.rb:1059 +#: src/clients/repositories.rb:1030 #, fuzzy msgid "Abort Repository Configuration" msgstr "Abort Catalogue Configuration" #. popup message -#: src/clients/repositories.rb:1061 +#: src/clients/repositories.rb:1032 #, fuzzy msgid "" "Abort the repository configuration?\n" @@ -927,7 +910,7 @@ "All changes will be lost." #. refresh also the combobox widget -#: src/clients/repositories.rb:1364 +#: src/clients/repositories.rb:1329 #, fuzzy msgid "" "There is no service at URL:\n" @@ -935,47 +918,47 @@ msgstr "There is no profile '%1'" #. TODO: add help text -#: src/clients/repositories.rb:1475 +#: src/clients/repositories.rb:1440 #, fuzzy msgid "Refreshing Repositories" msgstr "Refreshing repository " -#: src/clients/repositories.rb:1476 +#: src/clients/repositories.rb:1441 #, fuzzy msgid "Refreshing Services" msgstr "Refreshing repository " -#: src/clients/repositories.rb:1481 +#: src/clients/repositories.rb:1446 #, fuzzy msgid "Refresh Repositories" msgstr "Registered Host" -#: src/clients/repositories.rb:1482 +#: src/clients/repositories.rb:1447 #, fuzzy msgid "Refresh Services" msgstr "Registered Host" #. progress bar label -#: src/clients/repositories.rb:1514 +#: src/clients/repositories.rb:1479 #, fuzzy msgid "Refreshing Repository %1..." msgstr "Refreshing repository " #. refreshing services #. progress bar label -#: src/clients/repositories.rb:1540 +#: src/clients/repositories.rb:1505 #, fuzzy msgid "Refreshing Service %1..." msgstr "Restarting service %1..." #. yes-no popup -#: src/clients/repositories.rb:1559 +#: src/clients/repositories.rb:1524 #, fuzzy msgid "Delete the selected repository from the list?" msgstr "Delete selected catalogue from list?" #. yes-no popup -#: src/clients/repositories.rb:1573 +#: src/clients/repositories.rb:1538 #, fuzzy msgid "" "Delete service %1\n" @@ -983,7 +966,7 @@ msgstr "Delete selected catalogue from list?" #. popup message -#: src/clients/repositories.rb:1641 +#: src/clients/repositories.rb:1606 #, fuzzy msgid "" "For the selected repository, refresh\n" @@ -993,7 +976,7 @@ "cannot be set." #. popup question, %1 is repository URL -#: src/clients/repositories.rb:1803 +#: src/clients/repositories.rb:1768 msgid "" "Repository %1\n" "has been already added. Each repository should be added only once.\n" @@ -1002,7 +985,7 @@ msgstr "" #. Error popup -#: src/clients/repositories.rb:1871 +#: src/clients/repositories.rb:1836 #, fuzzy msgid "<p>Errors occurred while restoring the repository configuration.</p>\n" msgstr "<p>Please wait while reading the configuration.</p>" @@ -1141,7 +1124,7 @@ "Install them now?\n" #. start the repository manager -#: src/clients/sw_single.rb:614 +#: src/clients/sw_single.rb:619 #, fuzzy msgid "" "Cannot configure online update repository \n" @@ -1150,7 +1133,7 @@ "Cannot search for SLP installation sources\n" "without having %1 package installed" -#: src/clients/sw_single.rb:640 +#: src/clients/sw_single.rb:645 #, fuzzy msgid "" "Cannot search packages in online repositories\n" @@ -1160,7 +1143,7 @@ "without having %1 package installed" #. error report, %1 is a list of packages -#: src/clients/sw_single.rb:668 +#: src/clients/sw_single.rb:673 #, fuzzy #| msgid "" #| "Following packages haven't been found on the medium:\n" @@ -1526,49 +1509,49 @@ msgstr "Really delete '%1'?" #. TRANSLATORS: dialog caption -#: src/include/packager/repositories_include.rb:79 +#: src/include/packager/repositories_include.rb:77 #, fuzzy msgid "Adding a New Repository" msgstr "Adding Xen section..." -#: src/include/packager/repositories_include.rb:83 +#: src/include/packager/repositories_include.rb:81 #, fuzzy msgid "Check Repository Type" msgstr "Choose a Report Type" -#: src/include/packager/repositories_include.rb:84 +#: src/include/packager/repositories_include.rb:82 #, fuzzy msgid "Add Repository" msgstr "Repository" -#: src/include/packager/repositories_include.rb:85 +#: src/include/packager/repositories_include.rb:83 #, fuzzy msgid "Read Repository License" msgstr "Registered Host" -#: src/include/packager/repositories_include.rb:88 +#: src/include/packager/repositories_include.rb:86 #, fuzzy msgid "Checking Repository Type" msgstr "Creating software RAID %1$s" -#: src/include/packager/repositories_include.rb:89 +#: src/include/packager/repositories_include.rb:87 #, fuzzy msgid "Adding Repository" msgstr "Adding Xen section..." -#: src/include/packager/repositories_include.rb:90 +#: src/include/packager/repositories_include.rb:88 #, fuzzy msgid "Reading Repository License" msgstr "Refreshing repository " #. add at least one product if the scan result is empty (no product info available) -#: src/include/packager/repositories_include.rb:154 +#: src/include/packager/repositories_include.rb:152 msgid "Repository" msgstr "Repository" #. continue-back popup #. continue-back popup -#: src/include/packager/repositories_include.rb:226 +#: src/include/packager/repositories_include.rb:224 #: src/modules/SourceManager.rb:330 #, fuzzy #| msgid "" @@ -1592,7 +1575,7 @@ #. popup message part 1 #. Import GPG keys found in the inst-sys -#: src/include/packager/repositories_include.rb:321 +#: src/include/packager/repositories_include.rb:319 #: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306 #, fuzzy msgid "" @@ -1603,20 +1586,20 @@ "from URL '%1'." #. error message -#: src/include/packager/repositories_include.rb:333 +#: src/include/packager/repositories_include.rb:331 msgid "" "Using an ISO image over ftp or http protocol is not possible.\n" "Change the protocol or unpack the ISO image on the server side." msgstr "" #. popup message part 2 -#: src/include/packager/repositories_include.rb:343 +#: src/include/packager/repositories_include.rb:341 #, fuzzy msgid "Change the URL and try again?" msgstr "Change the XPRAM configuration" #. popup error message, %1 is the package name -#: src/include/packager/repositories_include.rb:420 +#: src/include/packager/repositories_include.rb:418 #, fuzzy msgid "" "Cannot search for SLP repositories\n" @@ -1632,21 +1615,21 @@ #. error report #. popup error #. popup error -#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620 +#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618 #: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730 #, fuzzy msgid "An error occurred while preparing the installation system." msgstr "An error occurred during the installation of" #. error report -#: src/modules/AddOnProduct.rb:655 +#: src/modules/AddOnProduct.rb:653 #, fuzzy msgid "Control file %1 not found on media." msgstr "Control file %1 was not found." #. FATE #305578: Add-On Product Requiring Registration #. or check the content file -#: src/modules/AddOnProduct.rb:896 +#: src/modules/AddOnProduct.rb:894 #, fuzzy #| msgid "Package %1 was not installed. The service cannot be edited." msgid "" @@ -1656,69 +1639,69 @@ #. TRANSLATORS: error report #. TRANSLATORS: error report -#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427 +#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425 #, fuzzy msgid "Unable to use additional products." msgstr "Insert the add-on product CD" #. fill up internal map (used later when item selected) -#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320 +#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318 #, fuzzy msgid "%1, URL: %2" msgstr "%1, %2" -#: src/modules/AddOnProduct.rb:1330 +#: src/modules/AddOnProduct.rb:1328 #, fuzzy msgid "URL: %1, Path: %2" msgstr "URL: %1, Directory: %2" #. TRANSLATORS: popup heading -#: src/modules/AddOnProduct.rb:1361 +#: src/modules/AddOnProduct.rb:1359 #, fuzzy msgid "Additional Products" msgstr "Additional &LDAP Groups" #. TRANSLATORS: additional dialog information -#: src/modules/AddOnProduct.rb:1367 +#: src/modules/AddOnProduct.rb:1365 msgid "" "The installation repository also contains the listed additional repositories.\n" "Select the ones you want to use.\n" msgstr "" -#: src/modules/AddOnProduct.rb:1378 +#: src/modules/AddOnProduct.rb:1376 #, fuzzy msgid "Additional Products to Select" msgstr "Additional Group Settings" #. push button label -#: src/modules/AddOnProduct.rb:1385 +#: src/modules/AddOnProduct.rb:1383 #, fuzzy msgid "Add Selected &Products" msgstr "Add-On Products" #. %1 is either "CD" or "DVD" -#: src/modules/AddOnProduct.rb:1517 +#: src/modules/AddOnProduct.rb:1515 #, 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:1522 +#: src/modules/AddOnProduct.rb:1520 #, 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:1574 +#: src/modules/AddOnProduct.rb:1572 #, fuzzy msgid "Unable to add product %1." msgstr "Unable to write %1." #. adding the product to the list of products (BNC #269625) #. no such products -#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772 +#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770 #: src/modules/Packages.rb:471 msgid "Unknown Product" msgstr "Unknown Product" @@ -2306,7 +2289,7 @@ #. radio button #. radio button -#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757 +#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1750 #, fuzzy #| msgid "&SMB/CIFS" msgid "S&MB/CIFS" @@ -2378,7 +2361,7 @@ #. text entry #. text entry -#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621 +#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1614 msgid "&Path to Directory or ISO Image" msgstr "&Path to Directory or ISO Image" @@ -2456,7 +2439,7 @@ #. label / dialog caption #. dialog caption -#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926 +#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:919 msgid "Local Directory" msgstr "Local Directory" @@ -2478,19 +2461,19 @@ msgstr "Server and Directory" #. popup message -#: src/modules/SourceDialogs.rb:468 +#: src/modules/SourceDialogs.rb:461 #, fuzzy msgid "The name of the repository cannot be empty." msgstr "Share path cannot be empty." #. text entry -#: src/modules/SourceDialogs.rb:480 +#: src/modules/SourceDialogs.rb:473 #, fuzzy msgid "&Repository Name" msgstr "Repository" #. help text -#: src/modules/SourceDialogs.rb:495 +#: src/modules/SourceDialogs.rb:488 #, fuzzy msgid "" "<p><big><b>Repository Name</b></big><br>\n" @@ -2501,13 +2484,13 @@ "loaded.</p>\n" #. text entry -#: src/modules/SourceDialogs.rb:509 +#: src/modules/SourceDialogs.rb:502 #, fuzzy msgid "&Service Name" msgstr "Service Name" #. help text -#: src/modules/SourceDialogs.rb:517 +#: src/modules/SourceDialogs.rb:510 #, fuzzy msgid "" "<p><big><b>Service Name</b></big><br>\n" @@ -2518,17 +2501,17 @@ "loaded.</p>\n" #. popup message -#: src/modules/SourceDialogs.rb:552 +#: src/modules/SourceDialogs.rb:545 msgid "URL cannot be empty." msgstr "URL cannot be empty." #. text entry -#: src/modules/SourceDialogs.rb:566 +#: src/modules/SourceDialogs.rb:559 msgid "&URL" msgstr "&URL" #. help text -#: src/modules/SourceDialogs.rb:580 +#: src/modules/SourceDialogs.rb:573 #, fuzzy msgid "" "<p><big><b>Repository URL</b></big><br>\n" @@ -2541,17 +2524,17 @@ #. @return widget description map #. Get widget description map #. @return widget description map -#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893 +#: src/modules/SourceDialogs.rb:746 src/modules/SourceDialogs.rb:1886 msgid "Edit Parts of the URL" msgstr "" -#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900 +#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893 #, fuzzy msgid "Edit Complete URL" msgstr "Show Complete &List" #. help text -#: src/modules/SourceDialogs.rb:772 +#: src/modules/SourceDialogs.rb:765 #, fuzzy msgid "" "<p><big><b>NFS Server</b></big><br>\n" @@ -2561,7 +2544,7 @@ "<p><big><b>Kernel</b></big><br>\n" "Use <b>Kernel</b> to specify the kernel image to load.</p>" -#: src/modules/SourceDialogs.rb:779 +#: src/modules/SourceDialogs.rb:772 msgid "" "<p><big><b>Mount Options</b></big><br>\n" "You can specify extra options used for mounting the NFS volume.\n" @@ -2570,16 +2553,16 @@ msgstr "" #. radio button -#: src/modules/SourceDialogs.rb:834 +#: src/modules/SourceDialogs.rb:827 msgid "&CD-ROM" msgstr "&CD-ROM" #. radio button -#: src/modules/SourceDialogs.rb:836 +#: src/modules/SourceDialogs.rb:829 msgid "&DVD-ROM" msgstr "&DVD-ROM" -#: src/modules/SourceDialogs.rb:841 +#: src/modules/SourceDialogs.rb:834 #, fuzzy msgid "" "<p><big><b>CD or DVD Media</b></big><br>\n" @@ -2589,12 +2572,12 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. dialog caption -#: src/modules/SourceDialogs.rb:941 +#: src/modules/SourceDialogs.rb:934 msgid "ISO Image File" msgstr "ISO Image File" #. error popup - the entered path is not a directory -#: src/modules/SourceDialogs.rb:964 +#: src/modules/SourceDialogs.rb:957 #, fuzzy msgid "" "The entered path is not a directory\n" @@ -2604,7 +2587,7 @@ "Try again.\n" #. error popup - the entered path is not a regular file -#: src/modules/SourceDialogs.rb:994 +#: src/modules/SourceDialogs.rb:987 #, fuzzy msgid "" "The entered path is not a file\n" @@ -2612,7 +2595,7 @@ msgstr "The specified file does not exist." #. continue/cancel popup, %1 is a file name -#: src/modules/SourceDialogs.rb:1018 +#: src/modules/SourceDialogs.rb:1011 msgid "" "File '%1'\n" "does not seem to be an ISO image.\n" @@ -2620,19 +2603,19 @@ msgstr "" #. text entry -#: src/modules/SourceDialogs.rb:1039 +#: src/modules/SourceDialogs.rb:1032 #, fuzzy msgid "&Path to Directory" msgstr "&Path to Generated Directory Tree:" #. checkbox label -#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305 -#: src/modules/SourceDialogs.rb:1372 +#: src/modules/SourceDialogs.rb:1040 src/modules/SourceDialogs.rb:1298 +#: src/modules/SourceDialogs.rb:1365 #, fuzzy msgid "&Plain RPM Directory" msgstr "&Path to Generated Directory Tree:" -#: src/modules/SourceDialogs.rb:1062 +#: src/modules/SourceDialogs.rb:1055 #, fuzzy msgid "" "<p><big><b>Local Directory</b></big><br>\n" @@ -2645,22 +2628,22 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. `opt(`hstretch), -#: src/modules/SourceDialogs.rb:1298 +#: src/modules/SourceDialogs.rb:1291 #, fuzzy msgid "&USB Mass Storage Device" msgstr "Mass Storage Device" #. the spacing is added to make the widget wider -#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370 +#: src/modules/SourceDialogs.rb:1296 src/modules/SourceDialogs.rb:1363 msgid "&File System" msgstr "&File System" -#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371 +#: src/modules/SourceDialogs.rb:1297 src/modules/SourceDialogs.rb:1364 #, fuzzy msgid "Dire&ctory" msgstr "Directory" -#: src/modules/SourceDialogs.rb:1309 +#: src/modules/SourceDialogs.rb:1302 #, fuzzy msgid "" "<p><big><b>USB Stick or Disk</b></big><br>\n" @@ -2676,7 +2659,7 @@ #. 'auto' is a value in the combo box widget, do not translate it! #. 'auto' is a value in the combo box widget, do not translate it! -#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386 +#: src/modules/SourceDialogs.rb:1312 src/modules/SourceDialogs.rb:1379 msgid "" "<p>The file system used on the device will be detected automatically\n" "if you select file system 'auto'. If the detection fails or you\n" @@ -2684,12 +2667,12 @@ msgstr "" #. combobox title -#: src/modules/SourceDialogs.rb:1369 +#: src/modules/SourceDialogs.rb:1362 #, fuzzy msgid "&Disk Device" msgstr "&Floppy Disk Device" -#: src/modules/SourceDialogs.rb:1376 +#: src/modules/SourceDialogs.rb:1369 #, fuzzy msgid "" "<p><big><b>Disk</b></big><br>\n" @@ -2704,13 +2687,13 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. text entry -#: src/modules/SourceDialogs.rb:1402 +#: src/modules/SourceDialogs.rb:1395 #, fuzzy msgid "&Path to ISO Image" msgstr "&Path to Generated Directory Tree:" #. push button -#: src/modules/SourceDialogs.rb:1422 +#: src/modules/SourceDialogs.rb:1415 #, fuzzy msgid "" "<p><big><b>Local ISO Image</b></big><br>\n" @@ -2721,73 +2704,73 @@ "Use <b>Kernel</b> to specify the kernel image to load.</p>" #. text entry -#: src/modules/SourceDialogs.rb:1603 +#: src/modules/SourceDialogs.rb:1596 msgid "Server &Name" msgstr "Server &Name" -#: src/modules/SourceDialogs.rb:1607 +#: src/modules/SourceDialogs.rb:1600 msgid "&Port" msgstr "&Port" #. text entry -#: src/modules/SourceDialogs.rb:1612 +#: src/modules/SourceDialogs.rb:1605 msgid "&Share" msgstr "&Share" #. checkbox label -#: src/modules/SourceDialogs.rb:1625 +#: src/modules/SourceDialogs.rb:1618 #, fuzzy msgid "ISO &Image" msgstr "Use &ISO Images" #. text entry -#: src/modules/SourceDialogs.rb:1628 +#: src/modules/SourceDialogs.rb:1621 msgid "&Directory on Server" msgstr "&Directory on Server" #. frame -#: src/modules/SourceDialogs.rb:1633 +#: src/modules/SourceDialogs.rb:1626 msgid "Au&thentication" msgstr "Au&thentication" #. check box -#: src/modules/SourceDialogs.rb:1640 +#: src/modules/SourceDialogs.rb:1633 msgid "&Anonymous" msgstr "&Anonymous" #. text entry -#: src/modules/SourceDialogs.rb:1649 +#: src/modules/SourceDialogs.rb:1642 #, fuzzy msgid "&Workgroup or Domain" msgstr "Workgroup or Domain" #. text entry -#: src/modules/SourceDialogs.rb:1658 +#: src/modules/SourceDialogs.rb:1651 msgid "&User Name" msgstr "&User Name" #. password entry -#: src/modules/SourceDialogs.rb:1665 +#: src/modules/SourceDialogs.rb:1658 msgid "&Password" msgstr "&Password" #. radio button -#: src/modules/SourceDialogs.rb:1740 +#: src/modules/SourceDialogs.rb:1733 msgid "&FTP" msgstr "&FTP" #. radio button -#: src/modules/SourceDialogs.rb:1743 +#: src/modules/SourceDialogs.rb:1736 msgid "H&TTP" msgstr "H&TTP" #. radio button -#: src/modules/SourceDialogs.rb:1750 +#: src/modules/SourceDialogs.rb:1743 msgid "HTT&PS" msgstr "HTT&PS" #. help text - server dialog -#: src/modules/SourceDialogs.rb:1924 +#: src/modules/SourceDialogs.rb:1917 msgid "" "<p><big><b>Server and Directory</b></big><br>\n" "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n" @@ -2802,7 +2785,7 @@ msgstr "" #. help text - server dialog, there is a "Port" widget -#: src/modules/SourceDialogs.rb:1937 +#: src/modules/SourceDialogs.rb:1930 msgid "" "<p>It is possible to set the <b>Port</b> number for a HTTP/HTTPS repository.\n" "Leave it empty to use the default port.</p>\n" @@ -2811,12 +2794,12 @@ #. Returns whether Community Repositories are defined in the control file. #. #. @return [Boolean] whether defined -#: src/modules/SourceDialogs.rb:1999 +#: src/modules/SourceDialogs.rb:1992 msgid "I would like to install an additional Add On Product" msgstr "" #. help text -#: src/modules/SourceDialogs.rb:2126 +#: src/modules/SourceDialogs.rb:2119 #, fuzzy msgid "" "<p><big><b>Media Type</b></big><br>\n" @@ -2829,7 +2812,7 @@ "</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2135 +#: src/modules/SourceDialogs.rb:2128 #, fuzzy msgid "" "<p>\n" @@ -2842,7 +2825,7 @@ "</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2145 +#: src/modules/SourceDialogs.rb:2138 #, fuzzy msgid "" "<p>\n" @@ -2861,7 +2844,7 @@ "</p>\n" #. help, continued -#: src/modules/SourceDialogs.rb:2157 +#: src/modules/SourceDialogs.rb:2150 #, fuzzy #| msgid "" #| "<p>\n" @@ -2880,27 +2863,27 @@ "the first CD are located, such as /data1/CD1.</p>\n" #. error popup -#: src/modules/SourceDialogs.rb:2172 +#: src/modules/SourceDialogs.rb:2165 #, fuzzy msgid "Select the media type" msgstr "Select the printer type." -#: src/modules/SourceDialogs.rb:2178 +#: src/modules/SourceDialogs.rb:2171 msgid "Insert the add-on product CD" msgstr "Insert the add-on product CD" -#: src/modules/SourceDialogs.rb:2179 +#: src/modules/SourceDialogs.rb:2172 msgid "Insert the add-on product DVD" msgstr "Insert the add-on product DVD" #. ask for a medium -#: src/modules/SourceDialogs.rb:2197 +#: src/modules/SourceDialogs.rb:2190 #, fuzzy msgid "No USB disk was detected." msgstr "No DASD disk detected" -#. use three slashes as third slash means path -#: src/modules/SourceDialogs.rb:2403 +#. TODO: disable "download" option when CD or DVD source is selected +#: src/modules/SourceDialogs.rb:2393 msgid "" "<p><b>Download Files</b><br>\n" "Each repository has description files which describe the content of the\n" @@ -2910,13 +2893,13 @@ msgstr "" #. dialog caption -#: src/modules/SourceDialogs.rb:2623 +#: src/modules/SourceDialogs.rb:2613 #, fuzzy msgid "Media Type" msgstr "Media Check" #. dialog caption -#: src/modules/SourceDialogs.rb:2647 +#: src/modules/SourceDialogs.rb:2637 #, fuzzy #| msgid "Add-On Products" msgid "Add On Product" @@ -2925,7 +2908,7 @@ #. Returns boolean whether user confirmed to abort the configuration #. #. @return [Boolean] whether to abort -#: src/modules/SourceDialogs.rb:2678 +#: src/modules/SourceDialogs.rb:2668 #, fuzzy #| msgid "URL entered is not valid" msgid "URL scheme '%s' is not valid." @@ -3165,6 +3148,11 @@ msgstr "Please deselect some packages." #, fuzzy +#~| msgid "URL: %1" +#~ msgid "Raw URL: %s" +#~ msgstr "URL: %1" + +#, fuzzy #~ msgid "Downloading patch RPM %1 (download size %2)" #~ msgstr "Downloading package %1 (%2)..." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/pam.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/pkg-bindings.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-05-05 12:07+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -50,13 +50,13 @@ msgstr "" #. error message -#: src/Package.cc:655 +#: src/Package.cc:658 #, fuzzy msgid "The package cannot be selected to install." msgstr "There are package conflict which cannot be resolved automatically." #. error message -#: src/Package.cc:661 +#: src/Package.cc:664 #, fuzzy msgid "The package is not available." msgstr "%1 package not available." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/printer.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2007-08-16 20:16+0100\n" "Last-Translator: Karl Eichwalder\n" "Language-Team: British English\n" @@ -209,7 +209,7 @@ #. where %1 will be replaced by the server name: #. where %1 will be replaced by the server name: #. where %1 will be replaced by the server name: -#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098 +#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101 #: src/include/printer/policies.rb:135 #: src/include/printer/printingvianetwork.rb:463 #: src/include/printer/sharing.rb:639 @@ -226,8 +226,8 @@ #. Only a simple message because this error does not happen on a normal system #. (i.e. a system which is not totally broken or totally messed up). #. Remove the 'ServerName' entry in /etc/cups/client.conf: -#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217 -#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153 +#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220 +#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153 #: src/include/printer/printingvianetwork.rb:478 #: src/include/printer/sharing.rb:657 msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf" @@ -365,7 +365,7 @@ #: src/include/printer/basicmodify.rb:371 #: src/include/printer/basicmodify.rb:899 #: src/include/printer/connectionwizard.rb:551 -#: src/include/printer/overview.rb:86 +#: src/include/printer/overview.rb:89 msgid "Description" msgstr "Description" @@ -480,8 +480,8 @@ #. does not set a valid Printer::selected_connections_index so that the BasicAddDialog #. does not preselect a connection so that the first connection in the list is preselected #. (via Table widget fallback) which is still better than an arbitrary preselected entry: -#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590 -#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150 +#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593 +#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153 msgid "Nothing Selected" msgstr "Nothing Selected" @@ -2724,60 +2724,60 @@ #. Authors: Johannes Meixner #. #. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $ -#: src/include/printer/overview.rb:46 +#: src/include/printer/overview.rb:49 #, fuzzy msgid "Show" msgstr "Show &details" #. CheckBox to select local print queues to be listed: -#: src/include/printer/overview.rb:52 +#: src/include/printer/overview.rb:55 #, fuzzy msgid "&Local" msgstr "Local" #. CheckBox to select remote print queues to be listed: -#: src/include/printer/overview.rb:59 +#: src/include/printer/overview.rb:62 #, fuzzy msgid "&Remote" msgstr "Remote" #. Where the queue configuration exists (local or remote): -#: src/include/printer/overview.rb:80 +#: src/include/printer/overview.rb:83 msgid "Configuration" msgstr "Configuration" #. Header of a Table column with a list of print queues. #. Print queue name: -#: src/include/printer/overview.rb:83 +#: src/include/printer/overview.rb:86 msgid "Name" msgstr "Name" #. Header of a Table column with a list of print queues. #. Location of the printer (e.g. second floor, room 2.3): -#: src/include/printer/overview.rb:89 +#: src/include/printer/overview.rb:92 msgid "Location" msgstr "Location" #. Header of a Table column with a list of print queues. #. Whether or not is is the default queue: -#: src/include/printer/overview.rb:92 +#: src/include/printer/overview.rb:95 msgid "Default" msgstr "Default" #. Header of a Table column with a list of print queues. #. Queue status (accepting/rejecting and enabled/disabled): -#: src/include/printer/overview.rb:95 +#: src/include/printer/overview.rb:98 msgid "Status" msgstr "Status" #. PushButton label to refresh the list of print queues: -#: src/include/printer/overview.rb:107 +#: src/include/printer/overview.rb:110 #, fuzzy msgid "Re&fresh List" msgstr "&Refresh List" #. PushButton label to print a test page: -#: src/include/printer/overview.rb:112 +#: src/include/printer/overview.rb:115 #, fuzzy msgid "Print &Test Page" msgstr "Print test page" @@ -2788,7 +2788,7 @@ #. to check whether or not a local cupsd is accessible. #. The command is shown here to the user (even if it is a bit technical) #. to have him informed what goes on here and what he can do on his own. -#: src/include/printer/overview.rb:128 +#: src/include/printer/overview.rb:131 msgid "" "A locally running CUPS daemon is required, but it seems to be not accessible.\n" "Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n" @@ -2801,7 +2801,7 @@ #. By default the cupsd uses the official IPP port (631). #. If not, the user must have intentionally and manually changed #. the port setting for the cupsd in /etc/cups/cupsd.conf -#: src/include/printer/overview.rb:140 +#: src/include/printer/overview.rb:143 #, fuzzy msgid "" "The CUPS daemon seems not to listen on the official IANA IPP port (631).\n" @@ -2825,39 +2825,39 @@ #. Busy message: #. Body of a Popup::ShowFeedback -#: src/include/printer/overview.rb:182 +#: src/include/printer/overview.rb:185 msgid "" "Running several tests regarding CUPS server accessibility...\n" "(this might take some time)" msgstr "" #. where %1 will be replaced by the server name: -#: src/include/printer/overview.rb:201 +#: src/include/printer/overview.rb:204 msgid "Do no longer use the inaccessible CUPS server '%1'?" msgstr "" #. Popup::YesNoHeadline body recommendation how to answer the headline question #. where %1 will be replaced by the server name: -#: src/include/printer/overview.rb:207 +#: src/include/printer/overview.rb:210 msgid "To proceed, you should agree that '%1' will be no longer used." msgstr "" #. The 'ServerName' entry in /etc/cups/client.conf was removed #. so that it is now no longer a real client-only config and #. therefore the Printerlib::client_* values must be determined anew: -#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234 +#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237 msgid "A non-accessible server leads to an endless sequence of delays and failures." msgstr "" #. where %1 will be replaced by the CUPS server name. -#: src/include/printer/overview.rb:253 +#: src/include/printer/overview.rb:256 #, fuzzy msgid "CUPS Server %1" msgstr "CUPS Server" #. Busy message: #. Body of a Popup::ShowFeedback: -#: src/include/printer/overview.rb:277 +#: src/include/printer/overview.rb:280 #, fuzzy #| msgid "The print server is accessible." msgid "Testing if CUPS server is accessible..." @@ -2866,39 +2866,39 @@ #. Body of a Popup::AnyMessage when no queue was selected from the list: #. Body of a Popup::AnyMessage when no queue was selected from the list: #. Body of a Popup::AnyMessage when no queue was selected from the list: -#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678 -#: src/include/printer/overview.rb:1152 +#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681 +#: src/include/printer/overview.rb:1155 msgid "Select an entry." msgstr "Select an entry." -#: src/include/printer/overview.rb:605 +#: src/include/printer/overview.rb:608 #, fuzzy msgid "Cannot Delete" msgstr "Cannot delete TSIG key." #. Body of a Popup::AnyMessage when a remote queue was selected to be deleted: -#: src/include/printer/overview.rb:607 +#: src/include/printer/overview.rb:610 msgid "This is a remote configuration. Only local configurations can be deleted." msgstr "" -#: src/include/printer/overview.rb:614 +#: src/include/printer/overview.rb:617 #, fuzzy msgid "Confirm Deletion" msgstr "Confirm Installation" #. Body of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:616 +#: src/include/printer/overview.rb:619 msgid "The selected configuration would be deleted immediately and cannot be restored." msgstr "" #. 'Yes' button label of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:620 +#: src/include/printer/overview.rb:623 #, fuzzy msgid "Delete configuration %1" msgstr "Default configuration" #. 'No' button label of a confirmation popup before a queue will be deleted: -#: src/include/printer/overview.rb:622 +#: src/include/printer/overview.rb:625 #, fuzzy msgid "Do not delete it" msgstr "Do not delete" @@ -2910,39 +2910,39 @@ #. Nevertheless it is possible to delete a class with the YaST printer module #. so that the user can get rid of a class which may have been created by accident #. with whatever other setup tool: -#: src/include/printer/overview.rb:637 +#: src/include/printer/overview.rb:640 #, fuzzy #| msgid "Configuration of a Class" msgid "Confirm Deletion of a Class" msgstr "Configuration of a Class" #. Body of a confirmation popup before a class will be deleted: -#: src/include/printer/overview.rb:639 +#: src/include/printer/overview.rb:642 #, fuzzy #| msgid "A zone of this type cannot be edited with this tool." msgid "A deleted class cannot be re-created with this tool." msgstr "A zone of this type cannot be edited with this tool." -#: src/include/printer/overview.rb:685 +#: src/include/printer/overview.rb:688 #, fuzzy msgid "Rejecting Print Jobs" msgstr "Detected Printers:" #. Body of a Popup::AnyMessage when the queue rejects print jobs: -#: src/include/printer/overview.rb:687 +#: src/include/printer/overview.rb:690 msgid "The testpage cannot be printed because print jobs are rejected." msgstr "" #. Do a refresh of the overview content to be on the safe side. #. Perhaps the actual current queue state is no longer "rejecting". #. Re-run the OverviewDialog (with re-created queue status) via the sequencer: -#: src/include/printer/overview.rb:697 +#: src/include/printer/overview.rb:700 #, fuzzy msgid "Printout Disabled" msgstr "Printout &Finished" #. Body of a Popup::AnyMessage when printing is disabled for the queue: -#: src/include/printer/overview.rb:699 +#: src/include/printer/overview.rb:702 msgid "The testpage cannot be printed because printout is disabled." msgstr "" @@ -2951,27 +2951,27 @@ #. the test above makes sure that the queue has printing enabled. #. When this command fails for whatever reason, it is a safe fallback #. to assume that there are no pending jobs in the queue: -#: src/include/printer/overview.rb:728 +#: src/include/printer/overview.rb:731 msgid "There are pending print jobs which might be deleted before the testpage is printed." msgstr "" #. where %1 will be replaced by the queue name. #. where %1 will be replaced by the queue name. -#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917 +#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920 #, fuzzy msgid "Delete Pending Print Jobs For %1" msgstr "Detected Printers:" #. 'Yes' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:756 +#: src/include/printer/overview.rb:759 #, fuzzy msgid "Delete them before printing testpage" msgstr "Delete the old settings?" #. 'No' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:759 +#: src/include/printer/overview.rb:762 #, fuzzy msgid "Print testpage after the other jobs" msgstr "Print the help for this module" @@ -2980,7 +2980,7 @@ #. Only a simple message because this error does not happen on a normal system. #. where %1 will be replaced by the queue name. #. Only a simple message because this error does not happen on a normal system. -#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941 +#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944 #, fuzzy msgid "Failed to delete all pending jobs for %1." msgstr "Really delete configuration \"%1\"?" @@ -3000,26 +3000,26 @@ #. + (Printed with CUPS) show #. make it obvious that it is not a YaST testpage but a CUPS testpage #. and it is now independent of the CUPS version. -#: src/include/printer/overview.rb:799 +#: src/include/printer/overview.rb:802 #, fuzzy #| msgid "&Test printing" msgid "Test printout" msgstr "&Test printing" #. Popup::AnyQuestion message: -#: src/include/printer/overview.rb:801 +#: src/include/printer/overview.rb:804 msgid "Print one or two pages e.g. to test duplex printing" msgstr "" #. Popup::AnyQuestion so called 'yes' (default) button label: -#: src/include/printer/overview.rb:803 +#: src/include/printer/overview.rb:806 #, fuzzy #| msgid "Print test page" msgid "Single test page" msgstr "Print test page" #. Popup::AnyQuestion so called 'no' button label: -#: src/include/printer/overview.rb:805 +#: src/include/printer/overview.rb:808 #, fuzzy #| msgid "YaST2 test page" msgid "Two test pages" @@ -3027,7 +3027,7 @@ #. where %1 will be replaced by the queue name. #. Only a simple message because this error does not happen on a normal system. -#: src/include/printer/overview.rb:835 +#: src/include/printer/overview.rb:838 #, fuzzy msgid "Failed to print testpage for %1." msgstr "Failed to install required package %1." @@ -3036,19 +3036,19 @@ #. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime) #. so that a refresh of the overview content is needed to be on the safe side. #. Re-run the OverviewDialog (with re-created queue status) via the sequencer: -#: src/include/printer/overview.rb:852 +#: src/include/printer/overview.rb:855 msgid "Wait Until Testpage Printing Finished" msgstr "" #. Popup::AnyQuestion message regarding testpage printout result #. where %1 will be replaced by the queue name. -#: src/include/printer/overview.rb:856 +#: src/include/printer/overview.rb:859 msgid "Sent testpage to %1. Printing should start soon." msgstr "" #. Popup::AnyQuestion 'Yes' button label #. regarding a positive testpage printout result: -#: src/include/printer/overview.rb:861 +#: src/include/printer/overview.rb:864 #, fuzzy #| msgid "The test was successful" msgid "Testpage printout was successful" @@ -3056,7 +3056,7 @@ #. Popup::AnyQuestion 'No' button label #. regarding a negative testpage printout result: -#: src/include/printer/overview.rb:864 +#: src/include/printer/overview.rb:867 #, fuzzy #| msgid "&Test printing" msgid "Testpage printing failed" @@ -3078,56 +3078,56 @@ #. spit out zillions of sheets with nonsense characters. #. When this command fails for whatever reason, it is a safe fallback #. to assume that there are no pending jobs in the queue: -#: src/include/printer/overview.rb:897 +#: src/include/printer/overview.rb:900 msgid "There are pending print jobs which might be deleted now." msgstr "" #. 'Yes' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:925 +#: src/include/printer/overview.rb:928 #, fuzzy msgid "Delete all pending jobs" msgstr "Detected Printers:" #. 'No' button label of a confirmation popup #. before all pending jobs in a queue will be deleted: -#: src/include/printer/overview.rb:928 +#: src/include/printer/overview.rb:931 #, fuzzy msgid "Do not delete them" msgstr "Do not delete" #. Ignore an effectively empty test_print_cups_error_log: -#: src/include/printer/overview.rb:1043 +#: src/include/printer/overview.rb:1046 msgid "For the full log, see the /var/log/cups/error_log file." msgstr "" -#: src/include/printer/overview.rb:1048 +#: src/include/printer/overview.rb:1051 msgid "CUPS log information while processing the testpage for %1 (English only)" msgstr "" #. but the test_print_cups_error_log was effectively empty, #. show a very generic info to the user to show at least something: -#: src/include/printer/overview.rb:1065 +#: src/include/printer/overview.rb:1068 msgid "For CUPS log information, see the /var/log/cups/error_log file." msgstr "" #. show a very generic info to the user to show at least something: -#: src/include/printer/overview.rb:1075 +#: src/include/printer/overview.rb:1078 msgid "When printing via a remote system fails, you may ask an admin of the remote system." msgstr "" #. PopupYesNoHeadline body: -#: src/include/printer/overview.rb:1102 +#: src/include/printer/overview.rb:1105 msgid "A remote CUPS server setting conflicts with adding a configuration." msgstr "" -#: src/include/printer/overview.rb:1159 +#: src/include/printer/overview.rb:1162 #, fuzzy msgid "Cannot Modify" msgstr "Cannot Read fstab" #. Body of a Popup::AnyMessage when a remote queue was selected to be modified: -#: src/include/printer/overview.rb:1161 +#: src/include/printer/overview.rb:1164 msgid "This is a remote configuration. Only local configurations can be modified." msgstr "" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/product-creator.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/proxy.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/rdp.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/rdp.en_GB.po 2016-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/rdp.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/rear.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -282,16 +282,16 @@ #: src/include/rear/ui.rb:698 #, fuzzy +#| msgid "Reading firewall settings" +msgid "Reading rear settings" +msgstr "Reading firewall settings" + +#: src/include/rear/ui.rb:698 +#, fuzzy #| msgid "Analyzing the system..." msgid "Analyzing system" msgstr "Analysing the system..." -#: src/include/rear/ui.rb:698 -#, fuzzy -#| msgid "Reading firewall settings" -msgid "Reading rear settings" -msgstr "Reading firewall settings" - #: src/include/rear/ui.rb:699 #, fuzzy #| msgid "Analyzing the system..." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/registration.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:17+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 23:04+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -64,7 +64,7 @@ #. dialog title #. display and run a dialog for updating the current registration #. @return [Symbol] user input -#: src/clients/inst_scc.rb:186 +#: src/clients/inst_scc.rb:189 #: src/lib/registration/ui/autoyast_config_dialog.rb:104 #: src/lib/registration/ui/base_system_registration_dialog.rb:48 #: src/lib/registration/ui/migration_repos_workflow.rb:287 @@ -82,25 +82,25 @@ msgstr "" #. popup message: registration finished properly -#: src/clients/scc_auto.rb:201 +#: src/clients/scc_auto.rb:204 #, fuzzy msgid "Registration was successfull." msgstr "Installation was successful" #. remove possible duplicates -#: src/clients/scc_auto.rb:229 +#: src/clients/scc_auto.rb:232 msgid "SLP discovery failed, no server found" msgstr "" #. download and install the specified SSL certificate to the system #. @param url [String] URL of the certificate -#: src/clients/scc_auto.rb:247 +#: src/clients/scc_auto.rb:250 #, fuzzy #| msgid "Downloading SMT certificate file failed" msgid "Downloading SSL Certificate" msgstr "Downloading SMT certificate file failed" -#: src/clients/scc_auto.rb:251 +#: src/clients/scc_auto.rb:254 #, fuzzy #| msgid "Import Certificate" msgid "Importing SSL Certificate" @@ -109,8 +109,8 @@ #. %s is name of given product #. then register the product(s) #. %s is name of given product -#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281 -#: src/lib/registration/registration_ui.rb:311 +#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:283 +#: src/lib/registration/registration_ui.rb:316 #, fuzzy #| msgid "Registration Code" msgid "Registering %s ..." @@ -290,30 +290,19 @@ msgstr "Fingerprint: " #. Error popup -#: src/lib/registration/connect_helpers.rb:74 -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:80 -msgid "Network error, check the network configuration." -msgstr "" - -#. Error popup -#: src/lib/registration/connect_helpers.rb:85 +#: src/lib/registration/connect_helpers.rb:76 msgid "Connection time out." msgstr "" #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:93 +#: src/lib/registration/connect_helpers.rb:84 #, fuzzy #| msgid "Destination is invalid." msgid "Check that this system is known to the registration server." msgstr "Destination is invalid." #. TRANSLATORS: additional hint for an error message -#: src/lib/registration/connect_helpers.rb:99 +#: src/lib/registration/connect_helpers.rb:90 msgid "" "If you are upgrading from SLE11 make sure the SCC server\n" "knows the old NCC registration. Synchronization from NCC to SCC\n" @@ -329,35 +318,35 @@ #. update the message when an old SMT server is found #. Error popup #. update the message when an old SMT server is found -#: src/lib/registration/connect_helpers.rb:113 -#: src/lib/registration/connect_helpers.rb:118 -#: src/lib/registration/connect_helpers.rb:121 -#: src/lib/registration/connect_helpers.rb:128 -#: src/lib/registration/connect_helpers.rb:179 -#: src/lib/registration/connect_helpers.rb:182 +#: src/lib/registration/connect_helpers.rb:104 +#: src/lib/registration/connect_helpers.rb:109 +#: src/lib/registration/connect_helpers.rb:112 +#: src/lib/registration/connect_helpers.rb:119 +#: src/lib/registration/connect_helpers.rb:170 +#: src/lib/registration/connect_helpers.rb:173 #, fuzzy #| msgid "Registration Code" msgid "Registration failed." msgstr "Registration Code" -#: src/lib/registration/connect_helpers.rb:123 +#: src/lib/registration/connect_helpers.rb:114 #, fuzzy msgid "Registration client error." msgstr "Registration Data to Use" -#: src/lib/registration/connect_helpers.rb:125 +#: src/lib/registration/connect_helpers.rb:116 msgid "" "Registration server error.\n" "Retry registration later." msgstr "" #. error message -#: src/lib/registration/connect_helpers.rb:167 +#: src/lib/registration/connect_helpers.rb:158 msgid "Received SSL Certificate does not match the expected certificate." msgstr "" #. %s are error details -#: src/lib/registration/connect_helpers.rb:197 +#: src/lib/registration/connect_helpers.rb:188 #, fuzzy #| msgid "Details..." msgid "Details: %s" @@ -366,7 +355,7 @@ #. TRANSLATORS: multiline error message - a SSL certificate has been #. imported but the registration server still cannot be accessed securely, #. user has to solve the certificate issue manually. -#: src/lib/registration/connect_helpers.rb:226 +#: src/lib/registration/connect_helpers.rb:217 msgid "" "A certificate has been already imported\n" "but the server connection still cannot be trusted.\n" @@ -376,23 +365,23 @@ msgstr "" #. progress label -#: src/lib/registration/connect_helpers.rb:238 +#: src/lib/registration/connect_helpers.rb:229 msgid "Importing the SSL certificate" msgstr "" -#: src/lib/registration/connect_helpers.rb:239 +#: src/lib/registration/connect_helpers.rb:230 msgid "Importing '%s' certificate..." msgstr "" #. try to use a translatable message first, if not found then use #. the original error message from openSSL -#: src/lib/registration/connect_helpers.rb:260 +#: src/lib/registration/connect_helpers.rb:251 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:279 +#: src/lib/registration/connect_helpers.rb:270 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -400,6 +389,26 @@ "protocol is installed at the server." msgstr "" +#. 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:282 +#: src/lib/registration/ui/local_server_dialog.rb:67 +#, fuzzy +#| msgid "Invalid value." +msgid "Invalid URL." +msgstr "Invalid value." + +#. Error popup +#: src/lib/registration/connect_helpers.rb:286 +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:292 +msgid "Network error, check the network configuration." +msgstr "" + #. progress step title #: src/lib/registration/finish_dialog.rb:35 #, fuzzy @@ -430,7 +439,7 @@ #. FIXME: reused an existing message due to text freeze #. (later use a better text, it's system update actually...) #: src/lib/registration/registration_ui.rb:80 -#: src/lib/registration/registration_ui.rb:267 +#: src/lib/registration/registration_ui.rb:269 msgid "Registering the System..." msgstr "" @@ -439,8 +448,8 @@ #. updating registered addon/extension, %s is an extension name #. TRANSLATORS: Progress label #: src/lib/registration/registration_ui.rb:106 -#: src/lib/registration/registration_ui.rb:146 -#: src/lib/registration/registration_ui.rb:346 +#: src/lib/registration/registration_ui.rb:148 +#: src/lib/registration/registration_ui.rb:353 #: src/lib/registration/ui/migration_repos_workflow.rb:304 #, fuzzy #| msgid "Updating zone files..." @@ -448,7 +457,7 @@ msgstr "Updating zone files..." #. TRANSLATORS: progress label -#: src/lib/registration/registration_ui.rb:163 +#: src/lib/registration/registration_ui.rb:165 #, fuzzy #| msgid "Loading configuration %1..." msgid "Synchronizing Products..." @@ -460,33 +469,33 @@ #. @return [ArrayRegistration::Addon] available addons #. download the addons from SCC, let the user select addons to install #. @return [Symbol] the user input -#: src/lib/registration/registration_ui.rb:177 +#: src/lib/registration/registration_ui.rb:179 #: src/lib/registration/ui/autoyast_config_workflow.rb:106 #, fuzzy msgid "Loading Available Extensions and Modules..." msgstr "Registration Code" -#: src/lib/registration/registration_ui.rb:191 +#: src/lib/registration/registration_ui.rb:193 #, fuzzy #| msgid "Loading configuration %1..." msgid "Loading Migration Products..." msgstr "Loading configuration %1..." #. dialog title -#: src/lib/registration/registration_ui.rb:208 +#: src/lib/registration/registration_ui.rb:210 #, fuzzy msgid "Register Extensions and Modules" msgstr "Registration Code" #. help text -#: src/lib/registration/registration_ui.rb:212 +#: src/lib/registration/registration_ui.rb:214 #, fuzzy #| msgid "<p>Please wait, while volumes are being detected.</p>" msgid "<p>Extensions and Modules are being registered.</p>" msgstr "<p>Please wait, while volumes are being detected.</p>" #. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:237 +#: src/lib/registration/registration_ui.rb:239 #, fuzzy msgid "" "The registration server offers update repositories.\n" @@ -494,7 +503,7 @@ msgstr "Registration Code" #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:241 +#: src/lib/registration/registration_ui.rb:243 #, fuzzy #| msgid "" #| "Would you like to use these mount points\n" @@ -508,7 +517,7 @@ #. Yast::Mode.update #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:245 +#: src/lib/registration/registration_ui.rb:247 #, fuzzy #| msgid "Would you like to enable access to the profile repository?" msgid "" @@ -545,7 +554,7 @@ #. error message #. error message -#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292 +#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:293 #, fuzzy msgid "Saving repository configuration failed." msgstr "Starting Installation" @@ -567,12 +576,12 @@ msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:279 +#: src/lib/registration/sw_mgmt.rb:280 msgid "Refreshing service '%s' failed." msgstr "" #. TRANSLATORS: %s is a product name -#: src/lib/registration/sw_mgmt.rb:486 +#: src/lib/registration/sw_mgmt.rb:487 #, fuzzy #| msgid "No product found in the repository" msgid "" @@ -796,7 +805,7 @@ #. handle nil specifically, it cannot be stored in XML profile #: src/lib/registration/ui/autoyast_addon_dialog.rb:191 #: src/lib/registration/ui/autoyast_config_dialog.rb:108 -#: src/lib/registration/ui/base_system_registration_dialog.rb:133 +#: src/lib/registration/ui/base_system_registration_dialog.rb:140 #, fuzzy #| msgid "Registration Code" msgid "Registration &Code" @@ -831,7 +840,7 @@ #. part of the main dialog definition - the input fields #. @return [Yast::Term] UI term #: src/lib/registration/ui/autoyast_config_dialog.rb:106 -#: src/lib/registration/ui/base_system_registration_dialog.rb:131 +#: src/lib/registration/ui/base_system_registration_dialog.rb:138 #, fuzzy #| msgid "Email Address" msgid "&E-mail Address" @@ -919,12 +928,12 @@ msgstr "" #. help text -#: src/lib/registration/ui/base_system_registration_dialog.rb:142 +#: src/lib/registration/ui/base_system_registration_dialog.rb:149 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions." msgstr "" #. Popup question: confirm skipping the registration -#: src/lib/registration/ui/base_system_registration_dialog.rb:177 +#: src/lib/registration/ui/base_system_registration_dialog.rb:184 msgid "" "If you do not register your system we will not be able\n" "to grant you access to the update repositories.\n" @@ -937,7 +946,7 @@ #. label text describing the registration (1/2) #. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/lib/registration/ui/base_system_registration_dialog.rb:194 +#: src/lib/registration/ui/base_system_registration_dialog.rb:201 msgid "" "Please enter a registration or evaluation code for this product and your\n" "User Name/E-mail address from the SUSE Customer Center in the fields below.\n" @@ -948,7 +957,7 @@ #. label text describing the registration (2/2), #. not displayed in installed system #. use \n to split to more lines if needed (use max. 76 chars/line) -#: src/lib/registration/ui/base_system_registration_dialog.rb:206 +#: src/lib/registration/ui/base_system_registration_dialog.rb:213 msgid "" "If you skip product registration now, remember to register after\n" "installation has completed." @@ -956,10 +965,10 @@ #. UI term for the network configuration button (or empty if not needed) #. @return [Yast::Term] UI term -#: src/lib/registration/ui/base_system_registration_dialog.rb:218 +#: src/lib/registration/ui/base_system_registration_dialog.rb:225 #, fuzzy #| msgid "Novell Customer Center Configuration" -msgid "Network Configuration..." +msgid "Net&work Configuration..." msgstr "Novell Customer Centre Configuration" #. SSL error message @@ -1010,13 +1019,6 @@ msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>" msgstr "" -#. error message, the entered URL is not valid -#: src/lib/registration/ui/local_server_dialog.rb:67 -#, fuzzy -#| msgid "Invalid value." -msgid "Invalid URL." -msgstr "Invalid value." - #. input field label #: src/lib/registration/ui/local_server_dialog.rb:106 #, fuzzy @@ -1252,13 +1254,13 @@ msgstr "" #. ignore SUSE manager registration servers (bnc#894470) -#: src/lib/registration/url_helpers.rb:203 +#: src/lib/registration/url_helpers.rb:211 #, fuzzy #| msgid "Checking..." msgid "Searching..." msgstr "Checking..." -#: src/lib/registration/url_helpers.rb:203 +#: src/lib/registration/url_helpers.rb:211 #, fuzzy msgid "Looking up local registration servers..." msgstr "1 item of registration data" Modified: branches/plus-SLE12-SP2/yast/en_GB/po/reipl.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/reipl.en_GB.po 2016-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/reipl.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -27,7 +27,7 @@ #. TRANSLATORS: part of a shutdown message #. %1 is replaced with a device name #. Newline at the end is required -#: src/clients/reipl_bootloader_finish.rb:64 +#: src/clients/reipl_bootloader_finish.rb:66 #, fuzzy msgid "" "\n" @@ -44,7 +44,7 @@ #. %2 is replaced with a WWPN name #. %3 is replaced with a LUN name #. Newline at the end is required -#: src/clients/reipl_bootloader_finish.rb:83 +#: src/clients/reipl_bootloader_finish.rb:85 #, fuzzy msgid "" "\n" @@ -58,7 +58,7 @@ "After shutdown, reload the system\n" "with the load address of your root DASD.\n" -#: src/clients/reipl_bootloader_finish.rb:97 +#: src/clients/reipl_bootloader_finish.rb:99 #, fuzzy msgid "" "\n" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/relocation-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/samba-client.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: samba-client\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -938,59 +938,59 @@ msgstr "Installing required packages..." #. summary header -#: src/modules/Kerberos.rb:947 +#: src/modules/Kerberos.rb:953 msgid "PAM Login" msgstr "PAM Login" #. summary item -#: src/modules/Kerberos.rb:953 +#: src/modules/Kerberos.rb:959 msgid "Use Kerberos" msgstr "Use Kerberos" #. summary item -#: src/modules/Kerberos.rb:955 +#: src/modules/Kerberos.rb:961 msgid "Do Not Use Kerberos" msgstr "Do Not Use Kerberos" #. summary header -#: src/modules/Kerberos.rb:959 +#: src/modules/Kerberos.rb:965 msgid "Default Realm" msgstr "Default Realm" #. summary header -#: src/modules/Kerberos.rb:966 +#: src/modules/Kerberos.rb:972 msgid "Default Domain" msgstr "Default Domain" #. summary header -#: src/modules/Kerberos.rb:973 +#: src/modules/Kerberos.rb:979 msgid "KDC Server Address" msgstr "KDC Server Address" #. summary header -#: src/modules/Kerberos.rb:977 +#: src/modules/Kerberos.rb:983 msgid "Clock Skew" msgstr "Clock Skew" #. summary text, %1 is value -#: src/modules/Kerberos.rb:993 +#: src/modules/Kerberos.rb:999 msgid "<b>KDC Server</b>: %1<br>" msgstr "<b>KDC Server</b>: %1<br>" #. summary text, %1 is value -#: src/modules/Kerberos.rb:998 +#: src/modules/Kerberos.rb:1004 #, fuzzy #| msgid "<p><b>Workgroup or Domain</b>: %1</p>" msgid "<b>Default Domain</b>: %1<br>" msgstr "<p><b>Workgroup or Domain</b>: %1</p>" #. summary text, %1 is value -#: src/modules/Kerberos.rb:1004 +#: src/modules/Kerberos.rb:1010 msgid "<b>Default Realm</b>: %1<br>" msgstr "<b>Default Realm</b>: %1<br>" #. summary text (yes/no follows) -#: src/modules/Kerberos.rb:1010 +#: src/modules/Kerberos.rb:1016 #, fuzzy #| msgid "Offline Authentication Enabled" msgid "<b>Kerberos Authentication Enabled</b>: %1" @@ -998,23 +998,23 @@ #. summary value #. translators: winbind status in summary -#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112 +#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112 msgid "Yes" msgstr "Yes" #. summary value #. translators: winbind status in summary -#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114 +#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114 msgid "No" msgstr "No" #. summary line -#: src/modules/Kerberos.rb:1022 +#: src/modules/Kerberos.rb:1028 msgid "Configuration Acquired via DNS" msgstr "" #. error popup (wrong format of entered value) -#: src/modules/Kerberos.rb:1050 +#: src/modules/Kerberos.rb:1056 msgid "" "Clock skew is invalid.\n" "Try again.\n" @@ -1023,7 +1023,7 @@ "Try again.\n" #. error popup (wrong format of entered value) -#: src/modules/Kerberos.rb:1053 +#: src/modules/Kerberos.rb:1059 msgid "" "Lifetime is invalid.\n" "Try again." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/samba-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: samba-server\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -248,11 +248,17 @@ #. TRANSLATORS: a popup message #: src/include/samba-server/complex.rb:88 +#, fuzzy +#| msgid "" +#| "Because users are currently connected to this Samba server,\n" +#| "the server configuration has been reloaded instead of restarted.\n" +#| "To confirm that all settings are applied despite possibly disconnecting the users,\n" +#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'" msgid "" "Because users are currently connected to this Samba server,\n" "the server configuration has been reloaded instead of restarted.\n" "To confirm that all settings are applied despite possibly disconnecting the users,\n" -"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'" +"run 'systemctl restart smb' and 'systemctl restart nmb'" msgstr "" "Because users are currently connected to this Samba server,\n" "the server configuration has been reloaded instead of restarted.\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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/samba-users.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/scanner.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: scanner\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 22:59+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/security.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: security\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 22:54+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -121,223 +121,223 @@ #. Authors: Michal Svec #. #. $Id$ -#: src/include/security/dialogs.rb:62 +#: src/include/security/dialogs.rb:64 msgid "Unknown" msgstr "Unknown" -#: src/include/security/dialogs.rb:65 +#: src/include/security/dialogs.rb:67 #, fuzzy msgid "Use magic SysRq keys" msgstr "Enable &Magic SysRq Keys" -#: src/include/security/dialogs.rb:66 +#: src/include/security/dialogs.rb:68 #, fuzzy msgid "Use secure file permissions" msgstr "Use inherited permissions" -#: src/include/security/dialogs.rb:69 +#: src/include/security/dialogs.rb:71 #, fuzzy msgid "Remote access to the display manager" msgstr "Remote Access to Display Manager" -#: src/include/security/dialogs.rb:72 +#: src/include/security/dialogs.rb:74 msgid "Write back system time to the hardware clock" msgstr "" -#: src/include/security/dialogs.rb:75 +#: src/include/security/dialogs.rb:77 msgid "Always generate syslog message for cron scripts" msgstr "" -#: src/include/security/dialogs.rb:78 +#: src/include/security/dialogs.rb:80 #, fuzzy msgid "Run the DHCP daemon in a chroot" msgstr "Run NTP Daemon in Chroot &Jail" -#: src/include/security/dialogs.rb:81 +#: src/include/security/dialogs.rb:83 msgid "Run the DHCP daemon as dhcp user" msgstr "" -#: src/include/security/dialogs.rb:84 +#: src/include/security/dialogs.rb:86 #, fuzzy msgid "Remote root login in the display manager" msgstr "Remote Access to Display Manager" -#: src/include/security/dialogs.rb:87 +#: src/include/security/dialogs.rb:89 #, fuzzy msgid "Remote access to the X server" msgstr "Disable the DHCP server" -#: src/include/security/dialogs.rb:90 +#: src/include/security/dialogs.rb:92 #, fuzzy msgid "Remote access to the email delivery subsystem" msgstr "Remote Access to Display Manager" -#: src/include/security/dialogs.rb:93 +#: src/include/security/dialogs.rb:95 #, fuzzy #| msgid "Restart services" msgid "Restart services on update" msgstr "Restart services" -#: src/include/security/dialogs.rb:96 +#: src/include/security/dialogs.rb:98 #, fuzzy msgid "Stop services on removal" msgstr "Disable service" -#: src/include/security/dialogs.rb:99 +#: src/include/security/dialogs.rb:101 #, fuzzy msgid "Enable TCP syncookies" msgstr "Enable Password Policies" -#: src/include/security/dialogs.rb:102 +#: src/include/security/dialogs.rb:104 #, fuzzy msgid "IPv4 forwarding" msgstr "Enable &IP Forwarding" -#: src/include/security/dialogs.rb:103 +#: src/include/security/dialogs.rb:105 #, fuzzy msgid "IPv6 forwarding" msgstr "Enable &IP Forwarding" -#: src/include/security/dialogs.rb:104 +#: src/include/security/dialogs.rb:106 #, fuzzy #| msgid "Enable the service" msgid "Enable basic system services" msgstr "Enable the service" -#: src/include/security/dialogs.rb:107 +#: src/include/security/dialogs.rb:109 #, fuzzy #| msgid "Disable the service" msgid "Disable extra services" msgstr "Disable the service" #. handle the special cases at first -#: src/include/security/dialogs.rb:150 +#: src/include/security/dialogs.rb:152 msgid "Configure" msgstr "Configure" -#: src/include/security/dialogs.rb:152 +#: src/include/security/dialogs.rb:154 msgid "Enabled" msgstr "Enabled" -#: src/include/security/dialogs.rb:154 +#: src/include/security/dialogs.rb:156 msgid "Disabled" msgstr "Disabled" #. table header #. table header -#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409 +#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411 #, fuzzy msgid "Security Setting" msgstr "Security Settings" -#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410 +#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412 msgid "Status" msgstr "Status" -#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411 +#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413 #, fuzzy msgid "Security Status" msgstr "Security Settings" #. add one line for each security setting -#: src/include/security/dialogs.rb:318 +#: src/include/security/dialogs.rb:320 msgid "Help" msgstr "Help" #. this is a separator between service names #. e.g.: "postfix" + " or " + "sendmail" -#: src/include/security/dialogs.rb:361 +#: src/include/security/dialogs.rb:363 msgid " or " msgstr "" #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services -#: src/include/security/dialogs.rb:368 +#: src/include/security/dialogs.rb:370 #, fuzzy msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>" msgstr "" "These required services are missing:\n" "%1." -#: src/include/security/dialogs.rb:370 +#: src/include/security/dialogs.rb:372 msgid "<P>All basic services are enabled.</P>" msgstr "" -#: src/include/security/dialogs.rb:378 +#: src/include/security/dialogs.rb:380 #, fuzzy msgid "<P>These extra services are enabled:<BR><B>%s</B></P>" msgstr "" "These required services are missing:\n" "%1." -#: src/include/security/dialogs.rb:379 +#: src/include/security/dialogs.rb:381 msgid "<P>Check the list of services and disable all unused services.</P>" msgstr "" -#: src/include/security/dialogs.rb:381 +#: src/include/security/dialogs.rb:383 msgid "<P>Only basic system services are enabled.</P>" msgstr "" -#: src/include/security/dialogs.rb:387 +#: src/include/security/dialogs.rb:389 msgid "Description" msgstr "Description" #. Overview dialog caption #. params: input tree, parent, label, id -#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49 +#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49 #, fuzzy msgid "Security Overview" msgstr "Special Keys Overview" #. push button label -#: src/include/security/dialogs.rb:424 +#: src/include/security/dialogs.rb:426 #, fuzzy msgid "Change &Status" msgstr "Change this?" #. push button label -#: src/include/security/dialogs.rb:427 +#: src/include/security/dialogs.rb:429 msgid "&Description" msgstr "&Description" #. update the current value -#: src/include/security/dialogs.rb:521 +#: src/include/security/dialogs.rb:523 #, fuzzy #| msgid "Analyzing the system..." msgid "Analyzing system" msgstr "Analysing the system..." #. Boot dialog caption -#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57 +#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57 msgid "Boot Settings" msgstr "Boot Settings" #. Frame label -#: src/include/security/dialogs.rb:587 +#: src/include/security/dialogs.rb:601 msgid "Boot Permissions" msgstr "Boot Permissions" #. Misc dialog caption -#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60 +#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60 msgid "Miscellaneous Settings" msgstr "Miscellaneous Settings" #. Password dialog caption -#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56 +#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56 msgid "Password Settings" msgstr "Password Settings" #. Frame label -#: src/include/security/dialogs.rb:753 +#: src/include/security/dialogs.rb:759 msgid "Checks" msgstr "Checks" #. Frame label -#: src/include/security/dialogs.rb:768 +#: src/include/security/dialogs.rb:774 msgid "Password Age" msgstr "Password Age" #. Popup text -#: src/include/security/dialogs.rb:846 +#: src/include/security/dialogs.rb:852 msgid "" "The minimum number of days cannot be larger\n" "than the maximum." @@ -346,7 +346,7 @@ "than the maximum." #. Popup text, %1 is number -#: src/include/security/dialogs.rb:863 +#: src/include/security/dialogs.rb:869 msgid "" "The minimum password length cannot be larger than the maximum.\n" "The maximum password length for the selected encryption method is %1." @@ -355,17 +355,17 @@ "The maximum password length for the selected encryption method is %1." #. Login dialog caption -#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58 +#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58 msgid "Login Settings" msgstr "Login Settings" #. Frame label -#: src/include/security/dialogs.rb:904 +#: src/include/security/dialogs.rb:910 msgid "Login" msgstr "Login" #. Read dialog help 1/2 -#: src/include/security/helps.rb:39 +#: src/include/security/helps.rb:41 msgid "" "<p><b><big>Initializing Security Configuration</big></b>\n" "<br>Please wait...<br></p>" @@ -374,7 +374,7 @@ "<br>Please wait...<br></p>" #. Read dialog help 2/2 -#: src/include/security/helps.rb:43 +#: src/include/security/helps.rb:45 msgid "" "<p><b><big>Aborting the Initialization</big></b><br>\n" "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>" @@ -383,7 +383,7 @@ "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>" #. Write dialog help 1/2 -#: src/include/security/helps.rb:47 +#: src/include/security/helps.rb:49 msgid "" "<p><b><big>Saving Security Configuration</big></b>\n" "<br>Please wait...<br></p>" @@ -392,7 +392,7 @@ "<br>Please wait...<br></p>" #. Write dialog help 2/2 -#: src/include/security/helps.rb:51 +#: src/include/security/helps.rb:53 msgid "" "<p><b><big>Aborting Saving</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.</p>" @@ -400,56 +400,9 @@ "<p><b><big>Aborting Saving</big></b><br>\n" "Abort the save procedure by pressing <b>Abort</b>.</p>" -#. Boot dialog help 1/4 -#: src/include/security/helps.rb:55 -msgid "" -"<p><b><big>Boot Security</big></b></p>\n" -"<p>In this dialog, change various boot settings related to security.</p>" -msgstr "" -"<p><b><big>Boot Security</big></b></p>\n" -"<p>In this dialogue, change various boot settings related to security.</p>" - -#. Boot dialog help 2/4 +#. Main dialog help 1/8 #: src/include/security/helps.rb:59 msgid "" -"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" -"Configure what the system should do in response to\n" -"someone at the console pressing the CTRL + ALT + DEL key\n" -"combination. Usually the system reboots. Sometimes it is desirable\n" -"to ignore this event, for example, when the system serves as both\n" -"workstation and server.</p>" -msgstr "" -"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" -"Configure what the system should do in response to\n" -"someone at the console pressing the CTRL + ALT + DEL key\n" -"combination. Usually the system reboots. Sometimes it is desirable\n" -"to ignore this event, for example, when the system serves as both\n" -"workstation and server.</p>" - -#. Boot dialog help 3/4 -#: src/include/security/helps.rb:68 -#, fuzzy -#| msgid "" -#| "<p><b>Shutdown Behaviour of Login Manager</b>:\n" -#| "Set who is allowed to shut down the machine from KDM or GDM.</p>\n" -msgid "" -"<p><b>Shutdown Behaviour of Login Manager</b>:\n" -"Set who is allowed to shut down the machine from KDM.</p>\n" -msgstr "" -"<p><b>Shutdown Behaviour of Login Manager</b>:\n" -"Set who is allowed to shut down the machine from KDM or GDM.</p>\n" - -#. Boot dialog help 4/4 -#: src/include/security/helps.rb:72 -msgid "" -"<p><b>Hibernate System</b>:\n" -"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n" -"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n" -msgstr "" - -#. Main dialog help 1/8 -#: src/include/security/helps.rb:78 -msgid "" "<P><BIG><B>Configuring Local Security</B></BIG></P>\n" "<p>Using predefined defaults, change the local security settings, which include\n" " booting, login, password, user creation, and file permissions. The default\n" @@ -463,7 +416,7 @@ "</p>" #. Main dialog help 5/8 -#: src/include/security/helps.rb:86 +#: src/include/security/helps.rb:67 #, fuzzy #| msgid "" #| "<p><b>Networked Workstation</b>: For a computer connected\n" @@ -476,14 +429,14 @@ "to any type of network including the Internet.</p>" #. Main dialog help 6/8 -#: src/include/security/helps.rb:90 +#: src/include/security/helps.rb:71 msgid "" "<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n" "that connects to different networks.</p>" msgstr "" #. Main dialog help 7/8 -#: src/include/security/helps.rb:94 +#: src/include/security/helps.rb:75 msgid "" "<p><b>Network Server</b>: For a computer that provides\n" "any type of service.</p>" @@ -492,13 +445,13 @@ "any type of service.</p>" #. Main dialog help 8/8 -#: src/include/security/helps.rb:98 +#: src/include/security/helps.rb:79 #, fuzzy msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>" msgstr "<p>Use <b>Custom Settings</b> to create your own configuration.</p>" #. Login dialog help 1/4 -#: src/include/security/helps.rb:100 +#: src/include/security/helps.rb:81 msgid "" "<p><big><b>Login Security</b></big></p>\n" "<p>These login settings\n" @@ -509,7 +462,7 @@ "are mainly stored in the /etc/login.defs file.</p>" #. Login dialog help 2/4 -#: src/include/security/helps.rb:106 +#: src/include/security/helps.rb:87 msgid "" "<p><b>Delay after Incorrect Login Attempt:</b>\n" "It is advisable to wait some time after an incorrect login attempt to prevent\n" @@ -522,7 +475,7 @@ "retry if a password is mistyped. A sensible value is three seconds (<tt>3</tt>).</p>" #. Login dialog help 3/4 -#: src/include/security/helps.rb:113 +#: src/include/security/helps.rb:94 #, fuzzy msgid "" "<p><b>Record Successful Login Attempts:</b> Logging successful login\n" @@ -536,7 +489,7 @@ "</p>" #. Login dialog help 4/4 -#: src/include/security/helps.rb:120 +#: src/include/security/helps.rb:101 msgid "" "<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n" "to a graphical login screen for this machine over the network. Remote access\n" @@ -547,7 +500,7 @@ "to your machine using a display manager might be a security risk.</p>" #. Password dialog help 1/8 -#: src/include/security/helps.rb:126 +#: src/include/security/helps.rb:107 msgid "" "<p>These password settings\n" "are mainly stored in the /etc/login.defs file.</p>" @@ -556,7 +509,7 @@ "are mainly stored in the /etc/login.defs file.</p>" #. Password dialog help 2/8 -#: src/include/security/helps.rb:130 +#: src/include/security/helps.rb:111 msgid "" "<p><b>Check New Passwords</b>: It is wise to choose a password that\n" "cannot be found in a dictionary and is not a name or other simple, common word.\n" @@ -567,7 +520,7 @@ "By checking the box, enforce password checking in regard to these rules.</p>" #. Password dialog help -#: src/include/security/helps.rb:136 +#: src/include/security/helps.rb:117 #, fuzzy msgid "" "<p><b>Minimum Acceptable Password Length:</b>\n" @@ -582,7 +535,7 @@ "suppresses this check.</p>" #. Password dialog help 4/8 -#: src/include/security/helps.rb:144 +#: src/include/security/helps.rb:125 msgid "" "<p><b>Passwords to Remember</b>:\n" "Enter the number of user passwords to store and prevent the user from reusing.\n" @@ -593,12 +546,12 @@ "Enter 0 if passwords should not be stored.</p>" #. Password dialog help 5a/8 -#: src/include/security/helps.rb:150 +#: src/include/security/helps.rb:131 msgid "<p><b>Password Encryption Method:</b></p>" msgstr "<p><b>Password Encryption Method:</b></p>" #. Password dialog help 5b/8 -#: src/include/security/helps.rb:152 +#: src/include/security/helps.rb:133 #, fuzzy #| msgid "" #| "<p><b>des</b>, the Linux default method, works in all network environments,\n" @@ -614,7 +567,7 @@ "compatibility with other systems, use this method.</p>" #. Password dialog help 5c/8 -#: src/include/security/helps.rb:158 +#: src/include/security/helps.rb:139 msgid "" "<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n" "distributions, but not by other systems or old software.</p>" @@ -623,12 +576,12 @@ "distributions, but not by other systems or old software.</p>" #. Password dialog help 5d/8 -#: src/include/security/helps.rb:162 +#: src/include/security/helps.rb:143 msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>" msgstr "" #. Password dialog help 7/8 -#: src/include/security/helps.rb:166 +#: src/include/security/helps.rb:147 msgid "" "<p><b>Password Age:</b> Set the minimum and\n" "maximum number of days a password may be used.</p>" @@ -637,7 +590,7 @@ "maximum number of days a password may be used.</p>" #. Password dialog help 8/8 -#: src/include/security/helps.rb:170 +#: src/include/security/helps.rb:151 msgid "" "<p><b>Days before Password Expires Warning</b>: This entry sets the\n" "number of days users are warned before their passwords expire. The longer the\n" @@ -648,7 +601,7 @@ "time, the less likely it is that someone can guess passwords.</p>" #. Adduser dialog help 1/2 -#: src/include/security/helps.rb:176 +#: src/include/security/helps.rb:157 msgid "" "<p><big><b>User Security</b></big></P>\n" "<p>In this dialog, change various settings used to create users.</p>" @@ -657,7 +610,7 @@ "<p>In this dialogue, change various settings used to create users.</p>" #. Adduser dialog help 2/3 -#: src/include/security/helps.rb:180 +#: src/include/security/helps.rb:161 msgid "" "<p><b>User ID Limitations:</b>\n" "Set the minimum and maximum possible user ID.</p>" @@ -666,7 +619,7 @@ "Set the minimum and maximum possible user ID.</p>" #. Adduser dialog help 3/3 -#: src/include/security/helps.rb:184 +#: src/include/security/helps.rb:165 msgid "" "<p><b>Group ID Limitations</b>:\n" "Set the minimum and maximum possible group ID.</p>" @@ -675,7 +628,7 @@ "Set the minimum and maximum possible group ID.</p>" #. Misc dialog help 1/14 -#: src/include/security/helps.rb:188 +#: src/include/security/helps.rb:169 msgid "" "<p><big><b>Other Security Settings</b></big></P>\n" "<p>In this dialog, change miscellaneous settings related to local security.</p>" @@ -684,7 +637,7 @@ "<p>In this dialogue, change miscellaneous settings related to local security.</p>" #. Misc dialog help 2/14 -#: src/include/security/helps.rb:192 +#: src/include/security/helps.rb:173 msgid "" "<p><b>File Permissions</b>: Settings for the permissions\n" "of certain system files are set according to the data in /etc/permissions.secure\n" @@ -715,7 +668,7 @@ "decide which users are able to run X applications and setuid programs.</p>\n" #. Misc dialog help 6/14 -#: src/include/security/helps.rb:208 +#: src/include/security/helps.rb:189 msgid "" "<p><b>User Launching updatedb</b>: The program updatedb runs \n" "once a day. It scans your entire file system and creates a database (locatedb)\n" @@ -730,7 +683,7 @@ " (few files) or <b>root</b> (all files).</p>" #. Misc dialog help 10/14 -#: src/include/security/helps.rb:216 +#: src/include/security/helps.rb:197 msgid "" "<p><b>Current Directory in root's Path</b> On a DOS system,\n" "the system first searches for executable files (programs) in the current\n" @@ -743,7 +696,7 @@ "searches for them exclusively via the search path (variable PATH).</p>" #. Misc dialog help 11/14 -#: src/include/security/helps.rb:223 +#: src/include/security/helps.rb:204 msgid "" "<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n" "system first searches for executable files (programs) in the current directory\n" @@ -756,7 +709,7 @@ "for them exclusively via the search path (variable PATH).</p>" #. Misc dialog help 12/14 -#: src/include/security/helps.rb:230 +#: src/include/security/helps.rb:211 msgid "" "<p>Some systems set up a work-around by adding the dot (\".\") to the\n" "search path, enabling files in the current path to be found and executed.\n" @@ -773,7 +726,7 @@ "is rather easy if you set this option.</p>" #. Misc dialog help 13/14 -#: src/include/security/helps.rb:239 +#: src/include/security/helps.rb:220 msgid "" "<p>\"yes\": the dot (\".\") is attached to the end of the search\n" "path of root, making it the last to be searched.</p>" @@ -782,7 +735,7 @@ "path of root, making it the last to be searched.</p>" #. Misc dialog help 14/14 -#: src/include/security/helps.rb:243 +#: src/include/security/helps.rb:224 msgid "" "<p>\"no\": the user root always must launch programs in the\n" "current directory prefixed with a \"./\". Example: \"./configure\".</p>" @@ -791,7 +744,7 @@ "current directory prefixed with a \"./\". Example: \"./configure\".</p>" #. Misc dialog help 14/14 -#: src/include/security/helps.rb:247 +#: src/include/security/helps.rb:228 msgid "" "<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n" "will have some control over the system even if it crashes (for example, during kernel\n" @@ -802,30 +755,30 @@ "debugging). For details, see /usr/src/linux/Documentation/sysrq.txt</p>" #. help text: security overview dialog 1/ -#: src/include/security/helps.rb:253 +#: src/include/security/helps.rb:234 #, fuzzy #| msgid "<P><B>Profiles</B><BR>This dialog shows the list of currently stored backup profiles.</P>" msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>" msgstr "<P><B>Profiles</B><BR>This dialogue shows the list of currently stored backup profiles.</P>" #. help text: security overview dialog 1/ -#: src/include/security/helps.rb:257 +#: src/include/security/helps.rb:238 msgid "<P>To change the current value, click the link associated to the option.</P>" msgstr "" #. help text: security overview dialog 1/ -#: src/include/security/helps.rb:261 +#: src/include/security/helps.rb:242 #, fuzzy #| msgid "<P>A check mark in the first column indicates that the file will be backed up.</P>" msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>" msgstr "<P>A check mark in the first column indicates that the file will be backed up.</P>" #. an error message (rich text) -#: src/include/security/helps.rb:265 +#: src/include/security/helps.rb:246 msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>" msgstr "" -#: src/include/security/helps.rb:271 +#: src/include/security/helps.rb:252 msgid "" "<P>A display manager provides a graphical login screen and can be accessed\n" "across the network by an X server running on another system if so\n" @@ -837,7 +790,7 @@ "logins, then disable this option.</P>" msgstr "" -#: src/include/security/helps.rb:281 +#: src/include/security/helps.rb:262 msgid "" "<P>Upon startup, the system time is being set from the hardware clock of the\n" "computer. As a consequence, setting the hardware clock before shutting down is\n" @@ -845,23 +798,23 @@ "correct log messages.</P>" msgstr "" -#: src/include/security/helps.rb:287 +#: src/include/security/helps.rb:268 msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>" msgstr "" -#: src/include/security/helps.rb:290 +#: src/include/security/helps.rb:271 msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>" msgstr "" -#: src/include/security/helps.rb:293 +#: src/include/security/helps.rb:274 msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>" msgstr "" -#: src/include/security/helps.rb:296 +#: src/include/security/helps.rb:277 msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>" msgstr "" -#: src/include/security/helps.rb:299 +#: src/include/security/helps.rb:280 msgid "" "<P>X Window clients, e.g. programs that open a window on your display, connect\n" "to the X server that runs on the physical machine. Programs can also run on a\n" @@ -873,13 +826,13 @@ "Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>" msgstr "" -#: src/include/security/helps.rb:309 +#: src/include/security/helps.rb:290 msgid "" "<P>The email delivery subsystem is always started. However, it does not expose\n" "itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>" msgstr "" -#: src/include/security/helps.rb:312 +#: src/include/security/helps.rb:293 msgid "" "<P>If a package containing a service that is currently running is being\n" "updated, the service is restarted after the files in the package have been\n" @@ -891,7 +844,7 @@ "reason to do so.</P>" msgstr "" -#: src/include/security/helps.rb:322 +#: src/include/security/helps.rb:303 msgid "" "<P>If a package containing a service that is currently running is being\n" "uninstalled, the service is stopped before the files of the package are\n" @@ -903,23 +856,23 @@ "reason to do so.</P>" msgstr "" -#: src/include/security/helps.rb:332 +#: src/include/security/helps.rb:313 msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>" msgstr "" -#: src/include/security/helps.rb:335 src/include/security/helps.rb:339 +#: src/include/security/helps.rb:316 src/include/security/helps.rb:320 msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>" msgstr "" -#: src/include/security/helps.rb:338 +#: src/include/security/helps.rb:319 msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>" msgstr "" -#: src/include/security/helps.rb:342 +#: src/include/security/helps.rb:323 msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>" msgstr "" -#: src/include/security/helps.rb:343 +#: src/include/security/helps.rb:324 #, fuzzy msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>" msgstr "" @@ -927,18 +880,112 @@ "will have some control over the system even if it crashes (e.g., during kernel\n" "debugging). For details, see <i>/usr/src/linux/Documentation/sysrq.txt</i></p>" -#: src/include/security/helps.rb:346 +#: src/include/security/helps.rb:327 msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>" msgstr "" -#: src/include/security/helps.rb:349 +#: src/include/security/helps.rb:330 msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>" msgstr "" -#: src/include/security/helps.rb:352 +#: src/include/security/helps.rb:333 msgid "<P>Every running service is a potential target of a security attack. Therefore it is recommended to turn off all services which are not used by the system.</P>" msgstr "" +#: src/include/security/helps.rb:341 +msgid "" +"<p><b><big>Boot Security</big></b></p>\n" +"<p>In this dialog, change various boot settings related to security.</p>" +msgstr "" +"<p><b><big>Boot Security</big></b></p>\n" +"<p>In this dialogue, change various boot settings related to security.</p>" + +#. TRANSLATORS: part of help text - default action (the default is +#. reboot) +#: src/include/security/helps.rb:348 +#, fuzzy +#| msgid "" +#| "<p><b>Interpretation of Ctrl + Alt + Del</b><br>\n" +#| "When someone at the console has pressed the CTRL + ALT + DEL key\n" +#| "combination, the system usually reboots. Sometimes it is desirable\n" +#| "to ignore this event, for example, when the system serves as both\n" +#| "workstation and server.</p>" +msgid "" +"Usually the system reboots. Sometimes it is desirable\n" +"to ignore this event, for example, when the system serves as both\n" +"workstation and server." +msgstr "" +"<p><b>Interpretation of Ctrl + Alt + Del</b><br>\n" +"When someone at the console has pressed the CTRL + ALT + DEL key\n" +"combination, the system usually reboots. Sometimes it is desirable\n" +"to ignore this event, for example, when the system serves as both\n" +"workstation and server.</p>" + +#. TRANSLATORS: part of help text - default action (the default is halt) +#: src/include/security/helps.rb:355 +#, fuzzy +#| msgid "" +#| "<p><b>Interpretation of Ctrl + Alt + Del</b><br>\n" +#| "When someone at the console has pressed the CTRL + ALT + DEL key\n" +#| "combination, the system usually reboots. Sometimes it is desirable\n" +#| "to ignore this event, for example, when the system serves as both\n" +#| "workstation and server.</p>" +msgid "" +"By default the system halts but sometimes it is desirable\n" +"to ignore this event, for example, when the system serves as both\n" +"workstation and server." +msgstr "" +"<p><b>Interpretation of Ctrl + Alt + Del</b><br>\n" +"When someone at the console has pressed the CTRL + ALT + DEL key\n" +"combination, the system usually reboots. Sometimes it is desirable\n" +"to ignore this event, for example, when the system serves as both\n" +"workstation and server.</p>" + +#. Boot dialog help 2/4 +#. TRANSLATORS: %s is help text - default action +#: src/include/security/helps.rb:364 +#, fuzzy +#| msgid "" +#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" +#| "Configure what the system should do in response to\n" +#| "someone at the console pressing the CTRL + ALT + DEL key\n" +#| "combination. Usually the system reboots. Sometimes it is desirable\n" +#| "to ignore this event, for example, when the system serves as both\n" +#| "workstation and server.</p>" +msgid "" +"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" +"Configure what the system should do in response to\n" +"someone at the console pressing the CTRL + ALT + DEL key\n" +"combination. %s</p>" +msgstr "" +"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n" +"Configure what the system should do in response to\n" +"someone at the console pressing the CTRL + ALT + DEL key\n" +"combination. Usually the system reboots. Sometimes it is desirable\n" +"to ignore this event, for example, when the system serves as both\n" +"workstation and server.</p>" + +#. Boot dialog help 3/4 +#: src/include/security/helps.rb:373 +#, fuzzy +#| msgid "" +#| "<p><b>Shutdown Behaviour of Login Manager</b>:\n" +#| "Set who is allowed to shut down the machine from KDM or GDM.</p>\n" +msgid "" +"<p><b>Shutdown Behaviour of Login Manager</b>:\n" +"Set who is allowed to shut down the machine from %s.</p>\n" +msgstr "" +"<p><b>Shutdown Behaviour of Login Manager</b>:\n" +"Set who is allowed to shut down the machine from KDM or GDM.</p>\n" + +#. Boot dialog help 4/4 +#: src/include/security/helps.rb:377 +msgid "" +"<p><b>Hibernate System</b>:\n" +"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n" +"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n" +msgstr "" + #. level name #: src/include/security/levels.rb:54 #, fuzzy @@ -1006,173 +1053,246 @@ "The minimum group ID cannot be larger than the\n" "maximum." -#. ComboBox label -#: src/include/security/widgets.rb:100 -msgid "&Interpretation of Ctrl + Alt + Del" -msgstr "&Interpretation of Ctrl + Alt + Del" - -#. ComboBox value -#: src/include/security/widgets.rb:105 +#. encoding: utf-8 +#. ------------------------------------------------------------------------------ +#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +#. +#. +#. This program is free software; you can redistribute it and/or modify it under +#. the terms of version 2 of the GNU General Public License as published by the +#. Free Software Foundation. +#. +#. This program is distributed in the hope that it will be useful, but WITHOUT +#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +#. +#. You should have received a copy of the GNU General Public License along with +#. this program; if not, contact Novell, Inc. +#. +#. To contact Novell about this file by physical or electronic mail, you may find +#. current contact information at www.novell.com. +#. ------------------------------------------------------------------------------ +#. * File: include/security/widgets.ycp +#. * Module: Security configuration +#. * Summary: Security widgets definitions +#. * Authors: Michal Svec +#. * +#. * $Id$ +#. * +#. * This file contains the definitions of all widgets used by the +#. * security module. They are all in one map (function) called +#. * WIDGETS. +#. +#. <pre> +#. +#. The WIDGETS format: +#. ------------------- +#. +#. map WIDGETS = $[ +#. "Item unique ID" : $[ +#. "Widget" : "ComboBox", +#. "Label" : "Item Label", +#. "Options" : [ "option1", "option2", ... ], +#. "Value" : "option2" +#. ], +#. ... +#. ]; +#. +#. The "Value" is the current value of this option and one from "Options". +#. +#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the +#. latter case, the first string is used as ID and the second is displayed. For +#. example: [ "option1", ["option2",_("Option2 translation")], ... ]. +#. +#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry". +#. +#. Implementation: +#. --------------- +#. +#. map2widget("ID") +#. - look up the "ID" in the "WIDGETS" map +#. - create the widget +#. +#. widget2value("ID") +#. - query UI for the widget with `id(ID) +#. - return its current value +#. +#. updatewidget("ID") +#. - look up the "ID" and change its "Value" to the "val" +#. - updates the WIDGETS map +#. - called after start and after each subdialog [OK] +#. - must check if the value is in "Options"! (TODO) +#. +#. processinput() +#. - return true (OK) or false (abort, back, nil, help!, ...) +#. +#. </pre> +#. +#. * +#. @return [Hash] all widgets +#: src/include/security/widgets.rb:87 msgid "Ignore" msgstr "Ignore" -#. ComboBox value -#: src/include/security/widgets.rb:107 +#: src/include/security/widgets.rb:88 msgid "Reboot" msgstr "Reboot" -#. ComboBox value -#: src/include/security/widgets.rb:109 +#: src/include/security/widgets.rb:89 msgid "Halt" msgstr "Halt" +#: src/include/security/widgets.rb:93 +msgid "Only root" +msgstr "Only root" + +#: src/include/security/widgets.rb:94 +msgid "All Users" +msgstr "All Users" + +#: src/include/security/widgets.rb:95 +msgid "Nobody" +msgstr "Nobody" + +#. ComboBox label +#: src/include/security/widgets.rb:117 +msgid "&Interpretation of Ctrl + Alt + Del" +msgstr "&Interpretation of Ctrl + Alt + Del" + #. CheckBox label -#: src/include/security/widgets.rb:116 +#: src/include/security/widgets.rb:126 msgid "Allow Remote &Graphical Login" msgstr "Allow Remote &Graphical Login" #. CheckBox label -#: src/include/security/widgets.rb:122 +#: src/include/security/widgets.rb:132 #, fuzzy #| msgid "Enable &Magic SysRq Keys" msgid "&Magic SysRq Keys" msgstr "Enable &Magic SysRq Keys" #. ComboBox value -#: src/include/security/widgets.rb:125 +#: src/include/security/widgets.rb:135 msgid "Disable" msgstr "Disable" #. ComboBox value -#: src/include/security/widgets.rb:127 +#: src/include/security/widgets.rb:137 #, fuzzy #| msgid "Enable AppArmor Functions" msgid "Enable All Functions" msgstr "Enable AppArmor Functions" #. IntField label -#: src/include/security/widgets.rb:134 +#: src/include/security/widgets.rb:144 msgid "&Delay after Incorrect Login Attempt" msgstr "&Delay after Incorrect Login Attempt" #. IntField label #. IntField label -#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205 +#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199 msgid "Maxim&um" msgstr "Maxim&um" #. IntField label #. IntField label -#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218 +#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212 msgid "M&inimum" msgstr "M&inimum" #. ComboBox label -#: src/include/security/widgets.rb:154 +#: src/include/security/widgets.rb:164 #, fuzzy -#| msgid "&Shutdown Behaviour of Login Manager:" -msgid "&Shutdown Behaviour of KDM Login Manager:" -msgstr "&Shutdown Behaviour of Login Manager:" - -#. ComboBox value -#: src/include/security/widgets.rb:159 -msgid "Only root" -msgstr "Only root" - -#. ComboBox value -#: src/include/security/widgets.rb:161 -msgid "All Users" -msgstr "All Users" - -#. ComboBox value -#: src/include/security/widgets.rb:163 -msgid "Nobody" -msgstr "Nobody" - -#. ComboBox label -#: src/include/security/widgets.rb:170 -#, fuzzy #| msgid "System Information" msgid "System Hybernation" msgstr "System Information" #. ComboBox value -#: src/include/security/widgets.rb:173 +#: src/include/security/widgets.rb:167 msgid "User on the active console" msgstr "" #. ComboBox value -#: src/include/security/widgets.rb:175 +#: src/include/security/widgets.rb:169 msgid "Anyone can hibernate" msgstr "" #. ComboBox value -#: src/include/security/widgets.rb:177 +#: src/include/security/widgets.rb:171 #, fuzzy #| msgid "Authentication Realms" msgid "Authentication always required" msgstr "Authentication Realms" #. ComboBox label -#: src/include/security/widgets.rb:184 +#: src/include/security/widgets.rb:178 msgid "P&assword Encryption Method" msgstr "P&assword Encryption Method" #. CheckBox label -#: src/include/security/widgets.rb:198 +#: src/include/security/widgets.rb:192 msgid "&Check New Passwords" msgstr "&Check New Passwords" #. IntField label -#: src/include/security/widgets.rb:211 +#: src/include/security/widgets.rb:205 msgid "Numb&er of Passwords to Remember" msgstr "Numb&er of Passwords to Remember" #. IntField label -#: src/include/security/widgets.rb:224 +#: src/include/security/widgets.rb:218 msgid "&Minimum Acceptable Password Length" msgstr "&Minimum Acceptable Password Length" #. IntField label -#: src/include/security/widgets.rb:232 +#: src/include/security/widgets.rb:226 msgid "&Days before Password Expires Warning" msgstr "&Days before Password Expires Warning" #. ComboBox label -#: src/include/security/widgets.rb:240 +#: src/include/security/widgets.rb:234 msgid "&File Permissions" msgstr "&File Permissions" #. ComboBox value -#: src/include/security/widgets.rb:243 +#: src/include/security/widgets.rb:237 msgid "Easy" msgstr "Easy" #. ComboBox value -#: src/include/security/widgets.rb:245 +#: src/include/security/widgets.rb:239 msgid "Secure" msgstr "Secure" #. ComboBox value -#: src/include/security/widgets.rb:247 +#: src/include/security/widgets.rb:241 msgid "Paranoid" msgstr "Paranoid" #. ComboBox label -#: src/include/security/widgets.rb:254 +#: src/include/security/widgets.rb:248 msgid "&User Launching updatedb" msgstr "&User Launching updatedb" #. IntField label -#: src/include/security/widgets.rb:261 +#: src/include/security/widgets.rb:255 msgid "Ma&ximum" msgstr "Ma&ximum" #. IntField label -#: src/include/security/widgets.rb:267 +#: src/include/security/widgets.rb:261 msgid "&Minimum" msgstr "&Minimum" +#. ComboBox label +#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM, +#. but could be XDM,WDM,ENTRANCE,CONSOLE +#: src/include/security/widgets.rb:277 +#, fuzzy +#| msgid "&Shutdown Behaviour of Login Manager:" +msgid "&Shutdown Behaviour of %s Login Manager:" +msgstr "&Shutdown Behaviour of Login Manager:" + #: src/include/security/wizards.rb:53 #, fuzzy msgid "Predefined Security Configurations" @@ -1189,69 +1309,74 @@ msgstr "Initialising..." #. Security read dialog caption -#: src/modules/Security.rb:654 +#: src/modules/Security.rb:638 msgid "Saving Security Configuration" msgstr "Saving Security Configuration" #. Progress stage 1/4 -#: src/modules/Security.rb:663 +#: src/modules/Security.rb:647 msgid "Write security settings" msgstr "Write security settings" #. Progress stage 2/4 -#: src/modules/Security.rb:665 +#: src/modules/Security.rb:649 msgid "Write inittab settings" msgstr "Write inittab settings" #. Progress stage 3/4 -#: src/modules/Security.rb:667 +#: src/modules/Security.rb:651 msgid "Write PAM settings" msgstr "Write PAM settings" #. Progress stage 4/4 -#: src/modules/Security.rb:669 +#: src/modules/Security.rb:653 #, fuzzy #| msgid "Save system settings" msgid "Update system settings" msgstr "Save system settings" #. Progress step 1/5 -#: src/modules/Security.rb:673 +#: src/modules/Security.rb:657 msgid "Writing security settings..." msgstr "Writing security settings..." #. Progress step 2/5 -#: src/modules/Security.rb:675 +#: src/modules/Security.rb:659 msgid "Writing inittab settings..." msgstr "Writing inittab settings..." #. Progress step 3/5 -#: src/modules/Security.rb:677 +#: src/modules/Security.rb:661 msgid "Writing PAM settings..." msgstr "Writing PAM settings..." #. Progress step 4/5 -#: src/modules/Security.rb:679 +#: src/modules/Security.rb:663 #, fuzzy #| msgid "Saving system settings..." msgid "Updating system settings..." msgstr "Saving system settings..." #. Progress step 5/5 -#: src/modules/Security.rb:681 +#: src/modules/Security.rb:665 msgid "Finished" msgstr "Finished" #. Summary text -#: src/modules/Security.rb:791 +#: src/modules/Security.rb:754 msgid "Current Security Level: Custom settings" msgstr "Current Security Level: Custom settings" #. Summary text -#: src/modules/Security.rb:795 +#: src/modules/Security.rb:758 msgid "Current Security Level: %1" msgstr "Current Security Level: %1" +#, fuzzy +#~| msgid "&Shutdown Behaviour of Login Manager:" +#~ msgid "&Shutdown Behaviour of KDM Login Manager:" +#~ msgstr "&Shutdown Behaviour of Login Manager:" + #~ msgid "Home Workstation security level (without network)" #~ msgstr "Home Workstation security level (without network)" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/services-manager.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 17:00+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/slp-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/snapper.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 17:00+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -18,32 +18,8 @@ "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. encoding: utf-8 -#. ------------------------------------------------------------------------------ -#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. -#. -#. -#. This program is free software; you can redistribute it and/or modify it under -#. the terms of version 2 of the GNU General Public License as published by the -#. Free Software Foundation. -#. -#. This program is distributed in the hope that it will be useful, but WITHOUT -#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -#. -#. You should have received a copy of the GNU General Public License along with -#. this program; if not, contact Novell, Inc. -#. -#. To contact Novell about this file by physical or electronic mail, you may find -#. current contact information at www.novell.com. -#. ------------------------------------------------------------------------------ -#. File: clients/snapper.ycp -#. Package: Configuration of snapper -#. Summary: Main file -#. Authors: Jiri Suchomel -#. -#. Main file for snapper configuration. Uses all other files. -#: src/clients/snapper.rb:49 +#. The main () +#: src/clients/snapper.rb:53 #, fuzzy #| msgid "Configuration of sshd" msgid "Configuration of system snapshots" @@ -51,14 +27,14 @@ #. text entry label #. text entry label -#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244 -#: src/include/snapper/dialogs.rb:496 +#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251 +#: src/include/snapper/dialogs.rb:490 msgid "Description" msgstr "Description" #. text entry label #. text entry label -#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290 +#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297 #, fuzzy #| msgid "User name" msgid "User data" @@ -66,45 +42,45 @@ #. combo box label #. text entry label -#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295 +#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302 #, fuzzy #| msgid "C&leanup Script" msgid "Cleanup algorithm" msgstr "C&leanup Script" -#. popup label, %{num} is number -#: src/include/snapper/dialogs.rb:153 -msgid "Modify Snapshot %{num}" +#. popup label, %1 is number +#: src/include/snapper/dialogs.rb:158 +msgid "Modify Snapshot %1" msgstr "" -#. popup label, %{pre} and %{post} are numbers -#: src/include/snapper/dialogs.rb:159 -msgid "Modify Snapshot %{pre} and %{post}" +#. popup label, %1, %2 are numbers (range) +#: src/include/snapper/dialogs.rb:166 +msgid "Modify Snapshots %1 - %2" msgstr "" #. label -#: src/include/snapper/dialogs.rb:161 +#: src/include/snapper/dialogs.rb:169 #, fuzzy #| msgid "PReP (%1)" -msgid "Pre (%{pre})" +msgid "Pre (%1)" msgstr "PReP (%1)" #. label -#: src/include/snapper/dialogs.rb:165 +#: src/include/snapper/dialogs.rb:173 #, fuzzy #| msgid "Host %1" -msgid "Post (%{post})" +msgid "Post (%1)" msgstr "Host %1" #. popup label -#: src/include/snapper/dialogs.rb:242 +#: src/include/snapper/dialogs.rb:249 #, fuzzy #| msgid "Create New " msgid "Create New Snapshot" msgstr "Create New " #. radio button label -#: src/include/snapper/dialogs.rb:255 +#: src/include/snapper/dialogs.rb:262 #, fuzzy #| msgid "Read the list of profiles" msgid "Single snapshot" @@ -112,250 +88,243 @@ #. radio button label #. 0 means there's no post -#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442 +#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435 msgid "Pre" msgstr "Pre" #. radio button label, snapshot selection will follow -#: src/include/snapper/dialogs.rb:274 +#: src/include/snapper/dialogs.rb:281 msgid "Post, paired with:" msgstr "" #. yes/no popup question -#: src/include/snapper/dialogs.rb:350 +#: src/include/snapper/dialogs.rb:352 #, fuzzy #| msgid "Really delete '%1'?" -msgid "Really delete snapshot %{num}?" +msgid "Really delete snapshot '%1'?" msgstr "Really delete '%1'?" -#. yes/no popup question -#: src/include/snapper/dialogs.rb:357 -#, fuzzy -#| msgid "Really delete '%1'?" -msgid "Really delete snapshots %{pre} and %{post}?" -msgstr "Really delete '%1'?" - #. summary dialog caption -#: src/include/snapper/dialogs.rb:372 +#: src/include/snapper/dialogs.rb:365 msgid "Snapshots" msgstr "" #. generate list of snapshot table items -#: src/include/snapper/dialogs.rb:401 +#: src/include/snapper/dialogs.rb:394 #, fuzzy #| msgid "Singlehead" msgid "Single" msgstr "Singlehead" #. pre canot be 0 -#: src/include/snapper/dialogs.rb:426 +#: src/include/snapper/dialogs.rb:419 msgid "Pre & Post" msgstr "" #. busy popup message -#: src/include/snapper/dialogs.rb:461 +#: src/include/snapper/dialogs.rb:454 #, fuzzy #| msgid "Read the list of profiles" msgid "Reading list of snapshots..." msgstr "Read the list of profiles" #. combo box label -#: src/include/snapper/dialogs.rb:481 +#: src/include/snapper/dialogs.rb:475 #, fuzzy #| msgid "Current Configuration:" msgid "Current Configuration" msgstr "Current Configuration:" #. table header -#: src/include/snapper/dialogs.rb:492 +#: src/include/snapper/dialogs.rb:486 msgid "ID" msgstr "ID" -#: src/include/snapper/dialogs.rb:493 +#: src/include/snapper/dialogs.rb:487 msgid "Type" msgstr "Type" -#: src/include/snapper/dialogs.rb:494 +#: src/include/snapper/dialogs.rb:488 msgid "Start Date" msgstr "Start Date" -#: src/include/snapper/dialogs.rb:495 +#: src/include/snapper/dialogs.rb:489 msgid "End Date" msgstr "End Date" -#: src/include/snapper/dialogs.rb:497 +#: src/include/snapper/dialogs.rb:491 msgid "User Data" msgstr "User Data" #. button label -#: src/include/snapper/dialogs.rb:503 +#: src/include/snapper/dialogs.rb:497 #, fuzzy #| msgid "&Show Changes" msgid "Show Changes" msgstr "&Show Changes" #. button label -#: src/include/snapper/dialogs.rb:506 +#: src/include/snapper/dialogs.rb:500 #, fuzzy #| msgid "&Modify" msgid "Modify" msgstr "&Modify" #. popup message -#: src/include/snapper/dialogs.rb:549 +#: src/include/snapper/dialogs.rb:542 msgid "" "This 'Pre' snapshot is not paired with any 'Post' one yet.\n" "Showing differences is not possible." msgstr "" #. dialog caption -#: src/include/snapper/dialogs.rb:634 +#: src/include/snapper/dialogs.rb:588 #, fuzzy #| msgid "Selected Service" msgid "Selected Snapshot Overview" msgstr "Selected Service" #. '%1: %2' means 'ID: description', adapt the order if necessary -#: src/include/snapper/dialogs.rb:666 +#: src/include/snapper/dialogs.rb:626 #, fuzzy #| msgid "Next %1: %2" msgid "%1: %2" msgstr "Next %1: %2" #. busy popup message -#: src/include/snapper/dialogs.rb:685 +#: src/include/snapper/dialogs.rb:645 #, fuzzy #| msgid "Saving changes to the files..." msgid "Calculating changed files..." msgstr "Saving changes to the files..." #. busy popup message -#: src/include/snapper/dialogs.rb:695 +#: src/include/snapper/dialogs.rb:742 #, fuzzy #| msgid "Accepting failed verifications" msgid "Calculating file modifications..." msgstr "Accepting failed verifications" #. label -#: src/include/snapper/dialogs.rb:703 +#: src/include/snapper/dialogs.rb:750 msgid "New file was created." msgstr "" #. label -#: src/include/snapper/dialogs.rb:707 +#: src/include/snapper/dialogs.rb:754 #, fuzzy #| msgid "Card removed" msgid "File was removed." msgstr "Card removed" #. label -#: src/include/snapper/dialogs.rb:712 +#: src/include/snapper/dialogs.rb:759 msgid "File content was not changed." msgstr "" #. label -#: src/include/snapper/dialogs.rb:718 +#: src/include/snapper/dialogs.rb:765 #, fuzzy #| msgid "File %1 does not exist." msgid "File does not exist in either snapshot." msgstr "File %1 does not exist." #. label -#: src/include/snapper/dialogs.rb:724 +#: src/include/snapper/dialogs.rb:771 #, fuzzy #| msgid "Nothing was modified yet." msgid "File content was modified." msgstr "Nothing was modified yet." #. text label, %1, %2 are file modes (like '-rw-r--r--') -#: src/include/snapper/dialogs.rb:734 +#: src/include/snapper/dialogs.rb:781 msgid "File mode was changed from '%1' to '%2'." msgstr "" #. text label, %1, %2 are user names -#: src/include/snapper/dialogs.rb:749 +#: src/include/snapper/dialogs.rb:796 msgid "File user ownership was changed from '%1' to '%2'." msgstr "" #. text label, %1, %2 are group names -#: src/include/snapper/dialogs.rb:765 +#: src/include/snapper/dialogs.rb:812 msgid "File group ownership was changed from '%1' to '%2'." msgstr "" #. button label -#: src/include/snapper/dialogs.rb:782 +#: src/include/snapper/dialogs.rb:847 #, fuzzy #| msgid "Restore options" msgid "R&estore from First" msgstr "Restore options" #. button label -#: src/include/snapper/dialogs.rb:784 +#: src/include/snapper/dialogs.rb:849 #, fuzzy #| msgid "Restore Options" msgid "Restore" msgstr "Restore Options" -#: src/include/snapper/dialogs.rb:807 +#: src/include/snapper/dialogs.rb:872 #, fuzzy #| msgid "Selected" msgid "Res&tore from Second" msgstr "Selected" #. radio button label -#: src/include/snapper/dialogs.rb:844 +#: src/include/snapper/dialogs.rb:909 msgid "Show the difference between snapshot and current system" msgstr "" #. radio button label, snapshot selection will follow -#: src/include/snapper/dialogs.rb:856 +#: src/include/snapper/dialogs.rb:921 msgid "Show the difference between current and selected snapshot:" msgstr "" #. radio button label -#: src/include/snapper/dialogs.rb:903 +#: src/include/snapper/dialogs.rb:968 msgid "Show the difference between first and second snapshot" msgstr "" #. radio button label -#: src/include/snapper/dialogs.rb:914 +#: src/include/snapper/dialogs.rb:979 msgid "Show the difference between first snapshot and current system" msgstr "" #. radio button label -#: src/include/snapper/dialogs.rb:925 +#: src/include/snapper/dialogs.rb:990 msgid "Show the difference between second snapshot and current system" msgstr "" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:954 -msgid "Time of taking the snapshot:" +#: src/include/snapper/dialogs.rb:1031 +msgid "Time of taking the first snapshot:" msgstr "" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:962 -msgid "Time of taking the first snapshot:" +#: src/include/snapper/dialogs.rb:1036 +msgid "Time of taking the second snapshot:" msgstr "" #. label, date string will follow at the end of line -#: src/include/snapper/dialogs.rb:967 -msgid "Time of taking the second snapshot:" +#: src/include/snapper/dialogs.rb:1044 +msgid "Time of taking the snapshot:" msgstr "" #. button label -#: src/include/snapper/dialogs.rb:990 +#: src/include/snapper/dialogs.rb:1066 msgid "&Open" msgstr "&Open" #. button label -#: src/include/snapper/dialogs.rb:1036 +#: src/include/snapper/dialogs.rb:1112 #, fuzzy #| msgid "Selected" msgid "Restore Selected" msgstr "Selected" #. yes/no question, %1 is file name, %2 is number -#: src/include/snapper/dialogs.rb:1121 +#: src/include/snapper/dialogs.rb:1186 #, fuzzy #| msgid "Do you really want to delete this entry?" msgid "" @@ -368,7 +337,7 @@ #. yes/no question, %1 is file name, %2 is number #. yes/no question, %1 is file name, %2 is number -#: src/include/snapper/dialogs.rb:1142 src/include/snapper/dialogs.rb:1161 +#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224 msgid "" "Do you want to copy the file\n" "\n" @@ -378,19 +347,19 @@ msgstr "" #. popup message -#: src/include/snapper/dialogs.rb:1187 +#: src/include/snapper/dialogs.rb:1259 #, fuzzy #| msgid "No patches have been selected for installation.\n" -msgid "No file was selected for restoring." +msgid "No file was selected for restoring" msgstr "No patches have been selected for installation.\n" #. popup headline -#: src/include/snapper/dialogs.rb:1197 +#: src/include/snapper/dialogs.rb:1264 msgid "Restoring files" msgstr "Restoring files" #. popup message, %1 is snapshot number, %2 list of files -#: src/include/snapper/dialogs.rb:1200 +#: src/include/snapper/dialogs.rb:1267 msgid "" "<p>These files will be restored from snapshot '%1':</p>\n" "<p>\n" @@ -401,7 +370,7 @@ msgstr "" #. Read dialog help -#: src/include/snapper/helps.rb:35 +#: src/include/snapper/helps.rb:36 #, fuzzy #| msgid "" #| "<p><b><big>Creating the Add-On</big></b><br>\n" @@ -414,30 +383,30 @@ "Please wait...<br></p>\n" #. Summary dialog help: -#: src/include/snapper/helps.rb:39 +#: src/include/snapper/helps.rb:40 msgid "" "<p><b><big>Snapshots Configuration</big></b><p>\n" "<p>The table shows a list of root filesystem snapshots. There are three types\n" "of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n" -"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are paired together in the table.</p>\n" -"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the\n" +"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n" +"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\n" "new file system changes in the specified snapshot.</p>\n" msgstr "" #. Show snapshot dialog help -#: src/include/snapper/helps.rb:48 +#: src/include/snapper/helps.rb:49 msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" "The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n" "</p>\n" "<p>\n" -"When a file is selected in the tree, you see the changes done to it. By default, changes between selected paired snapshots are shown, but it is possible to compare the file with different versions.\n" +"When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n" "</p>\n" msgstr "" #. Show snapshot dialog help, alternative for single snapshots -#: src/include/snapper/helps.rb:58 +#: src/include/snapper/helps.rb:59 msgid "" "<p><b><big>Snapshot Overview</big></b><p>\n" "<p>\n" @@ -448,164 +417,194 @@ "</p>\n" msgstr "" -#. Return Tree of files modified between given snapshots -#. Map is recursively describing the filesystem structure; helps to build Tree widget contents -#: src/modules/Snapper.rb:108 +#. popup error +#: src/modules/Snapper.rb:91 #, fuzzy -#| msgid "Failed to save ipsec.conf:" -msgid "Failed to get config:\n" -msgstr "Failed to save ipsec.conf:" +#| msgid "Variable %1 was not found." +msgid "Snapshot '%1' was not found." +msgstr "Variable %1 was not found." -#. Return the path to given snapshot -#: src/modules/Snapper.rb:129 -#, fuzzy -#| msgid "Failed to test %1." -msgid "Failed to get snapshot mount point:\n" -msgstr "Failed to test %1." - +#. Initialize snapper agent +#. Return true on success +#. Delete existing snapshot +#. Return true on success +#. Modify existing snapshot +#. Return true on success #. Create new snapshot #. Return true on success -#: src/modules/Snapper.rb:276 +#: src/modules/Snapper.rb:236 src/modules/Snapper.rb:264 +#: src/modules/Snapper.rb:284 src/modules/Snapper.rb:303 #, fuzzy -#| msgid "Failed to create the new map." -msgid "Failed to create new snapshot:\n" -msgstr "Failed to create the new map." +#| msgid "(not known)" +msgid "Reason not known." +msgstr "(not known)" -#. Modify existing snapshot -#. Return true on success -#: src/modules/Snapper.rb:291 +#: src/modules/Snapper.rb:238 #, fuzzy +#| msgid "Configuration of autofs" +msgid "Configuration not found." +msgstr "Configuration of autofs" + +#: src/modules/Snapper.rb:240 +#, fuzzy +#| msgid "Network configuration is not valid." +msgid "Configuration is not valid." +msgstr "Network configuration is not valid." + +#. error popup +#: src/modules/Snapper.rb:247 +#, fuzzy +#| msgid "Failed to initialize the software repository." +msgid "" +"Failed to initialize snapper library:\n" +"%1" +msgstr "Failed to initialise the software repository." + +#: src/modules/Snapper.rb:266 +#, fuzzy +#| msgid "Variable %1 was not found." +msgid "Snapshot was not found." +msgstr "Variable %1 was not found." + +#. error popup +#: src/modules/Snapper.rb:271 +#, fuzzy +#| msgid "Failed to test %1." +msgid "" +"Failed to delete snapshot:\n" +"%1" +msgstr "Failed to test %1." + +#. error popup +#: src/modules/Snapper.rb:289 +#, fuzzy #| msgid "Failed to modify an autofs entry in map." -msgid "Failed to modify snapshot:\n" +msgid "" +"Failed to modify snapshot:\n" +"%1" msgstr "Failed to modify an autofs entry in map." -#. Delete existing snapshot -#. Return true on success #: src/modules/Snapper.rb:306 #, fuzzy -#| msgid "Failed to test %1." -msgid "Failed to delete snapshot:\n" -msgstr "Failed to test %1." +#| msgid "Variable %1 was not found." +msgid "Wrong snapshot type given." +msgstr "Variable %1 was not found." -#. Snapper read dialog caption -#: src/modules/Snapper.rb:319 +#: src/modules/Snapper.rb:308 #, fuzzy -#| msgid "Initializing" -msgid "Initializing Snapper" -msgstr "Initialising" +#| msgid "Variable %1 was not found." +msgid "'Pre' snapshot was not given." +msgstr "Variable %1 was not found." -#. Progress stage 1/2 -#: src/modules/Snapper.rb:324 +#: src/modules/Snapper.rb:310 #, fuzzy -#| msgid "Read the configuration" -msgid "Read list of configurations" -msgstr "Read the configuration" +#| msgid "Variable %1 was not found." +msgid "Given 'Pre' snapshot was not found." +msgstr "Variable %1 was not found." -#. Progress stage 2/2 -#: src/modules/Snapper.rb:326 +#. error popup +#: src/modules/Snapper.rb:316 #, fuzzy -#| msgid "Read the list of profiles" -msgid "Read list of snapshots" -msgstr "Read the list of profiles" +#| msgid "Failed to create the new map." +msgid "" +"Failed to create new snapshot:\n" +"%1" +msgstr "Failed to create the new map." -#. Progress step 1/2 -#: src/modules/Snapper.rb:330 +#. Snapper read dialog caption +#: src/modules/Snapper.rb:326 #, fuzzy -#| msgid "Reading the Configuration" -msgid "Reading list of configurations" -msgstr "Reading the Configuration" +#| msgid "Initializing" +msgid "Initializing Snapper" +msgstr "Initialising" -#. Progress step 2/2 -#: src/modules/Snapper.rb:332 +#. Progress stage 1/3 +#: src/modules/Snapper.rb:337 #, fuzzy #| msgid "Read the list of profiles" -msgid "Reading list of snapshots" +msgid "Read the list of snapshots" msgstr "Read the list of profiles" +#. Progress step 1/3 +#: src/modules/Snapper.rb:341 +msgid "Reading the database..." +msgstr "Reading the database..." + #. Progress finished -#: src/modules/Snapper.rb:334 +#: src/modules/Snapper.rb:343 msgid "Finished" msgstr "Finished" -#: src/modules/Snapper.rb:344 -#, fuzzy -#| msgid "Boot loader configuration failed." -msgid "Querying snapper configurations failed:" -msgstr "Boot loader configuration failed." - -#: src/modules/Snapper.rb:349 +#. error popup +#: src/modules/Snapper.rb:352 msgid "" "No snapper configurations exist. You have to create one or more\n" "configurations to use yast2-snapper. The snapper command line\n" "tool can be used to create configurations." msgstr "" -#: src/modules/Snapper.rb:359 -msgid "Querying snapper snapshots failed:" -msgstr "" - #. label for log window -#: src/modules/Snapper.rb:399 +#: src/modules/Snapper.rb:395 #, fuzzy #| msgid "Restoring Files" msgid "Restoring Files..." msgstr "Restoring Files" #. log entry (%1 is file name) -#: src/modules/Snapper.rb:428 +#: src/modules/Snapper.rb:424 #, fuzzy #| msgid "Delete" msgid "Deleted %1\n" msgstr "Delete" #. log entry (%1 is file name) -#: src/modules/Snapper.rb:481 +#: src/modules/Snapper.rb:477 #, fuzzy #| msgid "Skipped\n" msgid "%1 skipped\n" msgstr "Skipped\n" #, fuzzy -#~| msgid "Variable %1 was not found." -#~ msgid "Snapshot '%1' was not found." -#~ msgstr "Variable %1 was not found." +#~| msgid "PReP (%1)" +#~ msgid "Pre (%{pre})" +#~ msgstr "PReP (%1)" #, fuzzy -#~| msgid "(not known)" -#~ msgid "Reason not known." -#~ msgstr "(not known)" +#~| msgid "Host %1" +#~ msgid "Post (%{post})" +#~ msgstr "Host %1" #, fuzzy -#~| msgid "Configuration of autofs" -#~ msgid "Configuration not found." -#~ msgstr "Configuration of autofs" +#~| msgid "Really delete '%1'?" +#~ msgid "Really delete snapshots %{pre} and %{post}?" +#~ msgstr "Really delete '%1'?" #, fuzzy -#~| msgid "Network configuration is not valid." -#~ msgid "Configuration is not valid." -#~ msgstr "Network configuration is not valid." +#~| msgid "Failed to save ipsec.conf:" +#~ msgid "Failed to get config:\n" +#~ msgstr "Failed to save ipsec.conf:" #, fuzzy -#~| msgid "Failed to initialize the software repository." -#~ msgid "" -#~ "Failed to initialize snapper library:\n" -#~ "%1" -#~ msgstr "Failed to initialise the software repository." +#~| msgid "Failed to test %1." +#~ msgid "Failed to get snapshot mount point:\n" +#~ msgstr "Failed to test %1." #, fuzzy -#~| msgid "Variable %1 was not found." -#~ msgid "Snapshot was not found." -#~ msgstr "Variable %1 was not found." +#~| msgid "Read the configuration" +#~ msgid "Read list of configurations" +#~ msgstr "Read the configuration" #, fuzzy -#~| msgid "Variable %1 was not found." -#~ msgid "'Pre' snapshot was not given." -#~ msgstr "Variable %1 was not found." +#~| msgid "Reading the Configuration" +#~ msgid "Reading list of configurations" +#~ msgstr "Reading the Configuration" #, fuzzy -#~| msgid "Variable %1 was not found." -#~ msgid "Given 'Pre' snapshot was not found." -#~ msgstr "Variable %1 was not found." +#~| msgid "Read the list of profiles" +#~ msgid "Reading list of snapshots" +#~ msgstr "Read the list of profiles" -#~ msgid "Reading the database..." -#~ msgstr "Reading the database..." +#, fuzzy +#~| msgid "Boot loader configuration failed." +#~ msgid "Querying snapper configurations failed:" +#~ msgstr "Boot loader configuration failed." 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sound.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: sound\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 22:53+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/squid.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: squid\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-03-27 22:53+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sshd.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: sshd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-03-27 22:42+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/storage.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:17+0200\n" +"POT-Creation-Date: 2016-05-06 16:58+0200\n" "PO-Revision-Date: 2008-12-02 10:13+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -206,7 +206,13 @@ msgid "Not enough space available to propose separate /home." msgstr "" -#: src/clients/inst_disk_proposal.rb:295 +#: src/clients/inst_disk_proposal.rb:283 +#, fuzzy +#| msgid "Copying root filesystem..." +msgid "Nothing assigned as root filesystem. Cannot continue." +msgstr "Copying root filesystem..." + +#: src/clients/inst_disk_proposal.rb:304 msgid "" "Computing this proposal will overwrite manual changes \n" "done so far. Continue with computing proposal?" @@ -1049,7 +1055,7 @@ #. Label text #. TRANSLATORS: checkbox text #: src/include/partitioning/auto_part_ui.rb:341 -#: src/modules/StorageProposal.rb:6245 +#: src/modules/StorageProposal.rb:6250 msgid "Propose Separate &Home Partition" msgstr "Propose Separate &Home Partition" @@ -1068,7 +1074,7 @@ msgstr "Proposal type" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:251 +#: src/include/partitioning/custom_part_check_generated.rb:244 #, fuzzy msgid "" "You have not assigned a root partition for\n" @@ -1082,7 +1088,7 @@ "Assign the root mount point \"/\" to a partition.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:264 +#: src/include/partitioning/custom_part_check_generated.rb:257 #, fuzzy msgid "" "You tried to mount a FAT partition to one of the following mount\n" @@ -1096,7 +1102,7 @@ "Use a Linux file system, such as ext3 or reiserfs, for these mount points.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:277 +#: src/include/partitioning/custom_part_check_generated.rb:270 #, fuzzy msgid "" "You tried to mount a FAT partition to the\n" @@ -1109,7 +1115,7 @@ "Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:291 +#: src/include/partitioning/custom_part_check_generated.rb:284 #, fuzzy msgid "" "You have mounted a partition with Btrfs to the\n" @@ -1123,7 +1129,7 @@ #. A PReP/CHRP partition is not supposed to be mounted. So if we find any #. other /boot partition, we should warn the user. -#: src/include/partitioning/custom_part_check_generated.rb:305 +#: src/include/partitioning/custom_part_check_generated.rb:298 msgid "" "Warning:\n" "Your system needs a boot partition with type 0x41 PReP/CHRP.\n" @@ -1133,7 +1139,7 @@ msgstr "" #. popup text, %1 is a number -#: src/include/partitioning/custom_part_check_generated.rb:320 +#: src/include/partitioning/custom_part_check_generated.rb:313 #, fuzzy msgid "" "Warning:\n" @@ -1155,7 +1161,7 @@ "Change this?\n" #. popup text, %1 is a size -#: src/include/partitioning/custom_part_check_generated.rb:340 +#: src/include/partitioning/custom_part_check_generated.rb:333 #, fuzzy msgid "" "Warning:\n" @@ -1171,7 +1177,7 @@ "Do you want to do this?\n" #. /////////////////////////// NO BOOT /////////////////////////// -#: src/include/partitioning/custom_part_check_generated.rb:357 +#: 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" @@ -1183,7 +1189,7 @@ #. 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:377 +#: src/include/partitioning/custom_part_check_generated.rb:370 #, fuzzy msgid "" "Warning: There is no partition mounted as /boot.\n" @@ -1202,7 +1208,7 @@ "Do you want to change your setup?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:396 +#: src/include/partitioning/custom_part_check_generated.rb:389 #, fuzzy msgid "" "Warning: According to your setup, you intend to\n" @@ -1223,11 +1229,11 @@ "\n" "Change this?\n" -#: src/include/partitioning/custom_part_check_generated.rb:416 +#: 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" -"\n" +"%s\n" "Really use this setup?\n" msgstr "" @@ -1388,7 +1394,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:595 +#: 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" @@ -1397,7 +1403,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:606 +#: 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" @@ -1406,7 +1412,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:616 +#: 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" @@ -1415,7 +1421,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:649 +#: 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" @@ -1424,7 +1430,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:660 +#: src/include/partitioning/custom_part_check_generated.rb:666 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1432,13 +1438,13 @@ "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" -#: src/include/partitioning/custom_part_check_generated.rb:672 +#: 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:708 +#: src/include/partitioning/custom_part_check_generated.rb:714 #, fuzzy #| msgid "" #| "The device (%1) cannot be removed\n" @@ -1453,7 +1459,7 @@ "partition with higher number is in use.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:784 +#: src/include/partitioning/custom_part_check_generated.rb:790 #, fuzzy #| msgid "" #| "The selected extended partition contains partitions which are currently mounted:\n" @@ -1472,7 +1478,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:802 +#: src/include/partitioning/custom_part_check_generated.rb:808 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1487,7 +1493,7 @@ "before deleting the extended partition.\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_check_generated.rb:813 +#: src/include/partitioning/custom_part_check_generated.rb:819 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1502,7 +1508,7 @@ "deleting the extended partition.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:824 +#: src/include/partitioning/custom_part_check_generated.rb:830 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1523,15 +1529,15 @@ #. label text #: src/include/partitioning/custom_part_dialogs.rb:74 -#: src/include/partitioning/ep-dialogs.rb:768 -#: src/modules/StorageProposal.rb:6372 +#: src/include/partitioning/ep-dialogs.rb:806 +#: src/modules/StorageProposal.rb:6378 #, fuzzy #| msgid "Do not forget what you enter here." msgid "Do not forget what you enter here!" msgstr "Do not forget what you enter here." #: src/include/partitioning/custom_part_dialogs.rb:78 -#: src/include/partitioning/ep-dialogs.rb:771 +#: src/include/partitioning/ep-dialogs.rb:809 #, fuzzy msgid "Empty password allowed." msgstr "Empty password is not allowed." @@ -1567,7 +1573,7 @@ #. Label: get password for user root #. Please use newline if label is longer than 40 characters #: src/include/partitioning/custom_part_dialogs.rb:136 -#: src/include/partitioning/ep-dialogs.rb:796 +#: src/include/partitioning/ep-dialogs.rb:834 #, fuzzy #| msgid "&Enter a password for your file system:" msgid "&Enter a Password for your File System:" @@ -1580,7 +1586,7 @@ #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters #: src/include/partitioning/custom_part_dialogs.rb:147 -#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002 +#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006 #, fuzzy #| msgid "Reenter the password for &verification:" msgid "Reenter the Password for &Verification:" @@ -1606,7 +1612,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:196 -#: src/modules/Storage.rb:3958 +#: src/modules/Storage.rb:3962 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -1617,7 +1623,7 @@ #. popup text #. popup text #: src/include/partitioning/custom_part_dialogs.rb:203 -#: src/modules/Storage.rb:3966 +#: src/modules/Storage.rb:3970 msgid "" "The password must have at least %1 characters.\n" "Try again.\n" @@ -2032,7 +2038,7 @@ #. TRANSLATOR: checkbox text #. TRANSLATORS: checkbox text #: src/include/partitioning/custom_part_dialogs.rb:1592 -#: src/modules/StorageProposal.rb:6226 +#: src/modules/StorageProposal.rb:6231 msgid "Enable Snapshots" msgstr "" @@ -2051,19 +2057,19 @@ msgid "Empty subvolume name not allowed." msgstr "Empty password is not allowed." -#: src/include/partitioning/custom_part_dialogs.rb:1670 +#: src/include/partitioning/custom_part_dialogs.rb:1671 msgid "" "Only subvolume names starting with \"%1\" currently allowed!\n" "Automatically prepending \"%1\" to name of subvolume." msgstr "" -#: src/include/partitioning/custom_part_dialogs.rb:1680 +#: src/include/partitioning/custom_part_dialogs.rb:1681 #, fuzzy #| msgid "Zone name %1 already exists." msgid "Subvolume name %1 already exists." msgstr "Zone name %1 already exists." -#: src/include/partitioning/custom_part_dialogs.rb:1709 +#: src/include/partitioning/custom_part_dialogs.rb:1711 msgid "Modifications done so far in this dialog will be lost." msgstr "" @@ -2106,7 +2112,7 @@ #. helptext #: src/include/partitioning/custom_part_helptexts.rb:87 -#: src/include/partitioning/ep-dialogs.rb:708 +#: src/include/partitioning/ep-dialogs.rb:746 #, fuzzy msgid "" "<p>\n" @@ -2126,7 +2132,7 @@ #. help text, continued #. helptext #: src/include/partitioning/custom_part_helptexts.rb:100 -#: src/include/partitioning/ep-dialogs.rb:723 +#: src/include/partitioning/ep-dialogs.rb:761 msgid "" "<p>\n" "If you forget your password, you will lose access to the data on your file system.\n" @@ -2145,7 +2151,7 @@ #. help text, continued #. helptext, %1 is replaced by integer #: src/include/partitioning/custom_part_helptexts.rb:114 -#: src/include/partitioning/ep-dialogs.rb:737 +#: src/include/partitioning/ep-dialogs.rb:775 msgid "" "<p>\n" "You must distinguish between uppercase and lowercase. A password should have at\n" @@ -2177,7 +2183,7 @@ #. help text, continued #. helptext #: src/include/partitioning/custom_part_helptexts.rb:142 -#: src/include/partitioning/ep-dialogs.rb:749 +#: src/include/partitioning/ep-dialogs.rb:787 msgid "" "<p>\n" "Do not forget this password!\n" @@ -2422,7 +2428,7 @@ "to a device with nonexistent or unknown file system." #. warning message, %1 is replaced by fs name (e.g. Ext3) -#: src/include/partitioning/custom_part_lib.rb:491 +#: src/include/partitioning/custom_part_lib.rb:482 #, fuzzy msgid "" "\n" @@ -2447,12 +2453,12 @@ #. ////////////////////////////////////////////// #. modify map new -#: src/include/partitioning/custom_part_lib.rb:919 -#: src/include/partitioning/custom_part_lib.rb:946 +#: src/include/partitioning/custom_part_lib.rb:924 +#: src/include/partitioning/custom_part_lib.rb:951 msgid "The file system is currently mounted on %1." msgstr "" -#: src/include/partitioning/custom_part_lib.rb:924 +#: src/include/partitioning/custom_part_lib.rb:929 msgid "" "You can try to unmount it now, continue without unmounting or cancel.\n" "Click Cancel unless you know exactly what you are doing." @@ -2460,32 +2466,32 @@ #. button text #. button text -#: src/include/partitioning/custom_part_lib.rb:935 -#: src/include/partitioning/custom_part_lib.rb:960 +#: src/include/partitioning/custom_part_lib.rb:940 +#: src/include/partitioning/custom_part_lib.rb:965 #, fuzzy #| msgid "Mount" msgid "Unmount" msgstr "Mount" -#: src/include/partitioning/custom_part_lib.rb:951 +#: src/include/partitioning/custom_part_lib.rb:956 msgid "" "You can try to unmount it now or cancel.\n" "Click Cancel unless you know exactly what you are doing." msgstr "" -#: src/include/partitioning/custom_part_lib.rb:997 +#: src/include/partitioning/custom_part_lib.rb:1002 #, fuzzy #| msgid "It is not possible to delete a NIS user." msgid "It is not possible to shrink the file system while it is mounted." msgstr "It is not possible to delete a NIS user." -#: src/include/partitioning/custom_part_lib.rb:1010 +#: src/include/partitioning/custom_part_lib.rb:1015 #, fuzzy #| msgid "It is not possible to delete a NIS user." msgid "It is not possible to extend the file system while it is mounted." msgstr "It is not possible to delete a NIS user." -#: src/include/partitioning/custom_part_lib.rb:1021 +#: src/include/partitioning/custom_part_lib.rb:1026 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -2945,36 +2951,43 @@ "</p>" #. radio button text -#: src/include/partitioning/ep-dialogs.rb:55 +#: src/include/partitioning/ep-dialogs.rb:56 +#, fuzzy +#| msgid "HFS Boot Partition" +msgid "EFI Boot Partition" +msgstr "HFS Boot Partition" + +#. radio button text +#: src/include/partitioning/ep-dialogs.rb:64 msgid "Operating System" msgstr "Operating System" #. radio button text -#: src/include/partitioning/ep-dialogs.rb:60 +#: src/include/partitioning/ep-dialogs.rb:69 #, fuzzy #| msgid "Delta RPM Application Progress" msgid "Data and ISV Applications" msgstr "Delta RPM Application Progress" #. radio button text -#: src/include/partitioning/ep-dialogs.rb:65 +#: src/include/partitioning/ep-dialogs.rb:75 msgid "Swap" msgstr "" #. radio button text -#: src/include/partitioning/ep-dialogs.rb:70 +#: src/include/partitioning/ep-dialogs.rb:80 msgid "Raw Volume (unformatted)" msgstr "" #. heading for a frame in a dialog -#: src/include/partitioning/ep-dialogs.rb:78 +#: src/include/partitioning/ep-dialogs.rb:88 #, fuzzy #| msgid "Role: %s" msgid "Role" msgstr "Role: %s" #. helptext -#: src/include/partitioning/ep-dialogs.rb:107 +#: src/include/partitioning/ep-dialogs.rb:120 #, fuzzy msgid "" "<p>First, choose whether the partition should be\n" @@ -2982,7 +2995,7 @@ msgstr "<p>First, choose the type of the partition and whether this partition should be formatted.</p>" #. helptext -#: src/include/partitioning/ep-dialogs.rb:114 +#: src/include/partitioning/ep-dialogs.rb:127 msgid "" "<p>If you want to encrypt all data on the\n" "volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n" @@ -2990,7 +3003,7 @@ msgstr "" #. helptext -#: src/include/partitioning/ep-dialogs.rb:124 +#: src/include/partitioning/ep-dialogs.rb:137 #, fuzzy msgid "" "<p>Then, choose whether the partition should\n" @@ -2998,55 +3011,55 @@ msgstr "<p>Then, enter the mount point ( /, /boot, /usr, /var, etc.)</p>" #. set globals -#: src/include/partitioning/ep-dialogs.rb:309 +#: src/include/partitioning/ep-dialogs.rb:337 #, fuzzy msgid "Formatting Options" msgstr "Logging Options" -#: src/include/partitioning/ep-dialogs.rb:317 +#: src/include/partitioning/ep-dialogs.rb:345 #, fuzzy msgid "Format partition" msgstr "Size of the partition." -#: src/include/partitioning/ep-dialogs.rb:328 +#: src/include/partitioning/ep-dialogs.rb:356 #, fuzzy msgid "Do not format partition" msgstr "Do ¬ format" -#: src/include/partitioning/ep-dialogs.rb:344 +#: src/include/partitioning/ep-dialogs.rb:372 #, fuzzy msgid "Do not mount partition" msgstr "Disk to Partition" -#: src/include/partitioning/ep-dialogs.rb:363 +#: src/include/partitioning/ep-dialogs.rb:391 #, fuzzy msgid "Mounting Options" msgstr "Mount Options" -#: src/include/partitioning/ep-dialogs.rb:371 +#: src/include/partitioning/ep-dialogs.rb:399 #, fuzzy msgid "Mount partition" msgstr "Mounting all partitions..." #. Column header -#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144 +#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144 msgid "Mount Point" msgstr "Mount Point" #. button text -#: src/include/partitioning/ep-dialogs.rb:384 +#: src/include/partitioning/ep-dialogs.rb:412 #, fuzzy msgid "Fs&tab Options..." msgstr "Fs&tab Options" #. error popup -#: src/include/partitioning/ep-dialogs.rb:558 +#: src/include/partitioning/ep-dialogs.rb:596 #, fuzzy msgid "Crypt files must be encrypted." msgstr "No scheme selected." #. error popup -#: src/include/partitioning/ep-dialogs.rb:569 +#: src/include/partitioning/ep-dialogs.rb:607 #, fuzzy msgid "" "You chose to create the crypt file, but did not specify\n" @@ -3060,19 +3073,19 @@ "Also check the format option.\n" #. error popup -#: src/include/partitioning/ep-dialogs.rb:585 +#: src/include/partitioning/ep-dialogs.rb:623 #, fuzzy msgid "Crypt files require a mount point." msgstr "Provide a mount point." #. error popup -#: src/include/partitioning/ep-dialogs.rb:599 +#: src/include/partitioning/ep-dialogs.rb:637 #, fuzzy msgid "Tmpfs requires a mount point." msgstr "Provide a mount point." #. helptext -#: src/include/partitioning/ep-dialogs.rb:683 +#: src/include/partitioning/ep-dialogs.rb:721 #, fuzzy msgid "" "<p>\n" @@ -3088,7 +3101,7 @@ "</p>\n" #. helptext -#: src/include/partitioning/ep-dialogs.rb:696 +#: src/include/partitioning/ep-dialogs.rb:734 msgid "" "<p>\n" "The file system used for this volume is swap. You can leave the encryption \n" @@ -3097,23 +3110,23 @@ "</p>\n" msgstr "" -#: src/include/partitioning/ep-dialogs.rb:766 +#: src/include/partitioning/ep-dialogs.rb:804 #, fuzzy #| msgid "All changes will be lost!" msgid "All data stored on the volume will be lost!" msgstr "All changes will be lost!" -#: src/include/partitioning/ep-dialogs.rb:789 +#: src/include/partitioning/ep-dialogs.rb:827 msgid "Password" msgstr "Password" #. popup text -#: src/include/partitioning/ep-dialogs.rb:886 +#: src/include/partitioning/ep-dialogs.rb:924 msgid "Resize not supported by underlying device." msgstr "" #. popup text -#: src/include/partitioning/ep-dialogs.rb:891 +#: src/include/partitioning/ep-dialogs.rb:929 msgid "" "\n" "You cannot resize the selected partition because the file system\n" @@ -3123,7 +3136,7 @@ "You cannot resize the selected partition because the file system\n" "on this partition does not support resizing.\n" -#: src/include/partitioning/ep-dialogs.rb:915 +#: src/include/partitioning/ep-dialogs.rb:953 #, fuzzy #| msgid "It is not possible to create a partition on %1." msgid "" @@ -3132,7 +3145,7 @@ msgstr "It is not possible to create a partition on %1." #. FIXME: Really? -#: src/include/partitioning/ep-dialogs.rb:934 +#: src/include/partitioning/ep-dialogs.rb:972 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -3145,24 +3158,24 @@ "because the file system seems to be inconsistent.\n" #. Heading for dialog -#: src/include/partitioning/ep-dialogs.rb:961 +#: src/include/partitioning/ep-dialogs.rb:999 #, fuzzy msgid "Resize Partition %1" msgstr "R&esize Partition" #. Heading for dialog -#: src/include/partitioning/ep-dialogs.rb:982 +#: src/include/partitioning/ep-dialogs.rb:1020 #, fuzzy msgid "Resize Logical Volume %1" msgstr "Resize Logical Volume" #. size_k + min_size_k could be > max_size_k -#: src/include/partitioning/ep-dialogs.rb:1014 +#: src/include/partitioning/ep-dialogs.rb:1052 #, fuzzy msgid "Current size: %1" msgstr "Current Time Zone: %1" -#: src/include/partitioning/ep-dialogs.rb:1026 +#: src/include/partitioning/ep-dialogs.rb:1064 #, fuzzy msgid "Currently used: %1" msgstr "" @@ -3173,8 +3186,8 @@ #. input field label #. combo box label #. Column header -#: src/include/partitioning/ep-dialogs.rb:1039 -#: src/include/partitioning/ep-dialogs.rb:1076 +#: src/include/partitioning/ep-dialogs.rb:1077 +#: src/include/partitioning/ep-dialogs.rb:1114 #: src/include/partitioning/ep-hd-dialogs.rb:256 #: src/include/partitioning/ep-loop-dialogs.rb:118 #: src/include/partitioning/ep-lvm-dialogs.rb:559 @@ -3186,7 +3199,7 @@ #. radio button text, %1 is replaced by size #. radio button text, %1 is replaced by size -#: src/include/partitioning/ep-dialogs.rb:1049 +#: src/include/partitioning/ep-dialogs.rb:1087 #: src/include/partitioning/ep-hd-dialogs.rb:242 #: src/include/partitioning/ep-lvm-dialogs.rb:535 #, fuzzy @@ -3194,14 +3207,14 @@ msgstr "Maximum &Size (MB)" #. radio button text, %1 is replaced by size -#: src/include/partitioning/ep-dialogs.rb:1059 +#: src/include/partitioning/ep-dialogs.rb:1097 #, fuzzy msgid "Minimum Size (%1)" msgstr "Maximum &Size (MB)" #. radio button text #. radio button text -#: src/include/partitioning/ep-dialogs.rb:1068 +#: src/include/partitioning/ep-dialogs.rb:1106 #: src/include/partitioning/ep-hd-dialogs.rb:251 #: src/include/partitioning/ep-lvm-dialogs.rb:568 #, fuzzy @@ -3209,7 +3222,7 @@ msgstr "Custom &Size" #. help text -#: src/include/partitioning/ep-dialogs.rb:1102 +#: src/include/partitioning/ep-dialogs.rb:1140 #, fuzzy msgid "<p>Choose new size.</p>" msgstr "" @@ -3219,7 +3232,7 @@ #. error popup, %1 and %2 are replaced by sizes #. error popup, %1 and %2 are replaced by sizes -#: src/include/partitioning/ep-dialogs.rb:1153 +#: src/include/partitioning/ep-dialogs.rb:1191 #: src/include/partitioning/ep-hd-dialogs.rb:359 #: src/include/partitioning/ep-lvm-dialogs.rb:692 #, fuzzy @@ -3232,7 +3245,7 @@ #. after user tries to do that is stupid - in some cases #. we can tell beforehand, thus user should never get to this #. point (e.g. when the partition is mounted) -#: src/include/partitioning/ep-dialogs.rb:1196 +#: src/include/partitioning/ep-dialogs.rb:1234 msgid "" "You are extending a mounted filesystem by %1 Gigabyte. \n" "This may be quite slow and can take hours. You might possibly want \n" @@ -3241,13 +3254,13 @@ msgstr "" #. label for log view -#: src/include/partitioning/ep-dialogs.rb:1272 +#: src/include/partitioning/ep-dialogs.rb:1310 #, fuzzy msgid "Output of %1" msgstr "\tOutput directory: %1" #. popup text -#: src/include/partitioning/ep-dialogs.rb:1299 +#: src/include/partitioning/ep-dialogs.rb:1337 #, fuzzy msgid "Rescanning disks..." msgstr "Running scripts..." @@ -3465,65 +3478,65 @@ msgstr "The entered WWPN is invalid." #. dialog title -#: src/include/partitioning/ep-hd-dialogs.rb:548 +#: src/include/partitioning/ep-hd-dialogs.rb:549 #, fuzzy msgid "Add Partition on %1" msgstr "Edit Partition %1" #. dialog title -#: src/include/partitioning/ep-hd-dialogs.rb:594 +#: src/include/partitioning/ep-hd-dialogs.rb:595 msgid "Edit Partition %1" msgstr "Edit Partition %1" #. error popup text, %1 is replace with name of partition -#: src/include/partitioning/ep-hd-dialogs.rb:627 +#: src/include/partitioning/ep-hd-dialogs.rb:628 #, fuzzy #| msgid "No space is left in the extended partition." msgid "No space to moved partition %1." msgstr "No space is left in the extended partition." #. popup text, %1 is replace with name of partition -#: src/include/partitioning/ep-hd-dialogs.rb:637 +#: src/include/partitioning/ep-hd-dialogs.rb:638 #, fuzzy #| msgid "Adding partition %1 to swap" msgid "Move partition %1 forward?" msgstr "Adding partition %1 to swap" #. popup text, %1 is replace with name of partition -#: src/include/partitioning/ep-hd-dialogs.rb:646 +#: src/include/partitioning/ep-hd-dialogs.rb:647 msgid "Move partition %1 backward?" msgstr "" #. popup text, %1 is replace with name of partition -#: src/include/partitioning/ep-hd-dialogs.rb:665 +#: src/include/partitioning/ep-hd-dialogs.rb:666 #, fuzzy msgid "Move partition %1?" msgstr "Mounting all partitions..." #. radio button text -#: src/include/partitioning/ep-hd-dialogs.rb:667 +#: src/include/partitioning/ep-hd-dialogs.rb:668 msgid "Forward" msgstr "Forward" #. radio button text -#: src/include/partitioning/ep-hd-dialogs.rb:669 +#: src/include/partitioning/ep-hd-dialogs.rb:670 #, fuzzy #| msgid "Background" msgid "Backward" msgstr "Background" -#: src/include/partitioning/ep-hd-dialogs.rb:725 +#: src/include/partitioning/ep-hd-dialogs.rb:726 #, fuzzy msgid "Confirm Deleting of All Partitions" msgstr "Mounting all partitions..." -#: src/include/partitioning/ep-hd-dialogs.rb:727 +#: src/include/partitioning/ep-hd-dialogs.rb:728 msgid "" "The disk \"%1\" contains at least one partition.\n" "If you proceed, the following partitions will be deleted:" msgstr "" -#: src/include/partitioning/ep-hd-dialogs.rb:732 +#: src/include/partitioning/ep-hd-dialogs.rb:733 #, fuzzy msgid "Really delete all partitions on \"%1\"?" msgstr "Really delete all partitions on %1?" @@ -3531,57 +3544,62 @@ #. error popup #. error popup #: src/include/partitioning/ep-hd-lib.rb:42 -#: src/include/partitioning/ep-hd-lib.rb:245 +#: src/include/partitioning/ep-hd-lib.rb:251 #, fuzzy msgid "No hard disk selected." msgstr "No disk selected." #. error popup +#: src/include/partitioning/ep-hd-lib.rb:51 +msgid "Cannot create partition table on LDL formatted DASD." +msgstr "" + +#. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240 +#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250 msgid "The disk is in use and cannot be modified." msgstr "" #. dialog heading -#: src/include/partitioning/ep-hd-lib.rb:86 +#: src/include/partitioning/ep-hd-lib.rb:92 #, fuzzy msgid "Select new partition table type for %1." msgstr "Delete partition table:" #. popup text, %1 is be replaced by disk name e.g. /dev/sda -#: src/include/partitioning/ep-hd-lib.rb:111 +#: src/include/partitioning/ep-hd-lib.rb:117 msgid "" "Really create new partition table on %1? This will delete all data\n" "on %1 and all RAIDs and Volume Groups using partitions on %1." msgstr "" #. error popup -#: src/include/partitioning/ep-hd-lib.rb:131 +#: src/include/partitioning/ep-hd-lib.rb:137 msgid "No disk selected." msgstr "No disk selected." #. popup text #. Must be called before removing device. -#: src/include/partitioning/ep-hd-lib.rb:145 -#: src/include/partitioning/ep-lib.rb:199 +#: src/include/partitioning/ep-hd-lib.rb:151 +#: src/include/partitioning/ep-lib.rb:202 msgid "Really delete BIOS RAID %1?" msgstr "Really delete BIOS RAID %1?" #. popup text -#: src/include/partitioning/ep-hd-lib.rb:159 +#: src/include/partitioning/ep-hd-lib.rb:165 #, fuzzy #| msgid "Really delete all partitions on %1?" msgid "Really delete Partitioned RAID %1?" msgstr "Really delete all partitions on %1?" #. error ppup -#: src/include/partitioning/ep-hd-lib.rb:176 +#: src/include/partitioning/ep-hd-lib.rb:182 #, fuzzy msgid "There are no partitions to delete on this disk." msgstr "There are no options for this module" #. error popup -#: src/include/partitioning/ep-hd-lib.rb:229 +#: src/include/partitioning/ep-hd-lib.rb:235 msgid "It is not possible to create a partition on %1." msgstr "It is not possible to create a partition on %1." @@ -3589,29 +3607,29 @@ #. error popup #. error popup #. error popup -#: src/include/partitioning/ep-hd-lib.rb:321 -#: src/include/partitioning/ep-hd-lib.rb:370 -#: src/include/partitioning/ep-hd-lib.rb:426 -#: src/include/partitioning/ep-hd-lib.rb:483 +#: src/include/partitioning/ep-hd-lib.rb:327 +#: src/include/partitioning/ep-hd-lib.rb:376 +#: src/include/partitioning/ep-hd-lib.rb:432 +#: src/include/partitioning/ep-hd-lib.rb:489 #, fuzzy msgid "No partition selected." msgstr "No boot option selected." #. error popup, %1 is replace by partition device name e.g. /dev/sdb1 -#: src/include/partitioning/ep-hd-lib.rb:334 +#: src/include/partitioning/ep-hd-lib.rb:340 msgid "" "The partition %1 is in use. It cannot be\n" "edited. To edit %1, make sure it is not used." msgstr "" #. error popup text -#: src/include/partitioning/ep-hd-lib.rb:345 +#: src/include/partitioning/ep-hd-lib.rb:351 #, fuzzy msgid "An extended partition cannot be edited." msgstr "An extended partition cannot be created." #. error popup, %1 is replace by partition device name, e.g. /dev/sdb1 -#: src/include/partitioning/ep-hd-lib.rb:387 +#: src/include/partitioning/ep-hd-lib.rb:393 #, fuzzy #| msgid "The /var partition %1 could not be mounted.\n" msgid "" @@ -3620,26 +3638,26 @@ msgstr "The /var partition %1 could not be mounted.\n" #. error popup text -#: src/include/partitioning/ep-hd-lib.rb:398 +#: src/include/partitioning/ep-hd-lib.rb:404 #, fuzzy msgid "An extended partition cannot be moved." msgstr "An extended partition cannot be created." #. error popup, %1 is replace by partition device name, e.g. /dev/sdb1 -#: src/include/partitioning/ep-hd-lib.rb:443 +#: src/include/partitioning/ep-hd-lib.rb:449 msgid "" "The partition %1 is in use. It cannot be\n" "resized. To resize %1, make sure it is not used." msgstr "" #. error popup text -#: src/include/partitioning/ep-hd-lib.rb:454 +#: src/include/partitioning/ep-hd-lib.rb:460 #, fuzzy msgid "An extended partition cannot be resized." msgstr "An extended partition cannot be created." #. helptext -#: src/include/partitioning/ep-hd-lib.rb:527 +#: src/include/partitioning/ep-hd-lib.rb:533 msgid "" "<p>Select one or more (if available) hard disks\n" "that will have the same partition layout as\n" @@ -3649,49 +3667,49 @@ "partitions will be deleted.</p>\n" msgstr "" -#: src/include/partitioning/ep-hd-lib.rb:573 +#: src/include/partitioning/ep-hd-lib.rb:579 msgid "" "The following partitions will be deleted\n" "and all data on them will be lost:" msgstr "" -#: src/include/partitioning/ep-hd-lib.rb:580 +#: src/include/partitioning/ep-hd-lib.rb:586 #, fuzzy #| msgid "Really delete the selected option?" msgid "Really delete these partitions?" msgstr "Really delete the selected option?" -#: src/include/partitioning/ep-hd-lib.rb:596 +#: src/include/partitioning/ep-hd-lib.rb:602 msgid "" "There are no partitions on this disk, but a clonable\n" "disk must have at least one partition.\n" "Create partitions before cloning the disk.\n" msgstr "" -#: src/include/partitioning/ep-hd-lib.rb:609 +#: src/include/partitioning/ep-hd-lib.rb:615 msgid "" "This disk cannot be cloned. There are no suitable\n" "disks that could have the same partitioning layout." msgstr "" -#: src/include/partitioning/ep-hd-lib.rb:638 +#: src/include/partitioning/ep-hd-lib.rb:644 #, fuzzy #| msgid "Repair Partition Table of %1" msgid "Clone partition layout of %1" msgstr "Repair Partition Table of %1" -#: src/include/partitioning/ep-hd-lib.rb:642 +#: src/include/partitioning/ep-hd-lib.rb:648 #, fuzzy #| msgid "A&vailable are:" msgid "Available target disks:" msgstr "A&vailable are:" -#: src/include/partitioning/ep-hd-lib.rb:670 +#: src/include/partitioning/ep-hd-lib.rb:676 msgid "Select a target disk for creating a clone" msgstr "" #. popup text, %1 is replaced by a dasd name e.g. /dev/dasda -#: src/include/partitioning/ep-hd-lib.rb:751 +#: src/include/partitioning/ep-hd-lib.rb:757 msgid "" "Running dasdfmt deletes all data on the disk.\n" "Really execute dasdfmt on disk %1?\n" @@ -3700,7 +3718,7 @@ "Really execute dasdfmt on disk %1?\n" #. popup text -#: src/include/partitioning/ep-hd-lib.rb:762 +#: src/include/partitioning/ep-hd-lib.rb:768 msgid "" "The disk is no longer marked for dasdfmt.\n" "\n" @@ -3973,12 +3991,12 @@ msgstr "Wrong password." #. Must be called before removing device. -#: src/include/partitioning/ep-lib.rb:107 +#: src/include/partitioning/ep-lib.rb:110 #, fuzzy msgid "Confirm Deleting Partition Used by LVM" msgstr "Deleting partition %1$s" -#: src/include/partitioning/ep-lib.rb:109 +#: src/include/partitioning/ep-lib.rb:112 #, fuzzy msgid "" "The selected partition is used by volume group \"%1\".\n" @@ -3988,17 +4006,17 @@ "The selected partition belongs to the RAID (%1).\n" "Please remove it from the RAID before you edit it." -#: src/include/partitioning/ep-lib.rb:117 +#: src/include/partitioning/ep-lib.rb:120 #, fuzzy msgid "Delete partition \"%1\" and volume group \"%2\" now?" msgstr "The entry '%1' already exists." -#: src/include/partitioning/ep-lib.rb:127 +#: src/include/partitioning/ep-lib.rb:130 #, fuzzy msgid "Confirm Deleting Partition Used by RAID" msgstr "Deleting partition %1$s" -#: src/include/partitioning/ep-lib.rb:129 +#: src/include/partitioning/ep-lib.rb:132 #, fuzzy msgid "" "The selected partition belongs to RAID \"%1\".\n" @@ -4008,25 +4026,25 @@ "The selected partition belongs to the RAID (%1).\n" "Please remove it from the RAID before you edit it." -#: src/include/partitioning/ep-lib.rb:137 +#: src/include/partitioning/ep-lib.rb:140 #, fuzzy msgid "Delete partition \"%1\" and RAID \"%2\" now?" msgstr "Delete partition %1$s (%2$s)" #. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda -#: src/include/partitioning/ep-lib.rb:207 +#: src/include/partitioning/ep-lib.rb:210 msgid "Really delete all partitions on %1?" msgstr "Really delete all partitions on %1?" #. /////////////////////////////////////////////////// #. now delete partition!! #. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1 -#: src/include/partitioning/ep-lib.rb:259 +#: src/include/partitioning/ep-lib.rb:262 msgid "Really delete %1?" msgstr "Really delete %1?" #. YesNo popup. %1 is path to a file -#: src/include/partitioning/ep-lib.rb:273 +#: src/include/partitioning/ep-lib.rb:276 msgid "" "\n" "Should the loop file %1 also be removed?\n" @@ -4036,7 +4054,7 @@ #. Guarantee some minimal share (1%) of total graph width to the segment. #. Prevents small partitions e.g. swaps from disappearing completely. -#: src/include/partitioning/ep-lib.rb:340 +#: src/include/partitioning/ep-lib.rb:358 #, fuzzy msgid "Unpartitioned" msgstr "&Partition Based" @@ -4045,37 +4063,37 @@ #. or the end of the disk if #. 1. end +1th cyl is not the next one #. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder) -#: src/include/partitioning/ep-lib.rb:443 +#: src/include/partitioning/ep-lib.rb:461 #, fuzzy msgid "Unallocated" msgstr "&Partition Based" -#: src/include/partitioning/ep-lib.rb:482 +#: src/include/partitioning/ep-lib.rb:500 #, fuzzy msgid "<p>No changes to partitioning.</p>" msgstr "<h1>Warning</h1>" -#: src/include/partitioning/ep-lib.rb:484 +#: src/include/partitioning/ep-lib.rb:502 #, fuzzy msgid "<p>Changes to partitioning:</p>" msgstr "<h1>Warning</h1>" -#: src/include/partitioning/ep-lib.rb:487 +#: src/include/partitioning/ep-lib.rb:505 #, fuzzy msgid "<p>No changes to storage settings.</p>" msgstr "<p>In this dialogue, change various useradd settings.</p>" -#: src/include/partitioning/ep-lib.rb:489 +#: src/include/partitioning/ep-lib.rb:507 #, fuzzy msgid "<p>Storage settings:</p>" msgstr "<p>In this dialogue, change various useradd settings.</p>" -#: src/include/partitioning/ep-lib.rb:498 +#: src/include/partitioning/ep-lib.rb:516 #, fuzzy msgid "<p>Packages to install:</p>" msgstr "<p>In this dialogue, change various useradd settings.</p>" -#: src/include/partitioning/ep-lib.rb:500 +#: src/include/partitioning/ep-lib.rb:518 #, fuzzy msgid "<p>No packages need to be installed.</p>" msgstr "<p>In this dialogue, change various useradd settings.</p>" @@ -4205,13 +4223,13 @@ "the create flag." #. dialog title -#: src/include/partitioning/ep-loop-dialogs.rb:281 +#: src/include/partitioning/ep-loop-dialogs.rb:282 #, fuzzy msgid "Add Crypt File" msgstr "&Edit Crypt File" #. dialog title -#: src/include/partitioning/ep-loop-dialogs.rb:325 +#: src/include/partitioning/ep-loop-dialogs.rb:326 #, fuzzy msgid "Edit Crypt File %1" msgstr "&Edit Crypt File" @@ -4556,13 +4574,13 @@ msgstr "Used by" #. dialog title, %1 is a volume group -#: src/include/partitioning/ep-lvm-dialogs.rb:1028 +#: src/include/partitioning/ep-lvm-dialogs.rb:1029 #, fuzzy msgid "Add Logical Volume on %1" msgstr "Edit Logical Volume" #. dialog title - %1 is a logical volume name, %2 is a volume group -#: src/include/partitioning/ep-lvm-dialogs.rb:1075 +#: src/include/partitioning/ep-lvm-dialogs.rb:1076 #, fuzzy msgid "Edit Logical Volume %1 on %2" msgstr "Edit Logical Volume" @@ -4600,9 +4618,9 @@ #. error popup #. error popup #: src/include/partitioning/ep-lvm-lib.rb:214 -#: src/include/partitioning/ep-lvm-lib.rb:315 -#: src/include/partitioning/ep-lvm-lib.rb:367 -#: src/include/partitioning/ep-lvm-lib.rb:402 +#: src/include/partitioning/ep-lvm-lib.rb:316 +#: src/include/partitioning/ep-lvm-lib.rb:368 +#: src/include/partitioning/ep-lvm-lib.rb:403 #, fuzzy msgid "No logical volume selected." msgstr "No scheme selected." @@ -4614,7 +4632,7 @@ msgstr "No space available in the current volume group %1." #. error popup, %1 is replace by partition device name e.g. /dev/system/root -#: src/include/partitioning/ep-lvm-lib.rb:326 +#: src/include/partitioning/ep-lvm-lib.rb:327 #, fuzzy #| msgid "" #| "\n" @@ -4629,7 +4647,7 @@ "It cannot be recovered.\n" #. error popup, %1 is replace by partition device name e.g. /dev/system/root -#: src/include/partitioning/ep-lvm-lib.rb:337 +#: src/include/partitioning/ep-lvm-lib.rb:338 #, fuzzy msgid "" "The volume %1 is in use. It cannot be\n" @@ -5032,19 +5050,19 @@ msgstr "<p>Select the type of the declaration to add.</p>" #. dialog title -#: src/include/partitioning/ep-raid-dialogs.rb:642 +#: src/include/partitioning/ep-raid-dialogs.rb:643 #, fuzzy msgid "Add RAID %1" msgstr "Add RAI&D" #. dialog title -#: src/include/partitioning/ep-raid-dialogs.rb:676 +#: src/include/partitioning/ep-raid-dialogs.rb:677 #, fuzzy msgid "Resize RAID %1" msgstr "Remo&ve RAID" #. dialog title -#: src/include/partitioning/ep-raid-dialogs.rb:722 +#: src/include/partitioning/ep-raid-dialogs.rb:723 #, fuzzy msgid "Edit RAID %1" msgstr "&Edit RAID" @@ -5337,7 +5355,7 @@ " already installed scanners.</p>" #. dialog title -#: src/include/partitioning/ep-tmpfs-dialogs.rb:49 +#: src/include/partitioning/ep-tmpfs-dialogs.rb:50 #, fuzzy #| msgid "Add to Zone" msgid "Add tmpfs Mount" @@ -6295,12 +6313,12 @@ msgstr "" #. this version makes some problems with interpreter, above lookup/add is OK -#: src/modules/Partitions.rb:930 -msgid "Operation not permitted on disk %1.\n" +#: src/modules/Partitions.rb:936 +msgid "Operation not permitted on disk %{device}.\n" msgstr "" -#. popup text %1 is replaced by disk name e.g. /dev/hda -#: src/modules/Partitions.rb:940 +#. popup text %{device} is replaced by disk name e.g. /dev/hda +#: src/modules/Partitions.rb:941 #, fuzzy #| msgid "" #| "\n" @@ -6314,11 +6332,44 @@ #| "disk here.\n" msgid "" "\n" -"The partitioning on your disk %1 is either not readable or not \n" +"It's not supported by the partitioning tool parted to change\n" +"the partition table on your disk %{device}\n" +"(the disk is LDL formatted).\n" +"\n" +"You can use the partitions on disk %{device} as they are or\n" +"format them and assign mount points, but you cannot add,\n" +"resize, or remove partitions from that disk here.\n" +msgstr "" +"\n" +"The partitioning on your disk %1 is either not readable by\n" +"the partitioning tool parted used to change the\n" +"partition table or is not supported by this tool.\n" +"\n" +"You may use the partitions on disk %1 as they are or\n" +"format them and assign mount points to them, but you\n" +"cannot add, edit, resize, or remove partitions from that\n" +"disk here.\n" + +#. popup text %{device} is replaced by disk name e.g. /dev/hda +#: src/modules/Partitions.rb:953 +#, fuzzy +#| msgid "" +#| "\n" +#| "The partitioning on your disk %1 is either not readable by\n" +#| "the partitioning tool parted used to change the\n" +#| "partition table or is not supported by this tool.\n" +#| "\n" +#| "You may use the partitions on disk %1 as they are or\n" +#| "format them and assign mount points to them, but you\n" +#| "cannot add, edit, resize, or remove partitions from that\n" +#| "disk here.\n" +msgid "" +"\n" +"The partitioning on your disk %{device} is either not readable or not \n" "supported by the partitioning tool parted used to change the\n" "partition table.\n" "\n" -"You can use the partitions on disk %1 as they are or\n" +"You can use the partitions on disk %{device} as they are or\n" "format them and assign mount points, but you cannot add, edit, \n" "resize, or remove partitions from that disk here.\n" msgstr "" @@ -6332,8 +6383,8 @@ "cannot add, edit, resize, or remove partitions from that\n" "disk here.\n" -#. popup text %1 is replaced by disk name e.g. /dev/dasda -#: src/modules/Partitions.rb:958 +#. popup text %{device} is replaced by disk name e.g. /dev/dasda +#: src/modules/Partitions.rb:965 #, fuzzy #| msgid "" #| "\n" @@ -6347,11 +6398,11 @@ #| "disk here.\n" msgid "" "\n" -"The disk %1 does not contain a partition table but for\n" +"The disk %{device} does not contain a partition table but for\n" "compatibility the kernel has automatically generated a\n" "partition spanning almost the entire disk.\n" "\n" -"You can use the partition on disk %1 as it is or\n" +"You can use the partition on disk %{device} as it is or\n" "format it and assign a mount point, but you cannot resize\n" "or remove the partition from that disk here.\n" msgstr "" @@ -6366,7 +6417,7 @@ "disk here.\n" #. popup text -#: src/modules/Partitions.rb:977 +#: src/modules/Partitions.rb:981 #, fuzzy #| msgid "" #| "\n" @@ -6390,7 +6441,7 @@ "disk.\n" #. popup text -#: src/modules/Partitions.rb:989 +#: src/modules/Partitions.rb:991 msgid "" "\n" "\n" @@ -6408,7 +6459,7 @@ #. @param integer testsize #. @param [Symbol] used_fs #. @param [Boolean] verbose -#: src/modules/Storage.rb:992 +#: src/modules/Storage.rb:993 msgid "Resize Not Possible:" msgstr "Resize Not Possible:" @@ -6421,7 +6472,7 @@ #. mark swap-partitions with pseudo Mountpoint swap in targetMap #. @param [Hash{String => map}] target Disk map #. @return [Hash{String => map}] modified target -#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915 +#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919 #, fuzzy #| msgid "" #| "Could not set encryption.\n" @@ -6440,7 +6491,7 @@ "The crypt password provided could be incorrect.\n" #. popup text -#: src/modules/Storage.rb:3946 +#: src/modules/Storage.rb:3950 #, fuzzy msgid "" "The first and the second version\n" @@ -6452,7 +6503,7 @@ "Please try again." #. popup text -#: src/modules/Storage.rb:3977 +#: src/modules/Storage.rb:3981 #, fuzzy msgid "" "The password may only contain the following characters:\n" @@ -6465,29 +6516,29 @@ #. Label: get password for encrypted volume #. Please use newline if label is longer than 40 characters -#: src/modules/Storage.rb:4031 +#: src/modules/Storage.rb:4035 #, fuzzy #| msgid "Enter Encryption Key" msgid "&Enter Encryption Password:" msgstr "Enter Encryption Key" #. Clear password fields on every round. -#: src/modules/Storage.rb:4090 +#: src/modules/Storage.rb:4094 #, fuzzy #| msgid "Enter Provider Password" msgid "Provide Password" msgstr "Enter Provider Password" -#: src/modules/Storage.rb:4109 +#: src/modules/Storage.rb:4113 msgid "The following encrypted volumes are already available." msgstr "" -#: src/modules/Storage.rb:4124 +#: src/modules/Storage.rb:4128 #, fuzzy msgid "Encrypted Volume Activation" msgstr " Volume Group " -#: src/modules/Storage.rb:4128 +#: src/modules/Storage.rb:4132 msgid "" "The following volumes contain an encryption signature but the \n" "passwords are not yet known.\n" @@ -6495,14 +6546,14 @@ "during an update or if they contain an encrypted LVM physical volume." msgstr "" -#: src/modules/Storage.rb:4140 +#: src/modules/Storage.rb:4144 #, fuzzy #| msgid "Do you want to retry?" msgid "Do you want to provide encryption passwords?" msgstr "Do you want to retry?" #. text in help field -#: src/modules/Storage.rb:4197 +#: src/modules/Storage.rb:4201 msgid "" "Enter encryption password for any of the\n" "devices in the locked devices list.\n" @@ -6510,60 +6561,60 @@ msgstr "" #. header text -#: src/modules/Storage.rb:4203 +#: src/modules/Storage.rb:4207 #, fuzzy #| msgid "Enter Encryption Key" msgid "Enter Encryption Password" msgstr "Enter Encryption Key" -#: src/modules/Storage.rb:4206 +#: src/modules/Storage.rb:4210 msgid "There are no encrypted volume to unlock." msgstr "" #. label text, multiple device names follow -#: src/modules/Storage.rb:4219 +#: src/modules/Storage.rb:4223 #, fuzzy #| msgid "YaST2 detected the following device" msgid "Provide password for any of the following devices:" msgstr "YaST2 detected the following device" #. label text, one device name follows -#: src/modules/Storage.rb:4222 +#: src/modules/Storage.rb:4226 #, fuzzy #| msgid "YaST2 detected the following device" msgid "Provide password for the following device:" msgstr "YaST2 detected the following device" -#: src/modules/Storage.rb:4235 +#: src/modules/Storage.rb:4239 msgid "Trying to unlock encrypted volumes..." msgstr "" -#: src/modules/Storage.rb:4259 +#: src/modules/Storage.rb:4263 msgid "Password did not unlock any volume." msgstr "" -#: src/modules/Storage.rb:4345 +#: src/modules/Storage.rb:4349 #, fuzzy #| msgid "DASD Disks" msgid "IDE Disk" msgstr "DASD Disks" -#: src/modules/Storage.rb:4351 +#: src/modules/Storage.rb:4355 #, fuzzy #| msgid "DASD Disks" msgid "SCSI Disk" msgstr "DASD Disks" -#: src/modules/Storage.rb:4357 +#: src/modules/Storage.rb:4361 msgid "Disk" msgstr "Disk" -#: src/modules/Storage.rb:4385 +#: src/modules/Storage.rb:4389 #, fuzzy msgid "DM RAID" msgstr "R&AID:" -#: src/modules/Storage.rb:4398 +#: src/modules/Storage.rb:4402 #, fuzzy msgid "MD RAID" msgstr "R&AID:" @@ -6571,18 +6622,18 @@ #. TODO: more informative error message, but the Package module does #. not provide anything #. TRANSLATORS: error popup -#: src/modules/Storage.rb:4893 +#: src/modules/Storage.rb:4897 msgid "Installing required packages failed." msgstr "Installing required packages failed." -#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159 +#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159 #, fuzzy #| msgid "Continue resizing the %1?" msgid "Continue despite the error?" msgstr "Continue resizing the %1?" #. TRANSLATORS: error popup -#: src/modules/Storage.rb:5252 +#: src/modules/Storage.rb:5262 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -6592,7 +6643,7 @@ "Partition %1 cannot be resized\n" "because the file system could not be mounted.\n" -#: src/modules/Storage.rb:5278 +#: src/modules/Storage.rb:5288 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -6602,7 +6653,7 @@ "Device %1 cannot be modified because it contains activated swap\n" "that is needed to run the installation.\n" -#: src/modules/Storage.rb:5292 +#: src/modules/Storage.rb:5302 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -6612,7 +6663,7 @@ "Device %1 cannot be modified because it contains the installation\n" "data needed to perform the installation.\n" -#: src/modules/Storage.rb:5321 +#: src/modules/Storage.rb:5331 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -6622,7 +6673,7 @@ "Device %1 cannot be removed because it contains activated swap\n" "that is needed to run the installation.\n" -#: src/modules/Storage.rb:5330 +#: src/modules/Storage.rb:5340 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -6632,7 +6683,7 @@ "Device %1 cannot be removed because it contains the installation\n" "data needed to perform the installation.\n" -#: src/modules/Storage.rb:5359 +#: src/modules/Storage.rb:5369 #, fuzzy #| msgid "" #| "\n" @@ -6650,7 +6701,7 @@ "device %2 which contains activated swap that is needed to run \n" "the installation.\n" -#: src/modules/Storage.rb:5370 +#: src/modules/Storage.rb:5380 #, fuzzy #| msgid "" #| "\n" @@ -6666,7 +6717,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:5392 +#: src/modules/Storage.rb:5402 #, fuzzy #| msgid "" #| "Partition %1 cannot be resized\n" @@ -6680,20 +6731,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:5481 +#: src/modules/Storage.rb:5491 #, fuzzy #| msgid "Copying root filesystem..." msgid "Nothing assigned as root filesystem!" msgstr "Copying root filesystem..." -#: src/modules/Storage.rb:5482 +#: 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:6032 +#: src/modules/Storage.rb:6042 #, fuzzy #| msgid "writing the firewall rules failed" msgid "Adding the following resolvables failed: %1" @@ -7362,67 +7413,49 @@ #. enable snapshots for root volume if desired #. penalty for not having separate /home -#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683 +#: src/modules/StorageProposal.rb:4579 src/modules/StorageProposal.rb:5702 #, fuzzy #| msgid "Resize impossible due to inconsistent fs. Try checking fs under Windows." msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows." msgstr "Resize impossible due to inconsistent fs. Try checking fs under Windows." -#. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6179 -#, fuzzy -#| msgid "Create &LVM Based Proposal" -msgid "Create &LVM-based Proposal" -msgstr "Create &LVM Based Proposal" - -#. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6194 -#, fuzzy -msgid "Encr&ypt Volume Group" -msgstr " Volume Group " - #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6212 +#: src/modules/StorageProposal.rb:6217 #, fuzzy #| msgid "File system options:" msgid "File System for Root Partition" msgstr "File system options:" #. TRANSLATORS: combobox label -#: src/modules/StorageProposal.rb:6259 +#: src/modules/StorageProposal.rb:6264 #, fuzzy #| msgid "Propose Separate &Home Partition" msgid "File System for Home Partition" msgstr "Propose Separate &Home Partition" #. TRANSLATORS: checkbox text -#: src/modules/StorageProposal.rb:6277 +#: src/modules/StorageProposal.rb:6282 #, fuzzy #| msgid "&Enable Suspend" msgid "Enlarge &Swap for Suspend" msgstr "&Enable Suspend" -#: src/modules/StorageProposal.rb:6287 +#: src/modules/StorageProposal.rb:6292 #, fuzzy #| msgid "Special settings" msgid "Proposal Settings" msgstr "Special settings" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6302 -#, fuzzy -#| msgid "" -#| "<p>\n" -#| "To create an LVM based proposal, choose the corresponding button.</p>\n" +#: src/modules/StorageProposal.rb:6307 msgid "" -"<p>To create an LVM-based proposal, choose the corresponding button. The\n" -"LVM-based proposal can be encrypted.</p>\n" +"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n" +"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n" +"Proposal</b> if you want your system to be encrypted.</p>" msgstr "" -"<p>\n" -"To create an LVM based proposal, choose the corresponding button.</p>\n" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6309 +#: src/modules/StorageProposal.rb:6315 msgid "" "<p>The filesystem for the root partition can be selected with the\n" "corresponding combo box. With the filesystem BtrFS the proposal can\n" @@ -7431,37 +7464,56 @@ msgstr "" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6318 +#: src/modules/StorageProposal.rb:6324 msgid "" "<p>The proposal can create a separate home partition. The filesystem for\n" "the home partition can be selected with the corresponding combo box.</p>" msgstr "" #. TRANSLATORS: help text -#: src/modules/StorageProposal.rb:6325 +#: src/modules/StorageProposal.rb:6331 msgid "" "<p>The swap partition can be made large enough to be used to suspend\n" "the system to disk in most cases.</p>" msgstr "" -#: src/modules/StorageProposal.rb:6350 +#: src/modules/StorageProposal.rb:6356 #, fuzzy msgid "Enter your password for the proposal encryption." msgstr "Enter your password for the encrypted file system." #. Label: get password for user root #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6357 +#: src/modules/StorageProposal.rb:6363 msgid "Password:" msgstr "Password:" #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters -#: src/modules/StorageProposal.rb:6368 +#: src/modules/StorageProposal.rb:6374 #, fuzzy msgid "Reenter the password for verification:" msgstr "Reenter the password for &verification:" +#. Clear password fields on every round. +#: src/modules/StorageProposal.rb:6572 +#, fuzzy +#| msgid "&Partition Based" +msgid "&Partition-based Proposal" +msgstr "&Partition Based" + +#: src/modules/StorageProposal.rb:6574 +#, fuzzy +#| msgid "Create &LVM Based Proposal" +msgid "&LVM-based Proposal" +msgstr "Create &LVM Based Proposal" + +#: src/modules/StorageProposal.rb:6576 +#, fuzzy +#| msgid "Create &LVM Based Proposal" +msgid "&Encrypted LVM-based Proposal" +msgstr "Create &LVM Based Proposal" + #. encoding: utf-8 #. Copyright (c) 2012 Novell, Inc. #. @@ -7511,6 +7563,21 @@ msgid "Visible Information on Storage Devices:" msgstr "User Information Sources" +#, fuzzy +#~ msgid "Encr&ypt Volume Group" +#~ msgstr " Volume Group " + +#, fuzzy +#~| msgid "" +#~| "<p>\n" +#~| "To create an LVM based proposal, choose the corresponding button.</p>\n" +#~ msgid "" +#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n" +#~ "LVM-based proposal can be encrypted.</p>\n" +#~ msgstr "" +#~ "<p>\n" +#~ "To create an LVM based proposal, choose the corresponding button.</p>\n" + #~ msgid "No unsaved changes exist." #~ msgstr "No unsaved changes exist." @@ -7739,9 +7806,6 @@ #~ msgid "Default Filesystem:" #~ msgstr "Local Filesystem" -#~ msgid "&Partition Based" -#~ msgstr "&Partition Based" - #~ msgid "&LVM Based" #~ msgstr "&LVM Based" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/support.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 17:00+0200\n" "PO-Revision-Date: 2014-05-19 09:35+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -33,56 +33,56 @@ msgstr "&Support" #. Command line parameters dialog caption -#: src/include/support/dialogs.rb:50 +#: src/include/support/dialogs.rb:46 msgid "Supportconfig Overview Dialog" msgstr "Supportconfig Overview Dialog" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:57 +#: src/include/support/dialogs.rb:53 #, fuzzy #| msgid "Open Novell Support Center" msgid "Open SUSE Support Center" msgstr "Open Novell Support Center" -#: src/include/support/dialogs.rb:62 +#: src/include/support/dialogs.rb:58 #, fuzzy #| msgid "This will start a browser connecting to the Novell Support Center Portal." msgid "This will start a browser connecting to the SUSE Support Center Portal." msgstr "This will start a browser connecting to the Novell Support Center Portal." -#: src/include/support/dialogs.rb:72 +#: src/include/support/dialogs.rb:68 msgid "Open" msgstr "Open" -#: src/include/support/dialogs.rb:83 +#: src/include/support/dialogs.rb:79 msgid "Collect Data" msgstr "Collect Data" -#: src/include/support/dialogs.rb:88 +#: src/include/support/dialogs.rb:84 msgid "This will create a tarball containing the collected log files." msgstr "This will create a tarball containing the collected log files." -#: src/include/support/dialogs.rb:100 +#: src/include/support/dialogs.rb:96 msgid "Create report tarball" msgstr "Create report tarball" -#: src/include/support/dialogs.rb:112 +#: src/include/support/dialogs.rb:108 msgid "Upload Data" msgstr "Upload Data" -#: src/include/support/dialogs.rb:116 +#: src/include/support/dialogs.rb:112 msgid "This will upload the collected logs to the specified URL." msgstr "This will upload the collected logs to the specified URL." -#: src/include/support/dialogs.rb:123 +#: src/include/support/dialogs.rb:119 msgid "Upload" msgstr "Upload" -#: src/include/support/dialogs.rb:153 +#: src/include/support/dialogs.rb:149 msgid "Could not find any installed browser." msgstr "Could not find any installed browser." -#: src/include/support/dialogs.rb:163 +#: src/include/support/dialogs.rb:159 msgid "" "YaST will run a Web browser as superuser. Consider\n" "running it as a non-provileged user and entering the URL\n" @@ -94,186 +94,185 @@ "%1.\n" "Start Web browser?\n" -#: src/include/support/dialogs.rb:205 +#: src/include/support/dialogs.rb:201 msgid "Supportconfig Upload Dialog" msgstr "Supportconfig Upload Dialog" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:230 +#: src/include/support/dialogs.rb:226 msgid "Save as" msgstr "Save as" -#: src/include/support/dialogs.rb:233 +#: src/include/support/dialogs.rb:229 msgid "Directory to Save" msgstr "Directory to Save" -#: src/include/support/dialogs.rb:243 +#: src/include/support/dialogs.rb:239 msgid "Package with log files" msgstr "Package with log files" -#: src/include/support/dialogs.rb:257 +#: src/include/support/dialogs.rb:253 msgid "Upload log files tarball to URL" msgstr "Upload log files tarball to URL" -#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760 +#: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756 msgid "Upload Target" msgstr "Upload Target" #. } -#: src/include/support/dialogs.rb:331 +#: src/include/support/dialogs.rb:327 msgid "Cannot write settings" msgstr "Cannot write settings" -#: src/include/support/dialogs.rb:347 +#: src/include/support/dialogs.rb:343 msgid "Cannot write settings." msgstr "Cannot write settings." -#: src/include/support/dialogs.rb:393 +#: src/include/support/dialogs.rb:389 msgid "Choose Directory Where to Save Tarball" msgstr "Choose Directory Where to Save Tarball" #. Support::log_files["tmp_dir"]=save_dir; -#: src/include/support/dialogs.rb:405 +#: src/include/support/dialogs.rb:401 msgid "Choose Log Files Tarball File" msgstr "Choose Log Files Tarball File" #. Command line parameters dialog caption -#: src/include/support/dialogs.rb:425 +#: src/include/support/dialogs.rb:421 msgid "Supportconfig Parameters Configuration" msgstr "Supportconfig Parameters Configuration" -#: src/include/support/dialogs.rb:430 +#: src/include/support/dialogs.rb:426 msgid "Create a full file listing from '/'" msgstr "Create a full file listing from '/'" -#: src/include/support/dialogs.rb:435 +#: src/include/support/dialogs.rb:431 msgid "Exclude detailed disk info and scans" msgstr "Exclude detailed disk info and scans" -#: src/include/support/dialogs.rb:440 +#: src/include/support/dialogs.rb:436 msgid "Search root filesystem for eDirectory instances" msgstr "Search root filesystem for eDirectory instances" -#: src/include/support/dialogs.rb:445 +#: src/include/support/dialogs.rb:441 msgid "Include full SLP service lists" msgstr "Include full SLP service lists" -#: src/include/support/dialogs.rb:450 +#: src/include/support/dialogs.rb:446 msgid "Performs an rpm -V for each installed rpm" msgstr "Performs an rpm -V for each installed rpm" -#: src/include/support/dialogs.rb:455 +#: src/include/support/dialogs.rb:451 msgid "Include all log file lines, gather additional rotated logs" msgstr "Include all log file lines, gather additional rotated logs" #. Support configure1 dialog contents -#: src/include/support/dialogs.rb:469 +#: src/include/support/dialogs.rb:465 msgid "Use Defaults (ignore /etc/supportconfig.conf)" msgstr "Use Defaults (ignore /etc/supportconfig.conf)" -#: src/include/support/dialogs.rb:476 +#: src/include/support/dialogs.rb:472 msgid "Activates all support functions" msgstr "Activates all support functions" -#: src/include/support/dialogs.rb:483 +#: src/include/support/dialogs.rb:479 msgid "Only gather a minimum amount of info" msgstr "Only gather a minimum amount of info" -#: src/include/support/dialogs.rb:491 +#: src/include/support/dialogs.rb:487 msgid "Use Custom (Expert) Settings" msgstr "Use Custom (Expert) Settings" -#: src/include/support/dialogs.rb:493 +#: src/include/support/dialogs.rb:489 msgid "Expert Settings" msgstr "Expert Settings" -#: src/include/support/dialogs.rb:499 +#: src/include/support/dialogs.rb:495 msgid "Options" msgstr "Options" #. Support overview dialog caption -#: src/include/support/dialogs.rb:588 +#: src/include/support/dialogs.rb:584 msgid "Supportconfig Expert Configuration" msgstr "Supportconfig Expert Configuration" #. FIXME table header -#: src/include/support/dialogs.rb:618 +#: src/include/support/dialogs.rb:614 msgid "Default Options" msgstr "Default Options" #. Support configure2 dialog caption -#: src/include/support/dialogs.rb:684 +#: src/include/support/dialogs.rb:680 msgid "Supportconfig Contact Configuration" msgstr "Supportconfig Contact Configuration" #. Support configure2 dialog contents -#: src/include/support/dialogs.rb:689 +#: src/include/support/dialogs.rb:685 msgid "Contact Information" msgstr "Contact Information" -#: src/include/support/dialogs.rb:694 +#: src/include/support/dialogs.rb:690 msgid "Company" msgstr "Company" -#: src/include/support/dialogs.rb:705 +#: src/include/support/dialogs.rb:701 msgid "Email Address" msgstr "Email Address" -#: src/include/support/dialogs.rb:712 +#: src/include/support/dialogs.rb:708 msgid "Name" msgstr "Name" -#: src/include/support/dialogs.rb:719 +#: src/include/support/dialogs.rb:715 msgid "Phone Number" msgstr "Phone Number" -#: src/include/support/dialogs.rb:726 +#: src/include/support/dialogs.rb:722 msgid "Store ID" msgstr "Store ID" -#: src/include/support/dialogs.rb:737 +#: src/include/support/dialogs.rb:733 msgid "Terminal ID" msgstr "Terminal ID" -#: src/include/support/dialogs.rb:748 +#: src/include/support/dialogs.rb:744 msgid "GPG UID" msgstr "GPG UID" -#: src/include/support/dialogs.rb:755 +#: src/include/support/dialogs.rb:751 msgid "Upload Information" msgstr "Upload Information" -#: src/include/support/dialogs.rb:774 +#: src/include/support/dialogs.rb:770 #, fuzzy #| msgid "Novell 11-digit service request number" msgid "11-digit service request number" msgstr "Novell 11-digit service request number" #. abort? -#: src/include/support/dialogs.rb:851 +#: src/include/support/dialogs.rb:847 msgid "The SR number must be 11 digits" msgstr "The SR number must be 11 digits" -#: src/include/support/dialogs.rb:869 +#: src/include/support/dialogs.rb:865 msgid "Collecting Data" msgstr "Collecting Data" -#: src/include/support/dialogs.rb:870 +#: src/include/support/dialogs.rb:866 msgid "Progress" msgstr "Progress" -#. Remove ANSI escape codes for cursor movement (bnc#921233) -#: src/include/support/dialogs.rb:939 +#: src/include/support/dialogs.rb:931 msgid "Collected Data Review" msgstr "Collected Data Review" #. FIXME use list of generated files, as well as directory prefix #. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents")) -#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034 +#: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026 msgid "File Name" msgstr "File Name" -#: src/include/support/dialogs.rb:992 +#: src/include/support/dialogs.rb:984 msgid "Remove from Data" msgstr "Remove from Data" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/sysconfig.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: yast2 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/tftp-server.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/timezone_db.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: timezone_db\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 22:36+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/tune.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: tune\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 22:33+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/update.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 17:00+0200\n" "PO-Revision-Date: 2008-03-27 22:32+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/users.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: users\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 22:31+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -128,650 +128,6 @@ msgid "Do not ask for missing data; return error instead." msgstr "" -#. caption for dialog "User Authentication Method" -#. dialog caption -#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137 -msgid "User Authentication Method" -msgstr "User Authentication Method" - -#. help text for dialog "User Authentication Method" 1/3 -#: src/clients/inst_auth.rb:118 -msgid "" -"<p>\n" -"<b>Authentication</b><br>\n" -"Select the authentication method to use for users on your system.\n" -"</p>" -msgstr "" -"<p>\n" -"<b>Authentication</b><br>\n" -"Select the authentication method to use for users on your system.\n" -"</p>" - -#. helptext 2/3 -#. help text for dialog "User Authentication Method" 2/2 -#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:164 -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>" -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>" - -#. optional helptext 2.5/3 (local users continued) -#: src/clients/inst_auth.rb:133 -msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation." -msgstr "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation." - -#. radiobutton to select ldap user auth. -#: src/clients/inst_auth.rb:141 -msgid "&LDAP" -msgstr "&LDAP" - -#. radiobutton to select nis user auth. -#: src/clients/inst_auth.rb:143 -msgid "N&IS" -msgstr "N&IS" - -#. radiobutton to select samba user auth. -#. menubutton label -#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159 -msgid "&Samba" -msgstr "&Samba" - -#. radiobutton to select samba user auth. -#: src/clients/inst_auth.rb:147 -msgid "&Windows Domain" -msgstr "&Windows Domain" - -#. radiobutton to select local user auth. -#. radiobutton label -#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85 -msgid "L&ocal (/etc/passwd)" -msgstr "L&ocal (/etc/passwd)" - -#. radiobutton to select local user auth. -#. authentication type -#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48 -msgid "eDirectory LDAP" -msgstr "eDirectory LDAP" - -#. helptext 3/3 -- nis & samba & ldap avialable -#: src/clients/inst_auth.rb:185 -msgid "" -"<p>If you are using a NIS or LDAP server to store user data or if you want\n" -"to authenticate users against an NT server, choose the appropriate value. Then\n" -"press <b>Next</b> to continue with configuration of your client.</p>" -msgstr "" -"<p>If you are using a NIS or LDAP server to store user data or if you want\n" -"to authenticate users against an NT server, choose the appropriate value. Then\n" -"press <b>Next</b> to continue with configuration of your client.</p>" - -#. helptext 3/3 -- nis & ldap avialable -#: src/clients/inst_auth.rb:195 -msgid "" -"<p>If you are using a NIS or LDAP server to store user data, choose the\n" -"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" -msgstr "" -"<p>If you are using a NIS or LDAP server to store user data, choose the\n" -"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" - -#. helptext 3/3 -- samba &ldap available -#: src/clients/inst_auth.rb:205 -msgid "" -"<p>If you are using an LDAP server to store user data or if you want to\n" -"authenticate users against an NT server, choose the appropriate value. Then\n" -"press <b>Next</b> to continue with configuration of your client.</p>" -msgstr "" -"<p>If you are using an LDAP server to store user data or if you want to\n" -"authenticate users against an NT server, choose the appropriate value. Then\n" -"press <b>Next</b> to continue with configuration of your client.</p>" - -#. helptext 3/3 -- only ldap available -#: src/clients/inst_auth.rb:215 -msgid "" -"<p>If you are using an LDAP server to store user data, choose the\n" -"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" -msgstr "" -"<p>If you are using an LDAP server to store user data, choose the\n" -"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" - -#. helptext: additional kerberos support -#: src/clients/inst_auth.rb:225 -msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>" -msgstr "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>" - -#. check box label -#. check box label -#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102 -msgid "&Read User Data from a Previous Installation" -msgstr "&Read User Data from a Previous Installation" - -#. button label -#. button label -#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107 -msgid "&Choose" -msgstr "&Choose" - -#. frame title for authentication methods -#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136 -msgid "Authentication Method" -msgstr "Authentication Method" - -#. check box label -#: src/clients/inst_auth.rb:303 -msgid "Set Up &Kerberos Authentication" -msgstr "Set Up &Kerberos Authentication" - -#. selection box label -#. selection box label -#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507 -msgid "&Select Users to Read" -msgstr "&Select Users to Read" - -#. check box label -#. check box label -#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515 -msgid "Select or Deselect &All" -msgstr "Select or Deselect &All" - -#. Title for root-password dialogue -#. Title for root-password dialogue -#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57 -msgid "Password for the System Administrator \"root\"" -msgstr "Password for the System Administrator \"root\"" - -#. advise user to remember his new password -#. advise users to remember their new password -#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67 -msgid "Do not forget what you enter here." -msgstr "Do not forget what you enter here." - -#. Label: get password for user root -#. Label: get password for user root -#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73 -msgid "&Password for root User" -msgstr "&Password for root User" - -#. Label: get same password again for verification -#. Label: get same password again for verification -#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81 -msgid "Con&firm Password" -msgstr "Con&firm Password" - -#. text entry label -#. text entry label -#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86 -msgid "&Test Keyboard Layout" -msgstr "&Test Keyboard Layout" - -#. push button -#: src/clients/inst_root.rb:119 -msgid "E&xpert Options..." -msgstr "E&xpert Options..." - -#. help text ( explain what the user "root" is and does ) 1/5 -#. help text ( explain what the user "root" is and does ) 1/5 -#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93 -msgid "" -"<p>\n" -"Unlike normal users of the system, who write texts, create\n" -"graphics, or browse the Internet, the user \"root\" exists on\n" -"every system and is called into action whenever\n" -"administrative tasks need to be performed. Only log in as root\n" -"when you need to be the system administrator.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Unlike normal users of the system, who write texts, create\n" -"graphics, or browse the Internet, the user \"root\" exists on\n" -"every system and is called into action whenever\n" -"administrative tasks need to be performed. Only log in as root\n" -"when you need to be the system administrator.\n" -"</p>\n" - -#. help text, continued 2/5 -#. help text, continued 2/5 -#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106 -msgid "" -"<p>\n" -"Because the root user is equipped with extensive permissions, the password\n" -"for \"root\" should be chosen carefully. A combination of letters and numbers\n" -"is recommended. To ensure that the password was entered correctly,\n" -"reenter it in a second field.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Because the root user is equipped with extensive permissions, the password\n" -"for \"root\" should be chosen carefully. A combination of letters and numbers\n" -"is recommended. To ensure that the password was entered correctly,\n" -"reenter it in a second field.\n" -"</p>\n" - -#. help text, continued 3/5 -#. help text, continued 3/5 -#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119 -#, fuzzy -msgid "" -"<p>\n" -"All the rules for user passwords apply to the \"root\" password:\n" -"Distinguish between uppercase and lowercase. A password should have at\n" -"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n" -"</p>\n" -msgstr "" -"<p>\n" -"All the rules for user passwords apply to the \"root\" password:\n" -"Distinguish between uppercase and lowercase. A password should have at\n" -"least 5 characters and, as a rule, not contain any special characters\n" -"(e.g., accented letters or umlauts).\n" -"</p>\n" - -#. help text, continued 5/5 -#. help text, continued 5/5 -#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133 -msgid "" -"<p>\n" -"Do not forget this \"root\" password.\n" -"</p>" -msgstr "" -"<p>\n" -"Do not forget this \"root\" password.\n" -"</p>" - -#. additional help text about password -#. additional help text about password -#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145 -msgid "" -"<p>If you intend to use this password for creating certificates,\n" -"it has to be at least %1 characters long.</p>" -msgstr "" -"<p>If you intend to use this password for creating certificates,\n" -"it has to be at least %1 characters long.</p>" - -#. help text for 'test keyboard layout' entry' -#: src/clients/inst_root.rb:187 -msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>" -msgstr "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>" - -#. report misspellings of the password -#. report misspellings of the password -#. The two group password information do not match -#. error popup -#. The two user password information do not match -#. error popup -#. The two group password information do not match -#. error popup -#: src/clients/inst_root.rb:233 src/clients/inst_root_first.rb:185 -#: src/clients/inst_user_first.rb:688 src/include/users/dialogs.rb:146 -#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364 -msgid "" -"The passwords do not match.\n" -"Try again." -msgstr "" -"The passwords do not match.\n" -"Try again." - -#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# -#. report if user forgot to enter a password -#. #-#-#-#-# users.xgettext.pot #-#-#-#-# -#. error popup -#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191 -#: src/modules/UsersSimple.pm:749 -msgid "" -"No password entered.\n" -"Try again." -msgstr "" -"No password entered.\n" -"Try again." - -#. yes/no popup question, %1 is a number -#. yes/no popup question, %1 is a number -#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224 -#, fuzzy -#| msgid "" -#| "If you intend to create certificates,\n" -#| "the password should have at least %1 characters.\n" -#| "Really use this shorter password?" -msgid "" -"If you intend to create certificates,\n" -"the password should have at least %1 characters." -msgstr "" -"If you intend to create certificates,\n" -"the password should have at least %1 characters.\n" -"Really use this shorter password?" - -#. last part of message popup -#. last part of message popup -#. last part of message popup -#. last part of message popup -#: src/clients/inst_root.rb:285 src/clients/inst_root_first.rb:239 -#: src/clients/inst_user_first.rb:714 src/include/users/dialogs.rb:1269 -#: src/include/users/dialogs.rb:2391 -#, fuzzy -#| msgid "&Reset Password" -msgid "Really use this password?" -msgstr "&Reset Password" - -#. Error msg (yes/no) -#: src/clients/inst_root.rb:301 -msgid "" -"The root password could not be set.\n" -"You might not be able to log in.\n" -"Try setting it again?\n" -msgstr "" -"The root password could not be set.\n" -"You might not be able to log in.\n" -"Try setting it again?\n" - -#. help text (shown in the 'busy' situation) -#: src/clients/inst_user.rb:144 -msgid "Initialization of module for configuration of authentication..." -msgstr "Initialisation of module for configuration of authentication..." - -#. popup label (%1 is package to install) -#. popup label (%1 is package to install) -#. popup label (%1 is package to install) -#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195 -#: src/include/users/widgets.rb:2450 -msgid "" -"Package %1 is not installed.\n" -"Install it now?\n" -msgstr "" -"Package %1 is not installed.\n" -"Install it now?\n" - -#. encryption type -#. encryption type -#. encryption type -#. encryption type -#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:53 -#: src/include/users/helps.rb:52 src/include/users/helps.rb:54 -msgid "DES" -msgstr "DES" - -#. encryption type -#. encryption type -#. encryption type -#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55 -#: src/include/users/helps.rb:56 -msgid "MD5" -msgstr "MD5" - -#. encryption type -#. encryption type -#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:57 -msgid "SHA-256" -msgstr "" - -#. encryption type -#. encryption type -#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59 -msgid "SHA-512" -msgstr "" - -#. frame label -#: src/clients/inst_user_first.rb:143 -msgid "Password Encryption Type" -msgstr "Password Encryption Type" - -#. Radio button label: password encryption type -#. Radio buttons for password encryption: DES-crypt -#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513 -msgid "&DES" -msgstr "" - -#. Radio button label: password encryption type -#. Radio buttons for password encryption: MD5-crypt -#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:515 -msgid "&MD5" -msgstr "&MD5" - -#. Radio button label: password encryption type -#. Radio buttons for password encryption: sha256 crypt -#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:520 -msgid "SHA-&256" -msgstr "" - -#. Radio button label: password encryption type -#. Radio buttons for password encryption: sha512 crypt -#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528 -msgid "SHA-&512" -msgstr "" - -#. help text for dialog "User Authentication Method" 1/2 -#: src/clients/inst_user_first.rb:162 -#, fuzzy -#| msgid "<p><b>Login Settings</b></p>" -msgid "<p><b>Authentication</b><br></p>" -msgstr "<p><b>Login Settings</b></p>" - -#. Help text for password expert dialog -#: src/clients/inst_user_first.rb:168 -#, fuzzy -#| msgid "The password encryption method is %1." -msgid "<p>Choose a password encryption method for local and system users.</p>" -msgstr "The password encryption method is %1." - -#. Help text for password expert dialog -#. Help text for password expert dialog 4/5 -#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491 -msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>" -msgstr "" - -#. text entry -#. text entry -#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403 -msgid "User's &Full Name" -msgstr "User's &Full Name" - -#. input field for login name -#. input field for login name -#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433 -msgid "&Username" -msgstr "&Username" - -#. checkbox label -#. checkbox label -#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470 -msgid "U&se this password for system administrator" -msgstr "U&se this password for system administrator" - -#. checkbox label -#. checkbox label -#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446 -msgid "Receive S&ystem Mail" -msgstr "Receive S&ystem Mail" - -#. checkbox label -#: src/clients/inst_user_first.rb:261 -msgid "&Automatic Login" -msgstr "&Automatic Login" - -#. dialog caption -#: src/clients/inst_user_first.rb:283 -msgid "Create New User" -msgstr "Create New User" - -#. yes-no popup headline -#. The user login field is empty, this is allowed if the -#. system is part of a network with (e.g.) NIS user management. -#. yes-no popup headline -#: src/clients/inst_user_first.rb:342 src/include/users/dialogs.rb:1112 -msgid "Empty User Login" -msgstr "Empty User Login" - -#. yes-no popup contents -#. yes-no popup contents -#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114 -msgid "" -"Leaving the user name empty only makes sense\n" -"in a network environment with an authentication server.\n" -"Leave it empty?" -msgstr "" -"Leaving the user name empty only makes sense\n" -"in a network environment with an authentication server.\n" -"Leave it empty?" - -#. help text for main add user dialog -#. alternative help text 1/7 -#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212 -msgid "" -"<p>\n" -"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" -"assign to this user account.\n" -"</p>\n" -msgstr "" -"<p>\n" -"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" -"assign to this user account.\n" -"</p>\n" - -#. help text for main add user dialog -#: src/clients/inst_user_first.rb:453 -#, fuzzy -msgid "" -"<p>\n" -"When entering a password, distinguish between uppercase and\n" -"lowercase. Passwords should not contain any accented characters or umlauts.\n" -"</p>\n" -msgstr "" -"<p>\n" -"When entering a password, distinguish between uppercase and\n" -"lowercase. Passwords should not contain any special characters, such as\n" -"accented characters. \n" -"</p>\n" - -#. help text %1 is encryption type, %2,%3 numbers -#. help text 2/4 %1 is encryption type, %2,%3 numbers -#: src/clients/inst_user_first.rb:457 src/include/users/helps.rb:73 -msgid "" -"<p>\n" -"With the current password encryption (%1), the password length should be between\n" -" %2 and %3 characters.\n" -"</p>" -msgstr "" -"<p>\n" -"With the current password encryption (%1), the password length should be between\n" -" %2 and %3 characters.\n" -"</p>" - -#. additional help text about password -#: src/clients/inst_user_first.rb:467 -#, fuzzy -#| msgid "" -#| "<p>If you intend to use this password for creating certificates,\n" -#| "it has to be at least %1 characters long.</p>" -msgid "" -"<p>If you intend to use this password for creating certificates,\n" -"it has to be at least %s characters long.</p>" -msgstr "" -"<p>If you intend to use this password for creating certificates,\n" -"it has to be at least %1 characters long.</p>" - -#. help text for main add user dialog -#. help text 4/4 -#: src/clients/inst_user_first.rb:472 src/include/users/helps.rb:90 -msgid "" -"<p>\n" -"To ensure that the password was entered correctly,\n" -"repeat it exactly in a second field. Do not forget your password.\n" -"</p>\n" -msgstr "" -"<p>\n" -"To ensure that the password was entered correctly,\n" -"repeat it exactly in a second field. Do not forget your password.\n" -"</p>\n" - -#. help text for main add user dialog -#: src/clients/inst_user_first.rb:476 -msgid "" -"<p>\n" -"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" -"Do not use uppercase letters in this entry unless you know what you are doing.\n" -"Usernames have stricter restrictions than passwords. You can redefine the\n" -"restrictions in the /etc/login.defs file. Read its man page for information.\n" -"</p>\n" -msgstr "" -"<p>\n" -"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" -"Do not use uppercase letters in this entry unless you know what you are doing.\n" -"Usernames have stricter restrictions than passwords. You can redefine the\n" -"restrictions in the /etc/login.defs file. Read its man page for information.\n" -"</p>\n" - -#. help text for main add user dialog -#: src/clients/inst_user_first.rb:482 -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>" - -#. help text for main add user dialog -#. these are used only during installation time -#. help text 4/7 (only during installation) -#: src/clients/inst_user_first.rb:485 src/include/users/helps.rb:259 -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" -msgstr "" -"<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" - -#. help text for main add user dialog -#. help text 5/7 (only during installation) -#: src/clients/inst_user_first.rb:489 src/include/users/helps.rb:264 -msgid "" -"<p>\n" -"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n" -msgstr "" -"<p>\n" -"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n" - -#. Dialog for expert user settings: authentication method as well -#. as password encryption (see fate 302980) -#. @return true if user accepted expert settings -#: src/clients/inst_user_first.rb:573 -msgid "Expert Settings" -msgstr "Expert Settings" - -#. summary label -#: src/clients/inst_user_first.rb:625 -msgid "The authentication method is local /etc/passwd." -msgstr "The authentication method is local /etc/passwd." - -#. summary label -#: src/clients/inst_user_first.rb:628 -#, fuzzy -#| msgid "The password encryption method is %1." -msgid "The password encryption method is %s." -msgstr "The password encryption method is %1." - -#. summary label, %s is a single user name or multiple usernames (comma separated) -#: src/clients/inst_user_first.rb:635 -#, fuzzy -msgid "User %s will be imported." -msgid_plural "Users %s will be imported." -msgstr[0] "Service %1 will be restarted" -msgstr[1] "Service %1 will be restarted" - -#. pushbutton label -#: src/clients/inst_user_first.rb:650 -msgid "&Change..." -msgstr "&Change..." - -#. frame label -#: src/clients/inst_user_first.rb:657 -msgid "Summary" -msgstr "Summary" - -#. yes/no popup question, %s is a number -#: src/clients/inst_user_first.rb:709 -#, fuzzy -#| msgid "" -#| "If you intend to create certificates,\n" -#| "the password should have at least %1 characters.\n" -#| "Really use this shorter password?" -msgid "" -"If you intend to create certificates,\n" -"the password should have at least %s characters." -msgstr "" -"If you intend to create certificates,\n" -"the password should have at least %1 characters.\n" -"Really use this shorter password?" - #. translators: command line help text for Users module #: src/clients/users.rb:102 msgid "User configuration module" @@ -893,11 +249,6 @@ msgid "New UID of the user" msgstr "New UID of the user" -#. progress step title -#: src/clients/users_finish.rb:63 -msgid "Writing Users Configuration..." -msgstr "Writing Users Configuration..." - #. helptext 1/3 #: src/clients/users_plugin_ldap_all.rb:105 msgid "" @@ -1164,97 +515,6 @@ msgid "Seconds" msgstr "Seconds" -#. authentication type -#. type of user/group -#. (item of list with the headline 'Choose the type of user to add') -#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365 -msgid "LDAP" -msgstr "LDAP" - -#. authentication type -#. richtext label -#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136 -msgid "NIS" -msgstr "NIS" - -#. authentication type -#: src/clients/users_proposal.rb:46 -msgid "Samba (Windows Domain)" -msgstr "Samba (Windows Domain)" - -#. summary label <%1>-<%2> are HTML tags, leave untouched -#: src/clients/users_proposal.rb:69 -msgid "<%1>Root Password<%2> set" -msgstr "<%1>Root Password<%2> set" - -#: src/clients/users_proposal.rb:74 -msgid "<%1>Root Password<%2> not set" -msgstr "<%1>Root Password<%2> not set" - -#. summary label <%1>-<%2> are HTML tags, leave untouched -#: src/clients/users_proposal.rb:81 -msgid "No <%1>user<%2> configured" -msgstr "No <%1>user<%2> configured" - -#. summary line: <%1>-<%2> are HTML tags, leave untouched, -#. % is LDAP/NIS etc. -#: src/clients/users_proposal.rb:93 -msgid "<%1>Authentication method<%2>: %3" -msgstr "<%1>Authentication method<%2>: %3" - -#. summary line: <%1>-<%2> are HTML tags, leave untouched, -#. % is LDAP/NIS etc. -#: src/clients/users_proposal.rb:102 -msgid "<%1>Authentication method<%2>: %3 and Kerberos." -msgstr "<%1>Authentication method<%2>: %3 and Kerberos." - -#. summary line, %3 are user names (comma separated) -#. <%1>,<%2> are HTML tags, leave untouched, -#: src/clients/users_proposal.rb:116 -#, fuzzy -msgid "<%1>Users<%2> %3 selected for import" -msgstr "<%1>User<%2> %3 configured" - -#. summary line, <%1>,<%2> are HTML tags, %3 user name -#: src/clients/users_proposal.rb:124 -#, fuzzy -msgid "<%1>User<%2> %3 will be imported." -msgstr "<%1>User<%2> %3 configured" - -#. summary line: <%1>-<%2> are HTML tags, leave untouched, -#. %3 is login name -#: src/clients/users_proposal.rb:134 -msgid "<%1>User<%2> %3 configured" -msgstr "<%1>User<%2> %3 configured" - -#. summary line: <%1>-<%2> are HTML tags, leave untouched, -#. %3 is full name, %4 login name -#: src/clients/users_proposal.rb:143 -#, fuzzy -msgid "<%1>User<%2> %3 (%4) configured" -msgstr "<%1>User<%2> %3 configured" - -#. summary line -#: src/clients/users_proposal.rb:156 -#, fuzzy -msgid "Password Encryption Method: %1" -msgstr "P&assword Encryption Method" - -#. rich text label -#: src/clients/users_proposal.rb:170 -msgid "User Settings" -msgstr "User Settings" - -#. menu button label -#: src/clients/users_proposal.rb:173 -msgid "&User" -msgstr "&User" - -#. menu button label -#: src/clients/users_proposal.rb:175 -msgid "&Root Password" -msgstr "&Root Password" - #. password entering label #: src/include/users/cmdline.rb:55 msgid "LDAP Server Password:" @@ -1417,6 +677,24 @@ "the encryption settings for this user,\n" "enter the user's current password." +#. The two user password information do not match +#. error popup +#. The two group password information do not match +#. error popup +#. report misspellings of the password +#. The two group password information do not match +#. error popup +#: 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:470 +msgid "" +"The passwords do not match.\n" +"Try again." +msgstr "" +"The passwords do not match.\n" +"Try again." + #. yes/no popup label, %1,%2 are file paths #: src/include/users/dialogs.rb:344 msgid "" @@ -1444,6 +722,13 @@ msgstr "Change home directory to %1?" #. text entry +#. text entry +#: src/include/users/dialogs.rb:403 +#: src/lib/users/dialogs/inst_user_first.rb:582 +msgid "User's &Full Name" +msgstr "User's &Full Name" + +#. text entry #: src/include/users/dialogs.rb:411 msgid "&First Name" msgstr "&First Name" @@ -1458,11 +743,30 @@ msgid "For remote users, only additional group memberships can be changed." msgstr "For remote users, only additional group memberships can be changed." +#. input field for login name +#. input field for login name +#: src/include/users/dialogs.rb:433 +#: src/lib/users/dialogs/inst_user_first.rb:589 +msgid "&Username" +msgstr "&Username" + #. checkbox label +#: src/include/users/dialogs.rb:446 +msgid "Receive S&ystem Mail" +msgstr "Receive S&ystem Mail" + +#. checkbox label #: src/include/users/dialogs.rb:456 msgid "A&utomatic Login" msgstr "A&utomatic Login" +#. checkbox label +#. checkbox label +#: src/include/users/dialogs.rb:470 +#: src/lib/users/dialogs/inst_user_first.rb:613 +msgid "U&se this password for system administrator" +msgstr "U&se this password for system administrator" + #. check box label #: src/include/users/dialogs.rb:480 msgid "D&isable User Login" @@ -1634,6 +938,35 @@ msgid "Plu&g-Ins" msgstr "Plu&g-Ins" +#. The user login field is empty, this is allowed if the +#. system is part of a network with (e.g.) NIS user management. +#. yes-no popup headline +#: src/include/users/dialogs.rb:1112 +msgid "Empty User Login" +msgstr "Empty User Login" + +#. yes-no popup contents +#: src/include/users/dialogs.rb:1114 +msgid "" +"Leaving the user name empty only makes sense\n" +"in a network environment with an authentication server.\n" +"Leave it empty?" +msgstr "" +"Leaving the user name empty only makes sense\n" +"in a network environment with an authentication server.\n" +"Leave it empty?" + +#. last part of message popup +#. last part of message popup +#. 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:482 +#, fuzzy +#| msgid "&Reset Password" +msgid "Really use this password?" +msgstr "&Reset Password" + #. popup question #: src/include/users/dialogs.rb:1308 msgid "Change home directory to %1?" @@ -1725,6 +1058,20 @@ msgid "Group &Data" msgstr "Group &Data" +#. encryption type +#. encryption type +#. TRANSLATORS: encryption type +#: src/include/users/helps.rb:52 src/include/users/helps.rb:54 +#: src/lib/users/encryption_method.rb:51 +msgid "DES" +msgstr "DES" + +#. encryption type +#. TRANSLATORS: encryption type +#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53 +msgid "MD5" +msgstr "MD5" + #. help text 1/4 #: src/include/users/helps.rb:62 #, fuzzy @@ -1740,6 +1087,32 @@ "accented characters. \n" "</p>\n" +#. help text 2/4 %1 is encryption type, %2,%3 numbers +#: src/include/users/helps.rb:73 +msgid "" +"<p>\n" +"With the current password encryption (%1), the password length should be between\n" +" %2 and %3 characters.\n" +"</p>" +msgstr "" +"<p>\n" +"With the current password encryption (%1), the password length should be between\n" +" %2 and %3 characters.\n" +"</p>" + +#. help text 4/4 +#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:159 +msgid "" +"<p>\n" +"To ensure that the password was entered correctly,\n" +"repeat it exactly in a second field. Do not forget your password.\n" +"</p>\n" +msgstr "" +"<p>\n" +"To ensure that the password was entered correctly,\n" +"repeat it exactly in a second field. Do not forget your password.\n" +"</p>\n" + #. Help text 0/6 #: src/include/users/helps.rb:103 msgid "" @@ -1909,6 +1282,19 @@ "<b>Password</b> to assign to this user.\n" "</p>\n" +#. alternative help text 1/7 +#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:138 +msgid "" +"<p>\n" +"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" +"assign to this user account.\n" +"</p>\n" +msgstr "" +"<p>\n" +"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n" +"assign to this user account.\n" +"</p>\n" + #. help text 2/7 #: src/include/users/helps.rb:226 msgid "" @@ -1949,6 +1335,25 @@ "restrictions in the /etc/login.defs file. Read its man page for information.\n" "</p>\n" +#. 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:175 +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" +msgstr "" +"<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" + +#. help text 5/7 (only during installation) +#: src/include/users/helps.rb:264 +msgid "" +"<p>\n" +"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n" +msgstr "" +"<p>\n" +"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n" + #. help text 6/7 (only during installation) #: src/include/users/helps.rb:269 msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>" @@ -2710,7 +2115,9 @@ msgstr "System Users" #. 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:274 msgid "Local Users" msgstr "Local Users" @@ -2786,6 +2193,11 @@ msgstr "Samba Groups" #. richtext label +#: src/include/users/widgets.rb:136 +msgid "NIS" +msgstr "NIS" + +#. richtext label #: src/include/users/widgets.rb:138 msgid "SSSD" msgstr "" @@ -2805,6 +2217,11 @@ msgid "&SSSD" msgstr "" +#. menubutton label +#: src/include/users/widgets.rb:159 +msgid "&Samba" +msgstr "&Samba" + #. tab header #: src/include/users/widgets.rb:168 msgid "&Users" @@ -2932,6 +2349,11 @@ "network protocols do not support this and you may have problems with NIS.\n" "</p>" +#. Help text for password expert dialog 4/5 +#: src/include/users/widgets.rb:491 +msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>" +msgstr "" + #. Label #: src/include/users/widgets.rb:499 msgid "Password Encryption" @@ -2942,6 +2364,26 @@ msgid "Encryption Type" msgstr "Encryption Type" +#. Radio buttons for password encryption: DES-crypt +#: src/include/users/widgets.rb:513 +msgid "&DES" +msgstr "" + +#. Radio buttons for password encryption: MD5-crypt +#: src/include/users/widgets.rb:515 +msgid "&MD5" +msgstr "&MD5" + +#. Radio buttons for password encryption: sha256 crypt +#: src/include/users/widgets.rb:520 +msgid "SHA-&256" +msgstr "" + +#. Radio buttons for password encryption: sha512 crypt +#: src/include/users/widgets.rb:528 +msgid "SHA-&512" +msgstr "" + #. help text 1/3 #: src/include/users/widgets.rb:582 msgid "" @@ -3243,6 +2685,12 @@ #. type of user/group #. (item of list with the headline 'Choose the type of user to add') +#: src/include/users/widgets.rb:1365 +msgid "LDAP" +msgstr "LDAP" + +#. type of user/group +#. (item of list with the headline 'Choose the type of user to add') #: src/include/users/widgets.rb:1370 msgid "System" msgstr "System" @@ -3579,6 +3027,15 @@ msgid "Package %1 is not available for installation." msgstr "Package %1 is not available for installation." +#. popup label (%1 is package to install) +#: src/include/users/widgets.rb:2450 +msgid "" +"Package %1 is not installed.\n" +"Install it now?\n" +msgstr "" +"Package %1 is not installed.\n" +"Install it now?\n" + #. dialog caption #: src/include/users/wizards.rb:102 msgid "User and Group Administration" @@ -3596,6 +3053,434 @@ msgid "Initializing..." msgstr "Initialising..." +#. List of errors found for a given password +#. +#. The errors are localized and ready to be displayed to the user +#. +#. @param passwd [String] password to check +#. @return [Array<String>] errors or empty array if no errors are found or +#. validation is disabled +#: src/lib/users/ca_password_validator.rb:56 +#, fuzzy +#| msgid "" +#| "If you intend to create certificates,\n" +#| "the password should have at least %1 characters.\n" +#| "Really use this shorter password?" +msgid "" +"If you intend to create certificates,\n" +"the password should have at least %s characters." +msgstr "" +"If you intend to create certificates,\n" +"the password should have at least %1 characters.\n" +"Really use this shorter password?" + +#. Localized help text about CA constraints +#. +#. @return [String] html text or empty string if validation is disabled +#: src/lib/users/ca_password_validator.rb:69 +#, fuzzy +#| msgid "" +#| "<p>If you intend to use this password for creating certificates,\n" +#| "it has to be at least %1 characters long.</p>" +msgid "" +"<p>If you intend to use this password for creating certificates,\n" +"it has to be at least %s characters long.</p>" +msgstr "" +"<p>If you intend to use this password for creating certificates,\n" +"it has to be at least %1 characters long.</p>" + +#. @see Implements ::Installation::FinishClient#title +#: src/lib/users/clients/users_finish.rb:55 +msgid "Writing Users Configuration..." +msgstr "Writing Users Configuration..." + +#. Copyright (c) 2016 SUSE LLC. +#. All Rights Reserved. +#. This program is free software; you can redistribute it and/or +#. modify it under the terms of version 2 or 3 of the GNU General +#. Public License as published by the Free Software Foundation. +#. This program is distributed in the hope that it will be useful, +#. but WITHOUT ANY WARRANTY; without even the implied warranty of +#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#. GNU General Public License for more details. +#. You should have received a copy of the GNU General Public License +#. along with this program; if not, contact SUSE LLC. +#. To contact SUSE about this file by physical or electronic mail, +#. you may find current contact information at www.suse.com +#: src/lib/users/dialogs/encryption_method.rb:39 +#, fuzzy +#| msgid "The password encryption method is %1." +msgid "<p>Choose a password encryption method for local and system users.</p>" +msgstr "The password encryption method is %1." + +#. TRANSLATORS: %s is the name of the recommended encryption method +#: src/lib/users/dialogs/encryption_method.rb:41 +msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>" +msgstr "" + +#. Let's add some vertical space after each widget +#. TRANSLATORS: rich text label +#: src/lib/users/dialogs/encryption_method.rb:72 +#: src/lib/users/encryption_proposal.rb:63 +msgid "Password Encryption Type" +msgstr "Password Encryption Type" + +#. advise users to remember their new password +#: src/lib/users/dialogs/inst_root_first.rb:70 +msgid "Do not forget what you enter here." +msgstr "Do not forget what you enter here." + +#. Label: get password for user root +#: src/lib/users/dialogs/inst_root_first.rb:76 +msgid "&Password for root User" +msgstr "&Password for root User" + +#. Label: get same password again for verification +#: src/lib/users/dialogs/inst_root_first.rb:84 +msgid "Con&firm Password" +msgstr "Con&firm Password" + +#. text entry label +#: src/lib/users/dialogs/inst_root_first.rb:89 +msgid "&Test Keyboard Layout" +msgstr "&Test Keyboard Layout" + +#. help text ( explain what the user "root" is and does ) 1 +#: src/lib/users/dialogs/inst_root_first.rb:99 +msgid "" +"<p>\n" +"Unlike normal users of the system, who write texts, create\n" +"graphics, or browse the Internet, the user \"root\" exists on\n" +"every system and is called into action whenever\n" +"administrative tasks need to be performed. Only log in as root\n" +"when you need to be the system administrator.\n" +"</p>\n" +msgstr "" +"<p>\n" +"Unlike normal users of the system, who write texts, create\n" +"graphics, or browse the Internet, the user \"root\" exists on\n" +"every system and is called into action whenever\n" +"administrative tasks need to be performed. Only log in as root\n" +"when you need to be the system administrator.\n" +"</p>\n" + +#. help text, continued 2 +#: src/lib/users/dialogs/inst_root_first.rb:110 +msgid "" +"<p>\n" +"Because the root user is equipped with extensive permissions, the password\n" +"for \"root\" should be chosen carefully. A combination of letters and numbers\n" +"is recommended. To ensure that the password was entered correctly,\n" +"reenter it in a second field.\n" +"</p>\n" +msgstr "" +"<p>\n" +"Because the root user is equipped with extensive permissions, the password\n" +"for \"root\" should be chosen carefully. A combination of letters and numbers\n" +"is recommended. To ensure that the password was entered correctly,\n" +"reenter it in a second field.\n" +"</p>\n" + +#. help text, continued 3 +#: src/lib/users/dialogs/inst_root_first.rb:120 +#, fuzzy +msgid "" +"<p>\n" +"All the rules for user passwords apply to the \"root\" password:\n" +"Distinguish between uppercase and lowercase. A password should have at\n" +"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n" +"</p>\n" +msgstr "" +"<p>\n" +"All the rules for user passwords apply to the \"root\" password:\n" +"Distinguish between uppercase and lowercase. A password should have at\n" +"least 5 characters and, as a rule, not contain any special characters\n" +"(e.g., accented letters or umlauts).\n" +"</p>\n" + +#. help text, continued 4 +#: src/lib/users/dialogs/inst_root_first.rb:131 +msgid "" +"<p>\n" +"Do not forget this \"root\" password.\n" +"</p>" +msgstr "" +"<p>\n" +"Do not forget this \"root\" password.\n" +"</p>" + +#. Title for root-password dialogue +#: src/lib/users/dialogs/inst_root_first.rb:148 +msgid "Password for the System Administrator \"root\"" +msgstr "Password for the System Administrator \"root\"" + +#. #-#-#-#-# users.xgettext.pot #-#-#-#-# +#. error popup +#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623 +msgid "" +"No password entered.\n" +"Try again." +msgstr "" +"No password entered.\n" +"Try again." + +#. reenable suggestion +#: src/lib/users/dialogs/inst_user_first.rb:133 +#, 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 "" +"<p>\n" +"Use one of the available options to add local users to the system.\n" +"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n" +"</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:137 +#, fuzzy +#| msgid "Create New User" +msgid "Create new user" +msgstr "Create New User" + +#: src/lib/users/dialogs/inst_user_first.rb:141 +#, fuzzy +msgid "" +"<p>\n" +"When entering a password, distinguish between uppercase and\n" +"lowercase. Passwords should not contain any accented characters or umlauts.\n" +"</p>\n" +msgstr "" +"<p>\n" +"When entering a password, distinguish between uppercase and\n" +"lowercase. Passwords should not contain any special characters, such as\n" +"accented characters. \n" +"</p>\n" + +#. TRANSLATORS: %{min} and %{max} will be replaced by numbers +#: src/lib/users/dialogs/inst_user_first.rb:148 +#, fuzzy +#| msgid "" +#| "<p>\n" +#| "With the current password encryption (%1), the password length should be between\n" +#| " %2 and %3 characters.\n" +#| "</p>" +msgid "" +"<p>\n" +"The password length should be between %{min}\n" +" and %{max} characters.\n" +"</p>\n" +msgstr "" +"<p>\n" +"With the current password encryption (%1), the password length should be between\n" +" %2 and %3 characters.\n" +"</p>" + +#: src/lib/users/dialogs/inst_user_first.rb:164 +msgid "" +"<p>\n" +"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" +"Do not use uppercase letters in this entry unless you know what you are doing.\n" +"Usernames have stricter restrictions than passwords. You can redefine the\n" +"restrictions in the /etc/login.defs file. Read its man page for information.\n" +"</p>\n" +msgstr "" +"<p>\n" +"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n" +"Do not use uppercase letters in this entry unless you know what you are doing.\n" +"Usernames have stricter restrictions than passwords. You can redefine the\n" +"restrictions in the /etc/login.defs file. Read its man page for information.\n" +"</p>\n" + +#: src/lib/users/dialogs/inst_user_first.rb:171 +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:182 +#, 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:183 +msgid "" +"<p>\n" +"A previous Linux installation with local users has been detected.\n" +"The information there can be used to create users in the system being installed.\n" +"Use the <b>Choose Users</b> button to select some users. Their basic information will\n" +"be imported.\n" +"</p>\n" +msgstr "" + +#: src/lib/users/dialogs/inst_user_first.rb:191 +#, fuzzy +#| msgid "&Skip Migration" +msgid "Skip User Creation" +msgstr "&Skip Migration" + +#: src/lib/users/dialogs/inst_user_first.rb:192 +msgid "" +"<p>\n" +"Sometimes root is the only needed local user, like in network environments\n" +"with an authentication server. Select this option to proceed without creating\n" +"a local user.\n" +"</p>\n" +msgstr "" + +#: src/lib/users/dialogs/inst_user_first.rb:274 +msgid "Local User" +msgstr "Local User" + +#. TRANSLATORS: Error popup +#: src/lib/users/dialogs/inst_user_first.rb:329 +msgid "" +"The new username cannot be blank.\n" +"If you don't want to create a user now, select\n" +"'Skip User Creation'." +msgstr "" + +#. TRANSLATORS: error popup +#: src/lib/users/dialogs/inst_user_first.rb:386 +msgid "" +"No users from the previous installation were choosen.\n" +"If you don't want to create a user now, select\n" +"'Skip User Creation'." +msgstr "" + +#. TRANSLATORS: radio button +#: src/lib/users/dialogs/inst_user_first.rb:513 +#, fuzzy +#| msgid "Create New User" +msgid "&Create New User" +msgstr "Create New User" + +#. TRANSLATORS: radio button +#: src/lib/users/dialogs/inst_user_first.rb:536 +#, 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:546 +#, fuzzy +#| msgid "System Users" +msgid "Choose Users" +msgstr "System Users" + +#. TRANSLATORS: radio button +#: src/lib/users/dialogs/inst_user_first.rb:562 +#, fuzzy +#| msgid "&Skip Migration" +msgid "&Skip User Creation" +msgstr "&Skip Migration" + +#. checkbox label +#: src/lib/users/dialogs/inst_user_first.rb:618 +msgid "&Automatic Login" +msgstr "&Automatic Login" + +#: src/lib/users/dialogs/inst_user_first.rb:625 +#, fuzzy +#| msgid "No server is selected." +msgid "No users selected" +msgstr "No server is selected." + +#: src/lib/users/dialogs/inst_user_first.rb:627 +#, fuzzy +msgid "%d user will be imported" +msgid_plural "%d users will be imported" +msgstr[0] "Service %1 will be restarted" +msgstr[1] "Service %1 will be restarted" + +#. selection box label +#: src/lib/users/dialogs/users_to_import.rb:58 +msgid "&Select Users to Read" +msgstr "&Select Users to Read" + +#. check box label +#: src/lib/users/dialogs/users_to_import.rb:66 +msgid "Select or Deselect &All" +msgstr "Select or Deselect &All" + +#. TRANSLATORS: encryption type +#: src/lib/users/encryption_method.rb:55 +msgid "SHA-256" +msgstr "" + +#. TRANSLATORS: encryption type +#: src/lib/users/encryption_method.rb:57 +msgid "SHA-512" +msgstr "" + +#. TRANSLATORS: summary line. Second %s is the name of the method +#: src/lib/users/encryption_proposal.rb:35 +#, fuzzy +msgid "Encryption Method: <a href=%s>%s</a>" +msgstr "P&assword Encryption Method" + +#. TRANSLATORS: menu button label +#. menu button label +#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82 +#, fuzzy +#| msgid "Password Encryption Type" +msgid "Password &Encryption Type" +msgstr "Password Encryption Type" + +#. rich text label +#: src/lib/users/proposal.rb:75 +msgid "User Settings" +msgstr "User Settings" + +#. menu button label +#: src/lib/users/proposal.rb:78 +msgid "&User" +msgstr "&User" + +#. menu button label +#: src/lib/users/proposal.rb:80 +msgid "&Root Password" +msgstr "&Root Password" + +#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched +#: src/lib/users/proposal.rb:92 +msgid "<%1>Root Password<%2> set" +msgstr "<%1>Root Password<%2> set" + +#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched +#: src/lib/users/proposal.rb:95 +msgid "<%1>Root Password<%2> not set" +msgstr "<%1>Root Password<%2> not set" + +#. summary label <%1>-<%2> are HTML tags, leave untouched +#: src/lib/users/proposal.rb:104 +msgid "No <%1>user<%2> configured" +msgstr "No <%1>user<%2> configured" + +#. TRANSLATORS: summary line, %d is the number of users +#: src/lib/users/proposal.rb:110 +#, fuzzy +msgid "<a href=%s>%d user</a> will be imported" +msgid_plural "<a href=%s>%d users</a> will be imported" +msgstr[0] "<%1>User<%2> %3 configured" +msgstr[1] "<%1>User<%2> %3 configured" + +#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched, +#. %3 is login name +#: src/lib/users/proposal.rb:118 +msgid "<%1>User<%2> %3 configured" +msgstr "<%1>User<%2> %3 configured" + +#. summary line: <%1>-<%2> are HTML tags, leave untouched, +#. %3 is full name, %4 login name +#: src/lib/users/proposal.rb:127 +#, fuzzy +msgid "<%1>User<%2> %3 (%4) configured" +msgstr "<%1>User<%2> %3 configured" + +#. TRANSLATORS: summary line. Second %s is the name of the method +#: src/lib/users/proposal.rb:141 +#, fuzzy +msgid "Password Encryption Method: <a href=%s>%s</a>" +msgstr "P&assword Encryption Method" + #. User name for user: "root" #: src/modules/UsersUI.rb:44 msgid "root" @@ -4058,7 +3943,7 @@ #. Popup text: %1 is the file name (e.g. /etc/fstab), #. %2 is the directory (e.g. /home), -#: src/modules/Users.pm:740 +#: src/modules/Users.pm:716 msgid "" "In %1, there is a mount point for the directory\n" "%2, which is used as a default home directory for new\n" @@ -4077,202 +3962,202 @@ "after you mount correctly. Continue user configuration?" #. error message -#: src/modules/Users.pm:988 +#: src/modules/Users.pm:964 msgid "Multiple users satisfy the input conditions." msgstr "Multiple users satisfy the input conditions." #. progress caption -#: src/modules/Users.pm:1566 +#: src/modules/Users.pm:1542 msgid "Initializing User and Group Configuration" msgstr "Initialising User and Group Configuration" #. progress stage label -#: src/modules/Users.pm:1573 +#: src/modules/Users.pm:1549 msgid "Read the default login settings" msgstr "Read the default login settings" #. progress stage label -#: src/modules/Users.pm:1575 +#: src/modules/Users.pm:1551 msgid "Read the default system settings" msgstr "Read the default system settings" #. progress stage label -#: src/modules/Users.pm:1577 +#: src/modules/Users.pm:1553 msgid "Read the configuration type" msgstr "Read the configuration type" #. progress stage label -#: src/modules/Users.pm:1579 +#: src/modules/Users.pm:1555 msgid "Read the user custom settings" msgstr "Read the user custom settings" #. progress stage label -#: src/modules/Users.pm:1581 +#: src/modules/Users.pm:1557 msgid "Read users and groups" msgstr "Read users and groups" #. progress stage label -#: src/modules/Users.pm:1583 +#: src/modules/Users.pm:1559 msgid "Build the cache structures" msgstr "Build the cache structures" #. progress step label -#: src/modules/Users.pm:1587 +#: src/modules/Users.pm:1563 msgid "Reading the default login settings..." msgstr "Reading the default login settings..." #. progress step label -#: src/modules/Users.pm:1589 +#: src/modules/Users.pm:1565 msgid "Reading the default system settings..." msgstr "Reading the default system settings..." #. progress step label -#: src/modules/Users.pm:1591 +#: src/modules/Users.pm:1567 msgid "Reading the configuration type..." msgstr "Reading the configuration type..." #. progress step label -#: src/modules/Users.pm:1593 +#: src/modules/Users.pm:1569 msgid "Reading custom settings..." msgstr "Reading custom settings..." #. progress step label -#: src/modules/Users.pm:1595 +#: src/modules/Users.pm:1571 msgid "Reading users and groups..." msgstr "Reading users and groups..." #. progress step label -#: src/modules/Users.pm:1597 +#: src/modules/Users.pm:1573 msgid "Building the cache structures..." msgstr "Building the cache structures..." #. final progress step label -#: src/modules/Users.pm:1599 src/modules/Users.pm:4314 +#: src/modules/Users.pm:1575 src/modules/Users.pm:4290 msgid "Finished" msgstr "Finished" #. error message -#: src/modules/Users.pm:2155 +#: src/modules/Users.pm:2131 msgid "User does not exist." msgstr "User does not exist." #. error message -#: src/modules/Users.pm:2407 +#: src/modules/Users.pm:2383 msgid "Group does not exist." msgstr "Group does not exist." #. progress caption -#: src/modules/Users.pm:4276 +#: src/modules/Users.pm:4252 msgid "Writing User and Group Configuration" msgstr "Writing User and Group Configuration" #. progress stage label -#: src/modules/Users.pm:4285 +#: src/modules/Users.pm:4261 msgid "Write LDAP users and groups" msgstr "Write LDAP users and groups" #. progress stage label -#: src/modules/Users.pm:4287 +#: src/modules/Users.pm:4263 msgid "Write groups" msgstr "Write groups" #. progress stage label -#: src/modules/Users.pm:4289 +#: src/modules/Users.pm:4265 msgid "Check for deleted users" msgstr "Check for deleted users" #. progress stage label -#: src/modules/Users.pm:4291 +#: src/modules/Users.pm:4267 msgid "Write users" msgstr "Write users" #. progress stage label -#: src/modules/Users.pm:4293 +#: src/modules/Users.pm:4269 msgid "Write passwords" msgstr "Write passwords" #. progress stage label -#: src/modules/Users.pm:4295 +#: src/modules/Users.pm:4271 msgid "Write the custom settings" msgstr "Write the custom settings" #. progress stage label -#: src/modules/Users.pm:4297 +#: src/modules/Users.pm:4273 msgid "Write the default login settings" msgstr "Write the default login settings" #. progress step label -#: src/modules/Users.pm:4300 +#: src/modules/Users.pm:4276 msgid "Writing LDAP users and groups..." msgstr "Writing LDAP users and groups..." #. progress step label -#: src/modules/Users.pm:4302 +#: src/modules/Users.pm:4278 msgid "Writing groups..." msgstr "Writing groups..." #. progress step label -#: src/modules/Users.pm:4304 +#: src/modules/Users.pm:4280 msgid "Checking deleted users..." msgstr "Checking deleted users..." #. progress step label -#: src/modules/Users.pm:4306 +#: src/modules/Users.pm:4282 msgid "Writing users..." msgstr "Writing users..." #. progress step label -#: src/modules/Users.pm:4308 +#: src/modules/Users.pm:4284 msgid "Writing passwords..." msgstr "Writing passwords..." #. progress step label -#: src/modules/Users.pm:4310 +#: src/modules/Users.pm:4286 msgid "Writing the custom settings..." msgstr "Writing the custom settings..." #. progress step label -#: src/modules/Users.pm:4312 +#: src/modules/Users.pm:4288 msgid "Writing the default login settings..." msgstr "Writing the default login settings..." #. error popup (%s is a file name) -#: src/modules/Users.pm:4397 +#: src/modules/Users.pm:4373 #, perl-format msgid "File %s was not read correctly, so it will not be written." msgstr "File %s was not read correctly, so it will not be written." #. error popup -#: src/modules/Users.pm:4433 src/modules/Users.pm:4468 -#: src/modules/Users.pm:4744 +#: src/modules/Users.pm:4409 src/modules/Users.pm:4444 +#: src/modules/Users.pm:4720 msgid "An error occurred while removing users." msgstr "An error occurred while removing users." #. error popup (%s is a file name) -#: src/modules/Users.pm:4446 src/modules/Users.pm:4594 +#: src/modules/Users.pm:4422 src/modules/Users.pm:4570 #, perl-format msgid "File %s was not correctly read, so it will not be written." msgstr "File %s was not correctly read, so it will not be written." #. error message -#: src/modules/Users.pm:4583 +#: src/modules/Users.pm:4559 msgid "" "\n" "Encryption support is not installed, home directories will NOT be encrypted." msgstr "" #. error popup -#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101 +#: src/modules/Users.pm:4761 src/modules/YaPI/ADMINISTRATOR.pm:101 msgid "An error occurred while setting forwarding for root's mail." msgstr "An error occurred while setting forwarding for root's mail." #. error popup -#: src/modules/Users.pm:4861 +#: src/modules/Users.pm:4837 msgid "No UID is available for this type of user." msgstr "No UID is available for this type of user." #. error popup -#: src/modules/Users.pm:4892 +#: src/modules/Users.pm:4868 #, perl-format msgid "" "The selected user ID is not allowed.\n" @@ -4282,7 +4167,7 @@ "Select a valid integer between %i and %i." #. popup question -#: src/modules/Users.pm:4923 +#: src/modules/Users.pm:4899 msgid "" "The user ID entered is already in use.\n" "Really use it?" @@ -4291,7 +4176,7 @@ "Really use it?" #. popup question, %i are numbers -#: src/modules/Users.pm:4936 +#: src/modules/Users.pm:4912 #, perl-format msgid "" "The selected user ID is not from a range\n" @@ -4303,7 +4188,7 @@ "Really use it?" #. popup question -#: src/modules/Users.pm:4951 +#: src/modules/Users.pm:4927 #, perl-format msgid "" "The selected user ID is a local ID,\n" @@ -4315,7 +4200,7 @@ "Really change the user type to 'local'?" #. popup question -#: src/modules/Users.pm:4965 +#: src/modules/Users.pm:4941 #, perl-format msgid "" "The selected user ID is a system ID,\n" @@ -4326,7 +4211,7 @@ "because the ID is smaller than %i.\n" "Really change the user type to 'system'?" -#: src/modules/Users.pm:4999 +#: src/modules/Users.pm:4975 #, fuzzy #| msgid "" #| "\n" @@ -4339,7 +4224,7 @@ "The existing username might belong to NIS or LDAP user." #. error popup, %1 might be additional sentence ("The existing username...") -#: src/modules/Users.pm:5003 +#: src/modules/Users.pm:4979 msgid "" "There is a conflict between the entered\n" "username and an existing username. %1\n" @@ -4350,7 +4235,7 @@ "Try another one." #. error popup -#: src/modules/Users.pm:5033 +#: src/modules/Users.pm:5009 msgid "" "The \"Additional User Information\" entry cannot\n" "contain a colon (:). Try again." @@ -4359,7 +4244,7 @@ "contain a colon (:). Try again." #. error popup -#: src/modules/Users.pm:5040 +#: src/modules/Users.pm:5016 msgid "" "The \"Additional User Information\" entry can consist\n" "of up to three sections separated by commas.\n" @@ -4370,7 +4255,7 @@ "Remove the surplus." #. error popup -#: src/modules/Users.pm:5103 +#: src/modules/Users.pm:5079 msgid "" "The home directory may only contain the following characters:\n" "a-z, A-Z, 0-9, and _-/\n" @@ -4381,7 +4266,7 @@ "Try again." #. error popup -#: src/modules/Users.pm:5126 +#: src/modules/Users.pm:5102 #, perl-format msgid "" "The directory %s is not writable.\n" @@ -4391,7 +4276,7 @@ "Choose another path for the home directory." #. error message -#: src/modules/Users.pm:5137 +#: src/modules/Users.pm:5113 msgid "" "The home directory is used by another user.\n" "Try again." @@ -4400,7 +4285,7 @@ "Try again." #. yes/no popup: user seleceted something strange as a home directory -#: src/modules/Users.pm:5179 +#: src/modules/Users.pm:5155 msgid "" "The path for the selected home directory already exists,\n" "but it is not a directory.\n" @@ -4411,7 +4296,7 @@ "Really use this path?" #. yes/no popup -#: src/modules/Users.pm:5190 +#: src/modules/Users.pm:5166 msgid "" "The home directory selected already exists.\n" "Use it and change its owner?" @@ -4421,7 +4306,7 @@ #. chown is not needed (#25200) #. yes/no popup -#: src/modules/Users.pm:5197 +#: src/modules/Users.pm:5173 #, fuzzy, perl-format msgid "" "The selected home directory (%s)\n" @@ -4433,7 +4318,7 @@ "Use this directory?" #. yes/no popup -#: src/modules/Users.pm:5206 +#: src/modules/Users.pm:5182 #, perl-format msgid "" "The home directory selected (%s)\n" @@ -4447,7 +4332,7 @@ "Use this directory?" #. popup question -#: src/modules/Users.pm:5234 +#: src/modules/Users.pm:5210 msgid "" "If you select a nonexistent shell, the user may be unable to log in.\n" "Use this shell?" @@ -4456,12 +4341,12 @@ "Use this shell?" #. error popup -#: src/modules/Users.pm:5254 +#: src/modules/Users.pm:5230 msgid "No GID is available for this type of group." msgstr "No GID is available for this type of group." #. error popup -#: src/modules/Users.pm:5287 +#: src/modules/Users.pm:5263 #, perl-format msgid "" "The selected group ID is not allowed.\n" @@ -4471,7 +4356,7 @@ "Select a valid integer between %i and %i." #. popup question -#: src/modules/Users.pm:5317 +#: src/modules/Users.pm:5293 msgid "" "The group ID entered is already in use.\n" "Really use it?" @@ -4480,7 +4365,7 @@ "Really use it?" #. popup question, %i are numbers -#: src/modules/Users.pm:5329 +#: src/modules/Users.pm:5305 #, perl-format msgid "" "The selected group ID is not from a range\n" @@ -4492,7 +4377,7 @@ "Really use it?" #. popup question -#: src/modules/Users.pm:5344 +#: src/modules/Users.pm:5320 #, perl-format msgid "" "The selected group ID is a local ID,\n" @@ -4504,7 +4389,7 @@ "Really change the group type to 'local'?" #. popup question -#: src/modules/Users.pm:5358 +#: src/modules/Users.pm:5334 #, perl-format msgid "" "The selected group ID is a system ID,\n" @@ -4516,7 +4401,7 @@ "Really change the group type to 'system'?" #. error popup -#: src/modules/Users.pm:5377 +#: src/modules/Users.pm:5353 msgid "" "No group name entered.\n" "Try again." @@ -4525,7 +4410,7 @@ "Try again." #. error popup -#: src/modules/Users.pm:5394 +#: src/modules/Users.pm:5370 #, perl-format msgid "" "The group name must be between %i and %i characters in length.\n" @@ -4535,7 +4420,7 @@ "Try again." #. error popup -#: src/modules/Users.pm:5407 +#: src/modules/Users.pm:5383 msgid "" "The group name may contain only\n" "letters, digits, \"-\", \".\", and \"_\"\n" @@ -4548,7 +4433,7 @@ "Try again." #. error popup -#: src/modules/Users.pm:5415 +#: src/modules/Users.pm:5391 msgid "" "There is a conflict between the entered\n" "group name and an existing group name.\n" @@ -4558,14 +4443,14 @@ "group name and an existing group name.\n" "Try another one." -#: src/modules/Users.pm:5531 +#: src/modules/Users.pm:5507 #, fuzzy, perl-format #| msgid "User does not exist." msgid "User %s does not exist." msgstr "User does not exist." #. error message: group cannot be deleted -#: src/modules/Users.pm:5585 +#: src/modules/Users.pm:5561 msgid "" "You cannot delete this group because\n" "there are users that use this group\n" @@ -4576,7 +4461,7 @@ "as their default group." #. error message: group cannot be deleted -#: src/modules/Users.pm:5592 +#: src/modules/Users.pm:5568 msgid "" "You cannot delete this group because\n" "there are users in the group.\n" @@ -4587,23 +4472,23 @@ "Remove these users from the group first." #. summary label -#: src/modules/Users.pm:6603 +#: src/modules/Users.pm:6581 msgid "<h3>Users</h3>" msgstr "<h3>Users</h3>" #. summary label -#: src/modules/Users.pm:6613 +#: src/modules/Users.pm:6591 msgid "<h3>Groups</h3>" msgstr "<h3>Groups</h3>" #. summary label -#: src/modules/Users.pm:6624 +#: src/modules/Users.pm:6602 #, fuzzy msgid "<h3>Login Settings</h3>" msgstr "Login Settings" #. summary item, %1 is user name -#: src/modules/Users.pm:6626 +#: src/modules/Users.pm:6604 msgid "User %1 configured for automatic login" msgstr "" @@ -4623,23 +4508,23 @@ "exists on the LDAP server. Create it now?" #. plugin name -#: src/modules/UsersPluginKerberos.pm:122 +#: src/modules/UsersPluginKerberos.pm:124 #, fuzzy #| msgid "Quota Configuration" msgid "Kerberos Configuration" msgstr "Quota Configuration" #. user plugin summary (table item) -#: src/modules/UsersPluginKerberos.pm:133 +#: src/modules/UsersPluginKerberos.pm:135 msgid "No Kerberos Management for Groups" msgstr "" #. user plugin summary (table item) -#: src/modules/UsersPluginKerberos.pm:136 +#: src/modules/UsersPluginKerberos.pm:138 msgid "Manage Kerberos Principials" msgstr "" -#: src/modules/UsersPluginKerberos.pm:260 +#: src/modules/UsersPluginKerberos.pm:262 msgid "Cannot execute kadmin.local." msgstr "" @@ -4771,7 +4656,7 @@ #. the ']' is or-ed... #. error popup -#: src/modules/UsersSimple.pm:505 +#: src/modules/UsersSimple.pm:379 msgid "" "The password may only contain the following characters:\n" "0-9, a-z, A-Z, and any of \"`~!@#$%^&* ,.;:._-+/|?='{[(<>)]}\\\".\n" @@ -4782,7 +4667,7 @@ "Try again." #. help text (default part shown in more places) -#: src/modules/UsersSimple.pm:540 +#: src/modules/UsersSimple.pm:414 msgid "" "<p>\n" "For the password, use only characters that can be found on an English keyboard\n" @@ -4797,7 +4682,7 @@ "</p>" #. error popup -#: src/modules/UsersSimple.pm:620 +#: src/modules/UsersSimple.pm:494 msgid "" "The user's full name cannot contain\n" "\":\" or \",\" characters.\n" @@ -4808,7 +4693,7 @@ "Try again." #. popup question -#: src/modules/UsersSimple.pm:647 +#: src/modules/UsersSimple.pm:521 #, fuzzy #| msgid "" #| "You have used the user name as a part of the password.\n" @@ -4819,7 +4704,7 @@ "This is not good security practice. Are you sure?" #. popup question -#: src/modules/UsersSimple.pm:650 +#: src/modules/UsersSimple.pm:524 #, fuzzy #| msgid "" #| "You have used the user name as a part of the password.\n" @@ -4830,7 +4715,7 @@ "This is not good security practice. Are you sure?" #. popup question -#: src/modules/UsersSimple.pm:659 +#: src/modules/UsersSimple.pm:533 #, fuzzy #| msgid "" #| "You have used only lowercase letters for the password.\n" @@ -4841,7 +4726,7 @@ "This is not good security practice. Are you sure?" #. popup question -#: src/modules/UsersSimple.pm:667 +#: src/modules/UsersSimple.pm:541 #, fuzzy #| msgid "" #| "<p>\n" @@ -4852,7 +4737,7 @@ "You have used uppercase letters in the user login entry.</p>" #. popup question -#: src/modules/UsersSimple.pm:674 +#: src/modules/UsersSimple.pm:548 #, fuzzy #| msgid "" #| "<p>\n" @@ -4863,7 +4748,7 @@ "You have changed the default encryption for user passwords.</p>" #. popup question -#: src/modules/UsersSimple.pm:682 +#: src/modules/UsersSimple.pm:556 #, fuzzy #| msgid "" #| "You have used only digits for the password.\n" @@ -4874,7 +4759,7 @@ "This is not good security practice. Are you sure?" #. popup question -#: src/modules/UsersSimple.pm:704 +#: src/modules/UsersSimple.pm:578 #, fuzzy, perl-format #| msgid "" #| "The password is too long for the current encryption method.\n" @@ -4887,7 +4772,7 @@ "Truncate it to %s characters?" #. error message -#: src/modules/UsersSimple.pm:791 +#: src/modules/UsersSimple.pm:665 #, fuzzy, perl-format #| msgid "" #| "Password is too simple:\n" @@ -4902,7 +4787,7 @@ "Really use it?" #. popup error, %i is number -#: src/modules/UsersSimple.pm:805 +#: src/modules/UsersSimple.pm:679 #, fuzzy, perl-format #| msgid "" #| "The password should have at least %i characters.\n" @@ -4913,7 +4798,7 @@ "Really use it?" #. error popup -#: src/modules/UsersSimple.pm:826 +#: src/modules/UsersSimple.pm:700 msgid "" "No username entered.\n" "Try again." @@ -4922,7 +4807,7 @@ "Try again." #. error popup -#: src/modules/UsersSimple.pm:836 +#: src/modules/UsersSimple.pm:710 #, perl-format msgid "" "The username must be between %i and %i characters in length.\n" @@ -4932,7 +4817,7 @@ "Try again." #. error popup -#: src/modules/UsersSimple.pm:865 +#: src/modules/UsersSimple.pm:739 msgid "" "The username may contain only\n" "letters, digits, \"-\", \".\", and \"_\"\n" @@ -4945,7 +4830,7 @@ "Try again." #. error popup -#: src/modules/UsersSimple.pm:886 +#: src/modules/UsersSimple.pm:760 msgid "" "There is a conflict between the entered\n" "username and an existing username.\n" @@ -4955,16 +4840,14 @@ "username and an existing username.\n" "Try another one." -#. busy popup message, %1 is package name #. busy popup message -#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294 +#: src/modules/UsersSimple.pm:982 #, fuzzy msgid "Retrieving %1 extension..." msgstr "Closing connection..." -#. busy popup message, %1 is package name #. busy popup message -#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308 +#: src/modules/UsersSimple.pm:996 #, fuzzy msgid "Releasing %1 extension..." msgstr "Closing connection..." @@ -5032,7 +4915,156 @@ msgid "There are multiple users satisfying the input conditions." msgstr "There are multiple users satisfying the input conditions." +#~ msgid "User Authentication Method" +#~ msgstr "User Authentication Method" + +#~ msgid "" +#~ "<p>\n" +#~ "<b>Authentication</b><br>\n" +#~ "Select the authentication method to use for users on your system.\n" +#~ "</p>" +#~ msgstr "" +#~ "<p>\n" +#~ "<b>Authentication</b><br>\n" +#~ "Select the authentication method to use for users on your system.\n" +#~ "</p>" + +#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation." +#~ msgstr "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation." + +#~ msgid "&LDAP" +#~ msgstr "&LDAP" + +#~ msgid "N&IS" +#~ msgstr "N&IS" + +#~ msgid "&Windows Domain" +#~ msgstr "&Windows Domain" + +#~ msgid "L&ocal (/etc/passwd)" +#~ msgstr "L&ocal (/etc/passwd)" + +#~ msgid "eDirectory LDAP" +#~ msgstr "eDirectory LDAP" + +#~ msgid "" +#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n" +#~ "to authenticate users against an NT server, choose the appropriate value. Then\n" +#~ "press <b>Next</b> to continue with configuration of your client.</p>" +#~ msgstr "" +#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n" +#~ "to authenticate users against an NT server, choose the appropriate value. Then\n" +#~ "press <b>Next</b> to continue with configuration of your client.</p>" + +#~ msgid "" +#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n" +#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" +#~ msgstr "" +#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n" +#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" + +#~ msgid "" +#~ "<p>If you are using an LDAP server to store user data or if you want to\n" +#~ "authenticate users against an NT server, choose the appropriate value. Then\n" +#~ "press <b>Next</b> to continue with configuration of your client.</p>" +#~ msgstr "" +#~ "<p>If you are using an LDAP server to store user data or if you want to\n" +#~ "authenticate users against an NT server, choose the appropriate value. Then\n" +#~ "press <b>Next</b> to continue with configuration of your client.</p>" + +#~ msgid "" +#~ "<p>If you are using an LDAP server to store user data, choose the\n" +#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" +#~ msgstr "" +#~ "<p>If you are using an LDAP server to store user data, choose the\n" +#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>" + +#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>" +#~ msgstr "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>" + +#~ msgid "&Choose" +#~ msgstr "&Choose" + +#~ msgid "Authentication Method" +#~ msgstr "Authentication Method" + +#~ msgid "Set Up &Kerberos Authentication" +#~ msgstr "Set Up &Kerberos Authentication" + +#~ msgid "E&xpert Options..." +#~ msgstr "E&xpert Options..." + +#~ msgid "" +#~ "<p>If you intend to use this password for creating certificates,\n" +#~ "it has to be at least %1 characters long.</p>" +#~ msgstr "" +#~ "<p>If you intend to use this password for creating certificates,\n" +#~ "it has to be at least %1 characters long.</p>" + +#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>" +#~ msgstr "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>" + #, fuzzy +#~| msgid "" +#~| "If you intend to create certificates,\n" +#~| "the password should have at least %1 characters.\n" +#~| "Really use this shorter password?" +#~ msgid "" +#~ "If you intend to create certificates,\n" +#~ "the password should have at least %1 characters." +#~ msgstr "" +#~ "If you intend to create certificates,\n" +#~ "the password should have at least %1 characters.\n" +#~ "Really use this shorter password?" + +#~ msgid "" +#~ "The root password could not be set.\n" +#~ "You might not be able to log in.\n" +#~ "Try setting it again?\n" +#~ msgstr "" +#~ "The root password could not be set.\n" +#~ "You might not be able to log in.\n" +#~ "Try setting it again?\n" + +#~ msgid "Initialization of module for configuration of authentication..." +#~ msgstr "Initialisation of module for configuration of authentication..." + +#, fuzzy +#~| msgid "<p><b>Login Settings</b></p>" +#~ msgid "<p><b>Authentication</b><br></p>" +#~ msgstr "<p><b>Login Settings</b></p>" + +#~ msgid "Expert Settings" +#~ msgstr "Expert Settings" + +#~ msgid "The authentication method is local /etc/passwd." +#~ msgstr "The authentication method is local /etc/passwd." + +#, fuzzy +#~| msgid "The password encryption method is %1." +#~ msgid "The password encryption method is %s." +#~ msgstr "The password encryption method is %1." + +#~ msgid "&Change..." +#~ msgstr "&Change..." + +#~ msgid "Summary" +#~ msgstr "Summary" + +#~ msgid "Samba (Windows Domain)" +#~ msgstr "Samba (Windows Domain)" + +#~ msgid "<%1>Authentication method<%2>: %3" +#~ msgstr "<%1>Authentication method<%2>: %3" + +#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos." +#~ msgstr "<%1>Authentication method<%2>: %3 and Kerberos." + +#, fuzzy +#~ msgid "<%1>Users<%2> %3 selected for import" +#~ msgstr "<%1>User<%2> %3 configured" + +#, fuzzy #~| msgid "No Password" #~ msgid "No Password Entered" #~ msgstr "No Password" 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/vm.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: vm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2008-03-27 22:27+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -34,12 +34,12 @@ msgstr "Configuring the virtual machine..." #. check for kernel-bigsmp -#: src/modules/VirtConfig.rb:158 +#: src/modules/VirtConfig.rb:157 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is " msgstr "" #. we are already in UML, nested virtual machine is not supported -#: src/modules/VirtConfig.rb:177 +#: src/modules/VirtConfig.rb:176 msgid "" "Virtual machine installation cannot be started inside the UML machine.\n" "Start installation in the host system.\n" @@ -49,176 +49,176 @@ #. progress stage 1/2 #. Generate a pop dialog to allow user selection of Xen or KVM -#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282 +#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281 msgid "Verify Installed Packages" msgstr "Verify Installed Packages" #. progress stage 2/2 -#: src/modules/VirtConfig.rb:196 +#: src/modules/VirtConfig.rb:195 #, fuzzy msgid "Network Bridge Configuration" msgstr "Network Card Configuration" #. Headline for management domain installation -#: src/modules/VirtConfig.rb:211 +#: src/modules/VirtConfig.rb:210 msgid "Configuring the VM Server (domain 0)" msgstr "Configuring the VM Server (domain 0)" #. xen domain0 installation help text - 1/4 -#: src/modules/VirtConfig.rb:214 +#: src/modules/VirtConfig.rb:213 msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>" msgstr "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>" #. xen domain0 installation help text - 2/4 -#: src/modules/VirtConfig.rb:218 +#: src/modules/VirtConfig.rb:217 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>" msgstr "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>" #. xen domain0 installation help text - 3/4 -#: src/modules/VirtConfig.rb:222 +#: src/modules/VirtConfig.rb:221 #, fuzzy #| msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>" msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>" msgstr "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>" #. xen domain0 installation help text - 4/4 -#: src/modules/VirtConfig.rb:226 +#: src/modules/VirtConfig.rb:225 #, fuzzy #| msgid "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>" msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>" msgstr "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>" #. error popup -#: src/modules/VirtConfig.rb:231 +#: src/modules/VirtConfig.rb:230 msgid "The installation will be aborted." msgstr "The installation will be aborted." -#: src/modules/VirtConfig.rb:234 +#: src/modules/VirtConfig.rb:233 #, fuzzy #| msgid "Hypervisor and tools are installed." msgid "Choose Hypervisor(s) to install" msgstr "Hypervisor and tools are installed." -#: src/modules/VirtConfig.rb:237 +#: src/modules/VirtConfig.rb:236 msgid "Server: Minimal system to get a running Hypervisor" msgstr "" -#: src/modules/VirtConfig.rb:238 +#: src/modules/VirtConfig.rb:237 #, fuzzy #| msgid "Configuring the virtual machine..." msgid "Tools: Configure, manage and monitor virtual machines" msgstr "Configuring the virtual machine..." -#: src/modules/VirtConfig.rb:251 +#: src/modules/VirtConfig.rb:250 msgid "KVM Hypervisor" msgstr "" -#: src/modules/VirtConfig.rb:253 +#: src/modules/VirtConfig.rb:252 msgid "KVM server" msgstr "" -#: src/modules/VirtConfig.rb:254 +#: src/modules/VirtConfig.rb:253 #, fuzzy #| msgid "Admin tools" msgid "KVM tools" msgstr "Admin tools" -#: src/modules/VirtConfig.rb:259 +#: src/modules/VirtConfig.rb:258 msgid "libvirt LXC containers" msgstr "" -#: src/modules/VirtConfig.rb:261 +#: src/modules/VirtConfig.rb:260 msgid "libvirt LXC daemon" msgstr "" -#: src/modules/VirtConfig.rb:289 +#: src/modules/VirtConfig.rb:288 msgid "Software to connect to Virtualization server" msgstr "" -#: src/modules/VirtConfig.rb:291 +#: src/modules/VirtConfig.rb:290 #, fuzzy #| msgid "Hypervisor and tools are installed." msgid "Virtualization client tools" msgstr "Hypervisor and tools are installed." -#: src/modules/VirtConfig.rb:307 +#: src/modules/VirtConfig.rb:306 msgid "Xen Hypervisor" msgstr "" -#: src/modules/VirtConfig.rb:309 +#: src/modules/VirtConfig.rb:308 #, fuzzy #| msgid "Broken server" msgid "Xen server" msgstr "Broken server" -#: src/modules/VirtConfig.rb:310 +#: src/modules/VirtConfig.rb:309 #, fuzzy #| msgid "Admin tools" msgid "Xen tools" msgstr "Admin tools" #. SLED doesn't have any installation capabilities (L3 support) -#: src/modules/VirtConfig.rb:388 +#: src/modules/VirtConfig.rb:387 #, fuzzy #| msgid "The installation will be aborted." msgid "Package installation failed\n" msgstr "The installation will be aborted." -#: src/modules/VirtConfig.rb:396 +#: src/modules/VirtConfig.rb:395 #, fuzzy #| msgid "The installation will be aborted." msgid "Package installation failed for lxc\n" msgstr "The installation will be aborted." -#: src/modules/VirtConfig.rb:403 +#: src/modules/VirtConfig.rb:402 msgid "Package installation failed for sled client pattern\n" msgstr "" -#: src/modules/VirtConfig.rb:413 +#: src/modules/VirtConfig.rb:412 msgid "Package installation failed for sles patterns\n" msgstr "" #. Assume python gtk is installed. If in text mode we don't care -#: src/modules/VirtConfig.rb:426 +#: src/modules/VirtConfig.rb:425 msgid "Running in text mode. Install graphical components anyway?" msgstr "Running in text mode. Install graphical components anyway?" #. progressbar title - check whether Xen packages are installed -#: src/modules/VirtConfig.rb:439 +#: src/modules/VirtConfig.rb:438 msgid "Checking packages..." msgstr "Checking packages..." #. progressbar title - install the required packages -#: src/modules/VirtConfig.rb:442 +#: src/modules/VirtConfig.rb:441 msgid "Installing packages..." msgstr "Installing packages..." #. error popup #. Now see if they really were installed (bnc#508347) -#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454 +#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453 msgid "Cannot install required packages." msgstr "Cannot install required packages." #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files -#: src/modules/VirtConfig.rb:464 +#: src/modules/VirtConfig.rb:463 #, fuzzy #| msgid "Updating configuration files..." msgid "Updating grub2 configuration files..." msgstr "Updating configuration files..." #. Default Bridge stage -#: src/modules/VirtConfig.rb:484 +#: src/modules/VirtConfig.rb:477 #, fuzzy msgid "Configuring Default Network Bridge..." msgstr "Configuring general settings..." #. Popup yes/no dialog -#: src/modules/VirtConfig.rb:505 +#: src/modules/VirtConfig.rb:498 #, fuzzy msgid "Network Bridge." msgstr "Ethernet Network Card" -#: src/modules/VirtConfig.rb:506 +#: src/modules/VirtConfig.rb:499 msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>" msgstr "" @@ -231,11 +231,11 @@ #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg); #. return false; #. } -#: src/modules/VirtConfig.rb:567 +#: src/modules/VirtConfig.rb:568 msgid "KVM components are installed. Your host is ready to install KVM guests." msgstr "" -#: src/modules/VirtConfig.rb:570 +#: src/modules/VirtConfig.rb:571 #, fuzzy #| msgid "" #| "The machine is ready to start the VM Server.\n" @@ -247,7 +247,7 @@ "\n" "Reboot the machine and select the Xen section in the boot loader menu to start it.\n" -#: src/modules/VirtConfig.rb:573 +#: src/modules/VirtConfig.rb:574 #, fuzzy #| msgid "" #| "The machine is ready to start the VM Server.\n" @@ -259,19 +259,19 @@ "\n" "Reboot the machine and select the Xen section in the boot loader menu to start it.\n" -#: src/modules/VirtConfig.rb:576 +#: src/modules/VirtConfig.rb:577 #, fuzzy #| msgid "Hypervisor and tools are installed." msgid "Xen Hypervisor and tools are installed." msgstr "Hypervisor and tools are installed." -#: src/modules/VirtConfig.rb:577 +#: src/modules/VirtConfig.rb:578 #, fuzzy #| msgid "Hypervisor and tools are installed." msgid "Virtualization client tools are installed." msgstr "Hypervisor and tools are installed." -#: src/modules/VirtConfig.rb:578 +#: src/modules/VirtConfig.rb:579 #, fuzzy #| msgid "Hypervisor and tools are installed." msgid "Libvirt LXC components are installed." Modified: branches/plus-SLE12-SP2/yast/en_GB/po/vpn.en_GB.po =================================================================== --- branches/plus-SLE12-SP2/yast/en_GB/po/vpn.en_GB.po 2016-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/vpn.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-28 18:17+0200\n" +"POT-Creation-Date: 2016-05-06 16:59+0200\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -237,14 +237,14 @@ msgstr "" #. Create the user (:xauth or :eap). Return true if successful. -#: src/lib/vpn/ipsec.rb:439 +#: src/lib/vpn/ipsec.rb:442 #, fuzzy #| msgid "Specified queue name %1 is already used." msgid "The user name is already used." msgstr "Specified queue name %1 is already used." #. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false. -#: src/lib/vpn/ipsec.rb:503 +#: src/lib/vpn/ipsec.rb:506 msgid "Cannot find a matching client connection." msgstr "" @@ -343,120 +343,120 @@ msgstr "Would you like to change the CD and retry ?" #. Open dialog to edit VPN client passwords/certificates. -#: src/lib/vpn/main_dialog.rb:285 +#: src/lib/vpn/main_dialog.rb:289 msgid "Please enter gateway IP before editing credentials." msgstr "" #. Render a table of configured gateway and client connections. -#: src/lib/vpn/main_dialog.rb:361 +#: src/lib/vpn/main_dialog.rb:365 msgid "Name" msgstr "Name" -#: src/lib/vpn/main_dialog.rb:361 +#: src/lib/vpn/main_dialog.rb:365 msgid "Description" msgstr "Description" #. Render configuration controls for the chosen connection. -#: src/lib/vpn/main_dialog.rb:376 +#: src/lib/vpn/main_dialog.rb:380 msgid "Click 'New VPN' to create a gateway or client." msgstr "" #. Make widgets for connection configuration -#: src/lib/vpn/main_dialog.rb:386 +#: src/lib/vpn/main_dialog.rb:390 msgid "All IPv4 networks (0.0.0.0/0)" msgstr "" -#: src/lib/vpn/main_dialog.rb:387 +#: src/lib/vpn/main_dialog.rb:391 msgid "All IPv6 networks (::/0)" msgstr "" -#: src/lib/vpn/main_dialog.rb:389 +#: src/lib/vpn/main_dialog.rb:393 msgid "Limited CIDRs, comma separated:" msgstr "" -#: src/lib/vpn/main_dialog.rb:395 +#: src/lib/vpn/main_dialog.rb:399 #, fuzzy #| msgid "Connection Management" msgid "Connection name: " msgstr "Connection Management" -#: src/lib/vpn/main_dialog.rb:396 +#: src/lib/vpn/main_dialog.rb:400 msgid "Type" msgstr "Type" -#: src/lib/vpn/main_dialog.rb:398 +#: src/lib/vpn/main_dialog.rb:402 #, fuzzy #| msgid "Master Server" msgid "Gateway (Server)" msgstr "Master Server" -#: src/lib/vpn/main_dialog.rb:399 +#: src/lib/vpn/main_dialog.rb:403 #, fuzzy #| msgid "Clients" msgid "Client" msgstr "Clients" -#: src/lib/vpn/main_dialog.rb:406 +#: src/lib/vpn/main_dialog.rb:410 #, fuzzy #| msgid "The scanner" msgid "The scenario is" msgstr "The scanner" -#: src/lib/vpn/main_dialog.rb:408 +#: src/lib/vpn/main_dialog.rb:412 msgid "Secure communication with a pre-shared key" msgstr "" -#: src/lib/vpn/main_dialog.rb:409 +#: src/lib/vpn/main_dialog.rb:413 #, fuzzy #| msgid "You must select a certificate." msgid "Secure communication with a certificate" msgstr "You must select a certificate." -#: src/lib/vpn/main_dialog.rb:410 +#: src/lib/vpn/main_dialog.rb:414 msgid "Provide access to Android, iOS, MacOS X clients" msgstr "" -#: src/lib/vpn/main_dialog.rb:411 +#: src/lib/vpn/main_dialog.rb:415 msgid "Provide access to Windows 7, Windows 8 clients" msgstr "" -#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427 +#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431 #, fuzzy #| msgid "Proxy User Credentials" msgid "Edit Credentials" msgstr "Proxy User Credentials" -#: src/lib/vpn/main_dialog.rb:416 +#: src/lib/vpn/main_dialog.rb:420 msgid "Provide VPN clients access to" msgstr "" -#: src/lib/vpn/main_dialog.rb:417 +#: src/lib/vpn/main_dialog.rb:421 msgid "Clients' address pool (e.g. 192.168.100.0/24)" msgstr "" -#: src/lib/vpn/main_dialog.rb:421 +#: src/lib/vpn/main_dialog.rb:425 #, fuzzy #| msgid "Server Requires Authentication" msgid "The gateway requires authentication" msgstr "Server Requires Authentication" -#: src/lib/vpn/main_dialog.rb:423 +#: src/lib/vpn/main_dialog.rb:427 msgid "By a pre-shared key" msgstr "" -#: src/lib/vpn/main_dialog.rb:424 +#: src/lib/vpn/main_dialog.rb:428 #, fuzzy #| msgid "Read certificates" msgid "By a certificate" msgstr "Read certificates" -#: src/lib/vpn/main_dialog.rb:426 +#: src/lib/vpn/main_dialog.rb:430 #, fuzzy #| msgid "Default &Gateway IP" msgid "VPN gateway IP" msgstr "Default &Gateway IP" -#: src/lib/vpn/main_dialog.rb:430 +#: src/lib/vpn/main_dialog.rb:434 msgid "Use the VPN tunnel to access" msgstr "" @@ -573,40 +573,40 @@ msgstr "%s is not available in the LDAP directory." #. Install packages -#: src/modules/IPSecConf.rb:172 +#: src/modules/IPSecConf.rb:174 #, fuzzy #| msgid "Failed to install required packages." msgid "Failed to install IPSec packages." msgstr "Failed to install required packages." #. Enable/disable daemon -#: src/modules/IPSecConf.rb:180 +#: src/modules/IPSecConf.rb:182 #, fuzzy #| msgid "Restart NTP daemon" msgid "Failed to start IPSec daemon." msgstr "Restart NTP daemon" #. Configure IP forwarding -#: src/modules/IPSecConf.rb:210 +#: src/modules/IPSecConf.rb:212 #, fuzzy #| msgid "Write IP forwarding settings" msgid "Failed to apply IP forwarding settings using sysctl:" msgstr "Write IP forwarding settings" #. Configure/deconfigure firewall -#: src/modules/IPSecConf.rb:225 +#: src/modules/IPSecConf.rb:228 msgid "" "SuSE firewall is enabled but not activated.\n" "In order for VPN to function properly, SuSE firewall will now be activated." msgstr "" -#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234 +#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237 #, fuzzy #| msgid "Failed to create the new map." msgid "Failed to restart SuSE firewall." msgstr "Failed to create the new map." -#: src/modules/IPSecConf.rb:240 +#: src/modules/IPSecConf.rb:243 msgid "" "Both VPN gateway and clients require special SuSE firewall configuration.\n" "SuSE firewall is not enabled, therefore you must manually run the configuration script on every reboot. The script will be run now.\n" @@ -614,35 +614,35 @@ msgstr "" #. AutoYaST: Return a rich text summary of the current configuration. -#: src/modules/IPSecConf.rb:279 +#: src/modules/IPSecConf.rb:282 #, fuzzy #| msgid "Global Settings" msgid "VPN Global Settings" msgstr "Global Settings" -#: src/modules/IPSecConf.rb:280 +#: src/modules/IPSecConf.rb:283 #, fuzzy #| msgid "Enable VPN Services" msgid "Enable VPN (IPSec) daemon: %s" msgstr "Enable VPN Services" -#: src/modules/IPSecConf.rb:281 -msgid "Reduce TCP MSS to 1024: %s" +#: src/modules/IPSecConf.rb:284 +msgid "Reduce TCP MSS: %s" msgstr "" -#: src/modules/IPSecConf.rb:282 +#: src/modules/IPSecConf.rb:285 #, fuzzy #| msgid "Create Client Connection" msgid "Gateway and Connections" msgstr "Create Client Connection" #. Gateway summary -#: src/modules/IPSecConf.rb:288 +#: src/modules/IPSecConf.rb:291 msgid "A gateway serving clients in " msgstr "" #. Client summary -#: src/modules/IPSecConf.rb:292 +#: src/modules/IPSecConf.rb:295 #, fuzzy #| msgid "Accept client connections" msgid "A client connecting to " 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-07-04 09:36:34 UTC (rev 96067) +++ branches/plus-SLE12-SP2/yast/en_GB/po/yast2-apparmor.en_GB.po 2016-07-04 09:37:18 UTC (rev 96068) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: yast2-apparmor\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2016-05-06 16:57+0200\n" "PO-Revision-Date: 2008-03-27 22:23+0000\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n"