Author: keichwa
Date: 2016-08-17 15:06:31 +0200 (Wed, 17 Aug 2016)
New Revision: 96335
Modified:
branches/plus-SLE12-SP2/yast/vi/po/add-on-creator.vi.po
branches/plus-SLE12-SP2/yast/vi/po/add-on.vi.po
branches/plus-SLE12-SP2/yast/vi/po/audit-laf.vi.po
branches/plus-SLE12-SP2/yast/vi/po/auth-client.vi.po
branches/plus-SLE12-SP2/yast/vi/po/auth-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/autoinst.vi.po
branches/plus-SLE12-SP2/yast/vi/po/base.vi.po
branches/plus-SLE12-SP2/yast/vi/po/bootloader.vi.po
branches/plus-SLE12-SP2/yast/vi/po/ca-management.vi.po
branches/plus-SLE12-SP2/yast/vi/po/cio.vi.po
branches/plus-SLE12-SP2/yast/vi/po/cluster.vi.po
branches/plus-SLE12-SP2/yast/vi/po/control-center.vi.po
branches/plus-SLE12-SP2/yast/vi/po/control.vi.po
branches/plus-SLE12-SP2/yast/vi/po/country.vi.po
branches/plus-SLE12-SP2/yast/vi/po/crowbar.vi.po
branches/plus-SLE12-SP2/yast/vi/po/dhcp-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/dns-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/docker.vi.po
branches/plus-SLE12-SP2/yast/vi/po/drbd.vi.po
branches/plus-SLE12-SP2/yast/vi/po/fcoe-client.vi.po
branches/plus-SLE12-SP2/yast/vi/po/firewall-services.vi.po
branches/plus-SLE12-SP2/yast/vi/po/firewall.vi.po
branches/plus-SLE12-SP2/yast/vi/po/firstboot.vi.po
branches/plus-SLE12-SP2/yast/vi/po/fonts.vi.po
branches/plus-SLE12-SP2/yast/vi/po/ftp-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/geo-cluster.vi.po
branches/plus-SLE12-SP2/yast/vi/po/http-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/inetd.vi.po
branches/plus-SLE12-SP2/yast/vi/po/installation.vi.po
branches/plus-SLE12-SP2/yast/vi/po/instserver.vi.po
branches/plus-SLE12-SP2/yast/vi/po/iplb.vi.po
branches/plus-SLE12-SP2/yast/vi/po/iscsi-client.vi.po
branches/plus-SLE12-SP2/yast/vi/po/iscsi-lio-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/isns.vi.po
branches/plus-SLE12-SP2/yast/vi/po/journal.vi.po
branches/plus-SLE12-SP2/yast/vi/po/kdump.vi.po
branches/plus-SLE12-SP2/yast/vi/po/languages_db.vi.po
branches/plus-SLE12-SP2/yast/vi/po/ldap-client.vi.po
branches/plus-SLE12-SP2/yast/vi/po/ldap.vi.po
branches/plus-SLE12-SP2/yast/vi/po/live-installer.vi.po
branches/plus-SLE12-SP2/yast/vi/po/mail.vi.po
branches/plus-SLE12-SP2/yast/vi/po/multipath.vi.po
branches/plus-SLE12-SP2/yast/vi/po/network.vi.po
branches/plus-SLE12-SP2/yast/vi/po/nfs.vi.po
branches/plus-SLE12-SP2/yast/vi/po/nfs_server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/nis.vi.po
branches/plus-SLE12-SP2/yast/vi/po/nis_server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/ntp-client.vi.po
branches/plus-SLE12-SP2/yast/vi/po/oneclickinstall.vi.po
branches/plus-SLE12-SP2/yast/vi/po/online-update-configuration.vi.po
branches/plus-SLE12-SP2/yast/vi/po/online-update.vi.po
branches/plus-SLE12-SP2/yast/vi/po/opensuse_mirror.vi.po
branches/plus-SLE12-SP2/yast/vi/po/packager.vi.po
branches/plus-SLE12-SP2/yast/vi/po/pam.vi.po
branches/plus-SLE12-SP2/yast/vi/po/pkg-bindings.vi.po
branches/plus-SLE12-SP2/yast/vi/po/printer.vi.po
branches/plus-SLE12-SP2/yast/vi/po/product-creator.vi.po
branches/plus-SLE12-SP2/yast/vi/po/proxy.vi.po
branches/plus-SLE12-SP2/yast/vi/po/rdp.vi.po
branches/plus-SLE12-SP2/yast/vi/po/rear.vi.po
branches/plus-SLE12-SP2/yast/vi/po/registration.vi.po
branches/plus-SLE12-SP2/yast/vi/po/reipl.vi.po
branches/plus-SLE12-SP2/yast/vi/po/relocation-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/samba-client.vi.po
branches/plus-SLE12-SP2/yast/vi/po/samba-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/samba-users.vi.po
branches/plus-SLE12-SP2/yast/vi/po/scanner.vi.po
branches/plus-SLE12-SP2/yast/vi/po/security.vi.po
branches/plus-SLE12-SP2/yast/vi/po/services-manager.vi.po
branches/plus-SLE12-SP2/yast/vi/po/slp-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/snapper.vi.po
branches/plus-SLE12-SP2/yast/vi/po/sound.vi.po
branches/plus-SLE12-SP2/yast/vi/po/squid.vi.po
branches/plus-SLE12-SP2/yast/vi/po/sshd.vi.po
branches/plus-SLE12-SP2/yast/vi/po/storage.vi.po
branches/plus-SLE12-SP2/yast/vi/po/support.vi.po
branches/plus-SLE12-SP2/yast/vi/po/sysconfig.vi.po
branches/plus-SLE12-SP2/yast/vi/po/tftp-server.vi.po
branches/plus-SLE12-SP2/yast/vi/po/timezone_db.vi.po
branches/plus-SLE12-SP2/yast/vi/po/tune.vi.po
branches/plus-SLE12-SP2/yast/vi/po/update.vi.po
branches/plus-SLE12-SP2/yast/vi/po/users.vi.po
branches/plus-SLE12-SP2/yast/vi/po/vm.vi.po
branches/plus-SLE12-SP2/yast/vi/po/vpn.vi.po
branches/plus-SLE12-SP2/yast/vi/po/yast2-apparmor.vi.po
Log:
from SLE12-SP2 plus Factory
Modified: branches/plus-SLE12-SP2/yast/vi/po/add-on-creator.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/add-on-creator.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/add-on-creator.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/add-on.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/add-on.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/add-on.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:35+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -71,16 +71,15 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>Đĩa: %1, Đường dẫn: %2, Sản phẩm: %3</li>\n"
-#. 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
+#. error report
+#: src/clients/add-on_auto.rb:185
msgid "Failed to add add-on product."
msgstr "Lỗi thêm sản phẩm thương mại."
+#: 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/vi/po/audit-laf.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/audit-laf.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/audit-laf.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/auth-client.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/auth-client.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/auth-client.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-11-30 10:04+0100\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,1834 +17,1148 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#. Edit Kerberos realm configuration
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
-#, fuzzy
-#| msgid "File name"
-msgid "Realm name"
-msgstr "Tên tập tin"
-
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
-msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
+#. translators: command line help text for authentication client module
+#: src/clients/auth-client.rb:46
+msgid "Authentication client configuration module"
msgstr ""
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
-msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
+#. translators: command line help text for summary action
+#: src/clients/auth-client.rb:56
+msgid "Configuration summary of the authentication client"
msgstr ""
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
-msgid "Host Name of Administration Server (Optional)"
+#. translators: command line help text for summary action
+#: src/clients/auth-client.rb:61
+msgid "Create autoyast rnc from @parameters"
msgstr ""
-#: 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
-msgid "Principal Name"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
-#, fuzzy
-#| msgid "&User Name"
-msgid "User Name"
-msgstr "&Tên người dùng"
-
-#: 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
-msgid "Please type in the host name of Key Distribution Centre:"
-msgstr ""
-
-#. 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 "Xin hãy nhập họ của ngài"
-
-#. Edit more configuration items for Kerberos.
-#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:48
-msgid "Default Location of Keytab File"
-msgstr ""
-
-#: 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
-msgid "Reset"
-msgstr ""
-
-#. Edit more configuration items for LDAP.
-#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
-#, fuzzy
-#| msgid "Create VPN Connection"
-msgid "In Case Of Connection Outage:"
-msgstr "Tạo sự kết nối VPN"
-
-#: 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
-msgid "Timeout for Bind Operations in Seconds"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
-msgid "Timeout for Search Operations in Seconds"
-msgstr ""
-
-#. 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:"
-msgid "Authentication via Kerberos"
-msgstr "Xác thực:"
-
-#. 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 keywords:"
-msgid "Please enter server URI."
-msgstr "Xin hãy nhập từ khóa:"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:126
-#, fuzzy
-#| msgid "Please enter your last name"
-msgid "Please enter DN of search base."
-msgstr "Xin hãy nhập họ của ngài"
-
-#. 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 "&Unspecified"
-msgid "(not specified)"
-msgstr "&Khác"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:202
-#, fuzzy
-#| msgid "Do you really want to reset your settings?"
-msgid "Are you sure to delete realm %s?"
-msgstr "Bạn có thực sự muốn đặt lại thiết lập của mình?"
-
-#: 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 "Tạo thư mục cá nhân khi đăng nhập"
-
-#: 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 "Người dùng"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:340
-#: src/lib/authui/sssd/main_dialog.rb:81
-#, fuzzy
-#| msgid "Group"
-msgid "Groups"
-msgstr "Nhóm"
-
-#: 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
-msgid "Enter LDAP server locations (space separated), in either format:"
-msgstr ""
-
-#: 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
-msgid "Secure LDAP communication"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:363
-msgid "Do Not Use Security"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:364
-msgid "Secure Communication via TLS"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:365
-msgid "Secure Communication via StartTLS"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:368
-#, fuzzy
-#| msgid "Connections"
-msgid "Test Connection"
-msgstr "Kết nối"
-
-#: 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 "Other Options"
-msgid "Extended Options"
-msgstr "Tùy chọn khác"
-
-#. If not specified, append the default port number
-#: src/lib/authui/ldapkrb/main_dialog.rb:403
-msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:407
-msgid "Default Realm For User Login:"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:409
-#, fuzzy
-#| msgid "Authentication"
-msgid "All Authentication Realms"
-msgstr "Xác thực"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:411
-msgid "Add Realm"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:411
-#, fuzzy
-#| msgid "Edit Tag"
-msgid "Edit Realm"
-msgstr "Sửa đổi thẻ"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:411
-#, fuzzy
-#| msgid "Delete Tag"
-#| msgid_plural "Delete Tags"
-msgid "Delete Realm"
-msgstr "Xoá bỏ thẻ"
-
-#: 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
-msgid "LDAP and Kerberos Client"
-msgstr ""
-
-#: src/lib/authui/main_dialog.rb:48
-#, fuzzy
-#| msgid "Power Management"
-msgid "User Logon Management"
-msgstr "Quản lý Điện năng"
-
-#: src/lib/authui/main_dialog.rb:63
-#, fuzzy
-#| msgid "Update Settings"
-msgid "Change Settings"
-msgstr "Cập nhật thiết lập"
-
-#. Allow entering both SSSD and ldapkrb settings
-#: src/lib/authui/main_dialog.rb:67
-#, fuzzy
-#| msgid "&Use Following Configuration"
-msgid "User Logon Configuration"
-msgstr "&Dùng cấu hình sau"
-
-#: src/lib/authui/main_dialog.rb:68
-#, fuzzy
-#| msgid "SLP Server Configuration"
-msgid "LDAP/Kerberos Configuration"
-msgstr "Cấu hình máy chủ SLP"
-
-#. 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 "Tên"
-
-#: 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 "Giá trị"
-
-#: src/lib/authui/main_dialog.rb:91
-#, fuzzy
-#| msgid "Module Name"
-msgid "Computer Name"
-msgstr "Tên môđun"
-
-#: src/lib/authui/main_dialog.rb:92
-msgid "Full Computer Name"
-msgstr ""
-
-#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
-#, fuzzy
-#| msgid "is not available"
-msgid "(Name is not resolvable)"
-msgstr "không có"
-
-#: src/lib/authui/main_dialog.rb:93
-#, fuzzy
-#| msgid "Networking"
-msgid "Network Domain"
-msgstr "Chạy mạng"
-
-#: src/lib/authui/main_dialog.rb:94
-#, fuzzy
-#| msgid "IP Address:"
-msgid "IP Addresses"
-msgstr "Địa chỉ IP:"
-
-#: src/lib/authui/main_dialog.rb:95
-#, fuzzy
-#| msgid "Identity:"
-msgid "Identity Domains"
-msgstr "Thực thể:"
-
-#: src/lib/authui/sssd/extended_param_dialog.rb:54
-#, fuzzy
-#| msgid "D&escription"
-msgid "Description"
-msgstr "&Mô tả"
-
-#: src/lib/authui/sssd/extended_param_dialog.rb:65
-#, fuzzy
-#| msgid "Other Options"
-msgid "Extended options"
-msgstr "Tùy chọn khác"
-
-#: src/lib/authui/sssd/extended_param_dialog.rb:68
-#, fuzzy
-#| msgid "Name of New File"
-msgid "Name filter:"
-msgstr "Tên của tập tin mới"
-
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
+#: src/lib/yauthclient/initial_customisation_dialog.rb:70
#, fuzzy
#| msgid "None"
msgid "None."
msgstr "Không có"
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
+#: src/lib/yauthclient/initial_customisation_dialog.rb:105
msgid "Mandatory Parameters"
msgstr ""
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
+#: src/lib/yauthclient/initial_customisation_dialog.rb:112
#, fuzzy
#| msgid "Optional Information"
msgid "Optional Parameters"
msgstr "Thông tin thêm"
#. Check that all mandatory parameters are set
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
+#: src/lib/yauthclient/initial_customisation_dialog.rb:138
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
+#. Render overview and edit buttons on left side, config editor on right side.
+#: src/lib/yauthclient/main_dialog.rb:55
#, fuzzy
-#| msgid "Modem Options"
-msgid "Global Options"
-msgstr "Tùy chọn modem"
-
-#: src/lib/authui/sssd/main_dialog.rb:40
-#, fuzzy
-#| msgid "Name of New File"
-msgid "Name switch"
-msgstr "Tên của tập tin mới"
-
-#: src/lib/authui/sssd/main_dialog.rb:41
-msgid "Authentication"
+#| msgid "Authentication"
+msgid "Authentication Client Configuration"
msgstr "Xác thực"
-#: src/lib/authui/sssd/main_dialog.rb:41
-msgid "Sudo"
-msgstr ""
+#. Overview of all config sections
+#: src/lib/yauthclient/main_dialog.rb:62
+msgid "Global Configuration"
+msgstr "Cấu hình toàn cầu"
-#: src/lib/authui/sssd/main_dialog.rb:42
-#, fuzzy
-#| msgid "Autoupdate"
-msgid "Auto-Mount"
-msgstr "Cập nhật tự động"
+#: src/lib/yauthclient/main_dialog.rb:65
+msgid "Create Home Directory on Login"
+msgstr "Tạo thư mục cá nhân khi đăng nhập"
-#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
-msgid "SSH Public Keys"
+#: src/lib/yauthclient/main_dialog.rb:68
+msgid "Enable SSSD daemon"
msgstr ""
-#: 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/authui/sssd/main_dialog.rb:67
-msgid "Manage Domain User Logon"
-msgstr ""
-
-#: src/lib/authui/sssd/main_dialog.rb:75
+#: src/lib/yauthclient/main_dialog.rb:73
#, fuzzy
-#| msgid "Current Status: "
-msgid "Daemon Status: "
-msgstr "Trạng thái hiện thời: "
+#| msgid "Selections"
+msgid "Sections"
+msgstr "Lựa chọn"
-#: src/lib/authui/sssd/main_dialog.rb:75
-#, fuzzy
-#| msgid "Running on AC"
-msgid "Running"
-msgstr "Đang chạy bằng điện chính"
-
-#: src/lib/authui/sssd/main_dialog.rb:75
-#, fuzzy
-#| msgid "&Stop"
-msgid "Stopped"
-msgstr "&Dừng"
-
-#: src/lib/authui/sssd/main_dialog.rb:76
-msgid "Allow Domain User Logon"
+#: src/lib/yauthclient/main_dialog.rb:76
+msgid "New Service/Domain"
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:77
+#: src/lib/yauthclient/main_dialog.rb:77
#, fuzzy
-#| msgid "Create Home Directory on Login"
-msgid "Create Home Directory"
-msgstr "Tạo thư mục cá nhân khi đăng nhập"
+#| msgid "_Delete Version"
+msgid "Delete Service/Domain"
+msgstr "_Xoá bỏ phiên bản"
-#: src/lib/authui/sssd/main_dialog.rb:79
-msgid "Enable domain data source:"
+#. 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"
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:83
-msgid "Map Network Drives (automount)"
-msgstr ""
+#: src/lib/yauthclient/main_dialog.rb:118
+#: src/lib/yauthclient/main_dialog.rb:143
+msgid "Name"
+msgstr "Tên"
-#: src/lib/authui/sssd/main_dialog.rb:91
-#, fuzzy
-#| msgid "&Domain"
-msgid "Join Domain"
-msgstr "&Miền"
+#: src/lib/yauthclient/main_dialog.rb:118
+msgid "Value"
+msgstr "Giá trị"
-#: src/lib/authui/sssd/main_dialog.rb:92
+#: src/lib/yauthclient/main_dialog.rb:118
+#: src/lib/yauthclient/main_dialog.rb:143
#, fuzzy
-#| msgid "&Domain"
-msgid "Leave Domain"
-msgstr "&Miền"
+#| msgid "D&escription"
+msgid "Description"
+msgstr "&Mô tả"
-#: src/lib/authui/sssd/main_dialog.rb:93
+#. For the currently selected config section, render list of additional parameters for customisation.
+#: src/lib/yauthclient/main_dialog.rb:137
#, fuzzy
-#| msgid "_Clear Date Range"
-msgid "Clear Domain Cache"
-msgstr "_Xoá phạm vị ngày"
+#| msgid "More dates"
+msgid "More Parameters"
+msgstr "Ngày thêm"
-#. 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
+#: src/lib/yauthclient/main_dialog.rb:140
#, fuzzy
-#| msgid "Other Options"
-msgid "Service Options"
-msgstr "Tùy chọn khác"
+#| msgid "Name of New File"
+msgid "Name filter:"
+msgstr "Tên của tập tin mới"
-#: src/lib/authui/sssd/main_dialog.rb:139
-#: src/lib/authui/sssd/main_dialog.rb:150
-#, fuzzy
-#| msgid "Modem Options"
-msgid "Domain Options"
-msgstr "Tùy chọn modem"
-
-#: src/lib/authui/sssd/main_dialog.rb:151
-msgid "Select Global Options, a service, or a domain to customise."
+#. Check system environment for the proper operation of SSSD
+#: src/lib/yauthclient/main_dialog.rb:169
+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 ""
-#. Additional widgets for a domain
-#: src/lib/authui/sssd/main_dialog.rb:157
-msgid "Use this domain"
+#: src/lib/yauthclient/main_dialog.rb:179
+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 ""
-#. Additiona widgets for an AD domain
-#: src/lib/authui/sssd/main_dialog.rb:162
+#. Delete the chosen section (domain or service)
+#: src/lib/yauthclient/main_dialog.rb:223
#, fuzzy
-#| msgid "Unable to create directory."
-msgid "Enroll to Active Directory"
-msgstr "Không thể tạo thư mục."
+#| msgid "Could not delete a version"
+msgid "You may not delete section SSSD."
+msgstr "Không thể xoá bỏ một phiên bản"
-#. 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
+#: src/lib/yauthclient/main_dialog.rb:225
#, fuzzy
-#| msgid "Options"
-msgid "Options - %s"
-msgstr "Tùy chọn"
-
-#. Delete the chosen domain
-#: src/lib/authui/sssd/main_dialog.rb:217
-#, fuzzy
-#| msgid "Please deselect some packages."
-msgid "Please select a domain among the list."
-msgstr "Xin hãy bỏ chọn một vài gói."
-
-#: src/lib/authui/sssd/main_dialog.rb:220
-#, fuzzy
#| msgid "Do you really want to reset your settings?"
-msgid "Do you really wish to erase configuration for domain %s?"
+msgid "Do you really wish to delete section %s?"
msgstr "Bạn có thực sự muốn đặt lại thiết lập của mình?"
-#. Enable/disable SSSD daemon
-#: src/lib/authui/sssd/main_dialog.rb:252
-msgid ""
-"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 ""
-
-#. Enable/disable NSS password database
-#: src/lib/authui/sssd/main_dialog.rb:284
-msgid ""
-"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 ""
-
-#. 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 ""
-
-#. 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/authui/sssd/main_dialog.rb:409
+#: src/lib/yauthclient/main_dialog.rb:269
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/authui/sssd/main_dialog.rb:414
+#: src/lib/yauthclient/main_dialog.rb:274
msgid "Confirm parameter removal: "
msgstr ""
-#: src/lib/authui/sssd/main_dialog.rb:415
+#: src/lib/yauthclient/main_dialog.rb:275
msgid ""
-"The parameter is important. Removal of the parameter may cause configuration failure.\n"
+"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to remove the parameter?"
+"Do you still wish to continue?"
msgstr ""
#. Save settings - validate
-#: src/lib/authui/sssd/main_dialog.rb:434
+#: src/lib/yauthclient/main_dialog.rb:305
#, fuzzy
#| msgid "Samba is now enabled."
-msgid "No domain"
+msgid "No domain enabled"
msgstr "Samba bây giờ được dùng."
-#: src/lib/authui/sssd/main_dialog.rb:435
+#: src/lib/yauthclient/main_dialog.rb:306
msgid ""
-"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"
+"No domain has been enabled in [sssd] \"domains\" parameter.\n"
+"SSSD will not start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
-#. 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 "Chưa cài đặt vá lỗi nào."
+#. user must correct the mistake
+#: src/lib/yauthclient/main_dialog.rb:323
+msgid "Inactive domain(s) found"
+msgstr ""
-#. 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:"
+#. Render input box and dropdowns for service/domain creation
+#: src/lib/yauthclient/new_section_dialog.rb:49
+msgid "Would you like to enable another service or join a domain?"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:69
-#, fuzzy
-#| msgid "&Username"
-msgid "Username"
-msgstr "Tên &người dùng"
+#. New service
+#: src/lib/yauthclient/new_section_dialog.rb:54
+msgid "Service"
+msgstr "Dịch vụ"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:70
+#. New domain and provider types
+#: src/lib/yauthclient/new_section_dialog.rb:58
#, fuzzy
-#| msgid "&Password"
-msgid "Password"
-msgstr "Mật &khẩu"
+#| msgid "&Domain"
+msgid "Domain"
+msgstr "&Miền"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:71
-msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
+#: src/lib/yauthclient/new_section_dialog.rb:61
+msgid "Domain name (example.com):"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:72
-msgid "Overwrite Samba configuration to work with this AD"
-msgstr ""
+#: src/lib/yauthclient/new_section_dialog.rb:64
+#, fuzzy
+#| msgid "Identification: %1"
+msgid "Identification provider:"
+msgstr "Xác thực: %1"
-#: 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
+#: src/lib/yauthclient/new_section_dialog.rb:69
#, fuzzy
-#| msgid "DNS Server"
-msgid "(DNS error)"
-msgstr "Máy chủ DNS"
+#| msgid "Authentication:"
+msgid "Authentication provider:"
+msgstr "Xác thực:"
-#: 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."
+#: src/lib/yauthclient/new_section_dialog.rb:72
+msgid "Activate Domain"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:89
-msgid "Already enrolled"
+#. Create new service
+#: src/lib/yauthclient/new_section_dialog.rb:105
+msgid "There are no more services to be enabled."
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+#. Create new domain
+#: src/lib/yauthclient/new_section_dialog.rb:123
#, fuzzy
-#| msgid "Not detected."
-msgid "Not yet enrolled"
-msgstr "Chưa xóa."
+#| msgid "Enter the name of a domain."
+msgid "Please enter a name for the new domain."
+msgstr "Nhập tên của một miền."
-#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+#: src/lib/yauthclient/new_section_dialog.rb:126
#, fuzzy
-#| msgid "Active Directory Server"
-msgid "Active Directory enrollment"
-msgstr "Máy chủ Active Directory"
+#| msgid "This name is already in use"
+msgid "The domain name is already in-use."
+msgstr "Tên này đã được dùng"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:116
-#, fuzzy
-#| msgid "Current Status: "
-msgid "Current status"
-msgstr "Trạng thái hiện thời: "
-
-#: src/lib/authui/sssd/manage_ad_dialog.rb:116
-#, fuzzy
-#| msgid "Reading the winbind status..."
-msgid "Gathering status..."
-msgstr "Đang đọc trạng thái winbind..."
-
-#. Enroll the computer, or save the enrollment details
-#: src/lib/authui/sssd/manage_ad_dialog.rb:134
-msgid "Please enter both username and password."
+#. Define Global Parameters
+#: src/lib/yauthclient/params.rb:108
+msgid "Indicates what is the syntax of the config file."
msgstr ""
-#. 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."
+#: src/lib/yauthclient/params.rb:114
+msgid "Comma separated list of services that are started when sssd itself starts."
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:150
+#: src/lib/yauthclient/params.rb:115
msgid ""
-"Enrollment has completed successfully!\n"
"\n"
-"Command output:\n"
+"Supported services: nss, pam, sudo, autofs, ssh"
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"
+#: src/lib/yauthclient/params.rb:120 src/lib/yauthclient/params.rb:174
+msgid "Number of times services should attempt to reconnect in the event of a Data Provider crash or restart before they give up"
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)"
+#: 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 ""
-#: src/lib/authui/sssd/new_section_dialog.rb:38
-#: src/lib/authui/sssd/new_section_dialog.rb:51
-msgid "Local SSSD file database"
+#: src/lib/yauthclient/params.rb:126
+msgid "This parameter contains the list of domains in the order these will be queried."
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:39
-#: src/lib/authui/sssd/new_section_dialog.rb:49
-#, fuzzy
-#| msgid "Active Directory Server"
-msgid "Microsoft Active Directory"
-msgstr "Máy chủ Active Directory"
-
-#: src/lib/authui/sssd/new_section_dialog.rb:40
-#: src/lib/authui/sssd/new_section_dialog.rb:48
-#, fuzzy
-#| msgid "Free"
-msgid "FreeIPA"
-msgstr "Trống"
-
-#: src/lib/authui/sssd/new_section_dialog.rb:41
-#: src/lib/authui/sssd/new_section_dialog.rb:46
-msgid "Generic directory service (LDAP)"
+#: 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"
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:47
-msgid "Generic Kerberos service"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:52
-msgid "The domain does not provide authentication service"
+#: 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."
msgstr ""
-#. New domain and provider types
-#: src/lib/authui/sssd/new_section_dialog.rb:75
-msgid "Domain name (such as example.com):"
+#: 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 ""
-#: src/lib/authui/sssd/new_section_dialog.rb:78
-msgid "Which service provides identity data, such as user names and group memberships?"
+#: src/lib/yauthclient/params.rb:143
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:83
-msgid "Which service handles user authentication?"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:86
-#, fuzzy
-#| msgid "Enable the service"
-msgid "Enable the domain"
-msgstr "Dùng dịch vụ"
-
-#. Create new domain
-#: src/lib/authui/sssd/new_section_dialog.rb:106
-#, fuzzy
-#| msgid "Please enter your last name"
-msgid "Please enter the domain name."
-msgstr "Xin hãy nhập họ của ngài"
-
-#: 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 name is already in use"
-msgid "The domain name is already in-use."
-msgstr "Tên này đã được dùng"
-
-#. Define Global Parameters
-#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
-#: src/lib/authui/sssd/params.rb:110
-msgid "Version of configuration file syntax (1 or 2)"
-msgstr ""
-
-#: 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 ""
-
-#: src/lib/authui/sssd/params.rb:119
-msgid "The regular expression parses user name and domain name into components"
-msgstr ""
-
-#: src/lib/authui/sssd/params.rb:123
-msgid "The default printf(3)-compatible format that describes translation of a name/domain tuple into FQDN"
-msgstr ""
-
-#: src/lib/authui/sssd/params.rb:127
-msgid "Whether or not to use inotify mechanism to monitor resolv.conf to update internal DNS resolver"
-msgstr ""
-
-#: src/lib/authui/sssd/params.rb:131
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
-msgstr ""
-
-#: src/lib/authui/sssd/params.rb:135
-msgid "A default domain name for all names without a domian name component"
-msgstr ""
-
#. Define Global Services Parameters
-#. 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)"
+#: 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 ""
-#: src/lib/authui/sssd/params.rb:151
+#: src/lib/yauthclient/params.rb:159
msgid "Add a timestamp to the debug messages"
msgstr ""
-#: src/lib/authui/sssd/params.rb:156
+#: src/lib/yauthclient/params.rb:164
msgid "Add microseconds to the timestamp in debug messages"
msgstr ""
-#: src/lib/authui/sssd/params.rb:161
-msgid "Timeout in seconds between heartbeats for this service"
+#: src/lib/yauthclient/params.rb:169
+msgid "Timeout in seconds between heartbeats for this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:171
-msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:176
-msgid "Number of seconds a client of SSSD process can hold onto a file descriptor without any communication"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:181
-msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
+#: 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 ""
-#: src/lib/authui/sssd/params.rb:193
+#. NSS configuration options
+#: src/lib/yauthclient/params.rb:197
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/authui/sssd/params.rb:198
+#: src/lib/yauthclient/params.rb:202
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 ""
-#: src/lib/authui/sssd/params.rb:203
+#: src/lib/yauthclient/params.rb:207
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 ""
-#: src/lib/authui/sssd/params.rb:209
+#: src/lib/yauthclient/params.rb:213
msgid "Exclude certain users from being fetched by SSS backend"
msgstr ""
-#: src/lib/authui/sssd/params.rb:215
+#: src/lib/yauthclient/params.rb:219
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr ""
-#: src/lib/authui/sssd/params.rb:220
+#: src/lib/yauthclient/params.rb:224
msgid "If you want filtered user to still be group members set this option to false."
msgstr ""
-#: src/lib/authui/sssd/params.rb:224
+#: src/lib/yauthclient/params.rb:228
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr ""
-#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1209
+#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
msgid "Set a default template for a user's home directory if one is not specified explicitly by the domain's data provider."
msgstr ""
-#: src/lib/authui/sssd/params.rb:232
+#: src/lib/yauthclient/params.rb:236
msgid "Override the login shell for all users."
msgstr ""
-#: src/lib/authui/sssd/params.rb:236
+#: src/lib/yauthclient/params.rb:240
msgid "Restrict user shell to one of the listed values."
msgstr ""
-#: src/lib/authui/sssd/params.rb:240
+#: src/lib/yauthclient/params.rb:244
msgid "Replace any instance of these shells with the shell_fallback"
msgstr ""
-#: src/lib/authui/sssd/params.rb:245
+#: src/lib/yauthclient/params.rb:249
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1213
+#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
-#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
+#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr ""
-#: src/lib/authui/sssd/params.rb:259
+#: src/lib/yauthclient/params.rb:263
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr ""
-#: src/lib/authui/sssd/params.rb:271
+#. PAM configuration options
+#: src/lib/yauthclient/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 ""
-#: src/lib/authui/sssd/params.rb:276 src/lib/authui/sssd/params.rb:281
+#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/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 ""
-#: src/lib/authui/sssd/params.rb:286
+#: src/lib/yauthclient/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr ""
-#: src/lib/authui/sssd/params.rb:291
+#: src/lib/yauthclient/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 ""
#. The kerberos domain section
-#: src/lib/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:811
-#: src/lib/authui/sssd/params.rb:1096
+#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
+#: src/lib/yauthclient/params.rb:1073
msgid "Display a warning N days before the password expires."
msgstr ""
-#: src/lib/authui/sssd/params.rb:313
+#. SUDO configuration options
+#: src/lib/yauthclient/params.rb:309
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr ""
-#: src/lib/authui/sssd/params.rb:325
+#. AUTOFS configuration options
+#: src/lib/yauthclient/params.rb:317
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:337
+#. SSH configuration options
+#: src/lib/yauthclient/params.rb:325
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr ""
-#: src/lib/authui/sssd/params.rb:342
+#: src/lib/yauthclient/params.rb:330
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr ""
-#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
+#. 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
msgid "UID and GID limits for the domain. If a domain contains an entry that is outside these limits, it is ignored."
msgstr ""
-#: src/lib/authui/sssd/params.rb:366
+#: src/lib/yauthclient/params.rb:350
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:371
+#: src/lib/yauthclient/params.rb:355
msgid "If the service does not terminate after “force_timeout” seconds, the monitor will forcibly shut it down by sending a SIGKILL signal."
msgstr ""
-#: src/lib/authui/sssd/params.rb:376
+#: src/lib/yauthclient/params.rb:360
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:381
+#: src/lib/yauthclient/params.rb:365
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:386
+#: src/lib/yauthclient/params.rb:370
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:391
+#: src/lib/yauthclient/params.rb:375
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:396
+#: src/lib/yauthclient/params.rb:380
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:401
+#: src/lib/yauthclient/params.rb:385
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:406
+#: src/lib/yauthclient/params.rb:390
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:412
+#: src/lib/yauthclient/params.rb:396
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/authui/sssd/params.rb:417
+#: src/lib/yauthclient/params.rb:401
msgid "Number of days entries are left in cache after last successful login before being removed during a cleanup of the cache."
msgstr ""
-#: src/lib/authui/sssd/params.rb:424
+#: src/lib/yauthclient/params.rb:408
msgid "The identification provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:429
+#: src/lib/yauthclient/params.rb:413
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 ""
-#: src/lib/authui/sssd/params.rb:436
+#: src/lib/yauthclient/params.rb:420
msgid "The authentication provider used for the domain"
msgstr ""
-#: src/lib/authui/sssd/params.rb:442
+#: src/lib/yauthclient/params.rb:426
msgid "The access control provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:447
+#: src/lib/yauthclient/params.rb:431
msgid "The provider which should handle change password operations for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:453
+#: src/lib/yauthclient/params.rb:437
msgid "The SUDO provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:459
+#: src/lib/yauthclient/params.rb:443
msgid "The provider which should handle loading of selinux settings."
msgstr ""
-#: src/lib/authui/sssd/params.rb:465
+#: src/lib/yauthclient/params.rb:449
msgid "The provider which should handle fetching of subdomains."
msgstr ""
-#: src/lib/authui/sssd/params.rb:471
+#: src/lib/yauthclient/params.rb:455
msgid "The autofs provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:477
+#: src/lib/yauthclient/params.rb:461
msgid "The provider used for retrieving host identity information."
msgstr ""
-#: src/lib/authui/sssd/params.rb:482
+#: src/lib/yauthclient/params.rb:466
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr ""
-#: src/lib/authui/sssd/params.rb:487
+#: src/lib/yauthclient/params.rb:471
msgid "A printf(3)-compatible format that describes how to translate a (name, domain) tuple for this domain into a fully qualified name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:493
+#: src/lib/yauthclient/params.rb:477
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr ""
-#: src/lib/authui/sssd/params.rb:498
+#: src/lib/yauthclient/params.rb:482
msgid "Defines the amount of time (in seconds) to wait for a reply from the DNS resolver before assuming that it is unreachable."
msgstr ""
-#: src/lib/authui/sssd/params.rb:502
+#: src/lib/yauthclient/params.rb:486
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr ""
-#: src/lib/authui/sssd/params.rb:506
+#: src/lib/yauthclient/params.rb:490
msgid "Override the primary GID value with the one specified."
msgstr ""
-#: src/lib/authui/sssd/params.rb:512
+#: src/lib/yauthclient/params.rb:495
msgid "Treat user and group names as case sensitive."
msgstr ""
-#: src/lib/authui/sssd/params.rb:517
+#: src/lib/yauthclient/params.rb:500
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 ""
-#: src/lib/authui/sssd/params.rb:522
+#: src/lib/yauthclient/params.rb:505
msgid "Use this homedir as default value for all subdomains within this domain."
msgstr ""
#. Following options will be provided by SSSD's 'simple' access-control provider
-#: src/lib/authui/sssd/params.rb:528
+#: src/lib/yauthclient/params.rb:511
msgid "Comma separated list of users who are allowed to log in."
msgstr ""
-#: src/lib/authui/sssd/params.rb:533
+#: src/lib/yauthclient/params.rb:516
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:538
+#: src/lib/yauthclient/params.rb:521
msgid "Comma separated list of groups that are explicitly denied access. This applies only to groups within this SSSD domain."
msgstr ""
#. 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/authui/sssd/params.rb:547
+#: src/lib/yauthclient/params.rb:530
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:552
+#: src/lib/yauthclient/params.rb:535
msgid "Indicate if a home directory should be created by default for new users."
msgstr ""
-#: src/lib/authui/sssd/params.rb:557
+#: src/lib/yauthclient/params.rb:540
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr ""
-#: src/lib/authui/sssd/params.rb:562
+#: src/lib/yauthclient/params.rb:545
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:567
+#: src/lib/yauthclient/params.rb:550
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 ""
-#: src/lib/authui/sssd/params.rb:572
+#: src/lib/yauthclient/params.rb:555
msgid "The mail spool directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:576
+#: src/lib/yauthclient/params.rb:559
msgid "The command that is run after a user is removed."
msgstr ""
#. The ldap domain section
-#: 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
+#: src/lib/yauthclient/params.rb:568
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:597
+#: src/lib/yauthclient/params.rb:574
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr ""
-#: src/lib/authui/sssd/params.rb:602
+#: src/lib/yauthclient/params.rb:579
msgid "Specifies the comma-separated list of URIs of the LDAP servers to which SSSD should connect in the order of preference."
msgstr ""
-#: src/lib/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:614
+#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
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 ""
-#: src/lib/authui/sssd/params.rb:620
+#: src/lib/yauthclient/params.rb:597
msgid "Base DN for LDAP search"
msgstr ""
-#: src/lib/authui/sssd/params.rb:627
+#: src/lib/yauthclient/params.rb:604
#, fuzzy
#| msgid "check type"
msgid "LDAP schema type"
msgstr "kiểu kiểm tra"
-#: src/lib/authui/sssd/params.rb:631
+#: src/lib/yauthclient/params.rb:608
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/authui/sssd/params.rb:637
+#: src/lib/yauthclient/params.rb:614
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/authui/sssd/params.rb:641
+#: src/lib/yauthclient/params.rb:618
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/authui/sssd/params.rb:646
+#: src/lib/yauthclient/params.rb:623
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:651
+#: src/lib/yauthclient/params.rb:628
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:656
+#: src/lib/yauthclient/params.rb:633
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:661
+#: src/lib/yauthclient/params.rb:638
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:666
+#: src/lib/yauthclient/params.rb:643
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/authui/sssd/params.rb:671
+#: src/lib/yauthclient/params.rb:648
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:676
+#: src/lib/yauthclient/params.rb:653
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/authui/sssd/params.rb:681
+#: src/lib/yauthclient/params.rb:658
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:686
+#: src/lib/yauthclient/params.rb:663
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:691 src/lib/authui/sssd/params.rb:896
+#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:696
+#: src/lib/yauthclient/params.rb:673
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 ""
-#: src/lib/authui/sssd/params.rb:701
+#: src/lib/yauthclient/params.rb:678
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 ""
-#: src/lib/authui/sssd/params.rb:706
+#: src/lib/yauthclient/params.rb:683
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 ""
-#: src/lib/authui/sssd/params.rb:711
+#: src/lib/yauthclient/params.rb:688
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 ""
-#: src/lib/authui/sssd/params.rb:716
+#: src/lib/yauthclient/params.rb:693
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 ""
-#: src/lib/authui/sssd/params.rb:721
+#: src/lib/yauthclient/params.rb:698
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 ""
-#: src/lib/authui/sssd/params.rb:726
+#: src/lib/yauthclient/params.rb:703
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 ""
-#: src/lib/authui/sssd/params.rb:731
+#: src/lib/yauthclient/params.rb:708
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 ""
-#: src/lib/authui/sssd/params.rb:736
+#: src/lib/yauthclient/params.rb:713
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 ""
-#: src/lib/authui/sssd/params.rb:741
+#: src/lib/yauthclient/params.rb:718
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 ""
-#: src/lib/authui/sssd/params.rb:746
+#: src/lib/yauthclient/params.rb:723
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr ""
-#: src/lib/authui/sssd/params.rb:751
+#: src/lib/yauthclient/params.rb:728
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr ""
-#: src/lib/authui/sssd/params.rb:756
+#: src/lib/yauthclient/params.rb:733
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:761
+#: src/lib/yauthclient/params.rb:738
msgid "When using ldap_account_expire_policy=nds, this attribute determines the hours of a day in a week when access is granted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:766
+#: src/lib/yauthclient/params.rb:743
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:770
+#: src/lib/yauthclient/params.rb:747
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/authui/sssd/params.rb:775
+#: src/lib/yauthclient/params.rb:752
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 ""
-#: src/lib/authui/sssd/params.rb:776
+#: src/lib/yauthclient/params.rb:753
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/authui/sssd/params.rb:781
+#: src/lib/yauthclient/params.rb:758
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr ""
-#: src/lib/authui/sssd/params.rb:786
+#: src/lib/yauthclient/params.rb:763
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 ""
-#: src/lib/authui/sssd/params.rb:791
+#: src/lib/yauthclient/params.rb:768
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:796
+#: src/lib/yauthclient/params.rb:773
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/authui/sssd/params.rb:801
+#: src/lib/yauthclient/params.rb:778
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 ""
-#: src/lib/authui/sssd/params.rb:806
+#: src/lib/yauthclient/params.rb:783
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 ""
-#: src/lib/authui/sssd/params.rb:816
+#: src/lib/yauthclient/params.rb:793
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:821
+#: src/lib/yauthclient/params.rb:798
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:826
+#: src/lib/yauthclient/params.rb:803
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:831
+#: src/lib/yauthclient/params.rb:808
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/authui/sssd/params.rb:836
+#: src/lib/yauthclient/params.rb:813
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:841
+#: src/lib/yauthclient/params.rb:818
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:846
+#: src/lib/yauthclient/params.rb:823
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:852
+#: src/lib/yauthclient/params.rb:829
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 ""
-#: src/lib/authui/sssd/params.rb:858
+#: src/lib/yauthclient/params.rb:835
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 ""
-#: src/lib/authui/sssd/params.rb:864
+#: src/lib/yauthclient/params.rb:841
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 ""
-#: src/lib/authui/sssd/params.rb:870
+#: src/lib/yauthclient/params.rb:847
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:876
+#: src/lib/yauthclient/params.rb:853
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:881
+#: src/lib/yauthclient/params.rb:858
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/authui/sssd/params.rb:886
+#: src/lib/yauthclient/params.rb:863
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/authui/sssd/params.rb:891
+#: src/lib/yauthclient/params.rb:868
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:901
+#: src/lib/yauthclient/params.rb:878
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:906
+#: src/lib/yauthclient/params.rb:883
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr ""
-#: src/lib/authui/sssd/params.rb:911
+#: src/lib/yauthclient/params.rb:888
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:916
+#: src/lib/yauthclient/params.rb:893
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:922
+#: src/lib/yauthclient/params.rb:899
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/authui/sssd/params.rb:927
+#: src/lib/yauthclient/params.rb:904
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 ""
-#: src/lib/authui/sssd/params.rb:932
+#: src/lib/yauthclient/params.rb:909
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 ""
-#: src/lib/authui/sssd/params.rb:937
+#: src/lib/yauthclient/params.rb:914
msgid "Specifies the timeout (in seconds) after which the poll(2)/select(2) following a connect(2) returns in case of no activity."
msgstr ""
-#: src/lib/authui/sssd/params.rb:942
+#: src/lib/yauthclient/params.rb:919
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr ""
-#: src/lib/authui/sssd/params.rb:947
+#: src/lib/yauthclient/params.rb:924
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr ""
-#: src/lib/authui/sssd/params.rb:952
+#: src/lib/yauthclient/params.rb:929
msgid "Specify the number of records to retrieve from LDAP in a single request. Some LDAP servers enforce a maximum limit per-request."
msgstr ""
-#: src/lib/authui/sssd/params.rb:957
+#: src/lib/yauthclient/params.rb:934
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/authui/sssd/params.rb:961
+#: src/lib/yauthclient/params.rb:938
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr ""
-#: src/lib/authui/sssd/params.rb:966
+#: src/lib/yauthclient/params.rb:943
msgid "Specify the number of group members that must be missing from the internal cache in order to trigger a dereference lookup."
msgstr ""
-#: src/lib/authui/sssd/params.rb:973
+#: src/lib/yauthclient/params.rb:950
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/authui/sssd/params.rb:977
+#: src/lib/yauthclient/params.rb:954
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr ""
-#: src/lib/authui/sssd/params.rb:981
+#: src/lib/yauthclient/params.rb:958
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr ""
-#: src/lib/authui/sssd/params.rb:985
+#: src/lib/yauthclient/params.rb:962
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/authui/sssd/params.rb:989
+#: src/lib/yauthclient/params.rb:966
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/authui/sssd/params.rb:994
+#: src/lib/yauthclient/params.rb:971
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/authui/sssd/params.rb:999
+#: src/lib/yauthclient/params.rb:976
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1004
+#: src/lib/yauthclient/params.rb:981
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 ""
-#: src/lib/authui/sssd/params.rb:1008
+#: src/lib/yauthclient/params.rb:985
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1013
+#: src/lib/yauthclient/params.rb:990
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1018
+#: src/lib/yauthclient/params.rb:995
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1023
+#: src/lib/yauthclient/params.rb:1000
msgid "If set to true, the LDAP library would perform a reverse lookup to canonicalize the host name during a SASL bind."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1028
+#: src/lib/yauthclient/params.rb:1005
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1033
+#: src/lib/yauthclient/params.rb:1010
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1038
+#: src/lib/yauthclient/params.rb:1015
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1043
+#: src/lib/yauthclient/params.rb:1020
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1048
+#: src/lib/yauthclient/params.rb:1025
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1053
+#: src/lib/yauthclient/params.rb:1030
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1057
+#: src/lib/yauthclient/params.rb:1034
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1062
+#: src/lib/yauthclient/params.rb:1039
msgid "Specifies whether to update the ldap_user_shadow_last_change attribute with days since the Epoch after a password change operation."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1067
+#: src/lib/yauthclient/params.rb:1044
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 ""
-#: src/lib/authui/sssd/params.rb:1072
+#: src/lib/yauthclient/params.rb:1049
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1078
+#: src/lib/yauthclient/params.rb:1055
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1083
+#: src/lib/yauthclient/params.rb:1060
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1088
+#: src/lib/yauthclient/params.rb:1065
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1101
+#: src/lib/yauthclient/params.rb:1078
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1105
+#: src/lib/yauthclient/params.rb:1082
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 ""
-#: src/lib/authui/sssd/params.rb:1110
+#: src/lib/yauthclient/params.rb:1087
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1114 src/lib/authui/sssd/params.rb:1119
+#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1124
+#: src/lib/yauthclient/params.rb:1101
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1129
+#: src/lib/yauthclient/params.rb:1106
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1134
+#: src/lib/yauthclient/params.rb:1111
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1139
+#: src/lib/yauthclient/params.rb:1116
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1144
+#: src/lib/yauthclient/params.rb:1121
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1149
+#: src/lib/yauthclient/params.rb:1126
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 ""
-#: src/lib/authui/sssd/params.rb:1153
+#: src/lib/yauthclient/params.rb:1130
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1157
+#: src/lib/yauthclient/params.rb:1134
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1161
+#: src/lib/yauthclient/params.rb:1138
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1166
+#: src/lib/yauthclient/params.rb:1143
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1170
+#: src/lib/yauthclient/params.rb:1147
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1175
+#: src/lib/yauthclient/params.rb:1152
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1187
+#: src/lib/yauthclient/params.rb:1164
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1192
+#: src/lib/yauthclient/params.rb:1169
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1196
+#: src/lib/yauthclient/params.rb:1173
msgid "The comma-separated list of IP addresses or hostnames of the AD servers to which SSSD should connect in order of preference."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1201
-msgid "AD hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by AD to identify this host."
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1205
+#: src/lib/yauthclient/params.rb:1181
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1218
+#: src/lib/yauthclient/params.rb:1194
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1223
+#: src/lib/yauthclient/params.rb:1199
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1228
+#: src/lib/yauthclient/params.rb:1204
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1232
+#: src/lib/yauthclient/params.rb:1208
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1236
+#: src/lib/yauthclient/params.rb:1212
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1241
+#: src/lib/yauthclient/params.rb:1217
msgid "Changes the behavior of the ID-mapping algorithm to behave more similarly to winbind's “idmap_autorid” algorithm."
msgstr ""
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1253
+#: src/lib/yauthclient/params.rb:1229
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1258
+#: src/lib/yauthclient/params.rb:1234
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1263
-msgid "IPA hostname (optional) - may be set if hostname(5) does not reflect the FQDN used by IPA to identify this host."
+#: src/lib/yauthclient/params.rb:1238
+msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1268
+#: src/lib/yauthclient/params.rb:1243
msgid "The automounter location this IPA client will be using."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1273
+#: src/lib/yauthclient/params.rb:1248
msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1278
+#: src/lib/yauthclient/params.rb:1253
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1282
+#: src/lib/yauthclient/params.rb:1257
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
-#, fuzzy
-#~| msgid "Authentication"
-#~ msgid "Authentication Client Configuration"
-#~ msgstr "Xác thực"
+#. 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 "Global Configuration"
-#~ msgstr "Cấu hình toàn cầu"
+#: src/modules/AuthClient.rb:232
+msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
+msgstr ""
-#, fuzzy
-#~| msgid "Selections"
-#~ msgid "Sections"
-#~ msgstr "Lựa chọn"
+#. 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 ""
-#, fuzzy
-#~| msgid "_Delete Version"
-#~ msgid "Delete Service/Domain"
-#~ msgstr "_Xoá bỏ phiên bản"
+#: src/modules/AuthClient.rb:348
+msgid "System is configured for using sssd.\n"
+msgstr ""
-#, fuzzy
-#~| msgid "More dates"
-#~ msgid "More Parameters"
-#~ msgstr "Ngày thêm"
+#: src/modules/AuthClient.rb:354
+msgid "System is configured for using OES.\n"
+msgstr ""
-#, fuzzy
-#~| msgid "Could not delete a version"
-#~ msgid "You may not delete section SSSD."
-#~ msgstr "Không thể xoá bỏ một phiên bản"
+#: src/modules/AuthClient.rb:357
+msgid "System is configured for using /etc/passwd only.\n"
+msgstr ""
-#~ msgid "Service"
-#~ msgstr "Dịch vụ"
-
-#, fuzzy
-#~| msgid "Identification: %1"
-#~ msgid "Identification provider:"
-#~ msgstr "Xác thực: %1"
-
-#, fuzzy
-#~| msgid "Enter the name of a domain."
-#~ msgid "Please enter a name for the new domain."
-#~ msgstr "Nhập tên của một miền."
-
#~ msgid "OK"
#~ msgstr "Được"
Modified: branches/plus-SLE12-SP2/yast/vi/po/auth-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/auth-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/auth-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -438,12 +438,12 @@
msgid "Configure Account for Replication"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
-#: src/modules/LdapDatabase.rb:1167
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
+#: src/modules/LdapDatabase.rb:1173
msgid "is not a valid LDAP DN"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
msgid "Password"
msgstr ""
@@ -469,8 +469,8 @@
msgid "Provider Details"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
-#: src/modules/LdapDatabase.rb:1696
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
+#: src/modules/LdapDatabase.rb:1702
msgid "Protocol"
msgstr ""
@@ -478,7 +478,7 @@
msgid "Provider Hostname"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
msgid "Use StartTLS"
msgstr ""
@@ -559,8 +559,8 @@
msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
-#: src/modules/LdapDatabase.rb:1992
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
+#: src/modules/LdapDatabase.rb:1998
msgid "The test returned the following error messages:"
msgstr ""
@@ -2196,7 +2196,7 @@
msgid "Index Cache (IDL cache)"
msgstr ""
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
msgid "Checkpoint Settings"
msgstr ""
@@ -2266,7 +2266,7 @@
msgstr ""
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
msgid "Password Policy Settings"
msgstr ""
@@ -2427,237 +2427,237 @@
msgstr ""
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:631
+#: src/modules/LdapDatabase.rb:637
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:634
+#: src/modules/LdapDatabase.rb:640
msgid "The error message was: '"
msgstr ""
-#: src/modules/LdapDatabase.rb:639
+#: src/modules/LdapDatabase.rb:645
msgid "Try again?"
msgstr "Thử lại?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:714
+#: src/modules/LdapDatabase.rb:720
msgid "Available Attribute Types"
msgstr ""
-#: src/modules/LdapDatabase.rb:718
+#: src/modules/LdapDatabase.rb:724
msgid "Selected Attribute Types"
msgstr ""
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
msgid "Who should this rule apply to"
msgstr ""
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
-#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
+#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
+#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
msgid "Entry DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
+#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
msgid "Select"
msgstr ""
-#: src/modules/LdapDatabase.rb:820
+#: src/modules/LdapDatabase.rb:826
msgid "Define the Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:830
+#: src/modules/LdapDatabase.rb:836
msgid "Stop access control evaluation here (default)"
msgstr ""
-#: src/modules/LdapDatabase.rb:837
+#: src/modules/LdapDatabase.rb:843
msgid "Continue with next access control rule (\"break\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:849
msgid "Continue evaluation of this rule (\"continue\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:898
+#: src/modules/LdapDatabase.rb:904
msgid "Please enter a DN in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
-#: src/modules/LdapDatabase.rb:1219
+#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
+#: src/modules/LdapDatabase.rb:1225
msgid "Subtree DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:944
+#: src/modules/LdapDatabase.rb:950
msgid "Group DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:967
+#: src/modules/LdapDatabase.rb:973
msgid "Edit Access Control Rule"
msgstr ""
-#: src/modules/LdapDatabase.rb:972
+#: src/modules/LdapDatabase.rb:978
msgid "Target Objects"
msgstr ""
-#: src/modules/LdapDatabase.rb:993
+#: src/modules/LdapDatabase.rb:999
msgid "Matching the filter:"
msgstr ""
-#: src/modules/LdapDatabase.rb:1000
+#: src/modules/LdapDatabase.rb:1006
msgid "LDAP Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1010
+#: src/modules/LdapDatabase.rb:1016
msgid "Apply this rule only to the listed attribute"
msgstr ""
-#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
msgid "Attributes"
msgstr "Thuộc tính"
-#: src/modules/LdapDatabase.rb:1017
+#: src/modules/LdapDatabase.rb:1023
msgid "Edit"
msgstr ""
-#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
+#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
msgid "Access Level"
msgstr ""
-#: src/modules/LdapDatabase.rb:1033
+#: src/modules/LdapDatabase.rb:1039
msgid "Who"
msgstr ""
-#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
msgid "DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1036
+#: src/modules/LdapDatabase.rb:1042
msgid "Flow Control"
msgstr ""
-#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
+#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
msgid "Up"
msgstr ""
-#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
+#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
msgid "Down"
msgstr ""
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1179
+#: src/modules/LdapDatabase.rb:1185
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1191
+#: src/modules/LdapDatabase.rb:1197
msgid "Enter valid a LDAP filter in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1203
msgid "You must add at least one item to the \"Access Level\" list."
msgstr ""
-#: src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1315
msgid "Target"
msgstr ""
-#: src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1315
msgid "Filter"
msgstr ""
-#: src/modules/LdapDatabase.rb:1341
+#: src/modules/LdapDatabase.rb:1347
msgid ""
"The selected database contains access control rules that are currently\n"
"not supported by YaST. The Access Control Dialog will be disabled.\n"
msgstr ""
-#: src/modules/LdapDatabase.rb:1588
+#: src/modules/LdapDatabase.rb:1594
msgid "This database is a Replication Consumer."
msgstr ""
-#: src/modules/LdapDatabase.rb:1608
+#: src/modules/LdapDatabase.rb:1614
msgid "Provider Name"
msgstr ""
-#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
+#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
msgid "Port"
msgstr "Cổng"
-#: src/modules/LdapDatabase.rb:1631
+#: src/modules/LdapDatabase.rb:1637
msgid "Replication Type"
msgstr ""
-#: src/modules/LdapDatabase.rb:1638
+#: src/modules/LdapDatabase.rb:1644
msgid "Replication Interval"
msgstr ""
-#: src/modules/LdapDatabase.rb:1641
+#: src/modules/LdapDatabase.rb:1647
msgid "Days"
msgstr ""
-#: src/modules/LdapDatabase.rb:1645
+#: src/modules/LdapDatabase.rb:1651
msgid "Hours"
msgstr ""
-#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
+#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
msgid "Minutes"
msgstr ""
-#: src/modules/LdapDatabase.rb:1653
+#: src/modules/LdapDatabase.rb:1659
msgid "Seconds"
msgstr ""
-#: src/modules/LdapDatabase.rb:1666
+#: src/modules/LdapDatabase.rb:1672
msgid "Authentication DN"
msgstr ""
-#: src/modules/LdapDatabase.rb:1687
+#: src/modules/LdapDatabase.rb:1693
msgid "Custom update referral"
msgstr ""
-#: src/modules/LdapDatabase.rb:1703
+#: src/modules/LdapDatabase.rb:1709
msgid "Target Host"
msgstr ""
#. no updateref
-#: src/modules/LdapDatabase.rb:1923
+#: src/modules/LdapDatabase.rb:1929
msgid "Invalid replication interval specified"
msgstr ""
#. test connection
-#: src/modules/LdapDatabase.rb:1959
+#: src/modules/LdapDatabase.rb:1965
msgid "Checking LDAP connectivity to the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
+#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
msgid "Do you still want to continue?"
msgstr ""
-#: src/modules/LdapDatabase.rb:1983
+#: src/modules/LdapDatabase.rb:1989
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1995
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr ""
-#: src/modules/LdapDatabase.rb:2088
+#: src/modules/LdapDatabase.rb:2094
msgid "Enable ldapsync provider for this database"
msgstr ""
-#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
+#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
msgid "Operations"
msgstr ""
-#: src/modules/LdapDatabase.rb:2125
+#: src/modules/LdapDatabase.rb:2131
msgid "Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2137
msgid "Enable Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2265
+#: src/modules/LdapDatabase.rb:2271
msgid "Replication Settings"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/autoinst.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/autoinst.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/autoinst.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -31,7 +31,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:358
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
msgid "This may take a while"
msgstr "Có thể cần chờ một chút"
@@ -54,12 +54,12 @@
#. command line options
#. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. Import users configuration from the profile
+#.
#. 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:389
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
#: src/clients/inst_autosetup_upgrade.rb:484
#: src/modules/AutoInstallRules.rb:1001
msgid ""
@@ -321,22 +321,24 @@
msgid "Executing Post-Scripts"
msgstr ""
-#: src/clients/inst_autoconfigure.rb:303
+#. Do not restart dbus. Otherwise some services will hang.
+#. bnc#937900
+#: src/clients/inst_autoconfigure.rb:304
msgid "Restarting all running services"
msgstr ""
-#: src/clients/inst_autoconfigure.rb:326
+#: src/clients/inst_autoconfigure.rb:327
msgid "Activating systemd default target"
msgstr ""
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:341
+#: src/clients/inst_autoconfigure.rb:342
#, fuzzy
msgid "Finishing Configuration"
msgstr "Cấu hình"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:444
+#: src/clients/inst_autoconfigure.rb:448
msgid "Processing resource %1"
msgstr ""
@@ -509,89 +511,102 @@
#. Uwe Gansert
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr ""
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
msgid "Execute pre-install user scripts"
msgstr ""
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
#, fuzzy
msgid "Configure General Settings "
msgstr "Cấu hình"
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
#, fuzzy
msgid "Set up language"
msgstr "Đặt phạm vị ngày"
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:60
msgid "Create partition plans"
msgstr ""
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
#, fuzzy
msgid "Configure Bootloader"
msgstr "Cấu hình"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
#, fuzzy
#| msgid "Registration Code"
msgid "Registration"
msgstr "Mã đăng ký"
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
#, fuzzy
msgid "Configure Software selections"
msgstr "Cấu hình"
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:64
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+msgid "Configure users and groups"
+msgstr "Cấu hình"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
msgid "Executing pre-install user scripts..."
msgstr ""
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring general settings..."
msgstr ""
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
#, fuzzy
msgid "Setting up language..."
msgstr "Đặt phạm vị ngày"
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
msgid "Creating partition plans..."
msgstr ""
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
msgid "Configuring Bootloader..."
msgstr ""
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
msgid "Registering the system..."
msgstr ""
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
#, fuzzy
msgid "Configuring Software selections..."
msgstr "Đang cấu hình thiết bị %s cho mạng tuyến..."
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
#, fuzzy
msgid "Configuring Systemd Default Target..."
msgstr "_Cấu hình VPN..."
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: 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
msgid "Preparing System for Automated Installation"
msgstr ""
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. 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
#, fuzzy
#| msgid "Add-On Products"
msgid "Handling Add-On Products..."
@@ -600,20 +615,20 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
#, fuzzy
msgid "Configuring language..."
msgstr "_Cấu hình VPN..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:273
+#: src/clients/inst_autosetup.rb:290
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
msgstr ""
#. Software
-#: src/clients/inst_autosetup.rb:331
+#: src/clients/inst_autosetup.rb:344
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -1608,7 +1623,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
msgid "Checking XML with RNG validation..."
msgstr ""
@@ -1618,7 +1633,7 @@
msgstr ""
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
msgid "Checking XML with RNC validation..."
msgstr ""
@@ -1659,7 +1674,7 @@
msgstr ""
#: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:121
+#: src/modules/AutoinstGeneral.rb:126
#, fuzzy
msgid "Signature Handling"
msgstr "Kiểm tra chữ ký không thành công"
@@ -2258,7 +2273,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:744
+#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr ""
@@ -2274,46 +2289,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:273
+#: src/modules/AutoinstConfig.rb:278
#, fuzzy
msgid "Choose Profile"
msgstr "Xác lập phần cứng"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:329
+#: src/modules/AutoinstConfig.rb:334
msgid "Retrieving control file from floppy."
msgstr ""
-#: src/modules/AutoinstConfig.rb:332
+#: src/modules/AutoinstConfig.rb:337
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:338
+#: src/modules/AutoinstConfig.rb:343
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:344
+#: src/modules/AutoinstConfig.rb:349
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:350
+#: src/modules/AutoinstConfig.rb:355
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr ""
-#: src/modules/AutoinstConfig.rb:356
+#: src/modules/AutoinstConfig.rb:361
msgid "Copying control file from file: %1."
msgstr ""
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:366
msgid "Copying control file from device: /dev/%1."
msgstr ""
-#: src/modules/AutoinstConfig.rb:365
+#: src/modules/AutoinstConfig.rb:370
msgid "Copying control file from default location."
msgstr ""
-#: src/modules/AutoinstConfig.rb:367
+#: src/modules/AutoinstConfig.rb:372
msgid "Source unknown."
msgstr ""
@@ -2323,14 +2338,14 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:447
+#: src/modules/AutoinstConfig.rb:452
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
"configured using the configuration management system.</p>\n"
msgstr ""
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:457
msgid ""
"<p>Most of the modules used to create the configuration are identical to those available\n"
"through the YaST Control Center. Instead of configuring this system, the data\n"
@@ -2339,7 +2354,7 @@
"</p>\n"
msgstr ""
-#: src/modules/AutoinstConfig.rb:459
+#: src/modules/AutoinstConfig.rb:464
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2372,85 +2387,107 @@
#. string language_name = "";
#. string keyboard_name = "";
-#: src/modules/AutoinstGeneral.rb:85
+#: src/modules/AutoinstGeneral.rb:90
#, fuzzy
msgid "Confirm installation?"
msgstr "_Xác nhận kết nối"
-#: 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
+#: 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
msgid "Yes"
msgstr "Có"
-#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
-#: src/modules/AutoinstGeneral.rb:103
+#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:108
#, fuzzy
msgid "No"
msgstr "Không có"
-#: src/modules/AutoinstGeneral.rb:91
+#: src/modules/AutoinstGeneral.rb:96
msgid "Second Stage of AutoYaST"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:104
msgid "Halting the machine after stage one"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:108
+#: src/modules/AutoinstGeneral.rb:113
msgid "Halting the machine after stage two"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:115
+#: src/modules/AutoinstGeneral.rb:120
msgid "Reboot the machine after stage two"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:125
+#: src/modules/AutoinstGeneral.rb:130
msgid "Accepting unsigned files"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:126
+#: src/modules/AutoinstGeneral.rb:131
msgid "Not accepting unsigned files"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:135
+#: src/modules/AutoinstGeneral.rb:140
msgid "Accepting files without a checksum"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:136
+#: src/modules/AutoinstGeneral.rb:141
msgid "Not accepting files without a checksum"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:145
+#: src/modules/AutoinstGeneral.rb:150
msgid "Accepting failed verifications"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:146
+#: src/modules/AutoinstGeneral.rb:151
msgid "Not accepting failed verifications"
msgstr ""
-#: src/modules/AutoinstGeneral.rb:151
+#: src/modules/AutoinstGeneral.rb:156
#, fuzzy
msgid "Accepting unknown GPG keys"
msgstr "Chìa khóa GnuPG không biết"
-#: src/modules/AutoinstGeneral.rb:152
+#: src/modules/AutoinstGeneral.rb:157
#, fuzzy
msgid "Not accepting unknown GPG Keys"
msgstr "Chìa khóa GnuPG không biết"
-#: src/modules/AutoinstGeneral.rb:157
+#: src/modules/AutoinstGeneral.rb:162
#, fuzzy
msgid "Importing new GPG keys"
msgstr "Nhập chìa khóa GnuPG không tin tưởng"
-#: src/modules/AutoinstGeneral.rb:158
+#: src/modules/AutoinstGeneral.rb:163
#, fuzzy
msgid "Not importing new GPG Keys"
msgstr "Nhập chìa khóa GnuPG không tin tưởng"
+#. NTP syncing
+#: src/modules/AutoinstGeneral.rb:414
+#, fuzzy
+#| msgid "Saving time zone..."
+msgid "Syncing time..."
+msgstr "Đang lưu múi giờ..."
+
+#. 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 "Prescript failed."
+msgid "Time syncing failed."
+msgstr "Prescript thất bại."
+
+#: src/modules/AutoinstGeneral.rb:424
+msgid "Cannot update system time."
+msgstr ""
+
#. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:111
+#: src/modules/AutoinstLVM.rb:113
msgid "Cannot reuse volume group %1. The volume group does not exist."
msgstr ""
@@ -2540,7 +2577,7 @@
msgstr "Không biết"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:171
+#: src/modules/AutoinstSoftware.rb:172
msgid ""
"These packages could not be found in the software repositories:\n"
"%1"
@@ -2548,82 +2585,82 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345
+#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
msgid "Adding repo %1 failed"
msgstr ""
#. Install
-#: src/modules/AutoinstSoftware.rb:373
+#: src/modules/AutoinstSoftware.rb:375
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:381
+#: src/modules/AutoinstSoftware.rb:383
#, fuzzy
#| msgid "Uninstalling Package"
msgid "Creating Image - installing packages"
msgstr "Đang gỡ bỏ gói"
-#: src/modules/AutoinstSoftware.rb:391
+#: src/modules/AutoinstSoftware.rb:393
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:402
+#: src/modules/AutoinstSoftware.rb:404
msgid "Store image to ..."
msgstr ""
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:431
+#: src/modules/AutoinstSoftware.rb:433
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:445
+#: src/modules/AutoinstSoftware.rb:447
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:452
+#: src/modules/AutoinstSoftware.rb:454
#, fuzzy
#| msgid "Domain %1 joined successfully."
msgid "Image created successfully"
msgstr "Đã gia nhập miền %1 thành công."
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:488
+#: src/modules/AutoinstSoftware.rb:490
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:522
+#: src/modules/AutoinstSoftware.rb:524
#, fuzzy
#| msgid "Cannot restart '%1' service"
msgid "can not read '%1'. Try again?"
msgstr "Không khởi động lại được dịch vụ '%1'"
#. copy a file
-#: src/modules/AutoinstSoftware.rb:540
+#: src/modules/AutoinstSoftware.rb:542
msgid "can not read '%1'. ISO creation failed"
msgstr ""
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:570
+#: src/modules/AutoinstSoftware.rb:572
msgid "Preparing ISO Filestructure ..."
msgstr ""
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:619
+#: src/modules/AutoinstSoftware.rb:621
msgid "boot config for the DVD"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:623
+#: src/modules/AutoinstSoftware.rb:625
msgid "Ok"
msgstr "Ok"
-#: src/modules/AutoinstSoftware.rb:626
+#: src/modules/AutoinstSoftware.rb:628
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."
@@ -2631,47 +2668,47 @@
#. 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:645
+#: src/modules/AutoinstSoftware.rb:647
msgid "Store ISO image to ..."
msgstr ""
-#: src/modules/AutoinstSoftware.rb:646
+#: src/modules/AutoinstSoftware.rb:648
#, fuzzy
#| msgid "Creating the TSIG key failed."
msgid "Creating ISO File ..."
msgstr "Tạo chìa khóa TSIG không thành công."
-#: src/modules/AutoinstSoftware.rb:667
+#: src/modules/AutoinstSoftware.rb:669
msgid "ISO successfully created at %1"
msgstr ""
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:743
+#: src/modules/AutoinstSoftware.rb:745
#, fuzzy
msgid "Selected Patterns"
msgstr "Chọn đường dẫn"
-#: src/modules/AutoinstSoftware.rb:753
+#: src/modules/AutoinstSoftware.rb:755
msgid "Individually Selected Packages"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:759
+#: src/modules/AutoinstSoftware.rb:761
msgid "Packages to Remove"
msgstr ""
-#: src/modules/AutoinstSoftware.rb:766
+#: src/modules/AutoinstSoftware.rb:768
msgid "Force Kernel Package"
msgstr ""
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:856
+#: src/modules/AutoinstSoftware.rb:858
#, fuzzy
msgid "Could not set patterns: %1."
msgstr "Không thể xoá bỏ một phiên bản"
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:917
+#: src/modules/AutoinstSoftware.rb:919
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr ""
@@ -2714,7 +2751,7 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:357
+#: src/modules/Profile.rb:351
#, fuzzy
msgid "Collecting configuration data..."
msgstr "Cấu hình thành phần"
@@ -2722,7 +2759,7 @@
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:460
+#: src/modules/Profile.rb:454
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr ""
@@ -2730,7 +2767,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:534
+#: src/modules/Profile.rb:528
#, fuzzy
msgid "Could not write section %1 to file %2."
msgstr "Không ghi được các thiết lập vào %1."
@@ -2738,7 +2775,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
@@ -2760,20 +2797,6 @@
msgstr "&OK"
#, fuzzy
-#~ msgid "Configure users and groups"
-#~ msgstr "Cấu hình"
-
-#, fuzzy
-#~| msgid "Saving time zone..."
-#~ msgid "Syncing time..."
-#~ msgstr "Đang lưu múi giờ..."
-
-#, fuzzy
-#~| msgid "Prescript failed."
-#~ msgid "Time syncing failed."
-#~ msgstr "Prescript thất bại."
-
-#, fuzzy
#~ msgid "Configure runlevel"
#~ msgstr "_Cấu hình"
Modified: branches/plus-SLE12-SP2/yast/vi/po/base.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/base.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/base.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2011-05-28 17:22+0700\n"
"Last-Translator: Quang Duong Ha \n"
"Language-Team: Vietnamese \n"
@@ -391,7 +391,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:1450
+#: library/control/src/modules/ProductControl.rb:1444
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr "http://en.opensuse.org/Bugs/YaST"
@@ -427,7 +427,7 @@
msgstr ""
#. error report
-#: library/control/src/modules/ProductControl.rb:1259
+#: library/control/src/modules/ProductControl.rb:1253
msgid "No workflow defined for this installation mode."
msgstr "Không có chuỗi các công việc xác định cho chế độ cài đặt này."
@@ -445,14 +445,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:737
+#: library/general/src/modules/Popup.rb:744
msgid "&Continue Installation"
msgstr "&Tiếp tục cài đặt"
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:735
+#: library/general/src/modules/Popup.rb:742
msgid "&Abort Installation"
msgstr "&Hủy bỏ cài đặt"
@@ -491,7 +491,7 @@
msgstr "Gặp lỗi khi kết nối tới máy chủ."
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:691
+#: library/cwm/src/modules/CWM.rb:677
msgid "The value of %1 is invalid."
msgstr "Giá trị %1 sai."
@@ -1108,87 +1108,6 @@
"<p>Trong một vài môi trường, tất cả\n"
"hoặc một vài phím F không làm việc.</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 "Read the previous settings"
-msgid "Restart After Saving Settings"
-msgstr "Đọc thiết lập trước đây"
-
-#: library/general/src/lib/ui/service_status.rb:61
-#, fuzzy
-#| msgid "Read the previous settings"
-msgid "Reload After Saving Settings"
-msgstr "Đọc thiết lập trước đây"
-
-#. @return [YaST::Term]
-#: library/general/src/lib/ui/service_status.rb:68
-#, fuzzy
-#| msgid "Service Start"
-msgid "Service Status"
-msgstr "Chạy dịch vụ"
-
-#. 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
-#, fuzzy
-#| msgid "Current Status: "
-msgid "Current status:"
-msgstr "Trạng thái hiện thời: "
-
-#. Widget to configure the status on boot
-#: library/general/src/lib/ui/service_status.rb:172
-#, fuzzy
-#| msgid "During Boot"
-msgid "Start During System Boot"
-msgstr "Khi khởi động"
-
-#. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:196
-#, fuzzy
-#| msgid "Warning"
-msgid "running"
-msgstr "Cảnh báo"
-
-#: library/general/src/lib/ui/service_status.rb:198
-#, fuzzy
-#| msgid "&Stop"
-msgid "Stop now"
-msgstr "&Dừng"
-
-#. 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
-msgid "Start now"
-msgstr ""
-
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
#: library/general/src/modules/FileUtils.rb:292
@@ -1389,7 +1308,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:665
+#: library/packages/src/modules/PackageCallbacks.rb:664
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "&Bỏ qua"
@@ -1412,7 +1331,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2231
+#: library/packages/src/modules/PackageCallbacks.rb:2230
msgid "&Password"
msgstr "Mật &khẩu"
@@ -1635,27 +1554,27 @@
msgstr ""
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:733
+#: library/general/src/modules/Popup.rb:740
msgid "Really abort the installation?"
msgstr "Thực sự huỷ bỏ cài đặt?"
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:749
msgid "Really abort YaST System Repair?"
msgstr "Thực sự dừng tiện ích sửa chữa hệ thống của YaST?"
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:751
msgid "Abort System Repair"
msgstr "Dừng sửa chữa hệ thống"
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:746
+#: library/general/src/modules/Popup.rb:753
msgid "&Continue System Repair"
msgstr "&Tiếp tục sửa chữa hệ thống"
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:756
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1668,7 +1587,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:759
+#: library/general/src/modules/Popup.rb:766
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1682,7 +1601,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:768
+#: library/general/src/modules/Popup.rb:775
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1693,18 +1612,18 @@
"Bạn sẽ phải cài đặt lại."
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:822
+#: library/general/src/modules/Popup.rb:829
msgid "Really abort?"
msgstr "Thật sự dừng?"
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:830
+#: library/general/src/modules/Popup.rb:837
msgid "All changes will be lost!"
msgstr "Mọi thay đổi sẽ bị mất!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:860
+#: library/general/src/modules/Popup.rb:867
msgid "&Details..."
msgstr "&Chi tiết..."
@@ -2757,47 +2676,47 @@
"Không cho phép khoảng trắng.\n"
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:116
+#: library/network/src/modules/SuSEFirewall.rb:115
msgid "External Zone"
msgstr "Vùng bên ngoài"
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:120
+#: library/network/src/modules/SuSEFirewall.rb:119
msgid "Internal Zone"
msgstr "Vùng ở trong"
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:124
+#: library/network/src/modules/SuSEFirewall.rb:123
msgid "Demilitarized Zone"
msgstr "Vùng không đánh nhau"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:247
+#: library/network/src/modules/SuSEFirewall.rb:246
msgid "TCP"
msgstr "TCP"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:249
+#: library/network/src/modules/SuSEFirewall.rb:248
msgid "UDP"
msgstr "UDP"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:251
+#: library/network/src/modules/SuSEFirewall.rb:250
msgid "RPC"
msgstr "RPC"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:253
+#: library/network/src/modules/SuSEFirewall.rb:252
msgid "IP"
msgstr "IP"
#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1159
+#: library/network/src/modules/SuSEFirewall.rb:1158
msgid "Unknown Zone"
msgstr "Vùng không rõ"
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1508
+#: library/network/src/modules/SuSEFirewall.rb:1506
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
"Continuing with configuration can produce errors.\n"
@@ -2813,8 +2732,8 @@
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1973
-#: library/network/src/modules/SuSEFirewall.rb:2049
+#: library/network/src/modules/SuSEFirewall.rb:1971
+#: library/network/src/modules/SuSEFirewall.rb:2047
msgid ""
"Interface '%1' is not assigned to any firewall zone.\n"
"Run YaST2 Firewall and assign it.\n"
@@ -2823,72 +2742,72 @@
"Hãy chạy YaST2 Firewall và gán nó.\n"
#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2480
+#: library/network/src/modules/SuSEFirewall.rb:2478
msgid "Initializing Firewall Configuration"
msgstr "Đang chạy cấu hình tường lửa"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
+#: library/network/src/modules/SuSEFirewall.rb:2486
msgid "Check for network devices"
msgstr "Kiểm tra các thiết bị mạng"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
+#: library/network/src/modules/SuSEFirewall.rb:2488
msgid "Read current configuration"
msgstr "Đọc cấu hình hiện thời"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2492
+#: library/network/src/modules/SuSEFirewall.rb:2490
msgid "Check possibly conflicting services"
msgstr "Kiểm tra các mâu thuẫn dịch vụ có thể xảy ra"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
+#: library/network/src/modules/SuSEFirewall.rb:2494
msgid "Checking for network devices..."
msgstr "Đang kiểm tra các thiết bị mạng..."
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
+#: library/network/src/modules/SuSEFirewall.rb:2496
msgid "Reading current configuration..."
msgstr "Đang đọc cấu hình hiện thời..."
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2500
+#: library/network/src/modules/SuSEFirewall.rb:2498
msgid "Checking possibly conflicting services..."
msgstr "Đang kiểm tra các mâu thuẫn dịch vụ có thể xảy ra..."
#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2643
+#: library/network/src/modules/SuSEFirewall.rb:2648
msgid "Writing Firewall Configuration"
msgstr "Đang ghi cấu hình tường lửa"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2651
+#: library/network/src/modules/SuSEFirewall.rb:2656
msgid "Write firewall settings"
msgstr "Ghi thiết lập tường lửa"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2653
+#: library/network/src/modules/SuSEFirewall.rb:2658
msgid "Adjust firewall service"
msgstr "Chỉnh sửa dịch vụ tường lửa"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2657
+#: library/network/src/modules/SuSEFirewall.rb:2662
msgid "Writing firewall settings..."
msgstr "Đang ghi thiết lập tường lửa..."
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2659
+#: library/network/src/modules/SuSEFirewall.rb:2664
msgid "Adjusting firewall service..."
msgstr "Đang chỉnh sửa dịch vụ tường lửa..."
#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2678
+#: library/network/src/modules/SuSEFirewall.rb:2683
msgid "Writing settings failed"
msgstr "Lỗi ghi thiết lập"
#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3471
+#: library/network/src/modules/SuSEFirewall.rb:3476
msgid "Unknown protocol (%1)"
msgstr "Giao thức không biết (%1)"
@@ -2993,52 +2912,51 @@
#. Returns service definition.
#. See @services for the format.
-#. If *silent* is `false` (the default), the method throws an exception
-#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#. If `silent` is not defined or set to `true`, function throws an exception
+#. SuSEFirewalServiceNotFound if service is not found on disk.
#.
-#. @param [String] service name (including the "service:" prefix)
+#. @param [String] service name
#. @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 {Yast::SuSEFirewalServiceNotFound}
+#. Function throws an exception 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 [Hash{String => Array<String>] store_definition of full service definition
+#. @param map 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:356
-#: library/network/src/modules/SuSEFirewallServices.rb:640
+#. $[
+#. "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
msgid "Service with name '%{service_name}' does not exist"
msgstr ""
#. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:434
+#: library/network/src/modules/SuSEFirewallServices.rb:430
#, fuzzy
#| msgid "Service: %1"
msgid "Service: %{filename}"
msgstr "Dịch vụ: %1"
#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:505
+#: library/network/src/modules/SuSEFirewallServices.rb:503
msgid "Unknown service '%1'"
msgstr "Dịch vụ không rõ '%1'"
@@ -3062,77 +2980,36 @@
msgid "&Uninstall"
msgstr "&Xóa bỏ"
-#. TRANSLATORS: progress bar label
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77
-#, fuzzy
-#| msgid "Checking possibly conflicting services..."
-msgid "Checking file conflicts..."
-msgstr "Đang kiểm tra các mâu thuẫn dịch vụ có thể xảy ra..."
-
-#. 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] ""
-
-#. Convert one message to richtext
-#.
-#. @return [String] Message converted to richtext
-#: library/packages/src/lib/packages/update_messages_view.rb:35
-msgid "This message will be available at %s"
-msgstr ""
-
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:150
-#: library/packages/src/modules/PackageCallbacks.rb:158
+#: library/packages/src/modules/PackageCallbacks.rb:149
+#: library/packages/src/modules/PackageCallbacks.rb:157
msgid "Downloading package %1 (%2)..."
msgstr "Đang tải xuống gói %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:162
+#: library/packages/src/modules/PackageCallbacks.rb:161
msgid "Downloading Package"
msgstr "Đang tải xuống gói"
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:221
+#: library/packages/src/modules/PackageCallbacks.rb:220
#, fuzzy
msgid "Package %1 is broken, integrity check has failed."
msgstr "Kiểm tra tính toàn vẹn của tập tin không thành công: "
#. 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:233
-#: library/packages/src/modules/PackageCallbacks.rb:448
+#: library/packages/src/modules/PackageCallbacks.rb:232
+#: library/packages/src/modules/PackageCallbacks.rb:447
msgid "Retry installation of the package?"
msgstr "Thử lại cài đặt gói?"
#. 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:241
-#: library/packages/src/modules/PackageCallbacks.rb:456
+#: library/packages/src/modules/PackageCallbacks.rb:240
+#: library/packages/src/modules/PackageCallbacks.rb:455
msgid "Abort the installation?"
msgstr "Thoát khỏi cài đặt?"
@@ -3141,57 +3018,57 @@
#. 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:269
-#: library/packages/src/modules/PackageCallbacks.rb:303
-#: library/packages/src/modules/PackageCallbacks.rb:2144
+#: library/packages/src/modules/PackageCallbacks.rb:268
+#: library/packages/src/modules/PackageCallbacks.rb:302
+#: library/packages/src/modules/PackageCallbacks.rb:2143
msgid "Error: %1:"
msgstr "Lỗi: %1:"
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:327
+#: library/packages/src/modules/PackageCallbacks.rb:326
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:365
+#: library/packages/src/modules/PackageCallbacks.rb:364
msgid "Uninstalling package %1 (%2)..."
msgstr "Đang gỡ bỏ gói %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:367
+#: library/packages/src/modules/PackageCallbacks.rb:366
msgid "Installing package %1 (%2)..."
msgstr "Đang cài đặt gói %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:375
+#: library/packages/src/modules/PackageCallbacks.rb:374
msgid "Uninstalling Package"
msgstr "Đang gỡ bỏ gói"
-#: library/packages/src/modules/PackageCallbacks.rb:375
+#: library/packages/src/modules/PackageCallbacks.rb:374
msgid "Installing Package"
msgstr "Đang cài đặt gói"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:431
+#: library/packages/src/modules/PackageCallbacks.rb:430
msgid "Removal of package %1 failed."
msgstr "Gỡ bỏ gói %1 không thành công."
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:434
+#: library/packages/src/modules/PackageCallbacks.rb:433
msgid "Installation of package %1 failed."
msgstr "Cài đặt gói %1 không thành công."
#. 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:507
+#: library/packages/src/modules/PackageCallbacks.rb:506
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:576
+#: library/packages/src/modules/PackageCallbacks.rb:575
#, fuzzy
msgid ""
"<p>The repository at the specified URL now provides a different media ID.\n"
@@ -3207,28 +3084,28 @@
#. 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:591
+#: library/packages/src/modules/PackageCallbacks.rb:590
msgid "Side A"
msgstr "Mặt A"
#. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:594
+#: library/packages/src/modules/PackageCallbacks.rb:593
msgid "Side B"
msgstr "Mặt 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:609
+#: library/packages/src/modules/PackageCallbacks.rb:608
msgid "%1 (Disc %2)"
msgstr "%1 (Đĩa %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:612
+#: library/packages/src/modules/PackageCallbacks.rb:611
#, fuzzy
msgid "%1 (Medium %2)"
msgstr "Đĩa: %1"
#. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:618
+#: library/packages/src/modules/PackageCallbacks.rb:617
msgid ""
"Insert\n"
"'%1'"
@@ -3237,7 +3114,7 @@
"'%1'"
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:623
+#: library/packages/src/modules/PackageCallbacks.rb:622
#, fuzzy
msgid ""
"Cannot access installation media\n"
@@ -3250,7 +3127,7 @@
"Hãy kiểm tra xem có truy cập được vào thư mục đó không."
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:635
+#: library/packages/src/modules/PackageCallbacks.rb:634
#, fuzzy
msgid ""
"Cannot access installation media \n"
@@ -3264,51 +3141,51 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:660
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:659
+#: library/packages/src/modules/PackageCallbacks.rb:1838
msgid "Skip Autorefresh"
msgstr "Bỏ qua tự động làm tươi"
#. 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:679
-#: library/packages/src/modules/PackageCallbacks.rb:682
+#: library/packages/src/modules/PackageCallbacks.rb:678
+#: library/packages/src/modules/PackageCallbacks.rb:681
msgid "&Eject"
msgstr "Đẩy đĩa r&a"
-#: library/packages/src/modules/PackageCallbacks.rb:689
+#: library/packages/src/modules/PackageCallbacks.rb:688
msgid "A&utomatically Eject CD or DVD Medium"
msgstr ""
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:756
+#: library/packages/src/modules/PackageCallbacks.rb:755
msgid "Retry the installation?"
msgstr "Thử cài đặt lại?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:764
+#: library/packages/src/modules/PackageCallbacks.rb:763
msgid "Skip the medium?"
msgstr "Bỏ qua đĩa này?"
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:771
+#: library/packages/src/modules/PackageCallbacks.rb:770
msgid "Ignoring the bad medium..."
msgstr "Đang lờ đi những đĩa xấu..."
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:792
-#: library/packages/src/modules/PackageCallbacks.rb:848
+#: library/packages/src/modules/PackageCallbacks.rb:791
+#: library/packages/src/modules/PackageCallbacks.rb:847
msgid "&URL"
msgstr "&URL"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1040
+#: library/packages/src/modules/PackageCallbacks.rb:1039
msgid "Creating Repository %1"
msgstr ""
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1073
+#: library/packages/src/modules/PackageCallbacks.rb:1072
#, fuzzy
msgid "An error occurred while creating the repository."
msgstr "Lỗi khi đọc bản ghi log."
@@ -3316,9 +3193,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:1077
-#: library/packages/src/modules/PackageCallbacks.rb:1204
-#: library/packages/src/modules/PackageCallbacks.rb:1314
+#: library/packages/src/modules/PackageCallbacks.rb:1076
+#: library/packages/src/modules/PackageCallbacks.rb:1203
+#: library/packages/src/modules/PackageCallbacks.rb:1313
#, fuzzy
msgid "Unable to retrieve the remote repository description."
msgstr "Không thể lấy được mô tả hạng mục ở xa."
@@ -3326,23 +3203,23 @@
#. 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:1080
-#: library/packages/src/modules/PackageCallbacks.rb:1207
-#: library/packages/src/modules/PackageCallbacks.rb:1317
+#: library/packages/src/modules/PackageCallbacks.rb:1079
+#: library/packages/src/modules/PackageCallbacks.rb:1206
+#: library/packages/src/modules/PackageCallbacks.rb:1316
msgid "An error occurred while retrieving the new metadata."
msgstr "Gặp lỗi khi lấy dữ liệu mêta mới."
#. 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:1083
-#: library/packages/src/modules/PackageCallbacks.rb:1210
-#: library/packages/src/modules/PackageCallbacks.rb:1320
+#: library/packages/src/modules/PackageCallbacks.rb:1082
+#: library/packages/src/modules/PackageCallbacks.rb:1209
+#: library/packages/src/modules/PackageCallbacks.rb:1319
msgid "The repository is not valid."
msgstr "Kho ứng dụng không hợp lệ."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1086
+#: library/packages/src/modules/PackageCallbacks.rb:1085
msgid "The repository metadata is invalid."
msgstr "Dữ liệu về kho ứng dụng không hợp lệ."
@@ -3350,101 +3227,101 @@
#. 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:1099
-#: library/packages/src/modules/PackageCallbacks.rb:1229
-#: library/packages/src/modules/PackageCallbacks.rb:1333
-#: library/packages/src/modules/PackageCallbacks.rb:2098
+#: 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
msgid "Retry?"
msgstr "Thử &lại?"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1145
-#: library/packages/src/modules/PackageCallbacks.rb:1153
+#: library/packages/src/modules/PackageCallbacks.rb:1144
+#: library/packages/src/modules/PackageCallbacks.rb:1152
msgid "Probing Repository %1"
msgstr ""
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1200
+#: library/packages/src/modules/PackageCallbacks.rb:1199
#, fuzzy
msgid "Error occurred while probing the repository."
msgstr "Lỗi khi đọc bản ghi log."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1213
+#: library/packages/src/modules/PackageCallbacks.rb:1212
msgid "Repository probing details."
msgstr ""
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1216
+#: library/packages/src/modules/PackageCallbacks.rb:1215
#, fuzzy
msgid "Repository metadata is invalid."
msgstr "Lỗi: Dữ liệu nhận được bị sai."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1310
+#: library/packages/src/modules/PackageCallbacks.rb:1309
msgid "Repository %1"
msgstr ""
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1398
+#: library/packages/src/modules/PackageCallbacks.rb:1397
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "Đang tải xuống những thay đổi gói RPM %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1406
+#: library/packages/src/modules/PackageCallbacks.rb:1405
msgid "Downloading Delta RPM package"
msgstr "Đang tải xuống những thay đổi gói RPM"
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1419
+#: library/packages/src/modules/PackageCallbacks.rb:1418
msgid "Applying delta RPM package %1..."
msgstr "Đang áp dụng cập nhật thay đổi gói RPM %1..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1426
+#: library/packages/src/modules/PackageCallbacks.rb:1425
msgid "Applying delta RPM package"
msgstr "Đang áp dụng cập nhật thay đổi gói RPM"
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1428
-#: library/packages/src/modules/PackageCallbacks.rb:3082
+#: library/packages/src/modules/PackageCallbacks.rb:1427
+#: library/packages/src/modules/PackageCallbacks.rb:3075
msgid "Package: "
msgstr "Gói: "
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1494
+#: library/packages/src/modules/PackageCallbacks.rb:1493
msgid "Starting script %1 (patch %2)..."
msgstr "Bắt đầu kịch bản %1 (bản vá %2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1503
+#: library/packages/src/modules/PackageCallbacks.rb:1502
msgid "Running Script"
msgstr "Đang chạy kịch bản..."
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1508
+#: library/packages/src/modules/PackageCallbacks.rb:1507
msgid "Patch: "
msgstr "Vá lỗi:"
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1517
+#: library/packages/src/modules/PackageCallbacks.rb:1516
msgid "Script: "
msgstr "Script: "
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1523
+#: library/packages/src/modules/PackageCallbacks.rb:1522
msgid "Output of the Script"
msgstr "Kết quả của Kịch bản"
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1611
+#: library/packages/src/modules/PackageCallbacks.rb:1610
msgid ""
"Patch: %1\n"
"\n"
msgstr "Vá lỗi: %1\n"
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1628
+#: library/packages/src/modules/PackageCallbacks.rb:1627
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3454,36 +3331,36 @@
msgstr ""
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1643
+#: library/packages/src/modules/PackageCallbacks.rb:1642
msgid "&Skip Refresh"
msgstr "&Bỏ qua cập nhật"
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1677
+#: library/packages/src/modules/PackageCallbacks.rb:1676
msgid "Downloading"
msgstr "Đang tải về"
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1724
-#: library/packages/src/modules/PackageCallbacks.rb:1772
+#: library/packages/src/modules/PackageCallbacks.rb:1723
+#: library/packages/src/modules/PackageCallbacks.rb:1771
msgid "Downloading: %1"
msgstr "Đang tải về: %1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1876
-#: library/packages/src/modules/PackageCallbacks.rb:1942
+#: library/packages/src/modules/PackageCallbacks.rb:1875
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Checking Package Database"
msgstr "Đang kiểm tra cơ sở dữ liệu gói"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1879
+#: library/packages/src/modules/PackageCallbacks.rb:1878
msgid "Rebuilding package database. This process can take some time."
msgstr "Đang xây dựng lại cơ sở dữ liệu gói. Quá trình này cần một chút thời gian."
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1912
+#: library/packages/src/modules/PackageCallbacks.rb:1911
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3492,16 +3369,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1945
+#: library/packages/src/modules/PackageCallbacks.rb:1944
msgid "Converting package database. This process can take some time."
msgstr "Đang chuyển đổi cơ sở dữ liệu gói. Quá trình này cần một chút thời gian."
-#: library/packages/src/modules/PackageCallbacks.rb:1958
+#: library/packages/src/modules/PackageCallbacks.rb:1957
msgid "Status"
msgstr "Trạng thái"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1982
+#: library/packages/src/modules/PackageCallbacks.rb:1981
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3510,12 +3387,12 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2018
+#: library/packages/src/modules/PackageCallbacks.rb:2017
msgid "Reading RPM database..."
msgstr "Đang đọc cơ sở dữ liệu RPM..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2028
+#: library/packages/src/modules/PackageCallbacks.rb:2027
msgid "Reading Installed Packages"
msgstr "Đang đọc gói đã cài"
@@ -3526,27 +3403,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2034
-#: library/packages/src/modules/PackageCallbacks.rb:2050
+#: library/packages/src/modules/PackageCallbacks.rb:2033
+#: library/packages/src/modules/PackageCallbacks.rb:2049
msgid "Scanning RPM database..."
msgstr "Quét cơ sở dữ liệu RPM..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2087
+#: library/packages/src/modules/PackageCallbacks.rb:2086
msgid "Initialization of the target failed."
msgstr "Khởi tạo đích không thành công."
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2179
+#: library/packages/src/modules/PackageCallbacks.rb:2178
msgid "RPM database read"
msgstr "Đọc cơ sở dữ liệu RPM"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2213
+#: library/packages/src/modules/PackageCallbacks.rb:2212
msgid "User Authentication"
msgstr "Xác thực người dùng"
-#: library/packages/src/modules/PackageCallbacks.rb:2219
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid ""
"URL: %1\n"
"\n"
@@ -3557,20 +3434,20 @@
"%2"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2228
+#: library/packages/src/modules/PackageCallbacks.rb:2227
msgid "&User Name"
msgstr "&Tên người dùng"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3017
+#: library/packages/src/modules/PackageCallbacks.rb:3010
msgid "Show &details"
msgstr "Hiển thị &chi tiết"
-#: library/packages/src/modules/PackageCallbacks.rb:3083
+#: library/packages/src/modules/PackageCallbacks.rb:3076
msgid "Size: "
msgstr "Cỡ: "
-#: library/packages/src/modules/PackageCallbacks.rb:3106
+#: library/packages/src/modules/PackageCallbacks.rb:3099
msgid "Remaining time to automatic retry: %1"
msgstr "Thời gian còn lại để thử lại: %1"
@@ -3643,12 +3520,12 @@
msgstr ""
#. error report
-#: library/packages/src/modules/PackageSystem.rb:417
+#: library/packages/src/modules/PackageSystem.rb:415
msgid "Installing required packages failed."
msgstr "Cài đặt gói yêu cầu không thành công."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:421
+#: library/packages/src/modules/PackageSystem.rb:419
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3659,12 +3536,12 @@
"YaST có thể sẽ làm việc không đúng.\n"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:432
+#: library/packages/src/modules/PackageSystem.rb:430
msgid "Cannot continue without installing required packages."
msgstr "Không thể tiếp tục mà không cài đặt các gói đã yêu cầu."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:437
+#: library/packages/src/modules/PackageSystem.rb:435
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
@@ -3673,22 +3550,22 @@
"YaST có thể sẽ làm việc không đúng.\n"
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:156
+#: library/packages/src/modules/PackagesUI.rb:152
msgid "Confirm Package License: %1"
msgstr "Xác nhận bản quyền gói: %1"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:163
+#: library/packages/src/modules/PackagesUI.rb:159
msgid "I &Agree"
msgstr "&Tôi đồng ý"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:165
+#: library/packages/src/modules/PackagesUI.rb:161
msgid "I &Disagree"
msgstr "&Không đồng ý"
#. help text
-#: library/packages/src/modules/PackagesUI.rb:177
+#: library/packages/src/modules/PackagesUI.rb:173
#, fuzzy
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
@@ -3711,7 +3588,7 @@
"nhấn <b>Không đồng ý với tất cả</b>.</p>"
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:347
+#: library/packages/src/modules/PackagesUI.rb:326
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3725,7 +3602,7 @@
"\t\t Để xem mô tả cho một mục, hãy chọn nó trong danh sách.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:354
+#: library/packages/src/modules/PackagesUI.rb:333
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3739,7 +3616,7 @@
"\t\t Với trình đơn này, bạn có thể thay đổi trạng thái của bất kỳ mục nào.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:361
+#: library/packages/src/modules/PackagesUI.rb:340
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3751,7 +3628,7 @@
"\t\t ở đó bạn có thể xem và chọn từng gói chương trình riêng biệt.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:346
#, fuzzy
msgid ""
"<p>\n"
@@ -3772,130 +3649,130 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:388
+#: library/packages/src/modules/PackagesUI.rb:367
msgid "Software Selection and System Tasks"
msgstr "Lựa chọn phần mềm và công việc hệ thống"
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:429
+#: library/packages/src/modules/PackagesUI.rb:408
msgid "(more)"
msgstr "(thêm)"
-#: library/packages/src/modules/PackagesUI.rb:445
+#: library/packages/src/modules/PackagesUI.rb:424
msgid "Installation Successfully Finished"
msgstr "Cài đặt đã hoàn thành thành công"
-#: library/packages/src/modules/PackagesUI.rb:447
+#: library/packages/src/modules/PackagesUI.rb:426
msgid "Package Installation Failed"
msgstr "Cài đặt gói thất bại"
-#: library/packages/src/modules/PackagesUI.rb:459
+#: library/packages/src/modules/PackagesUI.rb:438
msgid "Error Message: %1"
msgstr "Thông điệp lỗi: %1"
-#: library/packages/src/modules/PackagesUI.rb:476
+#: library/packages/src/modules/PackagesUI.rb:455
msgid "Failed Packages: %1"
msgstr "Gói thất bại: %1"
-#: library/packages/src/modules/PackagesUI.rb:495
+#: library/packages/src/modules/PackagesUI.rb:474
msgid "Installed Packages: %1"
msgstr "Gói đã cài: %1"
-#: library/packages/src/modules/PackagesUI.rb:514
+#: library/packages/src/modules/PackagesUI.rb:493
msgid "Updated Packages: %1"
msgstr "Những gói đã cập nhật: %1"
-#: library/packages/src/modules/PackagesUI.rb:533
+#: library/packages/src/modules/PackagesUI.rb:512
msgid "Removed Packages: %1"
msgstr "Gói đã xóa bỏ: %1"
-#: library/packages/src/modules/PackagesUI.rb:555
+#: library/packages/src/modules/PackagesUI.rb:534
msgid "Not Installed Packages: %1"
msgstr "Gói chưa cài: %1"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:571
-#: library/packages/src/modules/SlideShow.rb:534
+#: library/packages/src/modules/PackagesUI.rb:550
+#: library/packages/src/modules/SlideShow.rb:533
msgid "Packages"
msgstr "Gói"
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:582
+#: library/packages/src/modules/PackagesUI.rb:561
msgid "Elapsed Time: %1"
msgstr "Thời gian đã qua: %1"
-#: library/packages/src/modules/PackagesUI.rb:592
+#: library/packages/src/modules/PackagesUI.rb:571
msgid "Total Installed Size: %1"
msgstr "Tổng dung lượng đã cài đặt: %1"
-#: library/packages/src/modules/PackagesUI.rb:602
+#: library/packages/src/modules/PackagesUI.rb:581
msgid "Total Downloaded Size: %1"
msgstr "Tổng dung lượng tải xuống: %1"
-#: library/packages/src/modules/PackagesUI.rb:611
+#: library/packages/src/modules/PackagesUI.rb:590
msgid "Statistics"
msgstr "Thống kê"
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:624
-#: library/packages/src/modules/PackagesUI.rb:712
+#: library/packages/src/modules/PackagesUI.rb:603
+#: library/packages/src/modules/PackagesUI.rb:691
msgid "Installation log"
msgstr "Nhật kí cài đặt"
-#: library/packages/src/modules/PackagesUI.rb:631
+#: library/packages/src/modules/PackagesUI.rb:610
msgid "Details"
msgstr "Chi tiết"
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:679
+#: library/packages/src/modules/PackagesUI.rb:658
#, fuzzy
#| msgid "Installing Package"
msgid "After Installing Packages"
msgstr "Đang cài đặt gói"
-#: library/packages/src/modules/PackagesUI.rb:680
+#: library/packages/src/modules/PackagesUI.rb:659
msgid "Show This Report"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:681
+#: library/packages/src/modules/PackagesUI.rb:660
#, fuzzy
#| msgid "&Finish"
msgid "Finish"
msgstr "&Kết thúc"
-#: library/packages/src/modules/PackagesUI.rb:682
+#: library/packages/src/modules/PackagesUI.rb:661
msgid "Continue in the Software Manager"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:687
+#: library/packages/src/modules/PackagesUI.rb:666
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:695
+#: library/packages/src/modules/PackagesUI.rb:674
#, fuzzy
#| msgid "Installation Error"
msgid "Installation Report"
msgstr "Lỗi cài đặt"
-#: library/packages/src/modules/PackagesUI.rb:717
+#: library/packages/src/modules/PackagesUI.rb:696
msgid "Installed Packages"
msgstr "Gói đã cài"
-#: library/packages/src/modules/PackagesUI.rb:722
+#: library/packages/src/modules/PackagesUI.rb:701
msgid "Updated Packages"
msgstr "Những gói cập nhật"
-#: library/packages/src/modules/PackagesUI.rb:727
+#: library/packages/src/modules/PackagesUI.rb:706
msgid "Removed Packages"
msgstr "Những gói đã xóa"
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:711
msgid "Remaining Packages"
msgstr "Gói còn lại"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:753
+#: library/packages/src/modules/PackagesUI.rb:732
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -4361,85 +4238,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:153
-#: library/packages/src/modules/SlideShow.rb:324
-#: library/packages/src/modules/SlideShow.rb:345
+#: library/packages/src/modules/SlideShow.rb:323
+#: library/packages/src/modules/SlideShow.rb:344
msgid "Installing..."
msgstr "Đang cài đặt..."
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:530
+#: library/packages/src/modules/SlideShow.rb:529
msgid "Media"
msgstr "Đĩa"
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:532
+#: library/packages/src/modules/SlideShow.rb:531
#, fuzzy
#| msgid "Remaining Packages"
msgid "Remaining"
msgstr "Gói còn lại"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:536
+#: library/packages/src/modules/SlideShow.rb:535
msgid "Time"
msgstr "Thời gian"
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:552
+#: library/packages/src/modules/SlideShow.rb:551
msgid "Actions performed:"
msgstr "Hành động đã thực hiện:"
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:633
#, fuzzy
msgid "<p>Packages are being installed.</p>"
msgstr "<p>Xin hãy đợi một chút trong khi cài đặt gói.</p>"
-#: library/packages/src/modules/SlideShow.rb:635
+#: library/packages/src/modules/SlideShow.rb:634
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:653
+#: library/packages/src/modules/SlideShow.rb:652
#, fuzzy
#| msgid "Release &Notes"
msgid "%s Release Notes"
msgstr "Ghi chú về &phát hành"
#. tab
-#: library/packages/src/modules/SlideShow.rb:665
+#: library/packages/src/modules/SlideShow.rb:664
msgid "Slide Sho&w"
msgstr "&Chiếu ảnh"
#. tab
-#: library/packages/src/modules/SlideShow.rb:667
+#: library/packages/src/modules/SlideShow.rb:666
msgid "&Details"
msgstr "&Chi tiết"
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:706
+#: library/packages/src/modules/SlideShow.rb:705
#, fuzzy
#| msgid "Perform Update"
msgid "Performing Upgrade"
msgstr "Thực hiện cập nhật"
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:709
+#: library/packages/src/modules/SlideShow.rb:708
#, fuzzy
#| msgid "Perform Installation"
msgid "Performing Installation"
msgstr "Thực hiện cài đặt"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:744
+#: library/packages/src/modules/SlideShow.rb:743
msgid "Package Installation"
msgstr "Cài đặt gói"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:816
+#: library/packages/src/modules/SlideShow.rb:815
msgid ""
"Do you really want\n"
"to quit the installation?"
@@ -4448,7 +4325,7 @@
"thoát khỏi cài đặt?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:828
+#: library/packages/src/modules/SlideShow.rb:827
msgid "Aborted"
msgstr "Đã thoát"
@@ -5049,16 +4926,6 @@
msgid "Bluetooth device"
msgstr "Thiết bị Bluetooth"
-#. 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
msgid ""
@@ -5133,7 +5000,7 @@
"trong khoảng 0-255 phân cách nhau bởi dấu chấm."
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:56
+#: library/types/src/modules/Hostname.rb:55
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -5144,7 +5011,7 @@
"không thể đứng đầu hoặc cuối của một phần và phần cuối cùng không thể bắt đầu bằng một chữ số."
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:67
+#: library/types/src/modules/Hostname.rb:66
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -6086,7 +5953,67 @@
"Hostname %2 cannot be added."
msgstr ""
+#: src/lib/ui/srv_status_component.rb:60
#, fuzzy
+#| msgid "Service Start"
+msgid "Service Status"
+msgstr "Chạy dịch vụ"
+
+#. 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
+#, fuzzy
+#| msgid "Current Status: "
+msgid "Current status:"
+msgstr "Trạng thái hiện thời: "
+
+#. Widget to configure the status on boot
+#: src/lib/ui/srv_status_component.rb:194
+#, fuzzy
+#| msgid "During Boot"
+msgid "Start During System Boot"
+msgstr "Khi khởi động"
+
+#. Widget to configure reloading of the running service
+#: src/lib/ui/srv_status_component.rb:208
+#, fuzzy
+#| msgid "Read the previous settings"
+msgid "Reload After Saving Settings"
+msgstr "Đọc thiết lập trước đây"
+
+#. TRANSLATORS: status of a service
+#: src/lib/ui/srv_status_component.rb:218
+#, fuzzy
+#| msgid "Warning"
+msgid "running"
+msgstr "Cảnh báo"
+
+#: src/lib/ui/srv_status_component.rb:220
+#, fuzzy
+#| msgid "&Stop"
+msgid "Stop now"
+msgstr "&Dừng"
+
+#. TRANSLATORS: status of a service
+#: src/lib/ui/srv_status_component.rb:225
+msgid "stopped"
+msgstr ""
+
+#: src/lib/ui/srv_status_component.rb:227
+msgid "Start now"
+msgstr ""
+
+#, fuzzy
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "Không gắn được đĩa hạng mục đúng."
Modified: branches/plus-SLE12-SP2/yast/vi/po/bootloader.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/bootloader.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/bootloader.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2011-05-08 17:43+0700\n"
"Last-Translator: haqduong \n"
"Language-Team: Vietnamese \n"
@@ -29,165 +29,53 @@
#. command line help text for delete action
#: src/clients/bootloader.rb:58
-msgid "Delete a global option or option of a section"
-msgstr "Xóa một tùy chọn toàn cục hoặc một tùy chọn của một mục"
+#, fuzzy
+msgid "Delete a global option"
+msgstr "&Lựa chọn chi tiết..."
#. command line help text for set action
#: src/clients/bootloader.rb:65
-msgid "Set a global option or option of a section"
-msgstr "Thiết lập một tùy chọn toàn cục hoặc tùy chọn của một mục"
+#, fuzzy
+msgid "Set a global option"
+msgstr "&Lựa chọn chi tiết..."
-#. command line help text for add action
-#: src/clients/bootloader.rb:72
-msgid "Add a new section - please use interactive mode"
-msgstr "Thêm mục mới - sử dụng chế độ tương tác"
-
#. command line help text for print action
-#: src/clients/bootloader.rb:82
+#: src/clients/bootloader.rb:75
msgid "Print value of specified option"
msgstr "In giá trị của tùy chọn đã chọn"
#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The name of the section"
-msgstr "Tên mục này"
-
-#. command line help text for an option
-#: src/clients/bootloader.rb:97
+#: src/clients/bootloader.rb:83
msgid "The key of the option"
msgstr "Khóa của mục này"
#. command line help text for an option
-#: src/clients/bootloader.rb:104
+#: src/clients/bootloader.rb:90
msgid "The value of the option"
msgstr "Giá trị mục này"
-#. 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 "Không thấy mục %1"
-
#. command line error report
-#: src/clients/bootloader.rb:201
+#: src/clients/bootloader.rb:152
msgid "Value was not specified."
msgstr "Giá trị chưa được thiết lập"
-#. 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 "Thêm tùy chọn chỉ có thể trong chế độ tương tác dòng lệnh"
-
#. command line error report
-#: src/clients/bootloader.rb:245
-msgid "Section name must be specified."
-msgstr "Trường tên phải được chỉ rõ"
-
-#. command line error report
-#: src/clients/bootloader.rb:265
+#: src/clients/bootloader.rb:174
msgid "Option was not specified."
msgstr "Tùy chọn chưa được thiết lập"
-#. command line error report
-#: src/clients/bootloader.rb:284
-msgid "Specified option does not exist."
-msgstr "Không có tùy chọn này"
-
#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:287
+#: src/clients/bootloader.rb:180
#, fuzzy
#| msgid "Value: %1"
-msgid "Value: %1"
+msgid "Value: %s"
msgstr "Giá trị: %1"
-#. progress step title
-#: src/clients/bootloader_finish.rb:52
-#, fuzzy
-msgid "Saving bootloader configuration..."
-msgstr "Tải lại cấu hình"
+#. command line error report
+#: src/clients/bootloader.rb:183
+msgid "Specified option does not exist."
+msgstr "Không có tùy chọn này"
-#. TRANSLATORS: reboot message
-#. %1 is replaced with additional message from reIPL
-#: src/clients/bootloader_finish.rb:133
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "Your system will now shut down.%1%2\n"
-#| "For details, read the related chapter \n"
-#| "in the documentation. \n"
-msgid ""
-"\n"
-"Your system will now shut down.%1\n"
-"For details, read the related chapter \n"
-"in the documentation. \n"
-msgstr ""
-"\n"
-"Hệ thống của bạn sẽ tắt bây giờ%1%2\n"
-"Để có thêm chi tiết, đọc chương liên quan\n"
-"trong tài liệu.\n"
-
-#. 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 "Hệ thống sẽ khởi động lại..."
-
-#. 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 "Không có boot loader nào được chọn cho việc cài đặt. Hệ thống của bạn có thể không thể khởi động."
-
-#. error in the proposal
-#: src/clients/bootloader_proposal.rb:126
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Chương trình khởi động không thể cài đặt đúng do phân vùng."
-
-#. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:225
-#, fuzzy
-msgid "Booting"
-msgstr "Đừng làm gì"
-
-#. menubutton entry
-#: src/clients/bootloader_proposal.rb:227
-#, fuzzy
-msgid "&Booting"
-msgstr "Đừng làm gì"
-
-#. 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
-#, fuzzy
-#| msgid "Disk order settings"
-msgid "Disk Order"
-msgstr "Thiết lập thứ tự đĩa"
-
-#: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:230
-msgid "Disk order settings"
-msgstr "Thiết lập thứ tự đĩa"
-
-#. Run dialog for loader installation details on i386
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:68
-#, fuzzy
-msgid "Boot Menu"
-msgstr "Đừng làm gì"
-
-#. `VSpacing(1),
-#. Window title
-#: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:143
-msgid "Boot Loader Options"
-msgstr "Tùy chọn chương trình khởi động"
-
#. encoding: utf-8
#. File:
#. include/bootloader/grup/helps.ycp
@@ -259,17 +147,11 @@
#: 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 ""
-#: src/include/bootloader/grub/helps.rb:53
+#: src/include/bootloader/grub/helps.rb:50
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"
@@ -277,64 +159,55 @@
"to start this section.</p>"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:59
+#: src/include/bootloader/grub/helps.rb:56
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:62
+#: src/include/bootloader/grub/helps.rb:59
msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:65
+#: src/include/bootloader/grub/helps.rb:62
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:68
+#: src/include/bootloader/grub/helps.rb:65
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 grub</code>) for details.</p>"
+"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:71
+#: src/include/bootloader/grub/helps.rb:68
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"
+"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 ""
-#: src/include/bootloader/grub/helps.rb:78
+#: src/include/bootloader/grub/helps.rb:75
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>"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:81
+#: src/include/bootloader/grub/helps.rb:78
msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
msgstr ""
-#: 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 ""
-
-#: 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
+#: src/include/bootloader/grub/helps.rb:81
msgid ""
"<p><b>Protect Boot Loader with Password</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>"
+"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 ""
#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:97
+#: src/include/bootloader/grub/helps.rb:91
msgid ""
"<p><big><b>Disks Order</b></big><br>\n"
"To specify the order of the disks according to the order in BIOS, use\n"
@@ -343,212 +216,139 @@
"To remove a disk, push <b>Remove</b>.</p>"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:108
+#: src/include/bootloader/grub/helps.rb:101
#, fuzzy
msgid "Boot Loader Locations"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/helps.rb:109
+#: src/include/bootloader/grub/helps.rb:102
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:112
-#: src/include/bootloader/routines/common_helps.rb:29
+#: src/include/bootloader/grub/helps.rb:105
+#: src/include/bootloader/routines/common_helps.rb:28
msgid "&Timeout in Seconds"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:106
#, fuzzy
msgid "&Default Boot Section"
msgstr "Tuyến mặc định:"
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:107
msgid "Write &generic Boot Code to MBR"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:115
-msgid "Use &Trusted Grub"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:108
msgid "Custom Boot Partition"
msgstr "Tùy chọn phân vùng khởi động"
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:109
msgid "Boot from Master Boot Record"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:110
#, fuzzy
msgid "Boot from Root Partition"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:111
#, fuzzy
msgid "Boot from Boot Partition"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:112
#, fuzzy
msgid "Boot from Extended Partition"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:113
#, fuzzy
msgid "Serial Connection &Parameters"
msgstr "Kết nối _quay số"
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:114
msgid "Fallback Sections if Default fails"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:123
+#: src/include/bootloader/grub/helps.rb:115
msgid "&Hide Menu on Boot"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:124
-msgid "Graphical &Menu File"
-msgstr ""
-
-#: src/include/bootloader/grub/helps.rb:125
+#: src/include/bootloader/grub/helps.rb:116
msgid "Pa&ssword for the Menu Interface"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:126
+#: src/include/bootloader/grub/helps.rb:117
msgid "Debugg&ing Flag"
msgstr ""
-#. 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
-msgid "Choose new graphical menu file"
-msgstr ""
-
-#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
-#: src/include/bootloader/grub/options.rb:129
-msgid "Enable Acoustic &Signals"
-msgstr ""
-
#. 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:254
+#: src/include/bootloader/grub/options.rb:73
msgid "Prot&ect Boot Loader with Password"
msgstr ""
+#. 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:259
+#: src/include/bootloader/grub/options.rb:85
#, fuzzy
msgid "&Password"
msgstr "Mật khẩu :"
#. text entry
-#: src/include/bootloader/grub/options.rb:262
+#: src/include/bootloader/grub/options.rb:88
#, fuzzy
msgid "Re&type Password"
msgstr "Mật khẩu :"
-#. 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
-msgid "Use &serial console"
-msgstr ""
-
-#: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:302
-msgid "&Console arguments"
-msgstr ""
-
-#. textentry header
-#: src/include/bootloader/grub/options.rb:455
-#, fuzzy
-msgid "&Device"
-msgstr "_Thiết bị:"
-
-#. disabling & enabling up/down, do it after change
-#: src/include/bootloader/grub/options.rb:534
-msgid "Device map must contain at least one device"
-msgstr ""
-
-#: src/include/bootloader/grub/options.rb:543
-msgid "D&isks"
-msgstr ""
-
-#: src/include/bootloader/grub/options.rb:555
-msgid "&Up"
-msgstr "&Lên"
-
-#: src/include/bootloader/grub/options.rb:556
-msgid "&Down"
-msgstr "&Xuống"
-
#. Create Frame "Boot Loader Location"
#.
#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:730
+#: src/include/bootloader/grub/options.rb:222
#, fuzzy
msgid "Boot from &Root Partition"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/options.rb:731
+#: src/include/bootloader/grub/options.rb:224
#, fuzzy
msgid "Boo&t from Boot Partition"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/options.rb:739
-#: src/include/bootloader/grub/options.rb:766
-#: src/include/bootloader/grub/options.rb:801
+#: src/include/bootloader/grub/options.rb:235
#, fuzzy
+msgid "C&ustom Boot Partition"
+msgstr "Phân vùng"
+
+#: src/include/bootloader/grub/options.rb:250
+#: src/include/bootloader/grub/options.rb:280
+#: src/include/bootloader/grub/options.rb:301
+#, fuzzy
msgid "Boot Loader Location"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:772
-#: src/include/bootloader/grub/options.rb:807
+#: src/include/bootloader/grub/options.rb:256
+#: src/include/bootloader/grub/options.rb:286
+#: src/include/bootloader/grub/options.rb:307
#, fuzzy
msgid "Boot from &Master Boot Record"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/options.rb:752
+#: src/include/bootloader/grub/options.rb:263
#, fuzzy
msgid "Boot from &Extended Partition"
msgstr "Chép địa điểm ảnh"
-#: src/include/bootloader/grub/options.rb:778
-#: src/include/bootloader/grub/options.rb:819
-#, fuzzy
-msgid "C&ustom Boot Partition"
-msgstr "Phân vùng"
-
-#: src/include/bootloader/grub/options.rb:812
+#: src/include/bootloader/grub/options.rb:312
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 ""
-
#. Title in tab
#: src/include/bootloader/grub2/dialogs.rb:57
#, fuzzy
@@ -557,36 +357,41 @@
msgstr "Tùy chọn chương trình khởi động"
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:82
+#: src/include/bootloader/grub2/dialogs.rb:84
#, fuzzy
msgid "Kernel Parameters"
msgstr "Kết nối _quay số"
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:102
+#: src/include/bootloader/grub2/dialogs.rb:103
#, fuzzy
#| msgid "Boot Loader Options"
msgid "Bootloader Options"
msgstr "Tùy chọn chương trình khởi động"
-#: src/include/bootloader/grub2/dialogs.rb:183
+#. Window title
+#: src/include/bootloader/grub2/dialogs.rb:149
+msgid "Boot Loader Options"
+msgstr "Tùy chọn chương trình khởi động"
+
+#: src/include/bootloader/grub2/dialogs.rb:190
#, fuzzy
#| msgid "During Boot"
msgid "Secure Boot"
msgstr "Khi khởi động"
-#: src/include/bootloader/grub2/dialogs.rb:189
+#: src/include/bootloader/grub2/dialogs.rb:196
msgid "Enable &Secure Boot Support"
msgstr ""
#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:262
+#: src/include/bootloader/grub2/dialogs.rb:247
#, fuzzy
msgid "Boot &Loader Location"
msgstr "Chép địa điểm ảnh"
#. help text
-#: src/include/bootloader/grub2/dialogs.rb:281
+#: src/include/bootloader/grub2/dialogs.rb:266
msgid "Choose partition where is boot sequence installed."
msgstr ""
@@ -605,57 +410,35 @@
#.
#. $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
msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
msgstr ""
#: src/include/bootloader/grub2/helps.rb:26
-#: src/include/bootloader/routines/section_helps.rb:30
msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
msgstr ""
#: src/include/bootloader/grub2/helps.rb:29
-msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
-msgstr ""
-
-#: 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:35
+#: src/include/bootloader/grub2/helps.rb:32
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
msgid "O&ptional Kernel Command Line Parameter"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:45
+#: src/include/bootloader/grub2/helps.rb:39
#, fuzzy
-#| msgid "Distribution:"
-msgid "D&istributor"
-msgstr "Bản phân phối:"
-
-#: src/include/bootloader/grub2/helps.rb:46
-#: src/include/bootloader/routines/section_helps.rb:98
-#, fuzzy
msgid "&Vga Mode"
msgstr "Chế độ"
-#: src/include/bootloader/grub2/helps.rb:47
-msgid "&Failsafe Kernel Command Line Parameter"
-msgstr ""
-
-#: src/include/bootloader/grub2/helps.rb:48
+#: src/include/bootloader/grub2/helps.rb:40
msgid "Probe Foreign OS"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:49
+#: src/include/bootloader/grub2/helps.rb:41
msgid "Protective MBR flag"
msgstr ""
@@ -664,31 +447,21 @@
#. %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 ""
#: src/include/bootloader/grub2/options.rb:68
-#: src/include/bootloader/routines/section_widgets.rb:537
msgid "Standard 8-pixel font mode."
msgstr ""
#. 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
#, fuzzy
msgid "Text Mode"
msgstr "Chế độ đo"
#: src/include/bootloader/grub2/options.rb:72
-#: src/include/bootloader/routines/section_widgets.rb:541
#, fuzzy
#| msgid "&Unspecified"
msgid "Unspecified"
@@ -715,237 +488,72 @@
#. Init function for console
#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:174
+#: src/include/bootloader/grub2/options.rb:173
msgid "Autodetect by grub2"
msgstr ""
#. FATE: #110038: Serial console
#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:249
+#: src/include/bootloader/grub2/options.rb:246
msgid "Choose new graphical theme file"
msgstr ""
-#: src/include/bootloader/grub2/options.rb:261
+#: src/include/bootloader/grub2/options.rb:258
msgid "Use &graphical console"
msgstr ""
-#: src/include/bootloader/grub2/options.rb:268
+#: src/include/bootloader/grub2/options.rb:265
#, fuzzy
#| msgid "Conflict Resolution:"
msgid "&Console resolution"
msgstr "Giải quyết mâu thuẫu:"
-#: src/include/bootloader/grub2/options.rb:276
+#: src/include/bootloader/grub2/options.rb:273
msgid "&Console theme"
msgstr ""
-#. 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
+#: src/include/bootloader/grub2/options.rb:292
+msgid "Use &serial console"
+msgstr ""
+
+#: src/include/bootloader/grub2/options.rb:299
+msgid "&Console arguments"
+msgstr ""
+
+#. 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
msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
msgstr ""
#. file open popup caption
-#. 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
+#: src/include/bootloader/routines/common_options.rb:98
msgid "Select File"
msgstr "Chọn tập tin"
#. 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:90 src/modules/Bootloader.rb:270
+#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
msgid "The boot partition is of type NFS. Bootloader cannot be installed."
msgstr ""
#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:131
+#: src/include/bootloader/routines/dialogs.rb:114
msgid "Boot Loader Settings"
msgstr ""
#. message
-#: src/include/bootloader/routines/dialogs.rb:159
+#: src/include/bootloader/routines/dialogs.rb:142
msgid "There are no options to set for the current boot loader."
msgstr ""
-#. heading
-#. heading
-#. heading
-#: src/include/bootloader/routines/dialogs.rb:177
-#: src/include/bootloader/routines/dialogs.rb:255
-#: src/include/bootloader/routines/dialogs.rb:325
-#, fuzzy
-msgid "Kernel Section"
-msgstr "Máy ảnh chọn"
-
-#. 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
-#, fuzzy
-msgid "Section Settings"
-msgstr "Tình trạng kết nối"
-
-#. 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
-#, fuzzy
-msgid "Boot Loader Settings: Section Management"
-msgstr "Quản lý Điện năng"
-
-#. 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
-#, fuzzy
-msgid "Xen Section"
-msgstr "Máy ảnh chọn"
-
-#. 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
-#, fuzzy
-msgid "Menu Section"
-msgstr "Máy ảnh chọn"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:516
-#: src/include/bootloader/routines/section_widgets.rb:593
-#, fuzzy
-msgid "Dump Section"
-msgstr "Máy ảnh chọn"
-
-#. label
-#. label
-#: src/include/bootloader/routines/dialogs.rb:573
-#: src/include/bootloader/routines/dialogs.rb:628
-#, fuzzy
-msgid "Other System Section"
-msgstr "Máy ảnh chọn"
-
-#. combobox label
-#: src/include/bootloader/routines/dialogs.rb:803
-#, fuzzy
-msgid "&Filename"
-msgstr "Mẫu tên tập tin"
-
-#. label. %1 is name of file (eg. /etc/lilo.conf
-#: src/include/bootloader/routines/dialogs.rb:811
-msgid "Filename: %1"
-msgstr "Tên tập tin: %1"
-
-#. multiline edit header
-#: src/include/bootloader/routines/dialogs.rb:828
-#, fuzzy
-msgid "Fi&le Contents"
-msgstr "_Nội dung"
-
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:836
-#, fuzzy
-msgid "Expert Manual Configuration"
-msgstr "Cấu hình phẳng"
-
-#. 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 "Khác"
-
-#: src/include/bootloader/routines/global_widgets.rb:116
-msgid "Image"
-msgstr "Ảnh"
-
-#: src/include/bootloader/routines/global_widgets.rb:134
-msgid "Xen"
-msgstr ""
-
-#: src/include/bootloader/routines/global_widgets.rb:152
-msgid "Floppy"
-msgstr "Đĩa mềm"
-
-#: src/include/bootloader/routines/global_widgets.rb:154
-msgid "Menu"
-msgstr ""
-
-#: 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 ""
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Label"
-msgstr "Nhãn"
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:259
-#: src/include/bootloader/routines/global_widgets.rb:746
-msgid "Type"
-msgstr "Kiểu"
-
-#. 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 "Ảnh / Thiết bị"
-
-#: src/include/bootloader/routines/global_widgets.rb:271
-#, fuzzy
-#| msgid "&Reset to defaults"
-msgid "Set as De&fault"
-msgstr "Đặt thành &mặc định"
-
#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:312
+#: src/include/bootloader/routines/global_widgets.rb:109
msgid "&Boot Loader"
msgstr ""
#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:343
+#: src/include/bootloader/routines/global_widgets.rb:138
msgid ""
"\n"
"If you do not install any boot loader, the system\n"
@@ -954,120 +562,71 @@
"Proceed?\n"
msgstr ""
-#. 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 ""
+#. menu button entry
+#: src/include/bootloader/routines/global_widgets.rb:175
+#, fuzzy
+msgid "E&dit Configuration Files"
+msgstr "Cấu hình"
-#. radiobutton
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:399
-#: src/include/bootloader/routines/global_widgets.rb:593
+#: src/include/bootloader/routines/global_widgets.rb:182
#, fuzzy
msgid "&Propose New Configuration"
msgstr "Cấu hình thành phần"
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:406
-msgid "Co&nvert Current Configuration"
-msgstr "&Chuyển đổi thiết lập hiện tại"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:415
-#, fuzzy
-msgid "&Start New Configuration from Scratch"
-msgstr "Lỗi cấu hình VPN"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:423
-#, fuzzy
-msgid "&Read Configuration Saved on Disk"
-msgstr "Tải lại cấu hình"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:433
-#, fuzzy
-msgid "Res&tore Configuration Saved before Conversion"
-msgstr "Tải lại cấu hình"
-
-#. popup message
-#: src/include/bootloader/routines/global_widgets.rb:514
-#, fuzzy
-msgid "Select the boot loader before editing sections."
-msgstr "Bật/tắt kiểm tra trọng tải của đơn vị xử lý trung tâm trước khi làm hành động nghỉ."
-
-#. pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:563
-#: src/include/bootloader/routines/global_widgets.rb:586
-#, fuzzy
-msgid "E&dit Configuration Files"
-msgstr "Cấu hình"
-
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:600
+#: src/include/bootloader/routines/global_widgets.rb:189
msgid "&Start from Scratch"
msgstr ""
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:608
+#: src/include/bootloader/routines/global_widgets.rb:197
#, fuzzy
msgid "&Reread Configuration from Disk"
msgstr "Tải lại cấu hình"
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:625
+#: src/include/bootloader/routines/global_widgets.rb:214
msgid "Restore MBR of Hard Disk"
msgstr ""
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:633
+#: src/include/bootloader/routines/global_widgets.rb:222
msgid "Write bootloader boot code to disk"
msgstr ""
+#. menu button
+#: src/include/bootloader/routines/global_widgets.rb:230
+msgid "Other"
+msgstr "Khác"
+
#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:665
+#: src/include/bootloader/routines/global_widgets.rb:254
msgid "MBR restored successfully."
msgstr ""
#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:668
+#: src/include/bootloader/routines/global_widgets.rb:257
msgid "Failed to restore MBR."
msgstr ""
#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:691
+#: src/include/bootloader/routines/global_widgets.rb:280
#, fuzzy
msgid "Writing bootloader settings failed."
msgstr "Lỗi ghi thiết lập"
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:730
-#, fuzzy
-msgid "&Section Management"
-msgstr "Quản lý Điện năng"
-
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:740
-#, fuzzy
-#| msgid "Base Installation"
-msgid "Boot Loader &Installation"
-msgstr "Cài đặt cơ bản"
-
#. push button
-#: src/include/bootloader/routines/global_widgets.rb:818
+#: src/include/bootloader/routines/global_widgets.rb:329
#, fuzzy
msgid "Boot &Loader Options"
msgstr "Tùy chọn modem"
+#. push button
+#: src/include/bootloader/routines/global_widgets.rb:342
+msgid "Boot Loader Installation &Details"
+msgstr ""
+
#. help text 1/1 (shown during settings reading progress)
#: src/include/bootloader/routines/helps.rb:32
msgid ""
@@ -1082,16 +641,9 @@
"Please wait...<br></p>"
msgstr ""
-#. help text, optional part of following
+#. help text 1/2 (%1 may be following sentence, optionally empty)
#: 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 ""
-
-#. 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"
@@ -1099,28 +651,28 @@
msgstr ""
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:73
+#: src/include/bootloader/routines/helps.rb:67
msgid ""
"<P>To edit boot loader configuration files\n"
"manually, click <B>Edit Configuration Files</B>.</P>"
msgstr ""
#. help 1/4
-#: src/include/bootloader/routines/helps.rb:83
+#: src/include/bootloader/routines/helps.rb:76
msgid ""
"<P> In the table, each section represents one item\n"
"in the boot menu.</P>"
msgstr ""
#. help 2/4
-#: src/include/bootloader/routines/helps.rb:87
+#: src/include/bootloader/routines/helps.rb:80
msgid ""
"<P> Press <B>Edit</B> to display the properties of the\n"
"selected section.</P>"
msgstr ""
#. help 3/4
-#: src/include/bootloader/routines/helps.rb:91
+#: src/include/bootloader/routines/helps.rb:84
msgid ""
"<P> By pressing <b>Set as Default</b>, mark the selected \n"
"section as default. When booting, the boot loader will provide \n"
@@ -1131,7 +683,7 @@
msgstr ""
#. help 4/4
-#: src/include/bootloader/routines/helps.rb:100
+#: src/include/bootloader/routines/helps.rb:93
msgid ""
"<P>Press <B>Add</B> to create a new boot loader section\n"
"or <B>Delete</B> to delete the selected section.</P>"
@@ -1140,14 +692,14 @@
#. 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:115
+#: src/include/bootloader/routines/helps.rb:107
msgid ""
"<p><big><b>Boot Loader Location</b></big><br>\n"
"The boot manager (%1) can be installed in the following ways:</p>"
msgstr ""
#. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:124
+#: src/include/bootloader/routines/helps.rb:116
msgid ""
"<p>- In the <b>Master Boot Record</b> (MBR).\n"
"This is not recommended if there is another operating system installed\n"
@@ -1155,7 +707,7 @@
msgstr ""
#. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:134
+#: src/include/bootloader/routines/helps.rb:126
msgid ""
"<p>\n"
"- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
@@ -1167,19 +719,8 @@
"to start &product;.</p>"
msgstr ""
-#. 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 ""
-
#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:164
+#: src/include/bootloader/routines/helps.rb:141
msgid ""
"<p>\n"
"- In some <b>Other</b> partition. Consider your system's restrictions\n"
@@ -1187,7 +728,7 @@
msgstr ""
#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:174
+#: src/include/bootloader/routines/helps.rb:151
msgid ""
"<p>For example, most PCs have a BIOS\n"
"limit that restricts booting to\n"
@@ -1196,7 +737,7 @@
msgstr ""
#. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:186
+#: src/include/bootloader/routines/helps.rb:163
msgid ""
"<p>\n"
"Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
@@ -1204,7 +745,7 @@
msgstr ""
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:199
+#: src/include/bootloader/routines/helps.rb:176
msgid ""
"<p><b>Boot Loader Installation Details</b><br>\n"
"To adjust advanced boot loader installation options (such as the device\n"
@@ -1212,7 +753,7 @@
msgstr ""
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:210
+#: src/include/bootloader/routines/helps.rb:187
msgid ""
"<p><b>Boot Loader Type</b><br>\n"
"To select whether to install a boot loader and which bootloader to install,\n"
@@ -1220,7 +761,7 @@
msgstr ""
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:222
+#: src/include/bootloader/routines/helps.rb:198
msgid ""
"<p><b>Boot Loader Options</b><br>\n"
"To adjust options of the boot loader, such as the time-out, click\n"
@@ -1228,7 +769,7 @@
msgstr ""
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:233
+#: src/include/bootloader/routines/helps.rb:209
msgid ""
"<P><B>Expert Manual Configuration</B><BR>\n"
"Here, manually edit the boot loader configuration.</P>\n"
@@ -1236,7 +777,7 @@
msgstr ""
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:244
+#: src/include/bootloader/routines/helps.rb:220
msgid ""
"<p><b>Section Name</b><br>\n"
"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
@@ -1244,14 +785,14 @@
msgstr ""
#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:255
+#: src/include/bootloader/routines/helps.rb:231
msgid ""
"<p><big><b>Type of the New Section</b></big><br>\n"
"Select the type of the new section to create.</p>"
msgstr ""
#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:259
+#: src/include/bootloader/routines/helps.rb:235
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"
@@ -1259,28 +800,28 @@
msgstr ""
#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:265
+#: src/include/bootloader/routines/helps.rb:241
msgid ""
"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
"to load and start.</p>"
msgstr ""
#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:269
+#: src/include/bootloader/routines/helps.rb:245
msgid ""
"<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>"
msgstr ""
#. help text 5/5
-#: src/include/bootloader/routines/helps.rb:273
+#: src/include/bootloader/routines/helps.rb:249
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"
"booting other operating systems.</p>"
msgstr ""
-#: src/include/bootloader/routines/helps.rb:278
+#: src/include/bootloader/routines/helps.rb:254
msgid ""
"<p>Select <b>Menu Section</b> to add a section that \n"
"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
@@ -1288,52 +829,40 @@
msgstr ""
#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:697
+#: src/include/bootloader/routines/lilolike.rb:108
msgid "Order of Hard Disks: %1"
msgstr ""
#. summary string
-#: src/include/bootloader/routines/misc.rb:48
+#: src/include/bootloader/routines/misc.rb:51
msgid "Do not install any boot loader"
msgstr ""
#. combo box item
-#: src/include/bootloader/routines/misc.rb:50
+#: src/include/bootloader/routines/misc.rb:54
msgid "Do Not Install Any Boot Loader"
msgstr ""
#. summary string
-#: src/include/bootloader/routines/misc.rb:55
+#: src/include/bootloader/routines/misc.rb:60
msgid "Install the default boot loader"
msgstr ""
#. combo box item
-#: src/include/bootloader/routines/misc.rb:57
+#: src/include/bootloader/routines/misc.rb:63
msgid "Install Default Boot Loader"
msgstr ""
#. summary string
-#: src/include/bootloader/routines/misc.rb:61
+#: src/include/bootloader/routines/misc.rb:68
msgid "Boot loader"
msgstr ""
#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+#: src/include/bootloader/routines/misc.rb:71
msgid "Boot Loader"
msgstr ""
-#. popup, %1 is bootloader name
-#: src/include/bootloader/routines/misc.rb:101
-#, fuzzy
-#| msgid "Your settings have been saved to the floppy disk."
-msgid "The %1 boot sector has been written to the floppy disk."
-msgstr "Thiết lập của bạn đã được lưu vào đĩa mềm."
-
-#. popup - continuing
-#: src/include/bootloader/routines/misc.rb:113
-msgid "Leave the floppy disk in the drive."
-msgstr ""
-
#. popup message
#: src/include/bootloader/routines/popups.rb:35
msgid ""
@@ -1348,109 +877,28 @@
"All changes will be lost.\n"
msgstr ""
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:59
-#, fuzzy
-msgid "Really delete section %1?"
-msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
-
#. error popup
-#: src/include/bootloader/routines/popups.rb:65
+#: src/include/bootloader/routines/popups.rb:57
msgid "The password must not be empty."
msgstr ""
#. error popup
-#: src/include/bootloader/routines/popups.rb:74
+#: src/include/bootloader/routines/popups.rb:66
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
msgstr ""
-#. 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 ""
-
-#. 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 ""
-
#. 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:116
+#: src/include/bootloader/routines/popups.rb:82
#, fuzzy
msgid "%1Set default boot loader location?\n"
msgstr "Tuyến mặc định:"
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:128
-#, fuzzy
-msgid "Do Not Create a File System"
-msgstr "Hệ thống tập tin ả_o"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:130
-#, fuzzy
-msgid "Create an ext2 File System"
-msgstr "Hệ thống tập tin ả_o"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:136
-#, fuzzy
-msgid "Create a FAT File System"
-msgstr "Hệ thống tập tin ả_o"
-
-#. label
-#: src/include/bootloader/routines/popups.rb:142
-#, fuzzy
-#| msgid ""
-#| "The current package selection will be loaded\n"
-#| "from a floppy disk. Insert the floppy.\n"
-#| "\n"
-#| "Read data from the floppy disk now?\n"
-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 ""
-"Lựa chọn gói hiện thời sẽ được nạp từ một đĩa\n"
-"mềm. Hãy đặt đĩa mềm vào ổ.\n"
-"\n"
-"Đọc dữ liệu từ đĩa mềm ngay bây giờ?\n"
-
-#. checkbox
-#: src/include/bootloader/routines/popups.rb:150
-msgid "&Low Level Format"
-msgstr ""
-
-#. combobox
-#: src/include/bootloader/routines/popups.rb:153
-#, fuzzy
-msgid "&Create File System"
-msgstr "Hệ thống tập tin ả_o"
-
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:182
-msgid "Low level format failed. Try again?"
-msgstr ""
-
-#. error report
-#. error report
-#: src/include/bootloader/routines/popups.rb:195
-#: src/include/bootloader/routines/popups.rb:207
-#, fuzzy
-#| msgid "Creating the TSIG key failed."
-msgid "Creating file system failed."
-msgstr "Tạo chìa khóa TSIG không thành công."
-
#. error popup
-#: src/include/bootloader/routines/popups.rb:218
+#: src/include/bootloader/routines/popups.rb:90
#, fuzzy
msgid ""
"The name selected is already used.\n"
@@ -1458,21 +906,15 @@
msgstr "Đã cấu hình đường dẫn đã chọn cho truy cập bên ngoài."
#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:229
+#: src/include/bootloader/routines/popups.rb:101
msgid ""
"An error occurred during boot loader\n"
"installation. Retry boot loader configuration?\n"
msgstr ""
-#. FIXME too generic, but was already translated
-#: src/include/bootloader/routines/popups.rb:241
-#, fuzzy
-msgid "Unable to install the boot loader."
-msgstr "Không thể xoay {0} ảnh"
-
#. warning popup. %1 is device name, %2 is date/time in form of
#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:283
+#: src/include/bootloader/routines/popups.rb:125
msgid ""
"Warning!\n"
"\n"
@@ -1486,573 +928,495 @@
msgstr ""
#. PushButton
-#: src/include/bootloader/routines/popups.rb:305
+#: src/include/bootloader/routines/popups.rb:147
msgid "&Yes, Rewrite"
msgstr ""
-#. 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
-#, fuzzy
-msgid "<p><b>Image Section</b></p>"
-msgstr "<p><b>Thiết lập gia nhập</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:24
-#, fuzzy
-#| msgid ""
-#| "<p><b>Name of default image file</b>, if not empty, defines the image\n"
-#| "file to use. Either enter the path and file name directly or choose by using\n"
-#| "<b>Browse</b></p>"
-msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
+#. error report
+#: src/include/bootloader/routines/wizards.rb:36
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
msgstr ""
-"<p><b>Tên của tập tin ảnh mặc định</b>, nếu không rỗng, chỉ ra tập tin ảnh\n"
-"sử dụng. Có thể nhập đường dẫn và tên tập tin trực tiếp hoặc chọn bằng\n"
-"<b>Tìm kiếm</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>"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:53
+msgid "Device map must contain at least one device"
msgstr ""
-#: src/include/bootloader/routines/section_helps.rb:36
-#, fuzzy
-#| msgid ""
-#| "<p><b>Name of the default initrd file</b>, if not empty, defines the initial\n"
-#| "ramdisk to use. Either enter the path and file name directly or choose by using\n"
-#| "<b>Browse</b></p>\n"
-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>Tên của tập tin initrd mặc định</b>, nếu không rỗng, chỉ ra ramdisk khởi động\n"
-"được sử dụng. Có thể nhập trực tiếp đường dẫn và tên tập tin hoặc chọn bằng cách\n"
-"sử dụng <b>Tìm kiếm</b></p>\n"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:96
+msgid "Disk order settings"
+msgstr "Thiết lập thứ tự đĩa"
-#: src/include/bootloader/routines/section_helps.rb:39
-msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+#: src/lib/bootloader/device_map_dialog.rb:101
+msgid "D&isks"
msgstr ""
-#: src/include/bootloader/routines/section_helps.rb:42
-msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/include/bootloader/routines/section_helps.rb:51
-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 ""
-
-#: src/include/bootloader/routines/section_helps.rb:54
-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 ""
-
-#: src/include/bootloader/routines/section_helps.rb:57
-msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:60
-msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:63
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:146
#, fuzzy
-msgid "<p><b>Menu Section</b></p>"
-msgstr "<p><b>Thiết lập gia nhập</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:64
-#, fuzzy
-msgid "<p><b>Partition of Menu File</b></p>"
-msgstr "<p><b>Môđun hỗ trợ</b></p>\n"
-
-#: src/include/bootloader/routines/section_helps.rb:65
-msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
-msgstr ""
-
-#: 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 ""
-"<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 ""
-
-#: src/include/bootloader/routines/section_helps.rb:74
-msgid ""
-"<p><b>Allow attempt to relocate</b>\n"
-"Usually specified in global section</p>"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/include/bootloader/routines/section_helps.rb:85
-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 ""
-
-#: 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
-#, fuzzy
-msgid "Image Section"
-msgstr "Lưu lự&a chọn"
-
-#: src/include/bootloader/routines/section_helps.rb:96
-#, fuzzy
-msgid "&Kernel Image"
-msgstr "Lưu ảnh"
-
-#: src/include/bootloader/routines/section_helps.rb:97
-#, fuzzy
-msgid "&Root Device"
+msgid "&Device"
msgstr "_Thiết bị:"
-#: src/include/bootloader/routines/section_helps.rb:100
-msgid "&Initial RAM Disk"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:47
+msgid "Selected custom bootloader partition %s is not available any more."
msgstr ""
-#: src/include/bootloader/routines/section_helps.rb:101
-#, fuzzy
-msgid "Chainloader Section"
-msgstr "Chọn thư mục"
-
-#: src/include/bootloader/routines/section_helps.rb:102
-#, fuzzy
-msgid "Use Password Protection"
-msgstr "Không có hạn sử dụng mật khẩu"
-
-#: src/include/bootloader/routines/section_helps.rb:103
-#, fuzzy
-msgid "&Other System"
-msgstr "Hệ thống mở"
-
-#: src/include/bootloader/routines/section_helps.rb:104
-msgid "Do not &verify Filesystem before Booting"
+#. 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."
msgstr ""
-#: src/include/bootloader/routines/section_helps.rb:105
-msgid "&Activate this Partition when selected for Boot"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:106
-msgid "B&lock Offset for Chainloading"
-msgstr ""
-
-#: 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
-msgid "&Hypervisor"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:110
-msgid "&Additional Xen Hypervisor Parameters"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:112
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:28
#, fuzzy
-msgid "&Partition of Menu File"
-msgstr "<p><b>Môđun hỗ trợ</b></p>\n"
+msgid "Saving bootloader configuration..."
+msgstr "Tải lại cấu hình"
-#: src/include/bootloader/routines/section_helps.rb:113
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:145
#, fuzzy
-msgid "&Menu Description File"
-msgstr "Đọc mô tả đĩa không thành công"
-
-#: src/include/bootloader/routines/section_helps.rb:114
-#, fuzzy
-#| msgid "Force rootfs to be mounted read-only"
-msgid "&Force root filesystem to be mounted read-only"
-msgstr "Bắt buộc rootfs gắn chỉ đọc"
-
-#: src/include/bootloader/routines/section_helps.rb:115
-#, fuzzy
-#| msgid "Allow attempt to relocate"
-msgid "Allow attempt to &relocate"
-msgstr "Chấp nhận cố gắng định vị lại"
-
-#: src/include/bootloader/routines/section_helps.rb:116
-#, fuzzy
-msgid "Tar&get Directory for Section"
-msgstr "Thư mục đích: %1"
-
-#: src/include/bootloader/routines/section_helps.rb:117
-#, fuzzy
-msgid "Op&tional Parameter File"
-msgstr "Thông tin thêm"
-
-#: src/include/bootloader/routines/section_helps.rb:118
-#, fuzzy
-msgid "Dump Section (obsolete)"
-msgstr "Máy ảnh chọn"
-
-#: src/include/bootloader/routines/section_helps.rb:119
-#, fuzzy
-msgid "&Dump Device"
-msgstr "Thiết bị"
-
-#: src/include/bootloader/routines/section_helps.rb:120
-#, fuzzy
-msgid "&SCSI Dump Device"
-msgstr "Thư mục ảnh"
-
-#: src/include/bootloader/routines/section_helps.rb:122
-#, fuzzy
-msgid "&List of Menu Entries"
-msgstr "<p><b>Môđun hỗ trợ</b></p>\n"
-
-#: src/include/bootloader/routines/section_helps.rb:123
-#, fuzzy
-msgid "&Number of Default Entry"
-msgstr "Tên của tập tin mới"
-
-#: src/include/bootloader/routines/section_helps.rb:124
-msgid "&Timeout in seconds"
+#| msgid ""
+#| "\n"
+#| "Your system will now shut down.%1%2\n"
+#| "For details, read the related chapter \n"
+#| "in the documentation. \n"
+msgid ""
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
msgstr ""
+"\n"
+"Hệ thống của bạn sẽ tắt bây giờ%1%2\n"
+"Để có thêm chi tiết, đọc chương liên quan\n"
+"trong tài liệu.\n"
-#: src/include/bootloader/routines/section_helps.rb:125
-msgid "&Show boot menu"
-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 "Hệ thống sẽ khởi động lại..."
-#: src/include/bootloader/routines/section_helps.rb:126
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
#, fuzzy
-msgid "C&opy Image to Boot Partition"
-msgstr "Phân vùng"
+msgid "Booting"
+msgstr "Đừng làm gì"
-#: src/include/bootloader/routines/section_helps.rb:127
-msgid "&Skip Section gracefully on Errors"
-msgstr ""
-
-#: src/include/bootloader/routines/section_helps.rb:128
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
#, fuzzy
-msgid "Boot &Partition of Other System"
-msgstr "Hệ thống mở"
+msgid "&Booting"
+msgstr "Đừng làm gì"
-#. Cache for CommonSectionWidgets
-#: src/include/bootloader/routines/section_widgets.rb:58
-msgid "Image section must have specified kernel image"
-msgstr ""
+#. 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 "Không có boot loader nào được chọn cho việc cài đặt. Hệ thống của bạn có thể không thể khởi động."
-#: src/include/bootloader/routines/section_widgets.rb:65
-msgid "Image file doesn't exist now. Do you really want use it?"
-msgstr ""
+#. error in the proposal
+#: src/lib/bootloader/proposal_client.rb:183
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Chương trình khởi động không thể cài đặt đúng do phân vùng."
-#: src/include/bootloader/routines/section_widgets.rb:82
-msgid "Initrd file doesn't exist now. Do you really want use it?"
-msgstr ""
-
-#. string append = BootCommon::current_section["append"]:"";
-#: src/include/bootloader/routines/section_widgets.rb:227
-msgid "Enable &SELinux"
-msgstr ""
-
-#. 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 "Sao chép mục đã chọn"
-
-#. radio button (don't translate 'chainloader')
-#: src/include/bootloader/routines/section_widgets.rb:587
-#, fuzzy
-msgid "Other System (Chainloader)"
-msgstr "Máy ảnh chọn"
-
-#. frame
-#: src/include/bootloader/routines/section_widgets.rb:609
-msgid "Section Type"
-msgstr "Kiểu mục"
-
-#. text entry
-#: src/include/bootloader/routines/section_widgets.rb:668
-#, fuzzy
-#| msgid "Section Type"
-msgid "Section &Name"
-msgstr "Kiểu mục"
-
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr ""
-
#. FATE#303643 Enable one-click changes in bootloader proposal
#.
-#.
-#. FIXME identical code in BootGRUB module
-#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
+#: src/modules/BootGRUB2.rb:168
msgid "Install bootcode into MBR (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
+#: src/modules/BootGRUB2.rb:172
msgid "Do not install bootcode into MBR (install</a>)"
msgstr ""
#. check for separated boot partition, use root otherwise
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
+#: src/modules/BootGRUB2.rb:185
msgid "Install bootcode into /boot partition (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
+#: src/modules/BootGRUB2.rb:189
msgid "Do not install bootcode into /boot partition (install</a>)"
msgstr ""
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
+#: src/modules/BootGRUB2.rb:195
msgid "Install bootcode into \"/\" partition (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
+#: src/modules/BootGRUB2.rb:199
msgid "Do not install bootcode into \"/\" partition (install</a>)"
msgstr ""
+#. 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/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
+#: src/modules/BootGRUB2.rb:217
#, fuzzy
#| msgid "Change Location: %1"
msgid "Change Location: %s"
msgstr "Đổi vị trí: %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/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
-#: src/modules/BootGRUB2EFI.rb:96
+#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
msgid "Boot Loader Type: %1"
msgstr ""
-#. 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/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
+#: src/modules/BootGRUB2.rb:237
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/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
+#: src/modules/BootGRUB2.rb:245
msgid " (MBR)"
msgstr ""
-#. FIXME: should we translate all devices to names and add MBR suffixes?
-#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
+#: src/modules/BootGRUB2.rb:252
msgid "Status Location: %1"
msgstr "Trạng thái vị trí: %1"
-#. section name "suffix" for default section
-#: src/modules/BootGRUB.rb:768
-msgid " (default)"
-msgstr "(mặc định)"
-
-#: src/modules/BootGRUB.rb:779
-msgid "Sections:<br>%1"
-msgstr "Mục:<br>%1"
-
-#. summary text
-#: src/modules/BootGRUB.rb:788
+#: src/modules/BootGRUB2EFI.rb:108
#, fuzzy
-msgid "Do not install boot loader; just create configuration files"
-msgstr "Tải lại cấu hình"
-
-#. menubutton item, keep as short as possible
-#: src/modules/BootGRUB.rb:919
-msgid "Propose and &Merge with Existing GRUB Menus"
-msgstr ""
-
-#. 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 "During Boot"
msgid "Enable Secure Boot: %1"
msgstr "Khi khởi động"
#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:70
+#: src/modules/BootSupportCheck.rb:65
msgid "Unknown bootloader: %1"
msgstr "Không xác định chương trình khởi động: %1"
#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:101
+#: src/modules/BootSupportCheck.rb:99
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:140
+#: src/modules/BootSupportCheck.rb:139
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:168
+#: src/modules/BootSupportCheck.rb:167
#, fuzzy
msgid "The boot device is on raid type: %1. System will not boot."
msgstr "Thiết bị chưa được cấu hình"
#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:188
+#: src/modules/BootSupportCheck.rb:187
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:263
+#: src/modules/BootSupportCheck.rb:239
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:170
+#: src/modules/Bootloader.rb:146
msgid "Check boot loader"
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:172
+#: src/modules/Bootloader.rb:148
msgid "Read partitioning"
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:174
+#: src/modules/Bootloader.rb:150
msgid "Load boot loader settings"
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:178
+#: src/modules/Bootloader.rb:154
#, fuzzy
msgid "Checking boot loader..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:180
+#: src/modules/Bootloader.rb:156
msgid "Reading partitioning..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:182
+#: src/modules/Bootloader.rb:158
msgid "Loading boot loader settings..."
msgstr ""
#. dialog header
-#: src/modules/Bootloader.rb:186
+#: src/modules/Bootloader.rb:162
#, fuzzy
msgid "Initializing Boot Loader Configuration"
msgstr "Cấu hình phẳng"
-#. part of summary, %1 is a part of kernel command line
-#: src/modules/Bootloader.rb:307
-#, fuzzy
-msgid "Added Kernel Parameters: %1"
-msgstr "Kết nối _quay số"
-
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:367
+#: src/modules/Bootloader.rb:281
#, fuzzy
msgid "Create initrd"
msgstr "Tạo đĩa CD"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:369
+#: src/modules/Bootloader.rb:283
#, fuzzy
msgid "Save boot loader configuration files"
msgstr "Tải lại cấu hình"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:371
+#: src/modules/Bootloader.rb:285
#, fuzzy
msgid "Install boot loader"
msgstr "Không thể tải"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:375
+#: src/modules/Bootloader.rb:289
msgid "Creating initrd..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:377
+#: src/modules/Bootloader.rb:291
msgid "Saving boot loader configuration files..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:379
+#: src/modules/Bootloader.rb:293
msgid "Installing boot loader..."
msgstr ""
#. progress line
-#: src/modules/Bootloader.rb:385
+#: src/modules/Bootloader.rb:299
#, fuzzy
msgid "Saving Boot Loader Configuration"
msgstr "Cấu hình phẳng"
#, fuzzy
-#~ msgid "Delete a global option"
-#~ msgstr "&Lựa chọn chi tiết..."
+#~| msgid "Distribution:"
+#~ msgid "D&istributor"
+#~ msgstr "Bản phân phối:"
+#~ msgid "Delete a global option or option of a section"
+#~ msgstr "Xóa một tùy chọn toàn cục hoặc một tùy chọn của một mục"
+
+#~ msgid "Set a global option or option of a section"
+#~ msgstr "Thiết lập một tùy chọn toàn cục hoặc tùy chọn của một mục"
+
+#~ msgid "Add a new section - please use interactive mode"
+#~ msgstr "Thêm mục mới - sử dụng chế độ tương tác"
+
+#~ msgid "The name of the section"
+#~ msgstr "Tên mục này"
+
+#~ msgid "Section %1 not found."
+#~ msgstr "Không thấy mục %1"
+
+#~ msgid "Add option is available only in commandline interactive mode"
+#~ msgstr "Thêm tùy chọn chỉ có thể trong chế độ tương tác dòng lệnh"
+
+#~ msgid "Section name must be specified."
+#~ msgstr "Trường tên phải được chỉ rõ"
+
+#~ msgid "&Up"
+#~ msgstr "&Lên"
+
+#~ msgid "&Down"
+#~ msgstr "&Xuống"
+
#, fuzzy
-#~ msgid "Set a global option"
-#~ msgstr "&Lựa chọn chi tiết..."
+#~ msgid "Kernel Section"
+#~ msgstr "Máy ảnh chọn"
+#, fuzzy
+#~ msgid "Section Settings"
+#~ msgstr "Tình trạng kết nối"
+
+#, fuzzy
+#~ msgid "Xen Section"
+#~ msgstr "Máy ảnh chọn"
+
+#, fuzzy
+#~ msgid "Menu Section"
+#~ msgstr "Máy ảnh chọn"
+
+#, fuzzy
+#~ msgid "Dump Section"
+#~ msgstr "Máy ảnh chọn"
+
+#, fuzzy
+#~ msgid "Other System Section"
+#~ msgstr "Máy ảnh chọn"
+
+#, fuzzy
+#~ msgid "&Filename"
+#~ msgstr "Mẫu tên tập tin"
+
+#~ msgid "Filename: %1"
+#~ msgstr "Tên tập tin: %1"
+
+#, fuzzy
+#~ msgid "Fi&le Contents"
+#~ msgstr "_Nội dung"
+
+#, fuzzy
+#~ msgid "Expert Manual Configuration"
+#~ msgstr "Cấu hình phẳng"
+
+#~ msgid "Image"
+#~ msgstr "Ảnh"
+
+#~ msgid "Floppy"
+#~ msgstr "Đĩa mềm"
+
+#~ msgid "Label"
+#~ msgstr "Nhãn"
+
+#~ msgid "Type"
+#~ msgstr "Kiểu"
+
+#~ msgid "Image / Device"
+#~ msgstr "Ảnh / Thiết bị"
+
+#~ msgid "Co&nvert Current Configuration"
+#~ msgstr "&Chuyển đổi thiết lập hiện tại"
+
+#, fuzzy
+#~ msgid "&Start New Configuration from Scratch"
+#~ msgstr "Lỗi cấu hình VPN"
+
+#, fuzzy
+#~ msgid "&Read Configuration Saved on Disk"
+#~ msgstr "Tải lại cấu hình"
+
+#, fuzzy
+#~ msgid "Select the boot loader before editing sections."
+#~ msgstr "Bật/tắt kiểm tra trọng tải của đơn vị xử lý trung tâm trước khi làm hành động nghỉ."
+
+#, fuzzy
+#~ msgid "&Section Management"
+#~ msgstr "Quản lý Điện năng"
+
+#, fuzzy
+#~ msgid "Really delete section %1?"
+#~ msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
+
+#, fuzzy
+#~ msgid "Create a FAT File System"
+#~ msgstr "Hệ thống tập tin ả_o"
+
+#, fuzzy
+#~ msgid "&Create File System"
+#~ msgstr "Hệ thống tập tin ả_o"
+
+#, fuzzy
+#~ msgid "Unable to install the boot loader."
+#~ msgstr "Không thể xoay {0} ảnh"
+
+#, fuzzy
+#~ msgid "<p><b>Image Section</b></p>"
+#~ msgstr "<p><b>Thiết lập gia nhập</b></p>"
+
+#, fuzzy
+#~ msgid "<p><b>Menu Section</b></p>"
+#~ msgstr "<p><b>Thiết lập gia nhập</b></p>"
+
+#, fuzzy
+#~ msgid "<p><b>Partition of Menu File</b></p>"
+#~ msgstr "<p><b>Môđun hỗ trợ</b></p>\n"
+
+#, fuzzy
+#~ msgid "Image Section"
+#~ msgstr "Lưu lự&a chọn"
+
+#, fuzzy
+#~ msgid "&Kernel Image"
+#~ msgstr "Lưu ảnh"
+
+#, fuzzy
+#~ msgid "&Root Device"
+#~ msgstr "_Thiết bị:"
+
+#, fuzzy
+#~ msgid "Chainloader Section"
+#~ msgstr "Chọn thư mục"
+
+#, fuzzy
+#~ msgid "Use Password Protection"
+#~ msgstr "Không có hạn sử dụng mật khẩu"
+
+#, fuzzy
+#~ msgid "&Other System"
+#~ msgstr "Hệ thống mở"
+
+#, fuzzy
+#~ msgid "&Partition of Menu File"
+#~ msgstr "<p><b>Môđun hỗ trợ</b></p>\n"
+
+#, fuzzy
+#~ msgid "&Menu Description File"
+#~ msgstr "Đọc mô tả đĩa không thành công"
+
+#, fuzzy
+#~ msgid "Tar&get Directory for Section"
+#~ msgstr "Thư mục đích: %1"
+
+#, fuzzy
+#~ msgid "Op&tional Parameter File"
+#~ msgstr "Thông tin thêm"
+
+#, fuzzy
+#~ msgid "&Dump Device"
+#~ msgstr "Thiết bị"
+
+#, fuzzy
+#~ msgid "&SCSI Dump Device"
+#~ msgstr "Thư mục ảnh"
+
+#, fuzzy
+#~ msgid "&Number of Default Entry"
+#~ msgstr "Tên của tập tin mới"
+
+#, fuzzy
+#~ msgid "C&opy Image to Boot Partition"
+#~ msgstr "Phân vùng"
+
+#, fuzzy
+#~ msgid "Boot &Partition of Other System"
+#~ msgstr "Hệ thống mở"
+
+#~ msgid "Clone Selected Section"
+#~ msgstr "Sao chép mục đã chọn"
+
+#~ msgid "Section Type"
+#~ msgstr "Kiểu mục"
+
+#~ msgid " (default)"
+#~ msgstr "(mặc định)"
+
+#~ msgid "Sections:<br>%1"
+#~ msgstr "Mục:<br>%1"
+
+#, fuzzy
+#~ msgid "Do not install boot loader; just create configuration files"
+#~ msgstr "Tải lại cấu hình"
+
#~ msgid "The boot device is on iSCSI disk: %1. System may not boot."
#~ msgstr "Thiết bị khởi động ở trên đĩa iSCSI: %1. Hệ thống có thể không khởi động."
@@ -2117,6 +1481,10 @@
#~ msgstr "&ELILO tùy chọn toàn cục"
#, fuzzy
+#~ msgid "Booting Mode"
+#~ msgstr "Đừng làm gì"
+
+#, fuzzy
#~ msgid "Global Section Options"
#~ msgstr "Tình trạng kết nối"
@@ -2145,6 +1513,24 @@
#~ "<p><b>Thiết lập mức độ chi tiết [0-5]</b><br> Tăng mức chi tiết của ELILO\n"
#~ "trong trường hợp khởi động gặp lỗi.</p>"
+#~ msgid ""
+#~ "<p><b>Name of the default initrd file</b>, if not empty, defines the initial\n"
+#~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
+#~ "<b>Browse</b></p>\n"
+#~ msgstr ""
+#~ "<p><b>Tên của tập tin initrd mặc định</b>, nếu không rỗng, chỉ ra ramdisk khởi động\n"
+#~ "được sử dụng. Có thể nhập trực tiếp đường dẫn và tên tập tin hoặc chọn bằng cách\n"
+#~ "sử dụng <b>Tìm kiếm</b></p>\n"
+
+#~ msgid ""
+#~ "<p><b>Name of default image file</b>, if not empty, defines the image\n"
+#~ "file to use. Either enter the path and file name directly or choose by using\n"
+#~ "<b>Browse</b></p>"
+#~ msgstr ""
+#~ "<p><b>Tên của tập tin ảnh mặc định</b>, nếu không rỗng, chỉ ra tập tin ảnh\n"
+#~ "sử dụng. Có thể nhập đường dẫn và tên tập tin trực tiếp hoặc chọn bằng\n"
+#~ "<b>Tìm kiếm</b></p>"
+
#, fuzzy
#~ msgid "Boot Image Location"
#~ msgstr "Chép địa điểm ảnh"
@@ -2161,6 +1547,9 @@
#~ msgid "Set default root filesystem"
#~ msgstr "Thiết lập hệ thống root mặc định"
+#~ msgid "Force rootfs to be mounted read-only"
+#~ msgstr "Bắt buộc rootfs gắn chỉ đọc"
+
#~ msgid "Global append string of options to kernel command line"
#~ msgstr "Toàn cục: nối xâu các tùy chọn vào dòng lệnh nhân"
@@ -2175,6 +1564,9 @@
#~ msgid "Prevent EDD30 mode"
#~ msgstr "Ngăn chặn chế độ EDD30"
+#~ msgid "Allow attempt to relocate"
+#~ msgstr "Chấp nhận cố gắng định vị lại"
+
#, fuzzy
#~ msgid "&Name of Default Image File"
#~ msgstr "Tên của tập tin mới"
Modified: branches/plus-SLE12-SP2/yast/vi/po/ca-management.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/ca-management.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/ca-management.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -1968,44 +1968,45 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1891
+#: src/include/ca-management/new_cert_read_write.rb:1890
#, fuzzy
msgid "Creating certificate..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1933
-#: src/include/ca-management/new_cert_read_write.rb:2014
+#: src/include/ca-management/new_cert_read_write.rb:1932
+#: src/include/ca-management/new_cert_read_write.rb:2013
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
msgstr ""
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:50
msgid "Finish"
msgstr ""
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:54
+#: src/include/ca-management/popup.rb:52
#, fuzzy
msgid "Really save configuration ?"
msgstr "Tải lại cấu hình"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:64
#, fuzzy
msgid "Exit"
msgstr "Xuất"
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:68
+#: src/include/ca-management/popup.rb:66
msgid "Really exit configuration without saving ?"
msgstr ""
-#. Show description while normal installation only.(bnc#962328)
-#: src/include/ca-management/popup.rb:91
+#. Popup displaying openssl error messages
+#. @return [void]
+#: src/include/ca-management/popup.rb:88
msgid "Details"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/cio.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/cio.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/cio.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -44,13 +44,13 @@
msgstr "Dùng"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "có"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "no"
msgstr "không"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
-msgstr "có"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
#, fuzzy
Modified: branches/plus-SLE12-SP2/yast/vi/po/cluster.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/cluster.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/cluster.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -142,7 +142,7 @@
msgstr ""
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1429
+#: src/include/cluster/dialogs.rb:1427
msgid "The Multicast Address has to be fulfilled"
msgstr ""
@@ -172,7 +172,7 @@
msgstr "Địa chỉ đích:"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1365
+#: src/include/cluster/dialogs.rb:1363
#, fuzzy
#| msgid "Broadcast Address:"
msgid "Multicast Address:"
@@ -233,197 +233,197 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:717
+#: src/include/cluster/dialogs.rb:715
msgid "Enable Security Auth"
msgstr ""
-#: src/include/cluster/dialogs.rb:721
+#: src/include/cluster/dialogs.rb:719
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr ""
-#: src/include/cluster/dialogs.rb:726
+#: src/include/cluster/dialogs.rb:724
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr ""
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:750
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:754
+#: src/include/cluster/dialogs.rb:752
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
#, fuzzy
#| msgid "Running on AC"
msgid "Running"
msgstr "Đang chạy bằng điện chính"
-#: src/include/cluster/dialogs.rb:817
+#: src/include/cluster/dialogs.rb:815
#, fuzzy
#| msgid "Service is not running"
msgid "Not running"
msgstr "Dịch vụ không chạy"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:853
+#: src/include/cluster/dialogs.rb:851
#, fuzzy
#| msgid "&Booting"
msgid "Booting"
msgstr "&Khởi động"
-#: src/include/cluster/dialogs.rb:863
+#: src/include/cluster/dialogs.rb:861
#, fuzzy
#| msgid "Start the Service Now"
msgid "On -- Start pacemaker during boot"
msgstr "Chạy dịch vụ ngay bây giờ"
-#: src/include/cluster/dialogs.rb:870
+#: src/include/cluster/dialogs.rb:868
#, fuzzy
#| msgid "Start the Service Now"
msgid "Off -- Start pacemaker manually"
msgstr "Chạy dịch vụ ngay bây giờ"
-#: src/include/cluster/dialogs.rb:879
+#: src/include/cluster/dialogs.rb:877
msgid "Switch On and Off"
msgstr "Bật và tắt"
-#: src/include/cluster/dialogs.rb:884
+#: src/include/cluster/dialogs.rb:882
msgid "Current Status: "
msgstr "Trạng thái hiện thời: "
-#: src/include/cluster/dialogs.rb:893
+#: src/include/cluster/dialogs.rb:891
#, fuzzy
#| msgid "Start the Service Now"
msgid "Start pacemaker Now"
msgstr "Chạy dịch vụ ngay bây giờ"
-#: src/include/cluster/dialogs.rb:894
+#: src/include/cluster/dialogs.rb:892
#, fuzzy
#| msgid "Stop the Service Now"
msgid "Stop pacemaker Now"
msgstr "Dừng dịch vụ ngay bây giờ"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:992
+#: src/include/cluster/dialogs.rb:990
msgid "Sync Host"
msgstr ""
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
msgid "Add"
msgstr "Thêm"
-#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
#, fuzzy
#| msgid "Delete"
msgid "Del"
msgstr "Xoá"
-#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
#, fuzzy
#| msgid "&Edit"
msgid "Edit"
msgstr "&Sửa"
-#: src/include/cluster/dialogs.rb:1004
+#: src/include/cluster/dialogs.rb:1002
#, fuzzy
#| msgid "Select File"
msgid "Sync File"
msgstr "Chọn tập tin"
-#: src/include/cluster/dialogs.rb:1011
+#: src/include/cluster/dialogs.rb:1009
msgid "Add Suggested Files"
msgstr ""
-#: src/include/cluster/dialogs.rb:1020
+#: src/include/cluster/dialogs.rb:1018
msgid "Generate Pre-Shared-Keys"
msgstr ""
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1145
+#: src/include/cluster/dialogs.rb:1143
msgid "Csync2 Status Unknown"
msgstr ""
-#: src/include/cluster/dialogs.rb:1148
+#: src/include/cluster/dialogs.rb:1146
msgid "Turn csync2 ON"
msgstr ""
-#: src/include/cluster/dialogs.rb:1151
+#: src/include/cluster/dialogs.rb:1149
msgid "Turn csync2 OFF"
msgstr ""
-#: src/include/cluster/dialogs.rb:1181
+#: src/include/cluster/dialogs.rb:1179
#, fuzzy
#| msgid "Enter the file name"
msgid "Enter a hostname"
msgstr "Hãy nhập tên tập tin"
-#: src/include/cluster/dialogs.rb:1195
+#: src/include/cluster/dialogs.rb:1193
msgid "Edit the hostname"
msgstr ""
-#: src/include/cluster/dialogs.rb:1209
+#: src/include/cluster/dialogs.rb:1207
#, fuzzy
#| msgid "Enter the file name"
msgid "Enter a filename to synchronize"
msgstr "Hãy nhập tên tập tin"
-#: src/include/cluster/dialogs.rb:1224
+#: src/include/cluster/dialogs.rb:1222
#, fuzzy
#| msgid "Enter the file name"
msgid "Edit the filename"
msgstr "Hãy nhập tên tập tin"
#. key file exist
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1254
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
msgstr ""
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1266
+#: src/include/cluster/dialogs.rb:1264
msgid "Delete key file %1 failed."
msgstr ""
#. generate key file
-#: src/include/cluster/dialogs.rb:1280
+#: src/include/cluster/dialogs.rb:1278
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
msgstr ""
-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1285
#, fuzzy
#| msgid "Operation failed"
msgid "Key generation failed."
msgstr "Thao tác thất bại."
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1349
+#: src/include/cluster/dialogs.rb:1347
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:1360
+#: src/include/cluster/dialogs.rb:1358
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1361
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1366
+#: src/include/cluster/dialogs.rb:1364
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1370
+#: src/include/cluster/dialogs.rb:1368
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1437
+#: src/include/cluster/dialogs.rb:1435
msgid "The Group Number must be a positive integer"
msgstr ""
@@ -534,41 +534,41 @@
msgstr "Đang chạy..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:394
+#: src/modules/Cluster.rb:390
#, fuzzy
#| msgid "Initializing CASA Configuration"
msgid "Initializing cluster Configuration"
msgstr "Khởi chạy cấu hình CASA"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:406
msgid "Read the database"
msgstr "Đọc cơ sở dữ liệu"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:412
+#: src/modules/Cluster.rb:408
msgid "Read the previous settings"
msgstr "Đọc thiết lập trước đây"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:410
#, fuzzy
#| msgid "Write firewall settings"
msgid "Read SuSEFirewall Settings"
msgstr "Ghi thiết lập tường lửa"
#. Progress step 1/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:414
msgid "Reading the database..."
msgstr "Đang đọc cơ sở dữ liệu..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:420
+#: src/modules/Cluster.rb:416
msgid "Reading the previous settings..."
msgstr "Đang đọc thiết lập trước đây..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:422
+#: src/modules/Cluster.rb:418
#, fuzzy
#| msgid "Writing firewall settings..."
msgid "Reading SuSEFirewall settings..."
@@ -576,67 +576,67 @@
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
+#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
msgid "Finished"
msgstr "Hoàn thành"
-#: src/modules/Cluster.rb:439
+#: src/modules/Cluster.rb:435
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Cannot install required package"
msgstr "Lỗi cài đặt những gói đã yêu cầu."
#. read database
-#: src/modules/Cluster.rb:448
+#: src/modules/Cluster.rb:444
#, fuzzy
#| msgid "Updating configuration..."
msgid "Cannot load existing configuration"
msgstr "Đang cập nhật cấu hình..."
#. Error message
-#: src/modules/Cluster.rb:459
+#: src/modules/Cluster.rb:455
msgid "Cannot read database1."
msgstr "Không đọc được database1."
#. Error message
-#: src/modules/Cluster.rb:467
+#: src/modules/Cluster.rb:463
msgid "Cannot read database2."
msgstr "Không thể đọc được database2."
#. Error message
-#: src/modules/Cluster.rb:483
+#: src/modules/Cluster.rb:479
msgid "Cannot detect devices."
msgstr "Không dò tìm được thiết bị."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:501
+#: src/modules/Cluster.rb:497
#, fuzzy
#| msgid "Saving CASA Configuration"
msgid "Saving cluster Configuration"
msgstr "Đang lưu cấu hình CASA"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:516
+#: src/modules/Cluster.rb:512
msgid "Write the settings"
msgstr "Ghi thiết lập"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:514
msgid "Save changes to SuSEFirewall"
msgstr ""
#. Progress step 1/2
-#: src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:518
msgid "Writing the settings..."
msgstr "Đang ghi các thiết lập..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:524
+#: src/modules/Cluster.rb:520
msgid "Saving changes to SuSEFirewall..."
msgstr ""
#. Error message
-#: src/modules/Cluster.rb:536
+#: src/modules/Cluster.rb:532
msgid "Cannot write settings."
msgstr "Không ghi được các thiết lập."
Modified: branches/plus-SLE12-SP2/yast/vi/po/control-center.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/control-center.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/control-center.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-08-28 21:12+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/control.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/control.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/control.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-08-28 21:21+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -16,289 +16,314 @@
"Plural-Forms: nplurals=1; nplural=0\n"
"X-Generator: KBabel 1.11.2\n"
-#: control/control.SLED.glade.translations.glade:3
+#: control/control.openSUSE.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>\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"
-" "
+"<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"
-"Cài đặt đã kết thúc thành công.\n"
-"Hệ thống đã sẵn sàng.\n"
-"Nhấn Kết thúc để đăng nhập vào hệ thống.\n"
-"</p>\n"
-"<p>\n"
-"Hãy thăm chúng tôi tại http://www.novell.com/linux/.\n"
-"</p>\n"
+"<p><b>Xin chúc mừng!</b></p>\n"
+"<p>Đã hoàn thành cài đặt &product; lên máy của bạn.\n"
+"Sau khi nhấn <b>Hoàn thành</b>, bạn có thể đăng nhập vào hệ thống.</p>\n"
+"<p>Hãy thăm chúng tôi tại %1.</p>\n"
+"<p>Chúc bạn có nhiều niềm vui!<br>Nhóm phát triển SuSE</p>\n"
"\t"
-#: control/control.SLED.glade.translations.glade:15
+#: 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
#, fuzzy
-#| msgid "IMAP Server"
-msgid "CIM Server"
-msgstr "Máy chủ IMAP"
+msgid "GNOME Desktop"
+msgstr "Thoát Tìm kiếm Môi trường"
-#: 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 "Thiết lập cài đặt"
+#: control/control.openSUSE.glade.translations.glade:22
+#, fuzzy
+msgid "KDE Desktop"
+msgstr "Thoát Tìm kiếm Môi trường"
-#: control/control.SLED.glade.translations.glade:18
-msgid "Overview"
-msgstr "Tổng kết"
+#: control/control.openSUSE.glade.translations.glade:23
+#, fuzzy
+msgid "XFCE Desktop"
+msgstr "Thoát Tìm kiếm Môi trường"
-#: control/control.SLED.glade.translations.glade:19
-msgid "Expert"
-msgstr "Nâng cao"
+#: control/control.openSUSE.glade.translations.glade:24
+#, fuzzy
+msgid "LXDE Desktop"
+msgstr "Thoát Tìm kiếm Môi trường"
-#: control/control.SLED.glade.translations.glade:20
+#: 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 "Môi trường khác"
+
+#: 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
+msgid "Installation Settings"
+msgstr "Thiết lập cài đặt"
+
+#: control/control.openSUSE.glade.translations.glade:30
+#, fuzzy
msgid "Live Installation Settings"
msgstr "Thiết lập cài đặt"
-#: control/control.SLED.glade.translations.glade:21
+#: control/control.openSUSE.glade.translations.glade:31
+#: control/control.openSUSE.glade.translations.glade:85
msgid "Update Settings"
msgstr "Cập nhật thiết lập"
-#: control/control.SLED.glade.translations.glade:23
+#: control/control.openSUSE.glade.translations.glade:33
msgid "Network Configuration"
msgstr "Cấu hình mạng"
-#: control/control.SLED.glade.translations.glade:24
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Hardware Configuration"
msgstr "Cấu hình phần cứng"
-#: control/control.SLED.glade.translations.glade:25
-#: control/control.SLED.glade.translations.glade:63
-#: control/control.SLED.glade.translations.glade:90
+#: control/control.openSUSE.glade.translations.glade:35
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:103
msgid "Preparation"
msgstr "Chuẩn bị"
-#: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:50
-#: control/control.SLED.glade.translations.glade:64
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:63
#, fuzzy
#| msgid "Network Configuration"
msgid "Load linuxrc Network Configuration"
msgstr "Cấu hình mạng"
-#: control/control.SLED.glade.translations.glade:27
-#: control/control.SLED.glade.translations.glade:51
-#: control/control.SLED.glade.translations.glade:65
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:64
#, fuzzy
#| msgid "Disk Activation"
msgid "Network Autosetup"
msgstr "Dùng đĩa"
-#: control/control.SLED.glade.translations.glade:28
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:65
+#: control/control.openSUSE.glade.translations.glade:78
msgid "Welcome"
msgstr "Xin chào"
-#: control/control.SLED.glade.translations.glade:29
-#: control/control.SLED.glade.translations.glade:53
-#: control/control.SLED.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:39
#, fuzzy
#| msgid "Disk Activation"
msgid "Network Activation"
msgstr "Dùng đĩa"
-#: control/control.SLED.glade.translations.glade:30
-#: control/control.SLED.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:40
+#: control/control.openSUSE.glade.translations.glade:79
msgid "Disk Activation"
msgstr "Dùng đĩa"
-#: 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
+#: 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
msgid "System Analysis"
msgstr "Phân tích hệ thống"
-#: control/control.SLED.glade.translations.glade:33
-#: control/control.SLED.glade.translations.glade:71
-msgid "Add-On Products"
-msgstr "Sản phẩm thương mại"
-
-#: control/control.SLED.glade.translations.glade:34
-#: control/control.SLED.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:67
#, fuzzy
msgid "Disk"
msgstr "Ổ cứng"
-#: control/control.SLED.glade.translations.glade:35
-#: control/control.SLED.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:66
msgid "Time Zone"
msgstr "Múi giờ"
-#: control/control.SLED.glade.translations.glade:36
-#: control/control.SLED.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:82
#, fuzzy
+msgid "Online Repositories"
+msgstr "Cập nhật qua mạng"
+
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:83
+msgid "Add-On Products"
+msgstr "Sản phẩm thương mại"
+
+#: control/control.openSUSE.glade.translations.glade:47
+msgid "Desktop Selection"
+msgstr "Lựa chọn môi trường"
+
+#: 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
+#, fuzzy
msgid "User Settings"
msgstr "Cập nhật thiết lập"
-#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:62
+msgid "Installation"
+msgstr "Cài đặt"
+
+#: control/control.openSUSE.glade.translations.glade:51
#, fuzzy
msgid "Installation Overview"
msgstr "Nguồn cài đặt"
-#: 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
+#: 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
msgid "Perform Installation"
msgstr "Thực hiện cài đặt"
-#: control/control.SLED.glade.translations.glade:49
-msgid "Installation"
-msgstr "Cài đặt"
-
-#: control/control.SLED.glade.translations.glade:70
-#: control/control.SLED.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:105
msgid "System for Update"
msgstr "Hệ thống để cập nhật"
-#: control/control.SLED.glade.translations.glade:72
-#: control/control.SLED.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:108
msgid "Update"
msgstr "Cập nhật"
-#: control/control.SLED.glade.translations.glade:73
-msgid "Update Summary"
-msgstr "Tổng kết cập nhật"
-
-#: 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
+#: 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
msgid "Perform Update"
msgstr "Thực hiện cập nhật"
-#: control/control.SLED.glade.translations.glade:79
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:124
+msgid "Configuration"
+msgstr "Cấu hình"
+
+#: control/control.openSUSE.glade.translations.glade:92
msgid "Base Installation"
msgstr "Cài đặt cơ bản"
-#: 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
+#: 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
msgid "AutoYaST Settings"
msgstr "Thiết lập AutoYaST"
-#: control/control.SLED.glade.translations.glade:107
-#: control/control.SLED.glade.translations.glade:111
-msgid "Configuration"
-msgstr "Cấu hình"
-
-#: control/control.SLED.glade.translations.glade:108
-#: control/control.SLED.glade.translations.glade:112
+#: control/control.openSUSE.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:125
msgid "System Configuration"
msgstr "Cấu hình hệ thống"
#, 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 Finish 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>Xin chúc mừng!</b></p>\n"
-#~ "<p>Đã hoàn thành cài đặt &product; lên máy của bạn.\n"
-#~ "Sau khi nhấn <b>Hoàn thành</b>, bạn có thể đăng nhập vào hệ thống.</p>\n"
-#~ "<p>Hãy thăm chúng tôi tại %1.</p>\n"
-#~ "<p>Chúc bạn có nhiều niềm vui!<br>Nhóm phát triển SuSE</p>\n"
+#~ "<p>\n"
+#~ "Cài đặt đã kết thúc thành công.\n"
+#~ "Hệ thống đã sẵn sàng.\n"
+#~ "Nhấn Kết thúc để đăng nhập vào hệ thống.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Hãy thăm chúng tôi tại http://www.novell.com/linux/.\n"
+#~ "</p>\n"
#~ "\t"
#, fuzzy
-#~ msgid "GNOME Desktop"
-#~ msgstr "Thoát Tìm kiếm Môi trường"
+#~| msgid "IMAP Server"
+#~ msgid "CIM Server"
+#~ msgstr "Máy chủ IMAP"
-#, fuzzy
-#~ msgid "KDE Desktop"
-#~ msgstr "Thoát Tìm kiếm Môi trường"
+#~ msgid "Overview"
+#~ msgstr "Tổng kết"
-#, fuzzy
-#~ msgid "XFCE Desktop"
-#~ msgstr "Thoát Tìm kiếm Môi trường"
+#~ msgid "Expert"
+#~ msgstr "Nâng cao"
#, fuzzy
-#~ msgid "LXDE Desktop"
-#~ msgstr "Thoát Tìm kiếm Môi trường"
-
-#, fuzzy
-#~| msgid "Alternate Desktops"
-#~ msgid "Enlightenment Desktop"
-#~ msgstr "Môi trường khác"
-
-#, fuzzy
-#~ msgid "Online Repositories"
-#~ msgstr "Cập nhật qua mạng"
-
-#~ msgid "Desktop Selection"
-#~ msgstr "Lựa chọn môi trường"
-
-#, fuzzy
#~| msgid "Network Configuration"
#~ msgid "Network Services Configuration"
#~ msgstr "Cấu hình mạng"
@@ -306,6 +331,9 @@
#~ msgid "Installation Summary"
#~ msgstr "Tổng kết cài đặt"
+#~ msgid "Update Summary"
+#~ msgstr "Tổng kết cập nhật"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "Cài đặt sản phẩm thương mại"
Modified: branches/plus-SLE12-SP2/yast/vi/po/country.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/country.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/country.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -765,58 +765,58 @@
"Enter the correct date.\n"
msgstr ""
-#. TRANSLATORS: Button label
-#: timezone/src/include/timezone/dialogs.rb:535
+#. button text
+#: timezone/src/include/timezone/dialogs.rb:541
#, fuzzy
msgid "Other &Settings..."
msgstr "Cập nhật thiết lập"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:612
-#: timezone/src/include/timezone/dialogs.rb:916
+#: timezone/src/include/timezone/dialogs.rb:613
+#: timezone/src/include/timezone/dialogs.rb:910
#, fuzzy
msgid "Date and Time (NTP is configured)"
msgstr "Thiết bị chưa được cấu hình"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:614
-#: timezone/src/include/timezone/dialogs.rb:699
-#: timezone/src/include/timezone/dialogs.rb:918
+#: timezone/src/include/timezone/dialogs.rb:615
+#: timezone/src/include/timezone/dialogs.rb:693
+#: timezone/src/include/timezone/dialogs.rb:912
msgid "Date and Time"
msgstr ""
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:630
+#: timezone/src/include/timezone/dialogs.rb:631
msgid "&Hardware Clock Set to UTC"
msgstr ""
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:656
-#: timezone/src/include/timezone/dialogs.rb:690
+#: timezone/src/include/timezone/dialogs.rb:650
+#: timezone/src/include/timezone/dialogs.rb:684
msgid "&Region"
msgstr ""
-#: timezone/src/include/timezone/dialogs.rb:663
-#: timezone/src/include/timezone/dialogs.rb:694
+#: timezone/src/include/timezone/dialogs.rb:657
+#: timezone/src/include/timezone/dialogs.rb:688
msgid "Time &Zone"
msgstr ""
-#: timezone/src/include/timezone/dialogs.rb:675
+#: timezone/src/include/timezone/dialogs.rb:669
msgid "Date and Time:"
msgstr ""
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:797
+#: timezone/src/include/timezone/dialogs.rb:791
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
msgstr ""
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:799
+#: timezone/src/include/timezone/dialogs.rb:793
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -826,7 +826,7 @@
msgstr ""
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:816
+#: timezone/src/include/timezone/dialogs.rb:810
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -834,12 +834,12 @@
msgstr ""
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:826
+#: timezone/src/include/timezone/dialogs.rb:820
msgid "Clock and Time Zone"
msgstr ""
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:951
+#: timezone/src/include/timezone/dialogs.rb:945
msgid "Select a valid time zone."
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/crowbar.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/crowbar.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/crowbar.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -25,9 +25,19 @@
msgid "Configuration of crowbar"
msgstr "Cấu hình CASA"
+#. 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 SP1"
+msgid "SLES 12"
msgstr ""
#. combobox label
@@ -39,11 +49,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 enough to enter server's URL and the paths\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enought 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/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
+"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</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"
@@ -182,156 +192,146 @@
msgstr "Địa chỉ IP:"
#. text entry label
-#: src/include/crowbar/complex.rb:516
+#: src/include/crowbar/complex.rb:520
msgid "Name"
msgstr "Tên"
#. text entry label
-#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
msgid "URL"
msgstr "URL"
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
+#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
msgid "Ask On Error"
msgstr ""
-#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
+#. frame label
+#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
+#: src/include/crowbar/complex.rb:715
msgid "Target Platform"
msgstr ""
-#. radiobutton label
-#: src/include/crowbar/complex.rb:542
-msgid "Architecture"
-msgstr "Kiến trúc"
-
#. error popup
-#: src/include/crowbar/complex.rb:583
+#: src/include/crowbar/complex.rb:580
msgid ""
"Repository '%1' already exists.\n"
"Choose a different name."
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:685
+#: src/include/crowbar/complex.rb:676
#, fuzzy
#| msgid "Server URL: "
msgid "Server &URL"
msgstr "URL máy chủ: "
#. table header
-#: src/include/crowbar/complex.rb:703
+#: src/include/crowbar/complex.rb:694
#, fuzzy
#| msgid "Directory Name"
msgid "Repository Name"
msgstr "Tên thư mục"
#. checkbox label
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:701
msgid "&Ask On Error"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:716
+#: src/include/crowbar/complex.rb:707
msgid "Repository &URL"
msgstr ""
#. label (hint for user)
-#: src/include/crowbar/complex.rb:719
+#: src/include/crowbar/complex.rb:710
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:722
+#: src/include/crowbar/complex.rb:726
#, fuzzy
#| msgid "Directory Name"
msgid "A&dd Repository"
msgstr "Tên thư mục"
#. combobox item
-#: src/include/crowbar/complex.rb:792
+#: src/include/crowbar/complex.rb:793
#, fuzzy
#| msgid "Becomes DA Server"
-msgid "Local SMT Server"
-msgstr "Thành máy chủ DA"
-
-#. combobox item
-#: src/include/crowbar/complex.rb:794
-#, fuzzy
-#| msgid "Becomes DA Server"
msgid "Remote SMT Server"
msgstr "Thành máy chủ DA"
#. combobox item
-#: src/include/crowbar/complex.rb:796
+#: src/include/crowbar/complex.rb:795
#, fuzzy
#| msgid "Mail Server"
msgid "SUSE Manager Server"
msgstr "Máy chủ thư"
#. combobox item
-#: src/include/crowbar/complex.rb:798
+#: src/include/crowbar/complex.rb:797
msgid "Custom"
msgstr ""
#. text entry label
-#: src/include/crowbar/complex.rb:854
+#: src/include/crowbar/complex.rb:866
#, fuzzy
#| msgid "&User Name"
msgid "User Name"
msgstr "&Tên người dùng"
#. text entry label
-#: src/include/crowbar/complex.rb:856
+#: src/include/crowbar/complex.rb:868
#, fuzzy
#| msgid "&Password"
msgid "Password"
msgstr "Mật &khẩu"
#. text entry label
-#: src/include/crowbar/complex.rb:858
+#: src/include/crowbar/complex.rb:870
#, fuzzy
#| msgid "Root Password"
msgid "Repeat the Password"
msgstr "Mật khẩu root"
#. error popup
-#: src/include/crowbar/complex.rb:888
+#: src/include/crowbar/complex.rb:900
#, fuzzy
#| msgid "URL cannot be empty."
msgid "User name cannot be empty."
msgstr "URL không thể rỗng."
#. error popup
-#: src/include/crowbar/complex.rb:895
+#: src/include/crowbar/complex.rb:907
msgid ""
"The passwords do not match.\n"
"Try again."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:903
+#: src/include/crowbar/complex.rb:915
msgid ""
"User '%1' already exists.\n"
"Choose a different name."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1006
+#: src/include/crowbar/complex.rb:1018
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid "The interface format '%1' is not valid"
msgstr "Giá trị %1 sai."
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1064
+#: src/include/crowbar/complex.rb:1076
#, fuzzy
#| msgid "Disabled"
msgid "disabled"
msgstr "Không dùng"
#. error popup
-#: src/include/crowbar/complex.rb:1161
+#: src/include/crowbar/complex.rb:1173
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid ""
@@ -341,7 +341,7 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
+#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid ""
@@ -350,7 +350,7 @@
msgstr "Giá trị %1 sai."
#. error popup
-#: src/include/crowbar/complex.rb:1182
+#: src/include/crowbar/complex.rb:1194
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid ""
@@ -359,91 +359,91 @@
msgstr "Giá trị %1 sai."
#. error popup
-#: src/include/crowbar/complex.rb:1191
+#: src/include/crowbar/complex.rb:1203
msgid "The router address '%1' is not part of network '%2'."
msgstr ""
#. error popup
-#: src/include/crowbar/complex.rb:1213
+#: src/include/crowbar/complex.rb:1225
#, fuzzy
#| msgid "The value of %1 is invalid."
msgid "The IP address '%1' is not part of network '%2'."
msgstr "Giá trị %1 sai."
#. popup message
-#: src/include/crowbar/complex.rb:1234
+#: src/include/crowbar/complex.rb:1246
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:1326
+#: src/include/crowbar/complex.rb:1335
#, fuzzy
#| msgid "IP Address:"
msgid "Min IP Address"
msgstr "Địa chỉ IP:"
#. inputfield label
-#: src/include/crowbar/complex.rb:1333
+#: src/include/crowbar/complex.rb:1342
#, fuzzy
#| msgid "IP Address:"
msgid "Max IP Address"
msgstr "Địa chỉ IP:"
-#: src/include/crowbar/complex.rb:1386
+#: src/include/crowbar/complex.rb:1395
msgid "The address '%1' is not part of network '%2'."
msgstr ""
#. error message
-#: src/include/crowbar/complex.rb:1398
+#: src/include/crowbar/complex.rb:1407
msgid "The lowest address must be lower than the highest one."
msgstr ""
#. error message
-#: src/include/crowbar/complex.rb:1422
+#: src/include/crowbar/complex.rb:1431
msgid "Ranges '%1' and '%2' are overlapping."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1490
+#: src/include/crowbar/complex.rb:1499
#, fuzzy
#| msgid "Expert Settings"
msgid "&User Settings"
msgstr "Thiết lập cao cấp"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1502
+#: src/include/crowbar/complex.rb:1511
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1518
+#: src/include/crowbar/complex.rb:1527
#, fuzzy
#| msgid "Network"
msgid "N&etwork Mode"
msgstr "Mạng"
-#: src/include/crowbar/complex.rb:1526
+#: src/include/crowbar/complex.rb:1535
#, fuzzy
#| msgid "Network"
msgid "Bastion Network"
msgstr "Mạng"
#. tab header
-#: src/include/crowbar/complex.rb:1569
+#: src/include/crowbar/complex.rb:1578
#, fuzzy
#| msgid "Network"
msgid "Net&works"
msgstr "Mạng"
#. tab header
-#: src/include/crowbar/complex.rb:1605
+#: src/include/crowbar/complex.rb:1614
msgid "Re&positories"
msgstr ""
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1722
+#: src/include/crowbar/complex.rb:1731
msgid ""
"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
@@ -452,7 +452,7 @@
msgstr ""
#. default dialog caption
-#: src/include/crowbar/complex.rb:1740
+#: src/include/crowbar/complex.rb:1749
#, fuzzy
#| msgid "Hardware Configuration"
msgid "Crowbar Configuration Overview"
@@ -513,21 +513,21 @@
msgstr "Đang chạy..."
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:154
+#: src/modules/Crowbar.rb:142
#, fuzzy
#| msgid "Initializing Firewall Configuration"
msgid "Initializing crowbar Configuration"
msgstr "Đang chạy cấu hình tường lửa"
#. Progress stage
-#: src/modules/Crowbar.rb:165
+#: src/modules/Crowbar.rb:153
#, fuzzy
#| msgid "Read current configuration"
msgid "Read the configuraton"
msgstr "Đọc cấu hình hiện thời"
#. Progress step
-#: src/modules/Crowbar.rb:169
+#: src/modules/Crowbar.rb:157
#, fuzzy
#| msgid "Reading current configuration..."
msgid "Reading the configuration..."
@@ -535,24 +535,24 @@
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
+#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
msgid "Finished"
msgstr "Hoàn thành"
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:244
+#: src/modules/Crowbar.rb:232
#, fuzzy
#| msgid "Saving hardware configuration..."
msgid "Saving crowbar Configuration"
msgstr "Đang lưu cấu hình phần cứng..."
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:255
+#: src/modules/Crowbar.rb:243
msgid "Write the settings"
msgstr "Ghi thiết lập"
#. Progress step 1/2
-#: src/modules/Crowbar.rb:259
+#: src/modules/Crowbar.rb:247
msgid "Writing the settings..."
msgstr "Đang ghi các thiết lập..."
Modified: branches/plus-SLE12-SP2/yast/vi/po/dhcp-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/dhcp-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/dhcp-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -57,7 +57,9 @@
msgstr ""
#. 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 ""
@@ -98,165 +100,158 @@
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:138
+#: src/include/dhcp-server/commandline.rb:144
#, fuzzy
msgid "Select the network interface to use"
msgstr "Chọn tập tin chứng nhận của ứng dụng khách."
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:145
+#: src/include/dhcp-server/commandline.rb:151
msgid "Print the currently used interface and list other available interfaces"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:157
msgid "Print current options"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:163
msgid "Set a global option"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:169
msgid "Option key (for example, ntp-servers)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:170
+#: src/include/dhcp-server/commandline.rb:176
msgid "Option value (for example, IP address)"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:177
+#: src/include/dhcp-server/commandline.rb:183
msgid "Lowest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:184
+#: src/include/dhcp-server/commandline.rb:190
msgid "Highest IP address of the dynamic address assigning range"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:191
+#: src/include/dhcp-server/commandline.rb:197
msgid "Default lease time in seconds"
msgstr ""
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:198
+#: src/include/dhcp-server/commandline.rb:204
msgid "Maximum lease time in seconds"
msgstr ""
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:239
+#: src/include/dhcp-server/commandline.rb:245
#, fuzzy
msgid "DHCP server is enabled"
msgstr "Ngủ đông đã bật"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:241
+#: src/include/dhcp-server/commandline.rb:247
msgid "DHCP server is disabled"
msgstr ""
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:294
+#: src/include/dhcp-server/commandline.rb:300
msgid "Host: %1"
msgstr ""
#. 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:300
+#: src/include/dhcp-server/commandline.rb:306
#, fuzzy
msgid "Hardware: %1"
msgstr "Địa chỉ phần cứng:"
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:312
#, fuzzy
msgid "IP Address: %1"
msgstr "Địa chỉ IP:"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:321
+#: src/include/dhcp-server/commandline.rb:327
msgid "Hostname not specified."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:331
+#: src/include/dhcp-server/commandline.rb:337
#, fuzzy
msgid "Specified host does not exist."
msgstr "Không có thư mục này."
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:392
-#: src/include/dhcp-server/commandline.rb:396
+#: src/include/dhcp-server/commandline.rb:398
+#: src/include/dhcp-server/commandline.rb:402
msgid "None"
msgstr "Không có"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:400
+#: src/include/dhcp-server/commandline.rb:406
#, fuzzy
msgid "Selected Interfaces: %1"
msgstr "Máy ảnh đã chọn: "
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:403
+#: src/include/dhcp-server/commandline.rb:409
#, fuzzy
msgid "Other Interfaces: %1"
msgstr "Giao diện:"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:411
+#: src/include/dhcp-server/commandline.rb:417
#, fuzzy
msgid "Specified interface does not exist."
msgstr "Không có thư mục này."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:420
+#: src/include/dhcp-server/commandline.rb:426
msgid "Operation with the interface not specified."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:446
+#: src/include/dhcp-server/commandline.rb:452
msgid "Option key must be set."
msgstr ""
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:451
+#: src/include/dhcp-server/commandline.rb:457
msgid "Value must be set."
msgstr ""
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:495
+#: src/include/dhcp-server/commandline.rb:501
msgid "Address Range: %1-%2"
msgstr ""
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:504
+#: src/include/dhcp-server/commandline.rb:510
msgid "Default Lease Time: %1"
msgstr ""
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:512
+#: src/include/dhcp-server/commandline.rb:518
msgid "Maximum Lease Time: %1"
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:57
+#: src/include/dhcp-server/dialogs.rb:52
msgid "Saving the configuration failed. Change the settings?"
msgstr ""
-#. Restart only if it's already running
-#: src/include/dhcp-server/dialogs.rb:76
-#, fuzzy
-#| msgid "Save configuration"
-msgid "Saving the configuration failed"
-msgstr "Lưu cấu hình"
-
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:118
+#: src/include/dhcp-server/dialogs.rb:84
#, fuzzy
msgid "DHCP Server Configuration"
msgstr "Cấu hình phẳng"
@@ -264,105 +259,105 @@
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:150
-#: src/include/dhcp-server/widgets.rb:477
+#: src/include/dhcp-server/dialogs.rb:116
+#: src/include/dhcp-server/widgets.rb:541
#, fuzzy
msgid "Global Options"
msgstr "Tùy chọn modem"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:151
#, fuzzy
msgid "Subnet Configuration"
msgstr "Cấu hình"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:219
+#: src/include/dhcp-server/dialogs.rb:185
#, fuzzy
msgid "Host with Fixed Address"
msgstr "Địa chỉ đích:"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:222
#, fuzzy
msgid "Shared Network"
msgstr "mạng t_uyến"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:290
+#: src/include/dhcp-server/dialogs.rb:256
#, fuzzy
msgid "Pool of Addresses"
msgstr "Địa chỉ IP:"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:324
+#: src/include/dhcp-server/dialogs.rb:291
msgid "Group-Specific Options"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:358
+#: src/include/dhcp-server/dialogs.rb:325
#, fuzzy
msgid "Class"
msgstr "Xóa"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:406
+#: src/include/dhcp-server/dialogs.rb:374
#, fuzzy
msgid "&Subnet"
msgstr "Chủ đề:"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:408
+#: src/include/dhcp-server/dialogs.rb:376
msgid "&Host"
msgstr ""
#. radio button
-#: src/include/dhcp-server/dialogs.rb:410
+#: src/include/dhcp-server/dialogs.rb:378
#, fuzzy
msgid "Shared &Network"
msgstr "mạng t_uyến"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:412
+#: src/include/dhcp-server/dialogs.rb:380
#, fuzzy
msgid "&Group"
msgstr "Xén"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:414
+#: src/include/dhcp-server/dialogs.rb:382
#, fuzzy
msgid "&Pool of Addresses"
msgstr "Địa chỉ IP:"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:416
+#: src/include/dhcp-server/dialogs.rb:384
msgid "&Class"
msgstr ""
#. frame
-#: src/include/dhcp-server/dialogs.rb:431
+#: src/include/dhcp-server/dialogs.rb:399
#, fuzzy
msgid "Declaration Types"
msgstr "Kiểu nội suy"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:439
+#: src/include/dhcp-server/dialogs.rb:407
#, fuzzy
msgid "Declaration Type"
msgstr "Kiểu nội suy"
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:485
-#: src/include/dhcp-server/dialogs.rb:525
+#: src/include/dhcp-server/dialogs.rb:453
+#: src/include/dhcp-server/dialogs.rb:493
#, fuzzy
msgid "Interface Configuration"
msgstr "Cấu hình phẳng"
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:554
-#: src/include/dhcp-server/widgets.rb:1106
+#: src/include/dhcp-server/dialogs.rb:522
+#: src/include/dhcp-server/widgets.rb:1118
#, fuzzy
msgid "TSIG Key Management"
msgstr "Quản lý Điện năng"
@@ -390,125 +385,167 @@
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:94
+#: src/include/dhcp-server/dialogs2.rb:93
msgid "DHCP Server: Start-Up"
msgstr ""
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:96
-#: src/include/dhcp-server/dialogs2.rb:98
-#: src/include/dhcp-server/dialogs2.rb:182
+#: src/include/dhcp-server/dialogs2.rb:95
+#: src/include/dhcp-server/dialogs2.rb:97
+#: src/include/dhcp-server/dialogs2.rb:181
msgid "Start-Up"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:116
+#: src/include/dhcp-server/dialogs2.rb:115
#, fuzzy
msgid "DHCP Server: Card Selection"
msgstr "Máy ảnh chọn"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:118
-#: src/include/dhcp-server/dialogs2.rb:120
+#: src/include/dhcp-server/dialogs2.rb:117
+#: src/include/dhcp-server/dialogs2.rb:119
#, fuzzy
msgid "Card Selection"
msgstr "Máy ảnh chọn"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:130
+#: src/include/dhcp-server/dialogs2.rb:129
msgid "DHCP Server: Global Settings"
msgstr ""
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:134
-#: src/include/dhcp-server/dialogs2.rb:136
+#: src/include/dhcp-server/dialogs2.rb:133
+#: src/include/dhcp-server/dialogs2.rb:135
msgid "Global Settings"
msgstr ""
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:142
+#: src/include/dhcp-server/dialogs2.rb:141
msgid "DHCP Server: Dynamic DHCP"
msgstr ""
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:144
-#: src/include/dhcp-server/dialogs2.rb:146
+#: src/include/dhcp-server/dialogs2.rb:143
+#: src/include/dhcp-server/dialogs2.rb:145
#, fuzzy
msgid "Dynamic DHCP"
msgstr "WEP động"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:152
+#: src/include/dhcp-server/dialogs2.rb:151
#, fuzzy
msgid "DHCP Server: Host Management"
msgstr "Quản lý Điện năng"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:156
+#: src/include/dhcp-server/dialogs2.rb:155
#, fuzzy
msgid "Host Management"
msgstr "Quản lý Điện năng"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:161
+#: src/include/dhcp-server/dialogs2.rb:160
msgid "DHCP Server: Expert Settings"
msgstr ""
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:165
+#: src/include/dhcp-server/dialogs2.rb:164
#, fuzzy
msgid "Expert Settings"
msgstr "_Xuất thẻ"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:206
+#: src/include/dhcp-server/dialogs2.rb:205
msgid "When &Booting"
msgstr "&Khi khởi động"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:208
+#: src/include/dhcp-server/dialogs2.rb:207
msgid "&Manually"
msgstr "&Thủ công"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:212
+#: src/include/dhcp-server/dialogs2.rb:211
msgid "When Booting"
msgstr "Khi khởi động"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:214
+#: src/include/dhcp-server/dialogs2.rb:213
msgid "Manually"
msgstr "Thủ công"
-#: src/include/dhcp-server/dialogs2.rb:334
+#. label - service status
+#: src/include/dhcp-server/dialogs2.rb:221
#, fuzzy
+msgid "DHCP server is running"
+msgstr "Dịch vụ tìm kiếm không đang chạy"
+
+#. label - service status
+#: src/include/dhcp-server/dialogs2.rb:225
+#, fuzzy
+msgid "DHCP server is not running"
+msgstr "Dịch vụ tìm kiếm không đang chạy"
+
+#. push button
+#: src/include/dhcp-server/dialogs2.rb:229
+msgid "&Start DHCP Server Now"
+msgstr ""
+
+#. push button
+#: src/include/dhcp-server/dialogs2.rb:233
+msgid "S&top DHCP Server Now"
+msgstr ""
+
+#. push button
+#: src/include/dhcp-server/dialogs2.rb:241
+msgid "Save Settings and Restart DHCP Server &Now"
+msgstr ""
+
+#. part of help text - push button label, NO SHORTCUT!!!
+#: src/include/dhcp-server/dialogs2.rb:247
+msgid "Start DHCP Server Now"
+msgstr ""
+
+#. part of help text - push button label, NO SHORTCUT!!!
+#: src/include/dhcp-server/dialogs2.rb:249
+msgid "Stop DHCP Server Now"
+msgstr ""
+
+#. 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 ""
+
+#: src/include/dhcp-server/dialogs2.rb:371
+#, fuzzy
msgid "DHCP Server Start-up Arguments"
msgstr "Quản lý Điện năng"
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:404
+#: src/include/dhcp-server/dialogs2.rb:443
msgid "Network Cards for DHCP Server"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:410
+#: src/include/dhcp-server/dialogs2.rb:449
#, fuzzy
msgid "Selected"
msgstr "&Không chọn gì"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:412
+#: src/include/dhcp-server/dialogs2.rb:451
#, fuzzy
msgid "Interface Name"
msgstr "Giao diện:"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:414
+#: src/include/dhcp-server/dialogs2.rb:453
#, fuzzy
msgid "Device Name"
msgstr "Tên thiết bị modem"
@@ -516,39 +553,39 @@
# Literal: don't translate / Nghĩa chữ: đừng dịch
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:416
-#: src/include/dhcp-server/dialogs2.rb:1602
+#: src/include/dhcp-server/dialogs2.rb:455
+#: src/include/dhcp-server/dialogs2.rb:1650
#, fuzzy
msgid "IP"
msgstr "TKIP"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:423
+#: src/include/dhcp-server/dialogs2.rb:462
#, fuzzy
msgid "&Select"
msgstr "&Chọn..."
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:425
+#: src/include/dhcp-server/dialogs2.rb:464
#, fuzzy
msgid "&Deselect"
msgstr "&Chọn..."
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:494
+#: src/include/dhcp-server/dialogs2.rb:533
#, fuzzy
msgid "DHCP address"
msgstr "Địa chỉ IP:"
#. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
#. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:569
+#: src/include/dhcp-server/dialogs2.rb:608
msgid "At least one network interface must be selected."
msgstr ""
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:577
+#: src/include/dhcp-server/dialogs2.rb:616
msgid ""
"One or more selected network interfaces is not configured (no assigned IP address \n"
"and netmask)."
@@ -556,63 +593,63 @@
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:593
-#: src/include/dhcp-server/widgets.rb:1058
+#: src/include/dhcp-server/dialogs2.rb:632
+#: src/include/dhcp-server/widgets.rb:1079
msgid "&LDAP Support"
msgstr ""
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:600
+#: src/include/dhcp-server/dialogs2.rb:639
#, fuzzy
msgid "DHCP Server &Name (optional)"
msgstr "Máy ảnh chọn"
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:613
+#: src/include/dhcp-server/dialogs2.rb:652
msgid "&Domain Name"
msgstr ""
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:615
+#: src/include/dhcp-server/dialogs2.rb:654
msgid "&Primary Name Server IP"
msgstr ""
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:618
+#: src/include/dhcp-server/dialogs2.rb:657
#, fuzzy
msgid "&Secondary Name Server IP"
msgstr "DNS phụ :"
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:621
+#: src/include/dhcp-server/dialogs2.rb:660
#, fuzzy
msgid "Default &Gateway (Router) "
msgstr "Tuyến mặc định:"
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:626
+#: src/include/dhcp-server/dialogs2.rb:665
msgid "NTP &Time Server"
msgstr ""
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:628
+#: src/include/dhcp-server/dialogs2.rb:667
msgid "&Print Server"
msgstr ""
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:630
+#: src/include/dhcp-server/dialogs2.rb:669
msgid "&WINS Server"
msgstr ""
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:635
+#: src/include/dhcp-server/dialogs2.rb:674
msgid "Default &Lease Time"
msgstr ""
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:644
-#: src/include/dhcp-server/dialogs2.rb:1097
+#: src/include/dhcp-server/dialogs2.rb:683
+#: src/include/dhcp-server/dialogs2.rb:1139
msgid "&Units"
msgstr ""
@@ -620,39 +657,39 @@
#. error popup
#. error popup
#. error popup
-#: 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
+#: 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
msgid "The specified value is not a valid hostname or IP address."
msgstr ""
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1025
+#: src/include/dhcp-server/dialogs2.rb:1067
#, fuzzy
msgid "Subnet Information"
msgstr "Cấu hình"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1031
+#: src/include/dhcp-server/dialogs2.rb:1073
#, fuzzy
msgid "Current &Network"
msgstr "mạng t_uyến"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1036
+#: src/include/dhcp-server/dialogs2.rb:1078
#, fuzzy
msgid "Current Net&mask"
msgstr "Ngày hiện có :"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1083
msgid "Netmask Bi&ts"
msgstr ""
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1048
+#: src/include/dhcp-server/dialogs2.rb:1090
#: src/include/dhcp-server/dns-server-dialogs.rb:81
#, fuzzy
msgid "Min&imum IP Address"
@@ -660,13 +697,13 @@
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:1095
#: src/include/dhcp-server/dns-server-dialogs.rb:83
#, fuzzy
msgid "Ma&ximum IP Address"
msgstr "Địa chỉ IP:"
-#: src/include/dhcp-server/dialogs2.rb:1061
+#: src/include/dhcp-server/dialogs2.rb:1103
#, fuzzy
msgid "IP Address Range"
msgstr "Địa chỉ IP:"
@@ -675,10 +712,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1109
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:355
-#: src/include/dhcp-server/dns-server-management.rb:915
+#: src/include/dhcp-server/dns-server-management.rb:356
+#: src/include/dhcp-server/dns-server-management.rb:917
#, fuzzy
msgid "&First IP Address"
msgstr "Địa chỉ IP:"
@@ -687,65 +724,65 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1072
+#: src/include/dhcp-server/dialogs2.rb:1114
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:357
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:358
+#: src/include/dhcp-server/dns-server-management.rb:919
#, fuzzy
msgid "&Last IP Address"
msgstr "Địa chỉ IP:"
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1076
-#: src/include/dhcp-server/options.rb:1093
+#: src/include/dhcp-server/dialogs2.rb:1118
+#: src/include/dhcp-server/options.rb:1094
msgid "Allow Dynamic &BOOTP"
msgstr ""
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1082
+#: src/include/dhcp-server/dialogs2.rb:1124
msgid "Lease Time"
msgstr ""
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1088
+#: src/include/dhcp-server/dialogs2.rb:1130
#, fuzzy
msgid "&Default"
msgstr "Tuyến mặc định:"
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1106
+#: src/include/dhcp-server/dialogs2.rb:1148
msgid "&Maximum"
msgstr ""
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1116
+#: src/include/dhcp-server/dialogs2.rb:1158
msgid "Uni&ts"
msgstr ""
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1318
-#: src/include/dhcp-server/dialogs2.rb:1327
+#: src/include/dhcp-server/dialogs2.rb:1360
+#: src/include/dhcp-server/dialogs2.rb:1369
msgid "Create New DNS Zone from Scratch"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:1329
+#: src/include/dhcp-server/dialogs2.rb:1371
msgid "Edit Current DNS Zone"
msgstr ""
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1335
+#: src/include/dhcp-server/dialogs2.rb:1377
#, fuzzy
msgid "Get Current Zone Information"
msgstr "Thông tin kết nối"
-#: src/include/dhcp-server/dialogs2.rb:1343
+#: src/include/dhcp-server/dialogs2.rb:1385
#, fuzzy
msgid "&Synchronize DNS Server..."
msgstr "DNS chính:"
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1372
+#: src/include/dhcp-server/dialogs2.rb:1414
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -753,8 +790,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1499
-#: src/include/dhcp-server/dialogs2.rb:1507
+#: src/include/dhcp-server/dialogs2.rb:1547
+#: src/include/dhcp-server/dialogs2.rb:1555
msgid "Enter values for both ends of the IP address range."
msgstr ""
@@ -762,142 +799,142 @@
#. %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:1546
-#: src/include/dhcp-server/dialogs2.rb:1569
+#: src/include/dhcp-server/dialogs2.rb:1594
+#: src/include/dhcp-server/dialogs2.rb:1617
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."
msgstr ""
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1594
+#: src/include/dhcp-server/dialogs2.rb:1642
msgid "Registered Host"
msgstr ""
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1600
+#: src/include/dhcp-server/dialogs2.rb:1648
msgid "Name"
msgstr "Tên"
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1604
+#: src/include/dhcp-server/dialogs2.rb:1652
#, fuzzy
msgid "Hardware Address"
msgstr "Địa chỉ phần cứng:"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1606
+#: src/include/dhcp-server/dialogs2.rb:1654
msgid "Type"
msgstr "Kiểu"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1613
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "List Setup"
msgstr ""
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1621
+#: src/include/dhcp-server/dialogs2.rb:1669
#, fuzzy
msgid "&Name"
msgstr "Tên"
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1626
-#: src/include/dhcp-server/dns-server-management.rb:228
+#: src/include/dhcp-server/dialogs2.rb:1674
+#: src/include/dhcp-server/dns-server-management.rb:229
#, fuzzy
msgid "&IP Address"
msgstr "Địa chỉ IP:"
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1634
+#: src/include/dhcp-server/dialogs2.rb:1682
#, fuzzy
msgid "&Hardware Address"
msgstr "Địa chỉ phần cứng:"
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1641
+#: src/include/dhcp-server/dialogs2.rb:1689
msgid "&Ethernet"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:1643
+#: src/include/dhcp-server/dialogs2.rb:1691
msgid "&Token Ring"
msgstr ""
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1658
+#: src/include/dhcp-server/dialogs2.rb:1706
msgid "C&hange in List"
msgstr ""
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1709
#, fuzzy
msgid "Dele&te from List"
msgstr "Xoá bỏ ra Đĩa"
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1762
-#: src/include/dhcp-server/options.rb:1038
+#: src/include/dhcp-server/dialogs2.rb:1810
+#: src/include/dhcp-server/options.rb:1039
msgid "Ethernet"
msgstr ""
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1763
-#: src/include/dhcp-server/options.rb:1040
+#: src/include/dhcp-server/dialogs2.rb:1811
+#: src/include/dhcp-server/options.rb:1041
msgid "Token Ring"
msgstr ""
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1837
-#: src/include/dhcp-server/options.rb:934
+#: src/include/dhcp-server/dialogs2.rb:1885
+#: src/include/dhcp-server/options.rb:935
#, fuzzy
msgid "The hardware address is invalid.\n"
msgstr "Giá trị %1 sai."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1883
+#: src/include/dhcp-server/dialogs2.rb:1931
msgid "The hardware address must be unique."
msgstr ""
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1893
+#: src/include/dhcp-server/dialogs2.rb:1941
msgid "The hostname cannot be empty."
msgstr ""
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1903
+#: src/include/dhcp-server/dialogs2.rb:1951
#, fuzzy
msgid "A host named %1 already exists."
msgstr "Tên này đã được dùng"
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1921
-#: src/include/dhcp-server/dialogs2.rb:1985
+#: src/include/dhcp-server/dialogs2.rb:1969
+#: src/include/dhcp-server/dialogs2.rb:2033
msgid "Enter a host IP."
msgstr ""
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1936
+#: src/include/dhcp-server/dialogs2.rb:1984
msgid "The hardware address must be defined."
msgstr ""
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:1957
-#: src/include/dhcp-server/dialogs2.rb:1972
+#: src/include/dhcp-server/dialogs2.rb:2005
+#: src/include/dhcp-server/dialogs2.rb:2020
msgid "Select a host first."
msgstr ""
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:1999
+#: src/include/dhcp-server/dialogs2.rb:2047
msgid "The input value must be defined."
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2038
+#: src/include/dhcp-server/dialogs2.rb:2086
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -910,15 +947,15 @@
msgstr ""
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2085
+#: src/include/dhcp-server/dialogs2.rb:2133
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2096
+#: src/include/dhcp-server/dialogs2.rb:2144
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr ""
-#: src/include/dhcp-server/dialogs2.rb:2107
+#: src/include/dhcp-server/dialogs2.rb:2155
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -930,7 +967,7 @@
msgstr ""
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2179
+#: src/include/dhcp-server/dialogs2.rb:2236
msgid "DHCP Server Wizard (%1 of 4)"
msgstr ""
@@ -1152,7 +1189,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:454
+#: src/include/dhcp-server/dns-server-management.rb:455
#, fuzzy
msgid "The last IP address must be higher than the first one."
msgstr "Cần chèn phạm vi và địa chỉ IP."
@@ -1177,7 +1214,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:255
+#: src/include/dhcp-server/dns-server-management.rb:256
#, fuzzy
msgid "Invalid hostname."
msgstr "Mục nhập máy không hợp lệ"
@@ -1189,9 +1226,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:264
-#: src/include/dhcp-server/dns-server-management.rb:393
-#: src/include/dhcp-server/dns-server-management.rb:401
+#: 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
#, fuzzy
msgid "Invalid IP address."
msgstr "Xin hãy nhập một địa chỉ e-mail đúng"
@@ -1208,51 +1245,51 @@
msgstr ""
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:156
+#: src/include/dhcp-server/dns-server-management.rb:157
msgid "Regenerating DNS zone entries..."
msgstr ""
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:223
+#: src/include/dhcp-server/dns-server-management.rb:224
msgid "Adding a New DNS Record"
msgstr ""
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:226
+#: src/include/dhcp-server/dns-server-management.rb:227
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "Tên &máy"
#. 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:316
+#: src/include/dhcp-server/dns-server-management.rb:317
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr ""
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:352
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:353
+#: src/include/dhcp-server/dns-server-management.rb:955
msgid "Removing DNS Records Matching Range"
msgstr ""
#. 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:464
+#: src/include/dhcp-server/dns-server-management.rb:465
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr ""
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:555
+#: src/include/dhcp-server/dns-server-management.rb:556
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
msgstr ""
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:569
+#: src/include/dhcp-server/dns-server-management.rb:570
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1260,84 +1297,84 @@
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:589
+#: src/include/dhcp-server/dns-server-management.rb:590
#: src/include/dhcp-server/dns-server-wizard.rb:1107
#, fuzzy
msgid "Cannot create zone %1."
msgstr "Không tạo được thư mục '%1'."
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:813
+#: src/include/dhcp-server/dns-server-management.rb:815
msgid "Synchronizing DNS reverse records..."
msgstr ""
#. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:858
+#: src/include/dhcp-server/dns-server-management.rb:860
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
msgstr ""
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:907
+#: src/include/dhcp-server/dns-server-management.rb:909
msgid "&Domain"
msgstr "&Miền"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:911
#, fuzzy
msgid "&Network"
msgstr "Mạng"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:913
#, fuzzy
msgid "Net&mask"
msgstr "Ngày hiện có :"
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:921
+#: src/include/dhcp-server/dns-server-management.rb:923
msgid "DNS Zone Records"
msgstr ""
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:926
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Hostname"
msgstr "Tên máy"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:930
msgid "Assigned IP"
msgstr ""
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:935
+#: src/include/dhcp-server/dns-server-management.rb:937
#, fuzzy
msgid "&Add..."
msgstr "&Thêm"
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:943
+#: src/include/dhcp-server/dns-server-management.rb:945
msgid "&Special Tasks"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:951
+#: src/include/dhcp-server/dns-server-management.rb:953
msgid "Add New Range of DNS Records"
msgstr ""
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:957
+#: src/include/dhcp-server/dns-server-management.rb:959
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr ""
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1029
+#: src/include/dhcp-server/dns-server-management.rb:1031
msgid "Synchronize with Reverse Zone %1"
msgstr ""
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1082
+#: src/include/dhcp-server/dns-server-management.rb:1084
#, fuzzy
msgid "DHCP Server: DNS Server Synchronization"
msgstr "Máy ảnh chọn"
@@ -1641,7 +1678,8 @@
msgstr ""
#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24
+#. help text 1/2
+#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1659,9 +1697,17 @@
"is enabled.</p>"
msgstr ""
-#. help text 2/5
+#. help text 1/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 ""
+
+#. 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"
@@ -1669,7 +1715,7 @@
msgstr ""
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:46
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1677,7 +1723,7 @@
msgstr ""
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:58
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"
@@ -1687,7 +1733,7 @@
msgstr ""
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:60
+#: src/include/dhcp-server/helps.rb:66
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1697,14 +1743,14 @@
msgstr ""
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:68
+#: src/include/dhcp-server/helps.rb:74
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>"
msgstr ""
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:72
+#: src/include/dhcp-server/helps.rb:78
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"
@@ -1712,7 +1758,7 @@
msgstr ""
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:84
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"
@@ -1721,7 +1767,7 @@
msgstr ""
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:85
+#: src/include/dhcp-server/helps.rb:91
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"
@@ -1730,7 +1776,7 @@
msgstr ""
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:92
+#: src/include/dhcp-server/helps.rb:98
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1739,14 +1785,14 @@
msgstr ""
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:99
+#: src/include/dhcp-server/helps.rb:105
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
msgstr ""
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:103
+#: src/include/dhcp-server/helps.rb:109
msgid ""
"<p>\n"
"To edit DHCP options, choose the appropriate\n"
@@ -1756,14 +1802,14 @@
msgstr ""
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:111
+#: src/include/dhcp-server/helps.rb:117
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
msgstr ""
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:115
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1771,7 +1817,7 @@
msgstr ""
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:127
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1781,7 +1827,7 @@
msgstr ""
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:129
+#: src/include/dhcp-server/helps.rb:135
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1790,7 +1836,7 @@
msgstr ""
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:136
+#: src/include/dhcp-server/helps.rb:142
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -1799,7 +1845,7 @@
msgstr ""
#. help text
-#: src/include/dhcp-server/helps.rb:143
+#: src/include/dhcp-server/helps.rb:149
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"
@@ -1808,21 +1854,21 @@
msgstr ""
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:150
+#: src/include/dhcp-server/helps.rb:156
msgid ""
"<p><b><big>Network Card Selection</big></b><br>\n"
"Select one or more of the listed network cards to use for the DHCP server.</p>\n"
msgstr ""
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:154
+#: src/include/dhcp-server/helps.rb:160
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
msgstr ""
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:158
+#: src/include/dhcp-server/helps.rb:164
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1830,14 +1876,14 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:165
+#: src/include/dhcp-server/helps.rb:171
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:169
+#: src/include/dhcp-server/helps.rb:175
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"
@@ -1845,40 +1891,40 @@
msgstr ""
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:181
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
msgstr ""
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:179
+#: src/include/dhcp-server/helps.rb:185
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
msgstr ""
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:183
+#: src/include/dhcp-server/helps.rb:189
msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
msgstr ""
#. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:187
+#: src/include/dhcp-server/helps.rb:193
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
msgstr ""
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:191
+#: src/include/dhcp-server/helps.rb:197
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>"
msgstr ""
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:195
+#: src/include/dhcp-server/helps.rb:201
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -1887,7 +1933,7 @@
msgstr ""
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:202
+#: src/include/dhcp-server/helps.rb:208
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -1898,7 +1944,7 @@
msgstr ""
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:211
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -1906,14 +1952,14 @@
msgstr ""
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:223
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>"
msgstr ""
#. Help text
-#: src/include/dhcp-server/helps.rb:221
+#: src/include/dhcp-server/helps.rb:227
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -1921,14 +1967,14 @@
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:239
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
"Use this dialog to edit hosts with static address binding.</p>"
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:231
+#: src/include/dhcp-server/helps.rb:243
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -1938,45 +1984,45 @@
msgstr ""
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr ""
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:263
msgid "<p>Select the type of declaration to add.</p>"
msgstr ""
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:257
+#: src/include/dhcp-server/helps.rb:269
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
msgstr ""
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:264
+#: src/include/dhcp-server/helps.rb:276
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
msgstr ""
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:273
+#: src/include/dhcp-server/helps.rb:285
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
msgstr ""
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:282
+#: src/include/dhcp-server/helps.rb:294
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
msgstr ""
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:291
+#: src/include/dhcp-server/helps.rb:303
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"
@@ -1984,7 +2030,7 @@
msgstr ""
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:302
+#: src/include/dhcp-server/helps.rb:314
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"
@@ -1994,24 +2040,24 @@
#. selection box
#. selection box
#. selection box
-#: 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
+#: 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
#, fuzzy
msgid "A&ddresses"
msgstr "Địa chỉ"
#. popup message
-#: src/include/dhcp-server/options.rb:469
+#: src/include/dhcp-server/options.rb:470
msgid "The entered address is not valid."
msgstr ""
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:489
-#: src/include/dhcp-server/options.rb:542
+#: src/include/dhcp-server/options.rb:490
+#: src/include/dhcp-server/options.rb:543
msgid "At least one address must be specified."
msgstr ""
@@ -2021,108 +2067,108 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:511
-#: src/include/dhcp-server/options.rb:527
-#: src/include/dhcp-server/options.rb:818
+#: src/include/dhcp-server/options.rb:512
+#: src/include/dhcp-server/options.rb:528
+#: src/include/dhcp-server/options.rb:819
msgid "&Values"
msgstr ""
#. message popup
-#: src/include/dhcp-server/options.rb:562
+#: src/include/dhcp-server/options.rb:563
msgid "The entered addresses are not valid."
msgstr ""
#. message popup
-#: src/include/dhcp-server/options.rb:582
+#: src/include/dhcp-server/options.rb:583
msgid "At least one address pair must be specified."
msgstr ""
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:619
-#: src/include/dhcp-server/options.rb:660
+#: src/include/dhcp-server/options.rb:620
+#: src/include/dhcp-server/options.rb:661
#, fuzzy
msgid "On"
msgstr "Mở"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:622
-#: src/include/dhcp-server/options.rb:663
+#: src/include/dhcp-server/options.rb:623
+#: src/include/dhcp-server/options.rb:664
msgid "Off"
msgstr "Tắt"
#. popup message
-#: src/include/dhcp-server/options.rb:693
+#: src/include/dhcp-server/options.rb:694
msgid "A value must be specified."
msgstr ""
#. text entry
-#: src/include/dhcp-server/options.rb:785
+#: src/include/dhcp-server/options.rb:786
#, fuzzy
msgid "&New Address"
msgstr "Địa chỉ"
#. int field
-#: src/include/dhcp-server/options.rb:823
+#: src/include/dhcp-server/options.rb:824
#, fuzzy
msgid "&New Value"
msgstr "Tên mới :"
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:860
+#: src/include/dhcp-server/options.rb:861
msgid "Separate multiple addresses with spaces."
msgstr ""
#. push button
-#: src/include/dhcp-server/options.rb:863
+#: src/include/dhcp-server/options.rb:864
msgid "&Add Address Pair"
msgstr ""
#. popup message
-#: src/include/dhcp-server/options.rb:1007
+#: src/include/dhcp-server/options.rb:1008
msgid "The lowest address must be lower than the highest one."
msgstr ""
#. label -- help text
-#: src/include/dhcp-server/options.rb:1023
+#: src/include/dhcp-server/options.rb:1024
msgid "If you change this, also update the syslog configuration."
msgstr ""
#. combo box
-#: src/include/dhcp-server/options.rb:1035
+#: src/include/dhcp-server/options.rb:1036
#, fuzzy
msgid "&Hardware Type"
msgstr "Địa chỉ phần cứng:"
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1045
+#: src/include/dhcp-server/options.rb:1046
#, fuzzy
msgid "&MAC Address"
msgstr "Địa chỉ"
#. text entry
-#: src/include/dhcp-server/options.rb:1088
+#: src/include/dhcp-server/options.rb:1089
#, fuzzy
msgid "&Lowest IP Address"
msgstr "Địa chỉ IP:"
#. text entry
-#: src/include/dhcp-server/options.rb:1090
+#: src/include/dhcp-server/options.rb:1091
#, fuzzy
msgid "&Highest IP Address"
msgstr "Địa chỉ IP:"
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:191
+#: src/include/dhcp-server/widgets.rb:174
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
msgstr ""
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:311
+#: src/include/dhcp-server/widgets.rb:355
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2130,7 +2176,7 @@
msgstr ""
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:339
+#: src/include/dhcp-server/widgets.rb:383
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
"%1\n"
@@ -2138,7 +2184,7 @@
msgstr ""
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:354
+#: src/include/dhcp-server/widgets.rb:398
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
"Run the YaST firewall configuration to assign it to a zone."
@@ -2146,216 +2192,225 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:374
-#: src/include/dhcp-server/widgets.rb:588
+#: src/include/dhcp-server/widgets.rb:424
+#: src/include/dhcp-server/widgets.rb:653
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
msgstr ""
+#. menubutton entry, try to keep short
+#: src/include/dhcp-server/widgets.rb:445
+msgid "Restart DHCP Server"
+msgstr ""
+
+#. menubutton entry, try to keep short
+#: src/include/dhcp-server/widgets.rb:450
+msgid "Save Settings and Restart DHCP Server"
+msgstr ""
+
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:484
-#: src/include/dhcp-server/widgets.rb:1076
+#: src/include/dhcp-server/widgets.rb:548
+#: src/include/dhcp-server/widgets.rb:1097
#, fuzzy
msgid "&Configured Declarations"
msgstr "Cấu hình"
#. push button
-#: src/include/dhcp-server/widgets.rb:572
+#: src/include/dhcp-server/widgets.rb:637
#, fuzzy
msgid "&Dynamic DNS"
msgstr "WEP động"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:668
-#: src/include/dhcp-server/widgets.rb:1219
+#: src/include/dhcp-server/widgets.rb:733
+#: src/include/dhcp-server/widgets.rb:1239
msgid "Forward Zone TSIG &Key"
msgstr ""
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:677
-#: src/include/dhcp-server/widgets.rb:1226
+#: src/include/dhcp-server/widgets.rb:742
+#: src/include/dhcp-server/widgets.rb:1246
msgid "Reverse Zone TSIG &Key"
msgstr ""
#. popup headline
-#: src/include/dhcp-server/widgets.rb:796
+#: src/include/dhcp-server/widgets.rb:861
msgid "Select File with Authentication Key"
msgstr ""
-#. FIXME CWM should be able to handle virtual widgets
-#: src/include/dhcp-server/widgets.rb:1042
-#, fuzzy
-#| msgid "Automatic Changes"
-msgid "Apply Changes"
-msgstr "Thay đổi tự động"
+#. check box
+#: src/include/dhcp-server/widgets.rb:1060
+msgid "&Start DHCP Server"
+msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1049
+#: src/include/dhcp-server/widgets.rb:1070
msgid "&Run DHCP Server in Chroot Jail"
msgstr ""
-#: src/include/dhcp-server/widgets.rb:1099
+#. menu button
+#: src/include/dhcp-server/widgets.rb:1111
#, fuzzy
msgid "Ad&vanced"
msgstr "Nâng cao"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1102
+#: src/include/dhcp-server/widgets.rb:1114
#, fuzzy
msgid "Display &Log"
msgstr "Hiện t_hẻ"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1104
+#: src/include/dhcp-server/widgets.rb:1116
#, fuzzy
msgid "&Interface Configuration"
msgstr "Cấu hình phẳng"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1136
#, fuzzy
msgid "&Network Address"
msgstr "Địa chỉ đích:"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/widgets.rb:1138
#, fuzzy
msgid "Network &Mask"
msgstr "T_ên mạng:"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1156
msgid "Group &Name"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1144
+#: src/include/dhcp-server/widgets.rb:1164
msgid "Pool &Name"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1152
+#: src/include/dhcp-server/widgets.rb:1172
#, fuzzy
msgid "Shared Network &Name"
msgstr "T_ên mạng:"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1160
+#: src/include/dhcp-server/widgets.rb:1180
#, fuzzy
msgid "Class &Name"
msgstr "Tên thẻ :"
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1170
+#: src/include/dhcp-server/widgets.rb:1190
#, fuzzy
msgid "Available Interfaces"
msgstr "Giao diện:"
#. check box
-#: src/include/dhcp-server/widgets.rb:1185
+#: src/include/dhcp-server/widgets.rb:1205
msgid "Open &Firewall for Selected Interfaces"
msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1211
+#: src/include/dhcp-server/widgets.rb:1231
msgid "&Enable Dynamic DNS for This Subnet"
msgstr ""
#. check box
-#: src/include/dhcp-server/widgets.rb:1233
+#: src/include/dhcp-server/widgets.rb:1253
msgid "&Update Global Dynamic DNS Settings"
msgstr ""
#. text entry
-#: src/include/dhcp-server/widgets.rb:1243
+#: src/include/dhcp-server/widgets.rb:1263
#, fuzzy
msgid "&Zone"
msgstr "không có"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1270
+#: src/include/dhcp-server/widgets.rb:1290
#, fuzzy
msgid "&Primary DNS Server"
msgstr "DNS chính:"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1276
+#: src/include/dhcp-server/widgets.rb:1296
#, fuzzy
msgid "Re&verse Zone"
msgstr "Thứ tự _ngược lại"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1285
+#: src/include/dhcp-server/widgets.rb:1305
#, fuzzy
msgid "Pr&imary DNS Server"
msgstr "DNS chính:"
#. push button
-#: src/include/dhcp-server/widgets.rb:1315
+#: src/include/dhcp-server/widgets.rb:1335
#, fuzzy
msgid "DHCP Server &Expert Configuration..."
msgstr "Cấu hình thành phần"
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1401
+#: src/modules/DhcpServer.pm:1388
msgid "Initializing DHCP Server Configuration"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1405
+#: src/modules/DhcpServer.pm:1392
msgid "Check the environment"
msgstr "Kiểm tra môi trường"
#. progress stage
-#: src/modules/DhcpServer.pm:1407
+#: src/modules/DhcpServer.pm:1394
msgid "Read firewall settings"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1409
+#: src/modules/DhcpServer.pm:1396
msgid "Read DHCP server settings"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1411
+#: src/modules/DhcpServer.pm:1398
#, fuzzy
msgid "Read DNS server settings"
msgstr "Thiết lập máy chủ SLP"
#. progress step
-#: src/modules/DhcpServer.pm:1415
+#: src/modules/DhcpServer.pm:1402
#, fuzzy
msgid "Checking the environment..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. progress step
-#: src/modules/DhcpServer.pm:1417
+#: src/modules/DhcpServer.pm:1404
msgid "Reading firewall settings..."
msgstr ""
#. progress step
-#: src/modules/DhcpServer.pm:1419
+#: src/modules/DhcpServer.pm:1406
msgid "Reading DHCP server settings..."
msgstr ""
#. progress step
-#: src/modules/DhcpServer.pm:1421
+#: src/modules/DhcpServer.pm:1408
#, fuzzy
msgid "Reading DNS server settings..."
msgstr "Đang đọc thiết lập trước đây..."
#. progress step
-#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
+#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1453
+#: src/modules/DhcpServer.pm:1440
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2366,105 +2421,105 @@
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:1488
+#: src/modules/DhcpServer.pm:1475
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
msgstr ""
#. yes-no popup
-#: src/modules/DhcpServer.pm:1556
+#: src/modules/DhcpServer.pm:1543
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
msgstr ""
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1629
+#: src/modules/DhcpServer.pm:1616
#, fuzzy
msgid "Saving DHCP Server Configuration"
msgstr "Cấu hình phẳng"
#. progress stage
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1621
msgid "Write DHCP server settings"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1623
msgid "Write firewall settings"
msgstr "Ghi thiết lập tường lửa"
#. progress stage
-#: src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1625
msgid "Restart DHCP server"
msgstr ""
#. progress stage
-#: src/modules/DhcpServer.pm:1640
+#: src/modules/DhcpServer.pm:1627
#, fuzzy
msgid "Write DNS server settings"
msgstr "Ghi thiết lập"
#. progress step
-#: src/modules/DhcpServer.pm:1643
+#: src/modules/DhcpServer.pm:1630
msgid "Writing DHCP server settings..."
msgstr ""
#. progress step
-#: src/modules/DhcpServer.pm:1645
+#: src/modules/DhcpServer.pm:1632
msgid "Writing firewall settings..."
msgstr "Đang ghi thiết lập tường lửa..."
#. progress step
-#: src/modules/DhcpServer.pm:1647
+#: src/modules/DhcpServer.pm:1634
msgid "Restarting DHCP server..."
msgstr ""
#. progress step
-#: src/modules/DhcpServer.pm:1649
+#: src/modules/DhcpServer.pm:1636
#, fuzzy
msgid "Writing DNS server settings..."
msgstr "Đang ghi thiết lập..."
#. error report
-#: src/modules/DhcpServer.pm:1762
+#: src/modules/DhcpServer.pm:1749
#, fuzzy
msgid "Error occurred while restarting the DHCP daemon."
msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
#. summary string
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1888
msgid "The DHCP server is started at boot time"
msgstr ""
#. summary string
-#: src/modules/DhcpServer.pm:1906
+#: src/modules/DhcpServer.pm:1893
msgid "The DHCP server is not started at boot time"
msgstr ""
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1914
+#: src/modules/DhcpServer.pm:1901
msgid "Listen On: %1"
msgstr ""
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1933
+#: src/modules/DhcpServer.pm:1920
msgid "Dynamic Address Range: %1"
msgstr ""
#. error message
-#: src/modules/DhcpServer.pm:2328
+#: src/modules/DhcpServer.pm:2313
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
+#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr ""
#. error report
-#: src/modules/DhcpServer.pm:2574
+#: src/modules/DhcpServer.pm:2559
msgid "DHCP service DN is not defined."
msgstr ""
@@ -2472,38 +2527,30 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
-#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
+#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
+#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
#, fuzzy
msgid "Error occurred while creating %1."
msgstr "Gặp lỗi trong khi xoay ảnh."
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2754
+#: src/modules/DhcpServer.pm:2739
#, fuzzy
msgid "Error occurred while updating %1."
msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2825
+#: src/modules/DhcpServer.pm:2810
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr ""
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2922
+#: src/modules/DhcpServer.pm:2907
#, fuzzy
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
#, fuzzy
-#~ msgid "DHCP server is running"
-#~ msgstr "Dịch vụ tìm kiếm không đang chạy"
-
-#, fuzzy
-#~ msgid "DHCP server is not running"
-#~ msgstr "Dịch vụ tìm kiếm không đang chạy"
-
-#, fuzzy
#~ msgid "Cannot remove current zone %1."
#~ msgstr "Không đọc được thiết lập hiện thời."
Modified: branches/plus-SLE12-SP2/yast/vi/po/dns-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/dns-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/dns-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -436,8 +436,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:441
-#: src/include/dns-server/dialog-main.rb:444
+#: src/include/dns-server/dialog-main.rb:443
+#: src/include/dns-server/dialog-main.rb:446
#, fuzzy
msgid "Forwarders"
msgstr "Thư mục"
@@ -582,8 +582,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:515
-#: src/include/dns-server/dialog-main.rb:518
+#: src/include/dns-server/dialog-main.rb:517
+#: src/include/dns-server/dialog-main.rb:520
#, fuzzy
msgid "DNS Zones"
msgstr "Không có"
@@ -606,7 +606,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:289
+#: src/include/dns-server/dialog-main.rb:291
msgid "&LDAP Support Active"
msgstr "Dùng hỗ trợ &LDAP"
@@ -632,13 +632,13 @@
msgstr ""
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:259
+#: src/include/dns-server/dialog-main.rb:261
#, fuzzy
msgid "DNS Server"
msgstr "Không bao giờ"
#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:417
+#: src/include/dns-server/dialog-main.rb:419
#, fuzzy
#| msgid "Automatic Changes"
msgid "Apply Changes"
@@ -646,22 +646,22 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:423
-#: src/include/dns-server/dialog-main.rb:426
+#: src/include/dns-server/dialog-main.rb:425
+#: src/include/dns-server/dialog-main.rb:428
msgid "Start-Up"
msgstr ""
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:454
-#: src/include/dns-server/dialog-main.rb:457
+#: src/include/dns-server/dialog-main.rb:456
+#: src/include/dns-server/dialog-main.rb:459
#, fuzzy
msgid "Basic Options"
msgstr "Tùy chọn modem"
#. 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
#, fuzzy
msgid "Logging"
msgstr "Đang tải"
@@ -670,8 +670,8 @@
#. Tree Menu Item - DNS - expert settings
#. multi selection box
#. multi selection box
-#: src/include/dns-server/dialog-main.rb:480
-#: src/include/dns-server/dialog-main.rb:483
+#: src/include/dns-server/dialog-main.rb:482
+#: src/include/dns-server/dialog-main.rb:485
#: src/include/dns-server/dialog-masterzone.rb:163
#: src/include/dns-server/dialog-masterzone.rb:2729
msgid "ACLs"
@@ -679,8 +679,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:497
-#: src/include/dns-server/dialog-main.rb:500
+#: src/include/dns-server/dialog-main.rb:499
+#: src/include/dns-server/dialog-main.rb:502
msgid "TSIG Keys"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/docker.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/docker.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/docker.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/drbd.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/drbd.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/drbd.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -249,7 +249,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:86
+#: src/include/drbd/helps.rb:85
#, fuzzy
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
msgstr ""
@@ -271,11 +271,10 @@
"\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:89
+#: src/include/drbd/helps.rb:88
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -301,14 +300,14 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:113
+#: src/include/drbd/helps.rb:112
#, fuzzy
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr ""
"<p><b><big>Đang lưu cấu hình CASA</big></b><br>\n"
"Xin hãy chờ...<br></p>\n"
-#: src/include/drbd/helps.rb:116
+#: src/include/drbd/helps.rb:115
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -317,25 +316,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. Should disable the LVM cache when combined drbd with LVM.</p>\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"
"\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:133
+#: src/include/drbd/helps.rb:130
#, fuzzy
msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgstr ""
"<p><b><big>Đang lưu cấu hình CASA</big></b><br>\n"
"Xin hãy chờ...<br></p>\n"
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:133
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr ""
-#: src/include/drbd/helps.rb:139
+#: src/include/drbd/helps.rb:136
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"
@@ -345,7 +342,7 @@
" set it to 0 to disable redrawing completely. </p>"
msgstr ""
-#: src/include/drbd/helps.rb:147
+#: src/include/drbd/helps.rb:144
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -355,7 +352,7 @@
msgstr ""
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:155
+#: src/include/drbd/helps.rb:152
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration</big></b><br>\n"
@@ -365,7 +362,7 @@
"Cấu hình CASA ở đây.<br></p>\n"
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:159
+#: src/include/drbd/helps.rb:156
#, fuzzy
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
@@ -379,7 +376,7 @@
"Sau đó nhấn <b>Cấu hình</b>.</p>\n"
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:166
+#: src/include/drbd/helps.rb:163
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"
@@ -390,7 +387,7 @@
"sẽ mở ra.</p>\n"
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:172
+#: src/include/drbd/helps.rb:169
#, fuzzy
msgid ""
"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
@@ -402,7 +399,7 @@
"có thể sửa cấu hình của chúng.<br></p>\n"
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:178
+#: src/include/drbd/helps.rb:175
#, fuzzy
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
@@ -412,7 +409,7 @@
"Nhấn <b>Thêm</b> để cấu hình một máy chủ SLP.</p>\n"
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:182
+#: src/include/drbd/helps.rb:179
#, fuzzy
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
@@ -424,7 +421,7 @@
"Sau đó nhấn <b>Sửa</b> hoặc <b>Xóa</b> theo mong muốn.</p>\n"
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:188
+#: src/include/drbd/helps.rb:185
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -436,7 +433,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
+#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -447,7 +444,7 @@
"</p>"
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:200
+#: src/include/drbd/helps.rb:197
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -458,126 +455,57 @@
"<br></p>\n"
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:36
#, fuzzy
msgid "LVM Filter Configuration of DRBD"
msgstr "Cấu hình toàn cầu"
-#: src/include/drbd/lvm_conf.rb:52
+#: src/include/drbd/lvm_conf.rb:44
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:62
+#: src/include/drbd/lvm_conf.rb:54
#, fuzzy
#| msgid "Device"
msgid "Device Filter"
msgstr "Thiết bị"
-#: src/include/drbd/lvm_conf.rb:72
+#: src/include/drbd/lvm_conf.rb:64
msgid "Writing the LVM cache"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:81
+#: src/include/drbd/lvm_conf.rb:73
msgid "Enable LVM Cache"
msgstr ""
-#: 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:143
+#: src/include/drbd/resource_conf.rb:134
#, fuzzy
msgid "Resource Name"
msgstr "Tên môđun"
-#: src/include/drbd/resource_conf.rb:150
-msgid "Nodes"
-msgstr ""
-
-#: src/include/drbd/resource_conf.rb:153
-msgid "Add"
-msgstr "Thêm"
-
-#: src/include/drbd/resource_conf.rb:154
+#. Update new add disk used of drbd res for LVM filter
+#. Ignore the removed disk
+#: src/include/drbd/resource_conf.rb:326
#, fuzzy
-#| msgid "&Edit"
-msgid "Edit"
-msgstr "&Sửa"
-
-#: src/include/drbd/resource_conf.rb:155
-msgid "Delete"
-msgstr "Xoá"
-
-#: src/include/drbd/resource_conf.rb:187
-#, fuzzy
-#| msgid "&Save"
-msgid "Save"
-msgstr "&Lưu"
-
-#. Since n_name can't be edit, so set direct is OK
-#: src/include/drbd/resource_conf.rb:329
-#, fuzzy
msgid "Protocol"
msgstr "&Giao thức"
-#. return `cancel or a string
-#: src/include/drbd/resource_conf.rb:569
-msgid "OK"
-msgstr "Được"
-
-#: src/include/drbd/resource_conf.rb:570
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:572
#, fuzzy
-#| msgid "&Cancel"
-msgid "Cancel"
-msgstr "&Dừng"
+#| msgid "Scope and IP address must be inserted."
+msgid "Node names must be different."
+msgstr "Cần chèn phạm vi và địa chỉ IP."
-#: src/include/drbd/resource_conf.rb:584
-#, fuzzy
-#| msgid "URL cannot be empty."
-msgid "Node name can not be empty."
-msgstr "URL không thể rỗng."
-
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:687
+#: src/include/drbd/resource_conf.rb:578
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:707
+#: src/include/drbd/resource_conf.rb:608
msgid "Please fill out all fields."
msgstr ""
-#: src/include/drbd/resource_conf.rb:716
-#, fuzzy
-#| msgid "Read configured catalogs"
-msgid "Please configure at least two nodes."
-msgstr "Đọc hạng mục đã cấu hình"
-
-#. No need to check integrity since it will disabled when configuring
-#: src/include/drbd/resource_conf.rb:751
-#, fuzzy
-#| msgid "Enter the file name"
-msgid "Enter the node name:"
-msgstr "Hãy nhập tên tập tin"
-
-#: src/include/drbd/resource_conf.rb:757
-#, fuzzy
-#| msgid "Scope and IP address must be inserted."
-msgid "Node name must be different."
-msgstr "Cần chèn phạm vi và địa chỉ IP."
-
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar
@@ -691,83 +619,83 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:115
+#: src/modules/Drbd.rb:110
msgid "Failed to merge separated DRBD conf files\n"
msgstr ""
-#: src/modules/Drbd.rb:137
+#: src/modules/Drbd.rb:132
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr ""
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:192
+#: src/modules/Drbd.rb:185
#, fuzzy
msgid "Initializing DRBD Configuration"
msgstr "Khởi chạy cấu hình CASA"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:193
#, fuzzy
msgid "Read global settings"
msgstr "Đọc thiết lập Samba toàn cầu"
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:194
#, fuzzy
msgid "Read resources"
msgstr "<b>Thêm tài nguyên</b>"
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:195
#, fuzzy
#| msgid "Reload configuration"
msgid "Read LVM configurations"
msgstr "Tải lại cấu hình"
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:196
#, fuzzy
msgid "Read daemon status"
msgstr "Đọc trạng thái winbind"
-#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211
+#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
#, fuzzy
#| msgid "Write firewall settings"
msgid "Read SuSEFirewall Settings"
msgstr "Ghi thiết lập tường lửa"
-#: src/modules/Drbd.rb:207
+#: src/modules/Drbd.rb:200
#, fuzzy
msgid "Reading global settings..."
msgstr "Đang đọc thiết lập Samba toàn cầu..."
-#: src/modules/Drbd.rb:208
+#: src/modules/Drbd.rb:201
#, fuzzy
msgid "Reading resources..."
msgstr "Đang đọc danh sách môđun"
-#: src/modules/Drbd.rb:209
+#: src/modules/Drbd.rb:202
#, fuzzy
#| msgid "Reading current configuration..."
msgid "Reading LVM configurations..."
msgstr "Đang đọc cấu hình hiện thời..."
-#: src/modules/Drbd.rb:210
+#: src/modules/Drbd.rb:203
#, fuzzy
msgid "Reading daemon status..."
msgstr "Đang đọc trạng thái winbind..."
-#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662
+#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
msgid "Finished"
msgstr "Hoàn thành"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:515
+#: src/modules/Drbd.rb:497
msgid "Failed to backup drbd.conf"
msgstr ""
-#: src/modules/Drbd.rb:524
+#: src/modules/Drbd.rb:506
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr ""
-#: src/modules/Drbd.rb:548
+#: src/modules/Drbd.rb:530
#, fuzzy
#| msgid "YaST Configuration Module %1\n"
msgid ""
@@ -775,12 +703,12 @@
"%2"
msgstr "Môđun cấu hình YaST %1\n"
-#: src/modules/Drbd.rb:567
+#: src/modules/Drbd.rb:549
msgid "Failed to bring drbd.conf back"
msgstr ""
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:638
+#: src/modules/Drbd.rb:605
#, fuzzy
msgid "Writing DRBD Configuration"
msgstr "Đang ghi cấu hình YaST..."
@@ -789,60 +717,60 @@
#. 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:650
+#: src/modules/Drbd.rb:617
#, fuzzy
msgid "Write global settings"
msgstr "Ghi thiết lập hạng mục"
-#: src/modules/Drbd.rb:651
+#: src/modules/Drbd.rb:618
#, fuzzy
msgid "Write resources"
msgstr "Ghi thiết lập"
-#: src/modules/Drbd.rb:652
+#: src/modules/Drbd.rb:619
#, fuzzy
#| msgid "Write Kerberos configuration"
msgid "Write LVM configurations"
msgstr "Ghi cấu hình Kerberos"
-#: src/modules/Drbd.rb:653
+#: src/modules/Drbd.rb:620
msgid "Set daemon status"
msgstr ""
-#: src/modules/Drbd.rb:654
+#: src/modules/Drbd.rb:621
#, fuzzy
#| msgid "Write firewall settings"
msgid "Write the SuSEfirewall settings"
msgstr "Ghi thiết lập tường lửa"
-#: src/modules/Drbd.rb:657
+#: src/modules/Drbd.rb:624
#, fuzzy
msgid "Writing global settings..."
msgstr "Đang ghi các thiết lập..."
-#: src/modules/Drbd.rb:658
+#: src/modules/Drbd.rb:625
#, fuzzy
msgid "Writing resources..."
msgstr "Đang ghi các thiết lập..."
-#: src/modules/Drbd.rb:659
+#: src/modules/Drbd.rb:626
#, fuzzy
#| msgid "Writing YaST Configuration..."
msgid "Writing LVM configurations..."
msgstr "Đang ghi cấu hình YaST..."
-#: src/modules/Drbd.rb:660
+#: src/modules/Drbd.rb:627
#, fuzzy
msgid "Setting daemon status..."
msgstr "Đang đọc trạng thái winbind..."
-#: src/modules/Drbd.rb:661
+#: src/modules/Drbd.rb:628
#, fuzzy
#| msgid "Writing firewall settings..."
msgid "Writing the SuSEFirewall settings"
msgstr "Đang ghi thiết lập tường lửa..."
-#: src/modules/Drbd.rb:672
+#: src/modules/Drbd.rb:639
#, fuzzy
#| msgid "Unable to create directory."
msgid "Failed to make directory /etc/drbd.d"
Modified: branches/plus-SLE12-SP2/yast/vi/po/fcoe-client.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/fcoe-client.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/fcoe-client.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/firewall-services.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/firewall-services.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/firewall-services.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:38+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/firewall.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/firewall.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/firewall.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/firstboot.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/firstboot.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/firstboot.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-08-28 16:13+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -112,13 +112,13 @@
msgstr "Nhãn"
#: src/clients/firstboot_config.rb:68
+msgid "Module Name"
+msgstr "Tên môđun"
+
+#: src/clients/firstboot_config.rb:68
msgid "Status"
msgstr "Trạng thái"
-#: src/clients/firstboot_config.rb:68
-msgid "Module Name"
-msgstr "Tên môđun"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/fonts.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/fonts.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/fonts.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -21,61 +21,61 @@
#. 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:59
+#: src/lib/fonts/fonts-config-state.rb:58
msgid "Bitmap Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:104
+#: src/lib/fonts/fonts-config-state.rb:103
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:107
+#: src/lib/fonts/fonts-config-state.rb:106
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:124
+#: src/lib/fonts/fonts-config-state.rb:123
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:127
+#: src/lib/fonts/fonts-config-state.rb:126
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:144
+#: src/lib/fonts/fonts-config-state.rb:143
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:147
+#: src/lib/fonts/fonts-config-state.rb:146
#, fuzzy
#| msgid "Default Route:"
msgid "Default"
msgstr "Tuyến mặc định:"
-#: src/lib/fonts/fonts-config-state.rb:164
+#: src/lib/fonts/fonts-config-state.rb:163
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:167
+#: src/lib/fonts/fonts-config-state.rb:166
msgid "CFF Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:207
+#: src/lib/fonts/fonts-config-state.rb:206
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:210
+#: src/lib/fonts/fonts-config-state.rb:209
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:227
+#: src/lib/fonts/fonts-config-state.rb:226
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:230 src/lib/fonts/fonts-dialog.rb:818
+#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:255
+#: src/lib/fonts/fonts-config-state.rb:254
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/ftp-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/ftp-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/ftp-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/geo-cluster.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/geo-cluster.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/geo-cluster.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -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:470
-#: src/include/geo-cluster/dialogs.rb:819
+#: src/include/geo-cluster/dialogs.rb:465
+#: src/include/geo-cluster/dialogs.rb:814
#: src/include/geo-cluster/wizards.rb:46
#: src/include/geo-cluster/wizards.rb:141
#, fuzzy
@@ -121,17 +121,17 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:809
+#: src/include/geo-cluster/dialogs.rb:804
msgid "Add"
msgstr "Thêm"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:810
+#: src/include/geo-cluster/dialogs.rb:805
msgid "Edit"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:811
+#: src/include/geo-cluster/dialogs.rb:806
msgid "Delete"
msgstr "Xoá"
@@ -140,16 +140,18 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:240
+#: src/include/geo-cluster/dialogs.rb:235
msgid "ticket"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:106
-msgid "Authentication"
+#, fuzzy
+#| msgid "Authentication"
+msgid "Authentification"
msgstr "Xác thực"
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:161
+#: src/include/geo-cluster/dialogs.rb:156
#, fuzzy
#| msgid "&Cancel"
msgid "Ca&ncel"
@@ -157,9 +159,9 @@
#. return `cancel or a string
#: src/include/geo-cluster/dialogs.rb:109
-#: src/include/geo-cluster/dialogs.rb:162
-#: src/include/geo-cluster/dialogs.rb:182
-#: src/include/geo-cluster/dialogs.rb:259
+#: src/include/geo-cluster/dialogs.rb:157
+#: src/include/geo-cluster/dialogs.rb:177
+#: src/include/geo-cluster/dialogs.rb:254
msgid "OK"
msgstr "Được"
@@ -170,120 +172,116 @@
#: src/include/geo-cluster/dialogs.rb:128
#, fuzzy
#| msgid "Authentication"
-msgid "Authentication file"
+msgid "Authentification file"
msgstr "Xác thực"
#: src/include/geo-cluster/dialogs.rb:132
-msgid "The file will be written to /etc/booth."
+msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-msgid "To write it to a different directory, enter an absolute path."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
#: src/include/geo-cluster/dialogs.rb:142
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
msgstr ""
-#: 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
+#: src/include/geo-cluster/dialogs.rb:146
#, fuzzy
#| msgid "Select File for the Authentication Key"
-msgid "Generate Authentication Key File"
+msgid "Generate Authentification Key File"
msgstr "Chọn tập tin cho chìa khóa xác thực"
-#: src/include/geo-cluster/dialogs.rb:159
+#: src/include/geo-cluster/dialogs.rb:154
msgid "Basic"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:183
-#: src/include/geo-cluster/dialogs.rb:260
+#: src/include/geo-cluster/dialogs.rb:178
+#: src/include/geo-cluster/dialogs.rb:255
msgid "Cancel"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:197
+#: src/include/geo-cluster/dialogs.rb:192
#, fuzzy
#| msgid "Enter a valid e-mail address"
msgid "Please enter a valid ip address"
msgstr "Xin hãy nhập một địa chỉ e-mail đúng"
-#: src/include/geo-cluster/dialogs.rb:238
+#: src/include/geo-cluster/dialogs.rb:233
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:244
+#: src/include/geo-cluster/dialogs.rb:239
msgid "timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:246
+#: src/include/geo-cluster/dialogs.rb:241
#, fuzzy
#| msgid "More directories"
msgid "retries"
msgstr "Thư mục thêm"
-#: src/include/geo-cluster/dialogs.rb:248
+#: src/include/geo-cluster/dialogs.rb:243
#, fuzzy
#| msgid "Modem Lights"
msgid "weights"
msgstr "Đèn modem"
-#: src/include/geo-cluster/dialogs.rb:250
+#: src/include/geo-cluster/dialogs.rb:245
msgid "expire"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:252
+#: src/include/geo-cluster/dialogs.rb:247
msgid "acquire-after"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:254
+#: src/include/geo-cluster/dialogs.rb:249
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:291
+#: src/include/geo-cluster/dialogs.rb:286
#, fuzzy
#| msgid "Key is invalid."
msgid "timeout is invalid"
msgstr "Chìa khóa sai."
-#: src/include/geo-cluster/dialogs.rb:293
+#: src/include/geo-cluster/dialogs.rb:288
#, fuzzy
#| msgid "' is not valid."
msgid "expire is invalid"
msgstr "' không đúng."
-#: src/include/geo-cluster/dialogs.rb:295
+#: src/include/geo-cluster/dialogs.rb:290
#, fuzzy
#| msgid "' is not valid."
msgid "acquireafter is invalid"
msgstr "' không đúng."
-#: src/include/geo-cluster/dialogs.rb:297
+#: src/include/geo-cluster/dialogs.rb:292
#, fuzzy
#| msgid "' is not valid."
msgid "retries is invalid"
msgstr "' không đúng."
-#: src/include/geo-cluster/dialogs.rb:299
+#: src/include/geo-cluster/dialogs.rb:294
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:301
+#: src/include/geo-cluster/dialogs.rb:296
#, fuzzy
#| msgid "' is not valid."
msgid "weights is invalid"
msgstr "' không đúng."
-#: src/include/geo-cluster/dialogs.rb:303
+#: src/include/geo-cluster/dialogs.rb:298
#, fuzzy
#| msgid "URL cannot be empty."
msgid "ticket can not be empty"
msgstr "URL không thể rỗng."
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:412
+#: src/include/geo-cluster/dialogs.rb:407
#: src/include/geo-cluster/wizards.rb:48
#, fuzzy
#| msgid "Writing Firewall Configuration"
@@ -292,67 +290,67 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:559
+#: src/include/geo-cluster/dialogs.rb:554
msgid "Enter an IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:570
+#: src/include/geo-cluster/dialogs.rb:565
msgid "Edit IP address of your arbitrator"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:586
+#: src/include/geo-cluster/dialogs.rb:581
msgid "Enter an IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:597
+#: src/include/geo-cluster/dialogs.rb:592
msgid "Edit IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:619
+#: src/include/geo-cluster/dialogs.rb:614
#, fuzzy
#| msgid "This name is already in use"
msgid "Ticket name already exist!"
msgstr "Tên này đã được dùng"
-#. Validation check before switch to authentication
-#. Still fall to :authentication or :ok
-#: src/include/geo-cluster/dialogs.rb:651
+#. Validation check before switch to authentification
+#. Still fall to :authentification or :ok
+#: src/include/geo-cluster/dialogs.rb:646
#, fuzzy
#| msgid "Configuration Completed"
msgid "Configuration name can not be empty."
msgstr "Hoàn thành cấu hình"
-#: src/include/geo-cluster/dialogs.rb:654
+#: src/include/geo-cluster/dialogs.rb:649
#, fuzzy
#| msgid "Configuration Completed"
msgid "Configuration name can not be duplicated."
msgstr "Hoàn thành cấu hình"
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:662
+#: src/include/geo-cluster/dialogs.rb:657
#, fuzzy
#| msgid "Key is invalid."
msgid "port is invalid!"
msgstr "Chìa khóa sai."
-#: src/include/geo-cluster/dialogs.rb:668
+#: src/include/geo-cluster/dialogs.rb:663
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:669
#, fuzzy
#| msgid "Patches have been installed."
msgid "arbitrator have to be filled!"
msgstr "Đã cài các vá lỗi."
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:674
#, fuzzy
#| msgid "Patches have been installed."
msgid "site have to be filled!"
msgstr "Đã cài các vá lỗi."
-#: src/include/geo-cluster/dialogs.rb:684
+#: src/include/geo-cluster/dialogs.rb:679
#, fuzzy
#| msgid "Patches have been installed."
msgid "ticket have to be filled!"
@@ -360,26 +358,20 @@
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:738
+#: src/include/geo-cluster/dialogs.rb:733
#, fuzzy
#| msgid "Select File for the Authentication Key"
-msgid "Failed to create authentication file "
+msgid "Failed to create authentification file "
msgstr "Chọn tập tin cho chìa khóa xác thực"
-#: src/include/geo-cluster/dialogs.rb:741
+#: src/include/geo-cluster/dialogs.rb:736
#, fuzzy
-#| msgid "Authentication"
-msgid "Authentication file "
-msgstr "Xác thực"
+#| msgid "Select File for the Authentication Key"
+msgid "Succeed to created authentification file "
+msgstr "Chọn tập tin cho chìa khóa xác thực"
-#: src/include/geo-cluster/dialogs.rb:741
-#, fuzzy
-#| msgid "Domain %1 joined successfully."
-msgid " created successfully."
-msgstr "Đã gia nhập miền %1 thành công."
-
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:800
+#: src/include/geo-cluster/dialogs.rb:795
#, fuzzy
#| msgid "System Configuration"
msgid "GeoCluster Configuration Select"
@@ -387,7 +379,7 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:801
#, fuzzy
#| msgid "Save configuration"
msgid "Choose configuration file:"
@@ -396,7 +388,7 @@
#: src/include/geo-cluster/wizards.rb:47
#, fuzzy
#| msgid "Network Configuration"
-msgid "Authentication Configuration"
+msgid "Authentification Configuration"
msgstr "Cấu hình mạng"
#. Initialization dialog contents
@@ -553,16 +545,6 @@
msgstr "Tổng kết cấu hình ..."
#, fuzzy
-#~| msgid "Authentication"
-#~ msgid "Authentification"
-#~ msgstr "Xác thực"
-
-#, fuzzy
-#~| msgid "Select File for the Authentication Key"
-#~ msgid "Succeed to created authentification file "
-#~ msgstr "Chọn tập tin cho chìa khóa xác thực"
-
-#, fuzzy
#~| msgid "Patches have been installed."
#~ msgid "site have to be filled"
#~ msgstr "Đã cài các vá lỗi."
Modified: branches/plus-SLE12-SP2/yast/vi/po/http-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/http-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/http-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/inetd.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/inetd.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/inetd.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -106,11 +106,11 @@
msgid "The 'id' option cannot be combined with other options."
msgstr ""
-#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353
+#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356
msgid "Status"
msgstr "Trạng thái"
-#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354
+#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357
#, fuzzy
msgid "Service"
msgstr "_Thiết bị:"
@@ -124,15 +124,15 @@
msgid "Prot."
msgstr "Cổng"
-#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357
+#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360
msgid "Wait"
msgstr ""
-#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358
+#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361
msgid "User"
msgstr "Người dùng"
-#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359
+#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362
#, fuzzy
msgid "Server"
msgstr "Không bao giờ"
@@ -149,12 +149,12 @@
msgstr "Tắt"
#. determine wait mode (convert to string)
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
#: src/include/inetd/routines.rb:211
msgid "Yes"
msgstr "Có"
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
#: src/include/inetd/routines.rb:213
#, fuzzy
msgid "No"
@@ -171,192 +171,192 @@
#. Translators: In autoinstallation mode:
#. The package name is stored in %1. This is Popup::ContinueCancel.
-#: src/include/inetd/dialogs.rb:160
+#: src/include/inetd/dialogs.rb:164
msgid "Package %1 will be installed during the write process."
msgstr ""
#. if (true) { // for debugging
#. Translators: The package name is stored in %1. This is Popup::Message.
-#: src/include/inetd/dialogs.rb:179
+#: src/include/inetd/dialogs.rb:183
msgid "Package %1 was not installed. The service cannot be edited."
msgstr ""
#. Translators: The package name is stored in %1
-#: src/include/inetd/dialogs.rb:201
+#: src/include/inetd/dialogs.rb:205
msgid "Package %1 was successfully installed."
msgstr ""
#. This is main inetd module dialog.
#. @return dialog result
-#: src/include/inetd/dialogs.rb:299
+#: src/include/inetd/dialogs.rb:303
msgid "&Activate All Services"
msgstr ""
-#: src/include/inetd/dialogs.rb:300
+#: src/include/inetd/dialogs.rb:304
msgid "&Deactivate All Services"
msgstr ""
#. Translators: Initial and target state of xinetd (or inetd)
-#: src/include/inetd/dialogs.rb:334
+#: src/include/inetd/dialogs.rb:339
#, fuzzy
msgid "D&isable"
msgstr "Tắt"
-#: src/include/inetd/dialogs.rb:336
+#: src/include/inetd/dialogs.rb:340
#, fuzzy
msgid "Enab&le"
msgstr "Bật"
#. Main dialog edit inetd.conf
#. Translators: Name of table with services (echo, chargen, ...)
-#: src/include/inetd/dialogs.rb:344
+#: src/include/inetd/dialogs.rb:347
msgid "Currently Available Services"
msgstr ""
#. `opt(`notify),
#. `opt(`keepSorting),
-#: src/include/inetd/dialogs.rb:352
+#: src/include/inetd/dialogs.rb:355
msgid "Ch"
msgstr ""
-#: src/include/inetd/dialogs.rb:355
+#: src/include/inetd/dialogs.rb:358
#, fuzzy
msgid "Type "
msgstr "Kiểu"
-#: src/include/inetd/dialogs.rb:356
+#: src/include/inetd/dialogs.rb:359
msgid "Protocol"
msgstr ""
-#: src/include/inetd/dialogs.rb:360
+#: src/include/inetd/dialogs.rb:363
msgid "Server / Args"
msgstr ""
#. Translators: Add service
-#: src/include/inetd/dialogs.rb:370
+#: src/include/inetd/dialogs.rb:373
msgid "&Add"
msgstr "&Thêm"
#. Translators: Edit service
-#: src/include/inetd/dialogs.rb:373
+#: src/include/inetd/dialogs.rb:376
#, fuzzy
msgid "&Edit"
msgstr "Sửa đổi:"
#. Translators: Delete service
-#: src/include/inetd/dialogs.rb:376
+#: src/include/inetd/dialogs.rb:379
#, fuzzy
msgid "&Delete"
msgstr "Xoá bỏ thẻ"
#. Translators: Change service status
-#: src/include/inetd/dialogs.rb:384
+#: src/include/inetd/dialogs.rb:387
msgid "&Toggle Status (On or Off)"
msgstr ""
-#: src/include/inetd/dialogs.rb:396
+#: src/include/inetd/dialogs.rb:399
msgid "Status for All &Services"
msgstr ""
#. Inetd configure dialog caption
-#: src/include/inetd/dialogs.rb:410
+#: src/include/inetd/dialogs.rb:413
msgid "Network Service Configuration (xinetd)"
msgstr ""
#. execute dialog
#. Translators: Caption for EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:498
+#: src/include/inetd/dialogs.rb:504
msgid "Add a New Service Entry"
msgstr ""
#. Translators: Popup::Error
-#: src/include/inetd/dialogs.rb:528
+#: src/include/inetd/dialogs.rb:534
msgid "Cannot delete the service. It is not installed."
msgstr ""
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:552
+#: src/include/inetd/dialogs.rb:558
msgid "To delete a service, select one in the main dialog"
msgstr ""
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:599
+#: src/include/inetd/dialogs.rb:605
msgid "To activate or deactivate a service, select one in the main dialog."
msgstr ""
#. y2milestone("Current line %1", current_line);
#. Translators: Caption of EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:736
+#: src/include/inetd/dialogs.rb:742
msgid "Edit a service entry"
msgstr ""
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:751
+#: src/include/inetd/dialogs.rb:757
msgid "To edit a service, select one in the main dialog"
msgstr ""
#. Translators: Popup::Warning
-#: src/include/inetd/dialogs.rb:782
+#: src/include/inetd/dialogs.rb:788
msgid ""
"All services are marked as disabled (locked).\n"
"Internet super-server will be disabled."
msgstr ""
#. service name
-#: src/include/inetd/dialogs.rb:807
+#: src/include/inetd/dialogs.rb:811
#, fuzzy
msgid "&Service"
msgstr "_Thiết bị:"
-#: src/include/inetd/dialogs.rb:809
+#: src/include/inetd/dialogs.rb:813
#, fuzzy
msgid "RPC Versio&n"
msgstr "Phiên bản:"
#. service status (running or stopped)
-#: src/include/inetd/dialogs.rb:815
+#: src/include/inetd/dialogs.rb:819
msgid "Service is acti&ve."
msgstr ""
#. service socket type
-#: src/include/inetd/dialogs.rb:828
+#: src/include/inetd/dialogs.rb:832
#, fuzzy
msgid "Socket T&ype"
msgstr "Kiểu cảnh"
#. for protocol option - ediatble ComboBox
-#: src/include/inetd/dialogs.rb:839
+#: src/include/inetd/dialogs.rb:843
msgid "&Protocol"
msgstr ""
#. for flags (wait/nowait) - noneditable ComboBox
-#: src/include/inetd/dialogs.rb:850
+#: src/include/inetd/dialogs.rb:854
msgid "&Wait"
msgstr ""
#. user and group ComboBoxes
-#: src/include/inetd/dialogs.rb:860
+#: src/include/inetd/dialogs.rb:864
msgid "&User"
msgstr ""
-#: src/include/inetd/dialogs.rb:862
+#: src/include/inetd/dialogs.rb:866
#, fuzzy
msgid "&Group"
msgstr "Xén"
#. Server arguments
-#: src/include/inetd/dialogs.rb:865
+#: src/include/inetd/dialogs.rb:869
#, fuzzy
msgid "S&erver"
msgstr "Không bao giờ"
-#: src/include/inetd/dialogs.rb:866
+#: src/include/inetd/dialogs.rb:870
#, fuzzy
msgid "Server Argumen&ts"
msgstr "Tìm kiếm trong tài liệu"
#. Comment above the service line in inetd.conf
-#: src/include/inetd/dialogs.rb:868
+#: src/include/inetd/dialogs.rb:872
#, fuzzy
msgid "Co&mment"
msgstr "Ghi chú :"
@@ -371,26 +371,26 @@
#. It does not get the NIS entries.
#. "+" is filtered out.
#. @return [Array] groups
-#: 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/dialogs.rb:918 src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000
#: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353
msgid "--default--"
msgstr ""
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:942
+#: src/include/inetd/dialogs.rb:946
msgid ""
"Service is empty.\n"
"Enter valid values.\n"
msgstr ""
#. Error message
-#: src/include/inetd/dialogs.rb:948
+#: src/include/inetd/dialogs.rb:952
msgid "Service name contains disallowed character \"/\"."
msgstr ""
#. Translators: sformat-ed() 3 strings
-#: src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:960
msgid "The user %1 is reserved for internal server processes only."
msgstr ""
@@ -595,64 +595,64 @@
msgstr ""
#. Inetd read dialog caption
-#: src/modules/Inetd.rb:185
+#: src/modules/Inetd.rb:188
#, fuzzy
msgid "Initializing inetd Configuration"
msgstr "Cấu hình phẳng"
-#: src/modules/Inetd.rb:193
+#: src/modules/Inetd.rb:196
#, fuzzy
msgid "Read the Configuration"
msgstr "Tải lại cấu hình"
-#: src/modules/Inetd.rb:194
+#: src/modules/Inetd.rb:197
#, fuzzy
msgid "Reading the configuration..."
msgstr "Tải lại cấu hình"
#. read database
-#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276
-#: src/modules/Inetd.rb:340
+#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278
+#: src/modules/Inetd.rb:306
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
#. Inetd read dialog caption
-#: src/modules/Inetd.rb:267
+#: src/modules/Inetd.rb:269
#, fuzzy
msgid "Saving inetd Configuration"
msgstr "Cấu hình phẳng"
-#: src/modules/Inetd.rb:275
+#: src/modules/Inetd.rb:277
#, fuzzy
msgid "Write the settings"
msgstr "Hợp nhất những thẻ được chọn không?"
-#: src/modules/Inetd.rb:276
+#: src/modules/Inetd.rb:278
msgid "Writing the settings..."
msgstr "Đang ghi các thiết lập..."
#. in future: catch errors
-#: src/modules/Inetd.rb:337
+#: src/modules/Inetd.rb:303
msgid "Cannot write settings!"
msgstr ""
#. "enabled" defaults to true
-#: src/modules/Inetd.rb:607
+#: src/modules/Inetd.rb:598
msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>"
msgstr ""
#. Translators: Summary head, if nothing configured
-#: src/modules/Inetd.rb:618
+#: src/modules/Inetd.rb:609
#, fuzzy
msgid "Network services"
msgstr "Chạy mạng"
#. Translators: Summary head, if something configured
-#: src/modules/Inetd.rb:623
+#: src/modules/Inetd.rb:613
msgid "Network services are managed via %1"
msgstr ""
-#: src/modules/Inetd.rb:627
+#: src/modules/Inetd.rb:616
msgid "These services will be enabled"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/installation.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/installation.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/installation.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-27 10:52+0200\n"
"PO-Revision-Date: 2006-07-18 03:56+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -40,7 +40,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:151
+#: src/lib/installation/clients/inst_installation_options.rb:154
msgid "Initializing..."
msgstr "Đang chạy..."
@@ -231,21 +231,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:133
+#: src/lib/installation/proposal_runner.rb:136
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>Quay lại và kiểm tra lại thiết lập nếu không chắc chắn.</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:121
+#: src/lib/installation/proposal_runner.rb:124
msgid "Confirm Update"
msgstr "Xác nhập cập nhật"
#. 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:125
+#: src/lib/installation/proposal_runner.rb:128
#, 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>"
@@ -254,7 +254,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:127
+#: src/lib/installation/proposal_runner.rb:130
#, fuzzy
msgid ""
"\n"
@@ -268,7 +268,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:136
+#: src/lib/installation/proposal_runner.rb:139
msgid "Start &Update"
msgstr "Bắt đầu &cập nhật"
@@ -308,7 +308,56 @@
msgstr "Đang chạy môđun %1..."
#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:82
+#: 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>Dùng <b>Sao</b> nếu bạn muốn tạo một xác lập AutoYaST.\n"
+"AutoYaST là cách cài đặt tự động một hệ thống SUSE Linux không cần người dùng theo dõi. AutoYaST\n"
+"cần một xác lập để biết hệ thống muốn cài đặt sẽ như thế nào. Nếu dùng tùy chọn này\n"
+"thì một xác lập cho hệ thống hiện thời sẽ được đặt tại /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 "Online Update Configuration"
+msgid "Clone System Configuration"
+msgstr "Cấu hình cập nhật trực tuyến"
+
+#. this is a menu entry
+#: src/lib/installation/clients/clone_proposal.rb:73
+#, fuzzy
+#| msgid "Online Update Configuration"
+msgid "&Clone System Configuration"
+msgstr "Cấu hình cập nhật trực tuyến"
+
+#. 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
msgid "Copying files to installed system..."
msgstr "Đang sao chép tập tin vào hệ thống đã cài đặt..."
@@ -501,7 +550,7 @@
msgstr ""
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:306
+#: src/lib/installation/clients/inst_system_analysis.rb:304
#, fuzzy
msgid "Unknown Product"
msgstr "Không biết thời lượng"
@@ -531,29 +580,56 @@
"Chọn có chạy cập nhật trực tuyến bây giờ hay không.\n"
"Bạn có thể bỏ qua bước này và chạy cập nhật sau.\n"
-#. This client shows main dialog for choosing the language,
-#. keyboard and accepting the license.
-#: src/lib/installation/clients/inst_complex_welcome.rb:33
+#. ----------------------------------------------------------------------
+#. Build dialog
+#. ----------------------------------------------------------------------
+#. heading text
+#: src/lib/installation/clients/inst_complex_welcome.rb:65
#, fuzzy
msgid "Language, Keyboard and License Agreement"
msgstr "Vâng, tôi đồng ý với điều kiện bản quyề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:161
-#: src/lib/installation/clients/inst_download_release_notes.rb:126
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#. 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
#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Ghi chú về bản phát hành"
+msgid "&Language"
+msgstr "Ngôn ngữ"
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:79
+msgid "&Keyboard Layout"
+msgstr ""
+
+#. bnc #359456
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:91
+#, fuzzy
+msgid "I &Agree to the License Terms."
+msgstr "Vâng, tôi đồng ý với điều kiện bản quyền"
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:110
+msgid "K&eyboard Test"
+msgstr ""
+
+#. 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 "Điều kiện bản quyền"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:141
+#, fuzzy
+msgid "License &Translations..."
+msgstr "Đang kết thúc cài đặt sơ cấp"
+
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:169
+#: src/lib/installation/clients/inst_complex_welcome.rb:153
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -563,7 +639,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:177
+#: src/lib/installation/clients/inst_complex_welcome.rb:161
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -572,7 +648,7 @@
msgstr ""
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_complex_welcome.rb:168
#, fuzzy
msgid ""
"<p>\n"
@@ -583,7 +659,7 @@
"cấu hình sơ cấp cho hệ thống.</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:190
+#: src/lib/installation/clients/inst_complex_welcome.rb:174
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -592,7 +668,7 @@
msgstr ""
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:197
+#: src/lib/installation/clients/inst_complex_welcome.rb:181
#, fuzzy
msgid ""
"<p>\n"
@@ -604,51 +680,24 @@
"Dùng <b>Chấp nhận</b> để thực hiện một cài đặt mới với những giá trị đã hiển thị.\n"
"</p>\n"
-#. 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 "Điều kiện bản quyền"
-
-#. 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
+#. 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
#, fuzzy
-msgid "&Language"
-msgstr "Ngôn ngữ"
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Ghi chú về bản phát hành"
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:247
-msgid "&Keyboard Layout"
-msgstr ""
-
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:261
-#, fuzzy
-msgid "I &Agree to the License Terms."
-msgstr "Vâng, tôi đồng ý với điều kiện bản quyền"
-
-#. 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
+#: src/lib/installation/clients/inst_complex_welcome.rb:323
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
-msgid "K&eyboard Test"
-msgstr ""
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:436
-#, fuzzy
-msgid "License &Translations..."
-msgstr "Đang kết thúc cài đặt sơ cấp"
-
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
#, fuzzy
@@ -762,7 +811,7 @@
msgstr "Gói này chưa được cài đặt và sẽ không được cài đặt."
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:49
+#: src/lib/installation/clients/inst_deploy_image.rb:46
msgid "The system will reboot now..."
msgstr ""
@@ -771,8 +820,8 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:109
-#: src/lib/installation/clients/inst_deploy_image.rb:354
+#: src/lib/installation/clients/inst_deploy_image.rb:106
+#: src/lib/installation/clients/inst_deploy_image.rb:351
#: src/lib/installation/clients/inst_prepareprogress.rb:110
#: src/lib/installation/clients/inst_prepareprogress.rb:152
#, fuzzy
@@ -781,7 +830,7 @@
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:170
+#: src/lib/installation/clients/inst_deploy_image.rb:167
#, fuzzy
msgid ""
"Deploying images has failed.\n"
@@ -789,30 +838,30 @@
msgstr "Đọc những gói có trong nguồn cài đặt.."
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:202
+#: src/lib/installation/clients/inst_deploy_image.rb:199
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:378
+#: src/lib/installation/clients/inst_deploy_image.rb:375
#, fuzzy
msgid "Downloading image at speed %1/s"
msgstr "Đang tải xuống gói %1 (%2)..."
-#: src/lib/installation/clients/inst_deploy_image.rb:383
+#: src/lib/installation/clients/inst_deploy_image.rb:380
#, fuzzy
msgid "Downloading image %1 at speed %2/s"
msgstr "Đang tải xuống gói %1 (%2)..."
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:442
#, fuzzy
msgid "Deploying image..."
msgstr "Đang tải xuống gói %1 (%2)..."
-#: src/lib/installation/clients/inst_deploy_image.rb:448
+#: src/lib/installation/clients/inst_deploy_image.rb:445
#, fuzzy
msgid "Deploying image %1..."
msgstr "Đang tải xuống gói %1 (%2)..."
@@ -839,38 +888,36 @@
msgstr ""
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:65
+#: src/lib/installation/clients/inst_disks_activate.rb:60
msgid "Detecting Available Controllers"
msgstr "Đang dò tìm các bộ điều khiển"
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:81
+#: src/lib/installation/clients/inst_disks_activate.rb:76
msgid "Disk Activation"
msgstr "Dùng đĩa"
-#: src/lib/installation/clients/inst_disks_activate.rb:91
+#: src/lib/installation/clients/inst_disks_activate.rb:86
msgid "Configure &DASD Disks"
msgstr "Cấu hình các đĩa &DASD"
-#: src/lib/installation/clients/inst_disks_activate.rb:97
+#: src/lib/installation/clients/inst_disks_activate.rb:92
msgid "Configure &ZFCP Disks"
msgstr "Cấu hình các đĩa &ZFCP"
-#: src/lib/installation/clients/inst_disks_activate.rb:103
+#: src/lib/installation/clients/inst_disks_activate.rb:98
#, fuzzy
#| msgid "Configure &ZFCP Disks"
msgid "Configure &FCoE Interfaces"
msgstr "Cấu hình các đĩa &ZFCP"
-#: src/lib/installation/clients/inst_disks_activate.rb:117
+#: src/lib/installation/clients/inst_disks_activate.rb:110
msgid "Configure &iSCSI Disks"
msgstr "Cấu hình các đĩa &iSCSI"
-#. Finish
-#: src/lib/installation/clients/inst_disks_activate.rb:178
+#: src/lib/installation/clients/inst_disks_activate.rb:111
#, fuzzy
-#| msgid "Network Configuration"
-msgid "Net&work Configuration..."
+msgid "Change Net&work Configuration"
msgstr "Cấu hình mạng"
#. TRANSLATORS: dialog caption
@@ -890,7 +937,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:149
+#: src/lib/installation/clients/inst_installation_options.rb:152
msgid "Initializing"
msgstr "Đang chạy"
@@ -934,55 +981,55 @@
msgstr "Đang &chuyển tới hệ thống đã cài..."
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:203
+#: src/lib/installation/clients/inst_finish.rb:204
msgid "Copy files to installed system"
msgstr "Chép tập tin vào hệ thống đã cài đặt"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:210
+#: src/lib/installation/clients/inst_finish.rb:211
msgid "Save configuration"
msgstr "Lưu cấu hình"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:217
+#: src/lib/installation/clients/inst_finish.rb:218
msgid "Save installation settings"
msgstr "Lưu thiết lập cài đặt"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:226
+#: src/lib/installation/clients/inst_finish.rb:227
msgid "Install boot manager"
msgstr "Cài trình khởi động"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:233
+#: src/lib/installation/clients/inst_finish.rb:234
msgid "Prepare system for initial boot"
msgstr "Chuẩn bị hệ thống để khởi động lần đầu"
#. merge steps from add-on products
#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:337
+#: src/lib/installation/clients/inst_finish.rb:338
#, fuzzy
msgid "Checking stage: %1..."
msgstr "Đã bắt đầu kiểm tra (%1)...\n"
#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:424
+#: src/lib/installation/clients/inst_finish.rb:425
#, fuzzy
msgid "Calling step %1..."
msgstr "Đang chạy môđun %1..."
#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:444
+#: src/lib/installation/clients/inst_finish.rb:445
msgid " * %1"
msgstr ""
#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:481
+#: src/lib/installation/clients/inst_finish.rb:482
msgid "Finished"
msgstr "Hoàn thành"
#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:613
+#: src/lib/installation/clients/inst_finish.rb:614
#, fuzzy
msgid "Installation Error"
msgstr "Nguồn cài đặt"
@@ -1013,26 +1060,26 @@
msgstr "Đang ghi cấu hình hệ thống"
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:80
+#: src/lib/installation/clients/inst_installation_options.rb:83
#, fuzzy
#| msgid "Installation Settings"
msgid "Installation Options"
msgstr "Thiết lập cài đặt"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:177
+#: src/lib/installation/clients/inst_installation_options.rb:181
msgid "&Add Online Repositories Before Installation"
msgstr ""
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:189
+#: src/lib/installation/clients/inst_installation_options.rb:193
#, fuzzy
#| msgid "In&clude Add-On Products from Separate Media"
msgid "In&clude Add-on Products from Separate Media"
msgstr "&Gồm các sản phẩm thương mại trên đĩa riêng"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:200
+#: src/lib/installation/clients/inst_installation_options.rb:204
#, fuzzy
#| msgid ""
#| "<p><big><b>Installation Mode</b></big><br>\n"
@@ -1043,7 +1090,7 @@
"Hãy chọn:</p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:203
+#: src/lib/installation/clients/inst_installation_options.rb:207
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1051,7 +1098,7 @@
msgstr ""
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:209
+#: src/lib/installation/clients/inst_installation_options.rb:213
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -1067,7 +1114,7 @@
"<b>Gồm các sản phẩm thương mại trên đĩa riêng</b>.</p>\n"
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:212
+#: src/lib/installation/clients/inst_installation_options.rb:216
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr ""
@@ -1355,7 +1402,7 @@
msgstr "<p>Xin hãy đợi trong khi cấu hình hệ thống.</p>"
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:242
+#: src/lib/installation/clients/inst_system_analysis.rb:240
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1368,7 +1415,7 @@
"Xin hãy kiểm tra phần cứng!\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:256
+#: src/lib/installation/clients/inst_system_analysis.rb:254
#, fuzzy
#| msgid ""
#| "No hard disks were found for the installation.\n"
@@ -1381,7 +1428,7 @@
"Không tìm thấy ổ cứng để cài đặt.\n"
"Xin hãy kiểm tra phần cứng!\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:266
+#: src/lib/installation/clients/inst_system_analysis.rb:264
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1389,7 +1436,7 @@
msgstr ""
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:277
+#: src/lib/installation/clients/inst_system_analysis.rb:275
#, fuzzy
#| msgid ""
#| "No hard disks and no hard disk controllers were\n"
@@ -1406,41 +1453,13 @@
"Hãy kiểm tra phần cứng.\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:322
+#: src/lib/installation/clients/inst_system_analysis.rb:320
#, fuzzy
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
msgstr "Lỗi bắt đầu thư mục."
-#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:184
-msgid ""
-"A valid update could not be found at\n"
-"%s.\n"
-"\n"
-msgstr ""
-
-#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:190
-#, fuzzy
-#| msgid "Could not create directory."
-msgid ""
-"Could not fetch update from\n"
-"%s.\n"
-"\n"
-msgstr "Không thể tạo thư mục."
-
-#. 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
@@ -1497,8 +1516,8 @@
#. menu button
#. menu button
#: src/lib/installation/clients/inst_upgrade_urls.rb:247
-#: src/lib/installation/proposal_runner.rb:647
-#: src/lib/installation/proposal_runner.rb:762
+#: src/lib/installation/proposal_runner.rb:659
+#: src/lib/installation/proposal_runner.rb:783
msgid "&Change..."
msgstr "&Thay đổi..."
@@ -1737,7 +1756,7 @@
msgstr "Đang thiết lập bộ nhớ cache các liên kết"
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:60
+#: src/lib/installation/clients/network_finish.rb:68
msgid "Saving network configuration..."
msgstr "Đang lưu cấu hình mạng..."
@@ -1858,48 +1877,60 @@
msgstr ""
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:204
+#: src/lib/installation/proposal_runner.rb:207
msgid "Really reset everything to default values?"
msgstr "Thực sự đặt lại mọi giá trị thành mặc định?"
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:206
+#: src/lib/installation/proposal_runner.rb:209
msgid "You will lose all changes."
msgstr "Bạn sẽ mất mọi thay đổi."
+#. while input loop
+#: src/lib/installation/proposal_runner.rb:251
+#, fuzzy
+msgid "Location of Stored Configuration"
+msgstr "&Dùng cấu hình sau"
+
+#. 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:252
+#: src/lib/installation/proposal_runner.rb:268
msgid "Skipping configuration upon user request"
msgstr "Bỏ qua cấu hình theo yêu cầu của người dùng"
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:272
+#: src/lib/installation/proposal_runner.rb:288
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
msgstr "Đề xuất có một lỗi cần phải sửa trước khi tiếp tục.\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:381
+#: src/lib/installation/proposal_runner.rb:394
#, fuzzy
msgid "Adapting the proposal to the current settings..."
msgstr "Đang đọc thiết lập trước đây..."
#. busy message;
#. Initial contents of proposal subwindow while proposals are calculated
-#: src/lib/installation/proposal_runner.rb:385
-#: src/lib/installation/proposal_runner.rb:667
+#: src/lib/installation/proposal_runner.rb:398
+#: src/lib/installation/proposal_runner.rb:687
msgid "Analyzing your system..."
msgstr "Đang phân tích hệ thống..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:487
+#: src/lib/installation/proposal_runner.rb:500
msgid "ERROR: No proposal"
msgstr "LỖI: Không có đề xuất"
#. Submodules handle their own error reporting
#. text for a message box
-#: src/lib/installation/proposal_runner.rb:526
+#: src/lib/installation/proposal_runner.rb:539
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1912,40 +1943,48 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:621
+#: src/lib/installation/proposal_runner.rb:634
msgid "&Skip Configuration"
msgstr "&Bỏ qua cấu hình"
#. radio button
-#: src/lib/installation/proposal_runner.rb:630
+#: src/lib/installation/proposal_runner.rb:643
msgid "&Use Following Configuration"
msgstr "&Dùng cấu hình sau"
+#. menu button
+#: src/lib/installation/proposal_runner.rb:667
+#: src/lib/installation/proposal_runner.rb:778
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "&Export Configuration"
+msgstr "&Bỏ qua cấu hình"
+
#. 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:693
+#: src/lib/installation/proposal_runner.rb:713
#, 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 "Nhấn vào mỗi đề mục để thay đổi hoặc dùng trình đơn \"Thay đổi...\" ở dưới."
-#: src/lib/installation/proposal_runner.rb:697
+#: src/lib/installation/proposal_runner.rb:717
#, fuzzy
#| msgid "Click any headline to make changes or use the \"Change...\" menu below."
msgid "Click a headline to make changes."
msgstr "Nhấn vào mỗi đề mục để thay đổi hoặc dùng trình đơn \"Thay đổi...\" ở dưới."
#. menu button item
-#: src/lib/installation/proposal_runner.rb:757
+#: src/lib/installation/proposal_runner.rb:777
msgid "&Reset to defaults"
msgstr "Đặt thành &mặc định"
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:779
+#: src/lib/installation/proposal_runner.rb:800
msgid "&Update"
msgstr "&Cập nhật"
-#: src/lib/installation/proposal_runner.rb:779
+#: src/lib/installation/proposal_runner.rb:800
msgid "&Install"
msgstr "&Cài đặt"
@@ -1986,7 +2025,7 @@
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:426
+#: src/lib/installation/proposal_store.rb:417
#, fuzzy
msgid ""
"<p>\n"
@@ -2000,7 +2039,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:434
+#: src/lib/installation/proposal_store.rb:425
#, fuzzy
msgid ""
"<p>\n"
@@ -2013,7 +2052,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:443
+#: src/lib/installation/proposal_store.rb:434
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -2025,7 +2064,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:451
+#: src/lib/installation/proposal_store.rb:442
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -2037,7 +2076,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:459
+#: src/lib/installation/proposal_store.rb:450
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -2048,12 +2087,12 @@
"</p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:466
+#: src/lib/installation/proposal_store.rb:457
msgid "<P><B>UML Installation Proposal</B></P>"
msgstr "<P><B>Đề nghị cài đặt UML</B></P>"
#. help text
-#: src/lib/installation/proposal_store.rb:468
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -2064,7 +2103,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:482
+#: src/lib/installation/proposal_store.rb:473
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2083,17 +2122,6 @@
msgid "Enabling remote administration..."
msgstr "Quản lý từ xa"
-#. skip forward or backward
-#: src/lib/installation/select_system_role.rb:48
-#, fuzzy
-msgid "System Role"
-msgstr "Hệ thống để cập nhật"
-
-#. 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
@@ -2101,79 +2129,10 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:41
+#: src/lib/installation/snapshots_finish.rb:40
msgid "Creating root filesystem snapshot..."
msgstr ""
-#. 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 ""
-
-#. 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 ""
-
-#. 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 ""
-
-#: src/lib/transfer/file_from_url.rb:208
-#, fuzzy
-#| msgid "Reading Media Description Failed"
-msgid "Reading file on %1 failed.\n"
-msgstr "Đọc mô tả đĩa không thành công"
-
-#. 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
-#, fuzzy
-#| msgid "Installation failed."
-msgid "Mounting %1 failed."
-msgstr "Cài đặt thất bại."
-
-#. 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 ""
-
-#. 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 ""
-
-#. 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
-#, fuzzy
-#| msgid "File not found"
-msgid "File %1 cannot be found"
-msgstr "Không tìm thấy tập tin"
-
-#. Device
-#: src/lib/transfer/file_from_url.rb:561
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr ""
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/lib/transfer/file_from_url.rb:568
-#, fuzzy
-#| msgid "Unknown service '%1'"
-msgid "Unknown protocol %1."
-msgstr "Dịch vụ không rõ '%1'"
-
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
@@ -2211,41 +2170,6 @@
"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>Dùng <b>Sao</b> nếu bạn muốn tạo một xác lập AutoYaST.\n"
-#~ "AutoYaST là cách cài đặt tự động một hệ thống SUSE Linux không cần người dùng theo dõi. AutoYaST\n"
-#~ "cần một xác lập để biết hệ thống muốn cài đặt sẽ như thế nào. Nếu dùng tùy chọn này\n"
-#~ "thì một xác lập cho hệ thống hiện thời sẽ được đặt tại /root/autoyast.xml.</p>\n"
-
-#, fuzzy
-#~| msgid "Online Update Configuration"
-#~ msgid "Clone System Configuration"
-#~ msgstr "Cấu hình cập nhật trực tuyến"
-
-#, fuzzy
-#~| msgid "Online Update Configuration"
-#~ msgid "&Clone System Configuration"
-#~ msgstr "Cấu hình cập nhật trực tuyến"
-
-#, fuzzy
-#~ msgid "Change Net&work Configuration"
-#~ msgstr "Cấu hình mạng"
-
-#, fuzzy
-#~ msgid "Location of Stored Configuration"
-#~ msgstr "&Dùng cấu hình sau"
-
-#, fuzzy
-#~| msgid "&Skip Configuration"
-#~ msgid "&Export Configuration"
-#~ msgstr "&Bỏ qua cấu hình"
-
#~ msgid "ERROR: Missing Title"
#~ msgstr "LỖI: Thiếu tiêu đề"
@@ -2806,6 +2730,10 @@
#~ msgstr "&Mô tả"
#, fuzzy
+#~ msgid "System Type"
+#~ msgstr "Hệ thống để cập nhật"
+
+#, fuzzy
#~ msgid "Failed"
#~ msgstr "Thất bại.\n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/instserver.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/instserver.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/instserver.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -64,25 +64,25 @@
msgstr ""
#. %1 is the current cd number
-#: src/include/instserver/dialogs.rb:241
+#: src/include/instserver/dialogs.rb:230
msgid "Insert CD %1 then press continue."
msgstr ""
-#: src/include/instserver/dialogs.rb:246
+#: src/include/instserver/dialogs.rb:235
msgid "Select ISO image %1 then press continue."
msgstr ""
#. %2 is the product name and version
-#: src/include/instserver/dialogs.rb:252
+#: src/include/instserver/dialogs.rb:241
msgid "Insert CD %1 of %2."
msgstr ""
-#: src/include/instserver/dialogs.rb:253
+#: src/include/instserver/dialogs.rb:242
msgid "Select ISO image %1 of %2."
msgstr ""
#. popup request, %1 is CD medium name
-#: src/include/instserver/dialogs.rb:292
+#: src/include/instserver/dialogs.rb:281
#, fuzzy
msgid ""
"Insert\n"
@@ -92,13 +92,13 @@
"'%1'"
#. popup request, %1 is ISO name
-#: src/include/instserver/dialogs.rb:321
+#: src/include/instserver/dialogs.rb:310
#, fuzzy
msgid "Select %1"
msgstr "Chọn thẻ"
#. add-on medium (e.g. service pack) doesn't match configured repository
-#: src/include/instserver/dialogs.rb:573
+#: src/include/instserver/dialogs.rb:551
msgid ""
"The medium requires product %1, which is not provided\n"
"by the current repository.\n"
@@ -107,105 +107,105 @@
msgstr ""
#. else, we create CD1, CD2, etc. (for code10 always)
-#: src/include/instserver/dialogs.rb:697
+#: src/include/instserver/dialogs.rb:669
msgid "Copying CD contents to local directory"
msgstr ""
-#: src/include/instserver/dialogs.rb:698
+#: src/include/instserver/dialogs.rb:670
msgid "This may take a while..."
msgstr ""
#. TODO: report more details (stderr)
#. rename the directory
-#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361
+#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341
#, fuzzy
msgid "Error while moving repository content."
msgstr "Gặp lỗi trong khi xoay ảnh."
#. Instserver configuration dialog caption
#. Instserver configuration dialog caption
-#: src/include/instserver/dialogs.rb:978
-#: src/include/instserver/dialogs.rb:1191
+#: src/include/instserver/dialogs.rb:949
+#: src/include/instserver/dialogs.rb:1162
#, fuzzy
msgid "Repository Configuration"
msgstr "Cấu hình mạng"
#. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:994
+#: src/include/instserver/dialogs.rb:965
msgid "Read &CD or DVD Medium"
msgstr ""
-#: src/include/instserver/dialogs.rb:1000
+#: src/include/instserver/dialogs.rb:971
#, fuzzy
msgid "Data &Source"
msgstr "Nguồn ánh sáng"
-#: src/include/instserver/dialogs.rb:1008
+#: src/include/instserver/dialogs.rb:979
msgid "Use &ISO Images"
msgstr ""
-#: src/include/instserver/dialogs.rb:1017
+#: src/include/instserver/dialogs.rb:988
#, fuzzy
msgid "Di&rectory with CD Images:"
msgstr "Đường dẫn thư mục"
-#: src/include/instserver/dialogs.rb:1020
-#: src/include/instserver/dialogs.rb:1400
+#: src/include/instserver/dialogs.rb:991
+#: src/include/instserver/dialogs.rb:1371
#, fuzzy
msgid "Select &Directory"
msgstr "Thư mục GPS"
#. abort?
#. abort?
-#: src/include/instserver/dialogs.rb:1063
-#: src/include/instserver/dialogs.rb:1469
+#: src/include/instserver/dialogs.rb:1034
+#: src/include/instserver/dialogs.rb:1440
#, fuzzy
msgid "Select Directory"
msgstr "Thư mục GPS"
#. abort?
-#: src/include/instserver/dialogs.rb:1080
-#: src/include/instserver/dialogs.rb:1244
+#: src/include/instserver/dialogs.rb:1051
+#: src/include/instserver/dialogs.rb:1215
msgid "Installation server name missing."
msgstr ""
-#: src/include/instserver/dialogs.rb:1095
+#: src/include/instserver/dialogs.rb:1066
msgid ""
"Contents already exist in this directory.\n"
"Not copying CDs."
msgstr ""
#. for translators: popup question (prefer more shorter lines than few long lines)
-#: src/include/instserver/dialogs.rb:1123
+#: src/include/instserver/dialogs.rb:1094
msgid ""
"Add an additional product (Service Pack, Additional\n"
"Package CD, etc.) to the repository?"
msgstr ""
#. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:1199
+#: src/include/instserver/dialogs.rb:1170
#, fuzzy
msgid "Repository &Name:"
msgstr "Tên thư mục"
-#: src/include/instserver/dialogs.rb:1204
+#: src/include/instserver/dialogs.rb:1175
msgid "A&nnounce as Installation Service with SLP"
msgstr ""
-#: src/include/instserver/dialogs.rb:1252
+#: src/include/instserver/dialogs.rb:1223
#, fuzzy
msgid "Invalid repository name."
msgstr "Mục nhập máy không hợp lệ"
#. an error message - entered repository name already exists
-#: src/include/instserver/dialogs.rb:1260
+#: src/include/instserver/dialogs.rb:1231
msgid ""
"Repository '%1' already exists,\n"
"enter another name."
msgstr ""
#. create directory only for a new repository
-#: src/include/instserver/dialogs.rb:1273
+#: src/include/instserver/dialogs.rb:1244
#, fuzzy
msgid ""
"Error while creating <tt>repository</tt> directory.\n"
@@ -215,7 +215,7 @@
msgstr "Gặp lỗi « {0} » khi tạo thư mục « {1} ». Hãy kiểm tra có đường dẫn và quyền truy cập đúng, rồi thử lại."
#. confirm removal of a repository, the action is done immediately and cannot be reverted
-#: src/include/instserver/dialogs.rb:1292
+#: src/include/instserver/dialogs.rb:1263
msgid ""
"Repository '%1' has been marked to delete.\n"
"When adding a new repository with the same name\n"
@@ -225,94 +225,94 @@
msgstr ""
#. Instserver server dialog caption
-#: src/include/instserver/dialogs.rb:1376
+#: src/include/instserver/dialogs.rb:1347
msgid "Initial Setup -- Initial Setup"
msgstr ""
-#: src/include/instserver/dialogs.rb:1392
+#: src/include/instserver/dialogs.rb:1363
msgid "Do Not Configure Any Net&work Services"
msgstr ""
-#: src/include/instserver/dialogs.rb:1397
+#: src/include/instserver/dialogs.rb:1368
#, fuzzy
msgid "Di&rectory to Contain Repositories:"
msgstr "Không có thư mục này."
#. radio button label
-#: src/include/instserver/dialogs.rb:1412
+#: src/include/instserver/dialogs.rb:1383
msgid "&Configure as HTTP Repository"
msgstr ""
#. radio button label
-#: src/include/instserver/dialogs.rb:1420
+#: src/include/instserver/dialogs.rb:1391
#, fuzzy
msgid "&Configure as FTP Repository"
msgstr "Cấu hình sau"
#. radio button label
-#: src/include/instserver/dialogs.rb:1428
+#: src/include/instserver/dialogs.rb:1399
#, fuzzy
msgid "&Configure as NFS Repository"
msgstr "Cấu hình sau"
-#: src/include/instserver/dialogs.rb:1480
+#: src/include/instserver/dialogs.rb:1451
msgid "Directory path for the installation server missing."
msgstr ""
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1507
+#: src/include/instserver/dialogs.rb:1478
msgid "Installation Server -- NFS"
msgstr ""
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1525
+#: src/include/instserver/dialogs.rb:1496
msgid "&Host Wild Card"
msgstr ""
-#: src/include/instserver/dialogs.rb:1527
+#: src/include/instserver/dialogs.rb:1498
#, fuzzy
msgid "&Options"
msgstr "Tùy chọn modem"
#. store the firewall setting, (activation is in SetupNFS())
-#: src/include/instserver/dialogs.rb:1585
+#: src/include/instserver/dialogs.rb:1556
msgid "Error occurred while configuring NFS."
msgstr ""
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1617
+#: src/include/instserver/dialogs.rb:1588
msgid "Installation Server -- FTP"
msgstr ""
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1625
+#: src/include/instserver/dialogs.rb:1596
#, fuzzy
msgid "&FTP Server Root Directory:"
msgstr "Thư mục GPS"
-#: src/include/instserver/dialogs.rb:1627
+#: src/include/instserver/dialogs.rb:1598
#, fuzzy
msgid "&Directory Alias:"
msgstr "Đường dẫn thư mục"
#. store the firewall setting, (activation is in SetupFTP())
-#: src/include/instserver/dialogs.rb:1684
+#: src/include/instserver/dialogs.rb:1655
msgid "Error occurred while configuring FTP."
msgstr ""
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1704
+#: src/include/instserver/dialogs.rb:1675
msgid "Installation Server -- HTTP"
msgstr ""
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1720
+#: src/include/instserver/dialogs.rb:1691
#, fuzzy
msgid "&Directory Alias"
msgstr "Đường dẫn thư mục"
#. store the firewall setting, (activation is in SetupHTTP())
-#: src/include/instserver/dialogs.rb:1777
+#: src/include/instserver/dialogs.rb:1748
#, fuzzy
msgid "Error creating HTTPD configuration."
msgstr "Gặp lỗi khi lấy kết nối PN « %s »"
@@ -585,7 +585,7 @@
"Sau đó nhấn <b>Sửa</b> hoặc <b>Xóa</b> theo mong muốn.</p>\n"
#. Read service data using _auto
-#: src/modules/Instserver.rb:308
+#: src/modules/Instserver.rb:306
msgid ""
"The FTP installation server requires an FTP server package. The vsftpd package\n"
"will now be installed.\n"
@@ -608,88 +608,88 @@
#. @param string directory
#. @param [String] options
#. @return [Boolean]
-#: src/modules/Instserver.rb:570
+#: src/modules/Instserver.rb:569
msgid ""
"Directory is already exported via NFS.\n"
"Leave NFS exports unmodified?\n"
msgstr ""
#. Instserver read dialog caption
-#: src/modules/Instserver.rb:1152
+#: src/modules/Instserver.rb:1155
#, fuzzy
msgid "Initializing Configuration"
msgstr "Cấu hình phẳng"
#. Progress stage 1/2
-#: src/modules/Instserver.rb:1166
+#: src/modules/Instserver.rb:1165
#, fuzzy
msgid "Read configuration file"
msgstr "Tải lại cấu hình"
#. Progress stage 2/2
-#: src/modules/Instserver.rb:1168
+#: src/modules/Instserver.rb:1167
#, fuzzy
msgid "Search for a new repository"
msgstr "Tìm kiếm dữ liệu trong môi trường bạn"
#. Progress step 1/2
-#: src/modules/Instserver.rb:1172
+#: src/modules/Instserver.rb:1171
#, fuzzy
msgid "Reading configuration file..."
msgstr "Tải lại cấu hình"
#. Progress step 2/2
-#: src/modules/Instserver.rb:1174
+#: src/modules/Instserver.rb:1173
#, fuzzy
msgid "Searching for a new repository..."
msgstr "Đang tạo hạng mục..."
#. Progress finished
#. Progress finished
-#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278
+#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
-#. Error message
-#: src/modules/Instserver.rb:1224
+#. TRANSLATORS: Error message
+#: src/modules/Instserver.rb:1188
msgid "Cannot read current settings."
msgstr "Không đọc được thiết lập hiện thời."
#. Instserver read dialog caption
-#: src/modules/Instserver.rb:1254
+#: src/modules/Instserver.rb:1240
#, fuzzy
msgid "Saving Installation Server Configuration"
msgstr "Cấu hình phẳng"
#. Progress stage 1/2
-#: src/modules/Instserver.rb:1268
+#: src/modules/Instserver.rb:1250
#, fuzzy
msgid "Write the settings"
msgstr "Hợp nhất những thẻ được chọn không?"
#. Progress stage 2/2
-#: src/modules/Instserver.rb:1270
+#: src/modules/Instserver.rb:1252
msgid "Run SuSEconfig"
msgstr "Chạy SuSEconfig"
#. Progress step 1/2
-#: src/modules/Instserver.rb:1274
+#: src/modules/Instserver.rb:1256
msgid "Writing the settings..."
msgstr "Đang ghi các thiết lập..."
#. Progress step 2/2
-#: src/modules/Instserver.rb:1276
+#: src/modules/Instserver.rb:1258
msgid "Running SuSEconfig..."
msgstr "Đang chạy SuSEconfig..."
#. Error message
-#: src/modules/Instserver.rb:1292
+#: src/modules/Instserver.rb:1274
msgid "Cannot write settings."
msgstr "Không ghi được các thiết lập."
#. Configuration summary text for autoyast
-#: src/modules/Instserver.rb:1465
+#: src/modules/Instserver.rb:1441
#, fuzzy
msgid "Configured Repositories"
msgstr "_Cấu hình"
Modified: branches/plus-SLE12-SP2/yast/vi/po/iplb.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/iplb.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/iplb.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/iscsi-client.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/iscsi-client.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/iscsi-client.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -123,8 +123,9 @@
#: src/include/iscsi-client/dialogs.rb:161
#, fuzzy
-msgid "Log Out"
-msgstr "Biểu hình"
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "Bị ngắt kết nối"
#: src/include/iscsi-client/dialogs.rb:186
#, fuzzy
@@ -137,10 +138,6 @@
msgstr "Thư mục"
#: src/include/iscsi-client/dialogs.rb:193
-#, fuzzy
-msgid "Log In"
-msgstr "Biểu hình"
-
#: src/include/iscsi-client/dialogs.rb:223
#, fuzzy
msgid "Connect"
@@ -232,8 +229,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:107 src/include/iscsi-client/helps.rb:119
-#: src/include/iscsi-client/helps.rb:126
+#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122
+#: src/include/iscsi-client/helps.rb:129
msgid "<h1>iSCSI Initiator</h1>"
msgstr ""
@@ -325,49 +322,42 @@
#. table of connected targets
#: src/include/iscsi-client/helps.rb:90
-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"
+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>"
msgstr ""
#. Warning
#. Warning
-#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114
+#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117
msgid "<h1>Warning</h1>"
msgstr ""
-#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115
+#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118
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 ""
-#: src/include/iscsi-client/helps.rb:100
+#: src/include/iscsi-client/helps.rb:103
msgid ""
-"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
+"<p><b>Initiator Name</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 ""
-#: src/include/iscsi-client/helps.rb:103
+#: src/include/iscsi-client/helps.rb:106
msgid ""
"If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method,\n"
"fill in the IP address of the iSNS server and port. The default port should be 3205.\n"
msgstr ""
-#: src/include/iscsi-client/helps.rb:108
+#: src/include/iscsi-client/helps.rb:111
msgid ""
-"Enter the <b>IP Address</b> of the discovered server.\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 ""
-#: src/include/iscsi-client/helps.rb:122
+#: src/include/iscsi-client/helps.rb:125
msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. "
msgstr ""
-#: src/include/iscsi-client/helps.rb:129
-msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
-msgstr ""
-
#: src/include/iscsi-client/helps.rb:132
#, fuzzy
msgid "<h1>Startup</h1>"
@@ -383,12 +373,22 @@
"starts up.</p>\n"
msgstr ""
-#. list of discovered targets
+#: src/include/iscsi-client/helps.rb:141
+#, fuzzy
+#| msgid "Authentication"
+msgid "<h1>Authentication</h1>"
+msgstr "Xác thực"
+
#: src/include/iscsi-client/helps.rb:142
-msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
+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 ""
-#: src/include/iscsi-client/helps.rb:145
+#. 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
msgid "<h1>iBTF</h1>"
msgstr ""
@@ -446,25 +446,32 @@
msgstr "URL không thể rỗng."
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:423
+#: src/include/iscsi-client/widgets.rb:428
+#, fuzzy
+msgid "Incorrect Initiator Name"
+msgstr "Tên thư mục"
+
+#: src/include/iscsi-client/widgets.rb:429
msgid ""
-"Incorrect InitiatorName.\n"
+"\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 ""
#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:625
+#: src/include/iscsi-client/widgets.rb:635
#, fuzzy
msgid "Insert the IP address."
msgstr "Hiện mật khẩu"
#. validate port number
-#: src/include/iscsi-client/widgets.rb:631
+#: src/include/iscsi-client/widgets.rb:641
msgid "Insert the port."
msgstr ""
@@ -472,38 +479,38 @@
#. ******************* 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:733
-#: src/include/iscsi-client/widgets.rb:838
-#: src/include/iscsi-client/widgets.rb:866
+#: src/include/iscsi-client/widgets.rb:754
+#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:887
msgid "True"
msgstr ""
-#: src/include/iscsi-client/widgets.rb:733
-#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:754
+#: src/include/iscsi-client/widgets.rb:859
#, fuzzy
msgid "False"
msgstr "Tập tin"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:771
-#: src/include/iscsi-client/widgets.rb:891
+#: src/include/iscsi-client/widgets.rb:792
+#: src/include/iscsi-client/widgets.rb:912
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr ""
-#: src/include/iscsi-client/widgets.rb:774
-#: src/include/iscsi-client/widgets.rb:894
+#: src/include/iscsi-client/widgets.rb:795
+#: src/include/iscsi-client/widgets.rb:915
msgid "Continue"
msgstr "Tiếp tục"
-#: src/include/iscsi-client/widgets.rb:775
-#: src/include/iscsi-client/widgets.rb:895
+#: src/include/iscsi-client/widgets.rb:796
+#: src/include/iscsi-client/widgets.rb:916
#, fuzzy
msgid "Cancel"
msgstr "&Dừng"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:885
+#: src/include/iscsi-client/widgets.rb:906
#, fuzzy
msgid "The target is already connected."
msgstr "Tên này đã được dùng"
@@ -601,7 +608,7 @@
msgstr "Cài đặt"
#. }
-#: src/modules/IscsiClientLib.rb:694
+#: src/modules/IscsiClientLib.rb:698
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -609,26 +616,21 @@
"in the BIOS.\n"
msgstr ""
+#. change startup status (manual/onboot) for target
+#: src/modules/IscsiClientLib.rb:1013
+msgid "Target connection failed.\n"
+msgstr ""
+
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1147
+#: src/modules/IscsiClientLib.rb:1156
#, fuzzy
msgid "Configuration summary..."
msgstr "Cấu hình"
#, fuzzy
-#~| msgid "Disconnected"
-#~ msgid "Disconnect"
-#~ msgstr "Bị ngắt kết nối"
+#~ msgid "Log In"
+#~ msgstr "Biểu hình"
-#, fuzzy
-#~| msgid "Authentication"
-#~ msgid "<h1>Authentication</h1>"
-#~ msgstr "Xác thực"
-
-#, fuzzy
-#~ msgid "Incorrect Initiator Name"
-#~ msgstr "Tên thư mục"
-
#~ msgid "Run SuSEconfig"
#~ msgstr "Chạy SuSEconfig"
Modified: branches/plus-SLE12-SP2/yast/vi/po/iscsi-lio-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/iscsi-lio-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/iscsi-lio-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \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:321
+#: src/include/iscsi-lio-server/dialogs.rb:320
#: src/modules/IscsiLioServer.rb:443
#, fuzzy
#| msgid "iSCSI Target"
@@ -76,7 +76,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:321
+#: src/include/iscsi-lio-server/dialogs.rb:320
msgid "Portal group"
msgstr ""
@@ -114,67 +114,68 @@
msgstr "Đường dẫn"
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: 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/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/widgets.rb:442
msgid "Add"
msgstr "Thêm"
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: 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:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
#, fuzzy
#| msgid "&Edit"
msgid "Edit"
msgstr "&Sửa"
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: 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/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/widgets.rb:443
msgid "Delete"
msgstr "Xoá"
-#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
-#: src/include/iscsi-lio-server/dialogs.rb:194
-msgid "Initiator"
-msgstr ""
+#: src/include/iscsi-lio-server/dialogs.rb:193
+#, fuzzy
+#| msgid "NFS Client"
+msgid "Client"
+msgstr "Máy khách NFS"
-#: src/include/iscsi-lio-server/dialogs.rb:194
-msgid "LUN Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:193
+msgid "Lun Mapping"
msgstr ""
-#: src/include/iscsi-lio-server/dialogs.rb:194
+#: src/include/iscsi-lio-server/dialogs.rb:193
#, fuzzy
#| msgid "Author:"
msgid "Auth"
msgstr "Tác giả:"
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:199
#, fuzzy
#| msgid "Edit Tag"
msgid "Edit LUN"
msgstr "Sửa đổi thẻ"
-#: src/include/iscsi-lio-server/dialogs.rb:201
+#: src/include/iscsi-lio-server/dialogs.rb:200
#, fuzzy
#| msgid "Edit Photo"
msgid "Edit Auth"
msgstr "Sửa đổi ảnh chụp"
-#: src/include/iscsi-lio-server/dialogs.rb:203
+#: src/include/iscsi-lio-server/dialogs.rb:202
#, fuzzy
#| msgid "Copyright"
msgid "Copy"
msgstr "Bản quyền"
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/dialogs.rb:216
#: src/include/iscsi-lio-server/widgets.rb:207
#: src/modules/IscsiLioServer.rb:434
#, fuzzy
@@ -182,7 +183,7 @@
msgid "No Authentication"
msgstr "Xác thực"
-#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/dialogs.rb:225
#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:437
#, fuzzy
@@ -191,8 +192,8 @@
msgstr "Xác thực"
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:233
-#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:253
#: src/include/iscsi-lio-server/widgets.rb:223
#: src/include/iscsi-lio-server/widgets.rb:236
#: src/include/iscsi-lio-server/widgets.rb:721
@@ -201,8 +202,8 @@
msgid "Username"
msgstr "Tên &người dùng"
-#: src/include/iscsi-lio-server/dialogs.rb:233
-#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:254
#: src/include/iscsi-lio-server/widgets.rb:224
#: src/include/iscsi-lio-server/widgets.rb:237
#: src/include/iscsi-lio-server/widgets.rb:722
@@ -211,7 +212,7 @@
msgid "Password"
msgstr "Mật &khẩu"
-#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/dialogs.rb:248
#: src/include/iscsi-lio-server/widgets.rb:231
#: src/modules/IscsiLioServer.rb:440
#, fuzzy
@@ -220,46 +221,40 @@
msgstr "&Xác thực ngoại tuyến"
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:275
+#: src/include/iscsi-lio-server/dialogs.rb:274
msgid "When &Booting"
msgstr "&Khi khởi động"
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:279
+#: src/include/iscsi-lio-server/dialogs.rb:278
msgid "&Manually"
msgstr "&Thủ công"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:285
+#: src/include/iscsi-lio-server/dialogs.rb:284
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "Khi khởi động"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:287
+#: src/include/iscsi-lio-server/dialogs.rb:286
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "Tự chạy"
-#: src/include/iscsi-lio-server/dialogs.rb:321
-#, fuzzy
-#| msgid "Status"
-msgid "TPG Status"
-msgstr "Trạng thái"
-
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:370
+#: src/include/iscsi-lio-server/dialogs.rb:369
msgid "Key"
msgstr "Chìa khóa"
-#: src/include/iscsi-lio-server/dialogs.rb:370
+#: src/include/iscsi-lio-server/dialogs.rb:369
msgid "Value"
msgstr "Giá trị"
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:431
+#: src/include/iscsi-lio-server/dialogs.rb:430
#, fuzzy
#| msgid "iSCSI Target"
msgid "iSCSI LIO Target Overview"
@@ -267,34 +262,33 @@
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:439
-#: src/include/iscsi-lio-server/helps.rb:179
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/dialogs.rb:438
+#: src/include/iscsi-lio-server/helps.rb:178
+#: src/include/iscsi-lio-server/helps.rb:183
#, fuzzy
#| msgid "iSCSI Target"
msgid "<h1>iSCSI Target</h1>"
msgstr "Đích iSCSI"
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:474
+#: src/include/iscsi-lio-server/dialogs.rb:473
#, fuzzy
#| msgid "iSCSI Target"
msgid "Add iSCSI Target"
msgstr "Đích iSCSI"
-#. dialog for modifying initiator setup for a target
-#. (includes authentication)
-#: src/include/iscsi-lio-server/dialogs.rb:509
-msgid "Modify iSCSI Target Initiator Setup"
+#. discovery authentication dialog
+#: src/include/iscsi-lio-server/dialogs.rb:507
+msgid "Modify iSCSI Target Client Setup"
msgstr ""
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:543
+#: src/include/iscsi-lio-server/dialogs.rb:541
msgid "Modify iSCSI Target Lun Setup"
msgstr ""
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:576
+#: src/include/iscsi-lio-server/dialogs.rb:574
#, fuzzy
#| msgid "Expert Settings"
msgid "iSCSI Target Expert Settings"
@@ -493,24 +487,19 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-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>"
+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>"
msgstr ""
#: src/include/iscsi-lio-server/helps.rb:130
-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>"
+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>"
msgstr ""
-#: 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>"
+#: 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>"
msgstr ""
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:139
+#: src/include/iscsi-lio-server/helps.rb:138
msgid ""
"List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
"To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</b>."
@@ -518,12 +507,12 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:144
-#: src/include/iscsi-lio-server/helps.rb:160
+#: src/include/iscsi-lio-server/helps.rb:143
+#: src/include/iscsi-lio-server/helps.rb:159
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:147
+#: src/include/iscsi-lio-server/helps.rb:146
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"
@@ -532,19 +521,19 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:154
-#: src/include/iscsi-lio-server/helps.rb:173
+#: src/include/iscsi-lio-server/helps.rb:153
+#: src/include/iscsi-lio-server/helps.rb:172
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:163
+#: src/include/iscsi-lio-server/helps.rb:162
msgid "Create a new target. Replace template values with the correct values."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:166
+#: src/include/iscsi-lio-server/helps.rb:165
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"
@@ -553,11 +542,11 @@
"does not provide a name for LUN, it is generated automatically."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:180
+#: src/include/iscsi-lio-server/helps.rb:179
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr ""
-#: src/include/iscsi-lio-server/helps.rb:185
+#: src/include/iscsi-lio-server/helps.rb:184
msgid ""
"Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
"If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
@@ -588,7 +577,7 @@
#: src/include/iscsi-lio-server/widgets.rb:251
#, fuzzy
#| msgid "This name is already in use"
-msgid "Selected LUN is already in use!"
+msgid "Selected Lun is already in use!"
msgstr "Tên này đã được dùng"
#: src/include/iscsi-lio-server/widgets.rb:260
@@ -624,8 +613,10 @@
msgstr "Dò tìm thiết bị"
#: src/include/iscsi-lio-server/widgets.rb:436
-msgid "Initiator LUN"
-msgstr ""
+#, fuzzy
+#| msgid "NFS Client"
+msgid "Client Lun"
+msgstr "Máy khách NFS"
#: src/include/iscsi-lio-server/widgets.rb:436
msgid "Target LUN"
@@ -649,9 +640,9 @@
#: src/include/iscsi-lio-server/widgets.rb:619
#, fuzzy
-#| msgid "&Last name:"
-msgid "Initiator name:"
-msgstr "&Họ:"
+#| msgid "New name:"
+msgid "Client name:"
+msgstr "Tên mới :"
#: src/include/iscsi-lio-server/widgets.rb:622
msgid "Import LUNs from TPG"
@@ -659,27 +650,25 @@
#: src/include/iscsi-lio-server/widgets.rb:638
#: src/include/iscsi-lio-server/widgets.rb:695
-#, fuzzy
-#| msgid "URL cannot be empty."
-msgid "Initiator name must not be empty!"
-msgstr "URL không thể rỗng."
+msgid "Client name must not be empty!"
+msgstr ""
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. initiator name. It's allowed to have several LUNs accessable for same initiator.
+#. client name. It's allowed to have several LUNs accessable for same client.
#. 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 "This name is already in use"
-msgid "Initiator name already exists!"
+msgid "Client name already exists!"
msgstr "Tên này đã được dùng"
-#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
+#. Copy exisiting LUN, i.e. give additional client access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
#: src/include/iscsi-lio-server/widgets.rb:678
#, fuzzy
#| msgid "New name:"
-msgid "New initiator name:"
+msgid "New client name:"
msgstr "Tên mới :"
#: src/include/iscsi-lio-server/widgets.rb:724
@@ -692,132 +681,106 @@
msgid "Cancel"
msgstr "&Dừng"
-#. create items from targets
-#: src/include/iscsi-lio-server/widgets.rb:785
-msgid "Enabled"
-msgstr "Dùng"
-
-#: 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 "Không dùng"
-
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:822
-#: src/include/iscsi-lio-server/widgets.rb:936
-#: src/include/iscsi-lio-server/widgets.rb:1290
+#: src/include/iscsi-lio-server/widgets.rb:820
+#: src/include/iscsi-lio-server/widgets.rb:934
+#: src/include/iscsi-lio-server/widgets.rb:1288
#, fuzzy
#| msgid "Really delete selected entry?"
msgid "Really delete the selected item?"
msgstr "Thực sự xoá bỏ những mục đã chọn?"
-#: src/include/iscsi-lio-server/widgets.rb:1004
+#: src/include/iscsi-lio-server/widgets.rb:1002
msgid "Problem creating target %1 with tpg %2"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1026
+#: src/include/iscsi-lio-server/widgets.rb:1024
msgid "Problem setting network portal to %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1047
+#: src/include/iscsi-lio-server/widgets.rb:1045
msgid "Problem removing lun %1"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1072
+#: src/include/iscsi-lio-server/widgets.rb:1070
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1086
+#: src/include/iscsi-lio-server/widgets.rb:1084
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:1200
+#: src/include/iscsi-lio-server/widgets.rb:1198
#, fuzzy
#| msgid "URL cannot be empty."
msgid "The target cannot be empty."
msgstr "URL không thể rỗng."
-#: src/include/iscsi-lio-server/widgets.rb:1204
+#: src/include/iscsi-lio-server/widgets.rb:1202
msgid "The target portal group cannot be empty."
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1215
+#: src/include/iscsi-lio-server/widgets.rb:1213
#, fuzzy
#| msgid "A catalog for this product already exists."
msgid "The target already exists."
msgstr "Đã có một hạng mục cho sản phẩm này."
-#: src/include/iscsi-lio-server/widgets.rb:1235
+#: src/include/iscsi-lio-server/widgets.rb:1233
msgid "Incoming"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1236
msgid "Outgoing"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1240
+#: src/include/iscsi-lio-server/widgets.rb:1238
msgid "None"
msgstr "Không có"
-#: src/include/iscsi-lio-server/widgets.rb:1452
+#: 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 "Không dùng"
+
+#: src/include/iscsi-lio-server/widgets.rb:1450
msgid ""
-"There isn't any initiator specified.\n"
-"To allow an initiator login to the target, please\n"
+"There isn't any client specified.\n"
+"To allow a client 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 initiator access?"
+"Really want to continue without client access?"
msgstr ""
-#: 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"
+#: src/include/iscsi-lio-server/widgets.rb:1464
+msgid "Problem removing lun %4 for client %3 in %1:%2"
msgstr ""
-"Có lỗi khi tạo thư mục %1:\n"
-"%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"
+#: src/include/iscsi-lio-server/widgets.rb:1479
+msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
msgstr ""
-"Có lỗi khi tạo thư mục %1:\n"
-"%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"
+#: src/include/iscsi-lio-server/widgets.rb:1500
+msgid "Problem removing client %3 from %1:%2"
msgstr ""
-"Có lỗi khi tạo thư mục %1:\n"
-"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1526
+#: src/include/iscsi-lio-server/widgets.rb:1524
#, fuzzy
#| msgid ""
#| "Error occurred while creating directory %1:\n"
#| "%2"
-msgid "Problem creating initiator %3 for %1:%2"
+msgid "Problem creating client %3 for %1:%2"
msgstr ""
"Có lỗi khi tạo thư mục %1:\n"
"%2"
-#: src/include/iscsi-lio-server/widgets.rb:1561
-#, fuzzy
-#| msgid "Off&line Authentication"
-msgid "Problem changing auth for initiator %3 in %1:%2"
-msgstr "&Xác thực ngoại tuyến"
+#: src/include/iscsi-lio-server/widgets.rb:1559
+msgid "Problem changing auth for client %3 in %1:%2"
+msgstr ""
#. Initialization dialog caption
#: src/include/iscsi-lio-server/wizards.rb:110
@@ -832,11 +795,11 @@
msgstr "Đang chạy..."
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1424
msgid "Cannot save lio setup"
msgstr ""
-#: src/modules/IscsiLioData.rb:1432
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save tcm setup"
msgstr ""
@@ -946,21 +909,6 @@
msgid "Configuration summary..."
msgstr "Tổng kết cấu hình..."
-#, fuzzy
-#~| msgid "NFS Client"
-#~ msgid "Client"
-#~ msgstr "Máy khách NFS"
-
-#, fuzzy
-#~| msgid "NFS Client"
-#~ msgid "Client Lun"
-#~ msgstr "Máy khách NFS"
-
-#, fuzzy
-#~| msgid "New name:"
-#~ msgid "Client name:"
-#~ msgstr "Tên mới :"
-
#~ msgid "Run SuSEconfig"
#~ msgstr "Chạy SuSEconfig"
Modified: branches/plus-SLE12-SP2/yast/vi/po/isns.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/isns.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/isns.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/journal.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/journal.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/journal.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/kdump.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/kdump.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/kdump.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -392,8 +392,10 @@
#. 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:496
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
+#: src/modules/Kdump.rb:500
msgid "To apply changes a reboot is necessary."
msgstr ""
@@ -1207,188 +1209,163 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1454
+#: src/include/kdump/uifunctions.rb:1449
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1487
+#: src/include/kdump/uifunctions.rb:1482
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 ""
-"Cần chạy môđun dưới quyền root.\n"
-"Nếu tiếp tục bây giờ, môđun sẽ làm việc không đúng.\n"
-"Ví dụ, một vài thiết lập có thể sẽ đọc không đúng và\n"
-"rất có thể sẽ không lưu được những thiết lập đó.\n"
-
-#: src/include/kdump/uifunctions.rb:1855
-msgid "Kdump not supported"
-msgstr ""
-
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:398
+#: src/modules/Kdump.rb:412
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:506
+#: src/modules/Kdump.rb:514
#, fuzzy
msgid "Initializing kdump Configuration"
msgstr "Khởi chạy cấu hình CASA"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
#, fuzzy
msgid "Reading the config file..."
msgstr "Đang đọc cấu hình hiện thời..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:517
+#: src/modules/Kdump.rb:525
#, fuzzy
msgid "Reading kernel boot options..."
msgstr "Không đọc được thiết lập hiện thời."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:519
+#: src/modules/Kdump.rb:527
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:533
#, fuzzy
msgid "Reading partitions of disks..."
msgstr "Đang đọc thiết lập trước đây..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:535
#, fuzzy
msgid "Reading available memory and calibrating usage..."
msgstr "Đang dò tìm hạng mục..."
#. Error message
-#: src/modules/Kdump.rb:539
+#: src/modules/Kdump.rb:547
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:555
#, fuzzy
msgid "Cannot read kernel boot options."
msgstr "Không đọc được thiết lập hiện thời."
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:563
#, fuzzy
msgid "Cannot read available memory."
msgstr "Không đọc được hạng mục."
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:581
+#: src/modules/Kdump.rb:589
#, fuzzy
msgid "Saving kdump Configuration"
msgstr "Đang lưu cấu hình CASA"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:610
+#: src/modules/Kdump.rb:618
msgid "Write the settings"
msgstr "Ghi thiết lập"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:620
#, fuzzy
msgid "Update boot options"
msgstr "Cập nhật thiết lập"
#. Progress step 1/2
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:624
msgid "Writing the settings..."
msgstr "Đang ghi thiết lập..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:626
#, fuzzy
msgid "Updating boot options..."
msgstr "Đang cập nhật cấu hình..."
#. Progress finished
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:628
msgid "Finished"
msgstr "Hoàn thành"
#. Error message
-#: src/modules/Kdump.rb:630
+#: src/modules/Kdump.rb:638
msgid "Cannot write settings."
msgstr "Không ghi được thiết lập."
#. Error message
-#: src/modules/Kdump.rb:639
+#: src/modules/Kdump.rb:647
msgid "Adding crashkernel parameter to bootloader fault."
msgstr ""
#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:750
+#: src/modules/Kdump.rb:758
msgid "Kdump status: %1"
msgstr ""
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:759
#, fuzzy
msgid "enabled"
msgstr "Dùng"
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:759
#, fuzzy
msgid "disabled"
msgstr "Không dùng"
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:766
msgid "Value(s) of crashkernel option: %1"
msgstr ""
-#: src/modules/Kdump.rb:765
+#: src/modules/Kdump.rb:773
#, fuzzy
msgid "Dump format: %1"
msgstr "Dấu chân: %1"
-#: src/modules/Kdump.rb:772
+#: src/modules/Kdump.rb:780
#, fuzzy
msgid "Target of dumps: %1"
msgstr "Số bản _sao :"
-#: src/modules/Kdump.rb:779
+#: src/modules/Kdump.rb:787
#, fuzzy
msgid "Number of dumps: %1"
msgstr "Số bản _sao :"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:871
+#: src/modules/Kdump.rb:879
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:958
+#: src/modules/Kdump.rb:974
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: branches/plus-SLE12-SP2/yast/vi/po/languages_db.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/languages_db.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/languages_db.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2011-05-10 13:09+0700\n"
"Last-Translator: Ngọc \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/ldap-client.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/ldap-client.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/ldap-client.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/ldap.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/ldap.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/ldap.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/live-installer.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/live-installer.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/live-installer.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -40,17 +40,17 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
+#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
#, fuzzy
msgid "Evaluating filesystems to copy..."
msgstr "Đang đánh giá phân vùng gốc. Xin chờ một chút..."
-#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
#, fuzzy
msgid "Copying root filesystem..."
msgstr "Đang sao chép tập tin vào hệ thống đã cài đặt..."
-#: src/clients/inst_live_doit.rb:63
+#: src/clients/inst_live_doit.rb:62
#, fuzzy
msgid "Copying live image..."
msgstr "Đang tạo ảnh thư mục..."
@@ -58,12 +58,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:149 src/clients/inst_live_doit.rb:151
+#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
msgid "Copying %1..."
msgstr ""
#. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:226
+#: src/clients/inst_live_doit.rb:222
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -73,57 +73,75 @@
msgstr ""
#. generic error report
-#: src/clients/inst_live_doit.rb:254
+#: src/clients/inst_live_doit.rb:250
#, fuzzy
msgid "Copying the live image to hard disk failed."
msgstr "Việc kết nối đến mạng tuyến bị lỗi."
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:44
-#: src/clients/inst_live_simple_proposal.rb:179
+#: src/clients/inst_live_simple_proposal.rb:45
+#: src/clients/inst_live_simple_proposal.rb:211
msgid "Installation Settings"
msgstr "Thiết lập cài đặt"
#. label
-#: src/clients/inst_live_simple_proposal.rb:46
+#: src/clients/inst_live_simple_proposal.rb:47
#, fuzzy
msgid "Analyzing the system..."
msgstr "Đang phân tích hệ thống..."
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:110
+#: src/clients/inst_live_simple_proposal.rb:111
msgid "Use %1%% of disk %2 for Linux"
msgstr ""
-#: src/clients/inst_live_simple_proposal.rb:119
+#: src/clients/inst_live_simple_proposal.rb:120
msgid "Do not use disk %1"
msgstr ""
-#: src/clients/inst_live_simple_proposal.rb:126
+#: src/clients/inst_live_simple_proposal.rb:127
#, fuzzy
msgid "Partitioning"
msgstr "Phân vùng"
#. end of partitioning summary
+#. bootloader summary
+#: src/clients/inst_live_simple_proposal.rb:143
+msgid "System start-up"
+msgstr ""
+
+#: src/clients/inst_live_simple_proposal.rb:149
+msgid "Ask whether to boot Linux or existing system"
+msgstr ""
+
+#: src/clients/inst_live_simple_proposal.rb:150
+msgid "Boot only Linux"
+msgstr ""
+
+#: src/clients/inst_live_simple_proposal.rb:158
+msgid "System start time-out: %1 seconds"
+msgstr ""
+
+#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:135
+#: src/clients/inst_live_simple_proposal.rb:167
msgid "Keyboard"
msgstr ""
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:145
+#: src/clients/inst_live_simple_proposal.rb:177
msgid "Time Zone"
msgstr "Múi giờ"
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:155
+#: src/clients/inst_live_simple_proposal.rb:187
#, fuzzy
msgid "Change Installation Settings"
msgstr "Thiết lập cài đặt"
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:160
+#: src/clients/inst_live_simple_proposal.rb:192
#, fuzzy
msgid ""
"<p>\n"
@@ -134,7 +152,7 @@
"</p>\n"
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:164
+#: src/clients/inst_live_simple_proposal.rb:196
#, fuzzy
msgid ""
"<p>\n"
@@ -147,7 +165,7 @@
"</p>\n"
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:170
+#: src/clients/inst_live_simple_proposal.rb:202
#, fuzzy
msgid ""
"<p>\n"
@@ -239,7 +257,7 @@
msgstr ""
#. progress step title
-#: src/clients/live_copy_files_finish.rb:75
+#: src/clients/live_copy_files_finish.rb:76
msgid "Copying files to installed system..."
msgstr "Đang sao chép tập tin vào hệ thống đã cài đặt..."
Modified: branches/plus-SLE12-SP2/yast/vi/po/mail.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/mail.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/mail.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/multipath.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/multipath.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/multipath.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/network.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/network.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/network.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -231,7 +231,7 @@
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:114
+#: src/clients/host.rb:123
#, fuzzy
msgid "Host Configuration Summary:"
msgstr "Cấu hình"
@@ -502,7 +502,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:108
+#: src/clients/lan_auto.rb:136
msgid "Configuration Error: uninitialized interface."
msgstr ""
@@ -587,7 +587,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
#, fuzzy
msgid "Routing Configuration"
msgstr "Cấu hình"
@@ -779,13 +779,13 @@
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
msgid "Warning: no encryption is used."
msgstr ""
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
msgid "Change."
msgstr ""
@@ -1107,7 +1107,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:129
+#: src/include/network/services/host.rb:128
#, fuzzy
msgid "IP Address"
msgstr "Địa chỉ IP:"
@@ -1116,7 +1116,7 @@
#. PushButton label
#. PushButton label
#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:140
+#: src/include/network/services/host.rb:139
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "&Thêm"
@@ -1126,7 +1126,7 @@
#. PushButton label
#. Pushbutton label
#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:142
+#: src/include/network/services/host.rb:141
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
#, fuzzy
@@ -1138,7 +1138,7 @@
#. PushButton label
#. Pushbutton label
#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:144
+#: src/include/network/services/host.rb:143
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
#, fuzzy
@@ -1190,7 +1190,7 @@
msgstr ""
#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1315
+#: src/include/network/lan/address.rb:1297
#, fuzzy
msgid "Bridged Devices"
msgstr "Tên thiết bị modem"
@@ -1236,7 +1236,7 @@
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:816
+#: src/include/network/lan/address.rb:798
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr ""
@@ -1273,7 +1273,7 @@
#. TextEntry label
#: src/include/network/lan/address.rb:325
#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:334
+#: src/include/network/services/host.rb:341
#, fuzzy
msgid "&IP Address"
msgstr "Địa chỉ IP:"
@@ -1304,7 +1304,7 @@
msgstr ""
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1036
+#: src/include/network/lan/address.rb:1018
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1312,13 +1312,13 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1056
+#: src/include/network/lan/address.rb:1038
msgid "Configuration %1 already present."
msgstr ""
#. 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:1080
+#: src/include/network/lan/address.rb:1062
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1329,23 +1329,23 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1100
+#: src/include/network/lan/address.rb:1082
#, fuzzy
msgid "No valid IP address."
msgstr "Địa chỉ IP:"
-#: src/include/network/lan/address.rb:1107
+#: src/include/network/lan/address.rb:1089
#, fuzzy
msgid "No valid netmask or prefix length."
msgstr "Địa chỉ IP:"
-#: src/include/network/lan/address.rb:1115
+#: src/include/network/lan/address.rb:1097
#, fuzzy
msgid "Invalid hostname."
msgstr "Địa chỉ IP:"
#. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1123
+#: src/include/network/lan/address.rb:1105
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1355,7 +1355,7 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/address.rb:1142
+#: src/include/network/lan/address.rb:1124
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1363,65 +1363,65 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1195
+#: src/include/network/lan/address.rb:1177
#, fuzzy
msgid "&General"
msgstr "Chung"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1206
+#: src/include/network/lan/address.rb:1188
#, fuzzy
msgid "Device Activation"
msgstr "Dùng đĩa"
-#: src/include/network/lan/address.rb:1210
+#: src/include/network/lan/address.rb:1192
#, fuzzy
msgid "Firewall Zone"
msgstr "Tường lửa mở"
-#: src/include/network/lan/address.rb:1215
+#: src/include/network/lan/address.rb:1197
msgid "Maximum Transfer Unit (MTU)"
msgstr ""
#. FIXME: we have helps per widget and for the whole
#. tab set but not for one tab
-#: src/include/network/lan/address.rb:1225
+#: src/include/network/lan/address.rb:1207
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr ""
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1274
#, fuzzy
msgid "&Address"
msgstr "Địa chỉ"
#. Address tab help
-#: src/include/network/lan/address.rb:1295
+#: src/include/network/lan/address.rb:1277
msgid "<p>Configure your IP address.</p>"
msgstr ""
-#: src/include/network/lan/address.rb:1301
+#: src/include/network/lan/address.rb:1283
msgid "&Hardware"
msgstr "&Phần cứng"
-#: src/include/network/lan/address.rb:1308
+#: src/include/network/lan/address.rb:1290
msgid "&Bond Slaves"
msgstr ""
-#: src/include/network/lan/address.rb:1322
+#: src/include/network/lan/address.rb:1304
#, fuzzy
msgid "&Wireless"
msgstr "Chuột vô tuyến"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1406
+#: src/include/network/lan/address.rb:1388
msgid "Ifplugd Priority"
msgstr ""
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1412
+#: src/include/network/lan/address.rb:1394
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"
@@ -1431,13 +1431,13 @@
msgstr ""
#. Address dialog caption
-#: src/include/network/lan/address.rb:1494
+#: src/include/network/lan/address.rb:1476
#, fuzzy
msgid "Network Card Setup"
msgstr "T_ên mạng:"
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:86
+#: src/include/network/lan/bridge.rb:103
msgid ""
"At least one selected device is already configured.\n"
"Adapt the configuration for bridge?\n"
@@ -1758,12 +1758,12 @@
msgstr ""
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:454
+#: src/include/network/lan/complex.rb:456
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr ""
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
msgid "Network Setup Method"
msgstr ""
@@ -1772,7 +1772,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:517
+#: src/include/network/lan/complex.rb:519
#, fuzzy
msgid "Network Settings"
msgstr "Chạy mạng"
@@ -2593,7 +2593,7 @@
#. Popup::Error text
#. Popup::Error text
#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:379
+#: src/include/network/services/host.rb:386
msgid "The IP address is invalid."
msgstr ""
@@ -2854,47 +2854,47 @@
msgstr ""
#. Popup text
-#: src/include/network/lan/wireless.rb:561
+#: src/include/network/lan/wireless.rb:560
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr ""
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:572
+#: src/include/network/lan/wireless.rb:571
msgid "Specify the network name for this mode."
msgstr ""
#. Popup text
-#: src/include/network/lan/wireless.rb:579
+#: src/include/network/lan/wireless.rb:578
msgid "The network name must be shorter than 32 characters."
msgstr ""
#. Error popup
-#: src/include/network/lan/wireless.rb:599
+#: src/include/network/lan/wireless.rb:598
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr ""
#. Error popup
-#: src/include/network/lan/wireless.rb:610
+#: src/include/network/lan/wireless.rb:609
msgid "The key must have %1 hexadecimal digits."
msgstr ""
#. Popup text
#. Popup text
-#: src/include/network/lan/wireless.rb:622
-#: src/include/network/lan/wireless.rb:941
+#: src/include/network/lan/wireless.rb:621
+#: src/include/network/lan/wireless.rb:939
msgid "The encryption key is invalid."
msgstr ""
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:630
+#: src/include/network/lan/wireless.rb:629
msgid "The encryption key must be specified for this authentication mode."
msgstr ""
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:637
+#: src/include/network/lan/wireless.rb:636
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -2902,21 +2902,21 @@
#. Wireless expert dialog caption
#. Frame label
-#: src/include/network/lan/wireless.rb:695
-#: src/include/network/lan/wireless.rb:776
+#: src/include/network/lan/wireless.rb:694
+#: src/include/network/lan/wireless.rb:775
#, fuzzy
msgid "Wireless Expert Settings"
msgstr "Ethernet vô tuyến (%s)"
#. Wireless expert dialog help 1/5
-#: src/include/network/lan/wireless.rb:698
+#: src/include/network/lan/wireless.rb:697
msgid ""
"<p>Here, set additional configuration parameters\n"
"(rarely needed).</p>"
msgstr ""
#. Wireless expert dialog help 2/5
-#: src/include/network/lan/wireless.rb:702
+#: src/include/network/lan/wireless.rb:701
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"
@@ -2925,21 +2925,21 @@
msgstr ""
#. Wireless expert dialog help 3/5
-#: src/include/network/lan/wireless.rb:709
+#: src/include/network/lan/wireless.rb:708
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>"
msgstr ""
#. Wireless expert dialog help 4/5
-#: src/include/network/lan/wireless.rb:713
+#: src/include/network/lan/wireless.rb:712
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>"
msgstr ""
#. Wireless expert dialog help 5/5
-#: src/include/network/lan/wireless.rb:717
+#: src/include/network/lan/wireless.rb:716
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"
@@ -2948,63 +2948,63 @@
#. Combobox item
#. Combobox item
-#: src/include/network/lan/wireless.rb:745
-#: src/include/network/lan/wireless.rb:767
+#: src/include/network/lan/wireless.rb:744
+#: src/include/network/lan/wireless.rb:766
#, fuzzy
msgid "Automatic"
msgstr "WPA Tự động"
#. Combobox label
-#: src/include/network/lan/wireless.rb:782
+#: src/include/network/lan/wireless.rb:781
msgid "&Channel"
msgstr ""
#. Combobox label
-#: src/include/network/lan/wireless.rb:785
+#: src/include/network/lan/wireless.rb:784
msgid "B&it Rate"
msgstr ""
#. Text entry label
-#: src/include/network/lan/wireless.rb:791
+#: src/include/network/lan/wireless.rb:790
msgid "&Access Point"
msgstr ""
#. CheckBox label
-#: src/include/network/lan/wireless.rb:799
+#: src/include/network/lan/wireless.rb:798
#, fuzzy
msgid "Use &Power Management"
msgstr "Quản lý Điện năng"
-#: src/include/network/lan/wireless.rb:808
+#: src/include/network/lan/wireless.rb:807
#, fuzzy
msgid "AP ScanMode"
msgstr "Phương pháp EAP:"
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:899
+#: src/include/network/lan/wireless.rb:897
msgid "Enter Encryption Key"
msgstr ""
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:903
+#: src/include/network/lan/wireless.rb:901
#, fuzzy
msgid "&Key"
msgstr "Khóa:"
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:927
+#: src/include/network/lan/wireless.rb:925
#, fuzzy
msgid "Help"
msgstr "Trợ _giúp"
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:976
+#: src/include/network/lan/wireless.rb:974
#, fuzzy
msgid "Wireless Keys"
msgstr "Chuột vô tuyến"
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:979
+#: src/include/network/lan/wireless.rb:977
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"
@@ -3014,7 +3014,7 @@
msgstr ""
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:987
+#: src/include/network/lan/wireless.rb:985
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"
@@ -3024,102 +3024,102 @@
msgstr ""
#. Frame label
-#: src/include/network/lan/wireless.rb:1012
+#: src/include/network/lan/wireless.rb:1010
msgid "WEP Keys"
msgstr ""
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1018
+#: src/include/network/lan/wireless.rb:1016
msgid "&Key Length"
msgstr ""
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1024
msgid "No."
msgstr ""
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1026
#, fuzzy
msgid "Key"
msgstr "Khóa:"
#. Table header label
-#: src/include/network/lan/wireless.rb:1030
+#: src/include/network/lan/wireless.rb:1028
#, fuzzy
msgid "Default"
msgstr "Tuyến mặc định:"
#. PushButton label
-#: src/include/network/lan/wireless.rb:1040
+#: src/include/network/lan/wireless.rb:1038
msgid "&Set as Default"
msgstr ""
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1213
+#: src/include/network/lan/wireless.rb:1210
#, fuzzy
msgid "Choose a Certificate"
msgstr "Tập tin chứng nhận của CA:"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1258
+#: src/include/network/lan/wireless.rb:1255
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:1286
+#: src/include/network/lan/wireless.rb:1283
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
msgstr ""
#. dialog caption
-#: src/include/network/lan/wireless.rb:1332
+#: src/include/network/lan/wireless.rb:1329
#, fuzzy
msgid "WPA-EAP"
msgstr "PEAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1354
+#: src/include/network/lan/wireless.rb:1351
msgid "Any"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1358
+#: src/include/network/lan/wireless.rb:1355
msgid "MD5"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1360
+#: src/include/network/lan/wireless.rb:1357
msgid "GTC"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1362
+#: src/include/network/lan/wireless.rb:1359
msgid "CHAP"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1364
+#: src/include/network/lan/wireless.rb:1361
#, fuzzy
msgid "PAP"
msgstr "PEAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1366
+#: src/include/network/lan/wireless.rb:1363
msgid "MSCHAPv1"
msgstr ""
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1370
+#: src/include/network/lan/wireless.rb:1367
msgid "MSCHAPv2"
msgstr ""
#. dialog caption
-#: src/include/network/lan/wireless.rb:1393
+#: src/include/network/lan/wireless.rb:1390
msgid "WPA-EAP Details"
msgstr ""
@@ -3161,12 +3161,12 @@
msgstr ""
#. Popup text
-#: src/include/network/routines.rb:129
+#: src/include/network/routines.rb:144
msgid "These packages need to be installed:"
msgstr "Cần cài đặt những gói sau:"
#. Popup text
-#: src/include/network/routines.rb:147
+#: src/include/network/routines.rb:162
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3174,64 +3174,116 @@
"Try again?\n"
msgstr ""
-#. 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
+#. Table field (Unknown device)
+#: src/include/network/routines.rb:255
msgid "Unknown"
msgstr "Không biết"
+#. Popup headline
+#: src/include/network/routines.rb:279
+msgid "Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:284
+msgid "DNS Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:286
+msgid "DSL Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:288
+msgid "Hosts Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:292
+msgid "ISDN Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:296
+msgid "Network Card Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:300
+msgid "Modem Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:304
+msgid "Proxy Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:308
+msgid "Provider Configuration Successfully Saved"
+msgstr ""
+
+#. Popup headline
+#: src/include/network/routines.rb:312
+msgid "Routing Configuration Successfully Saved"
+msgstr ""
+
+#. Popup text
+#: src/include/network/routines.rb:321
+#, fuzzy
+msgid "Configure mail now?"
+msgstr "Cấu hình"
+
+#. Popup text
+#: src/include/network/routines.rb:326
+#, fuzzy
+msgid "Run configuration of %1?"
+msgstr "Tải lại cấu hình"
+
#. 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:807
+#: src/include/network/routines.rb:1004
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:867
+#: src/include/network/routines.rb:1064
#, fuzzy
msgid "Network Cards"
msgstr "T_ên mạng:"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:871
+#: src/include/network/routines.rb:1068
#, fuzzy
msgid "Modems"
msgstr "Đèn modem"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:875
+#: src/include/network/routines.rb:1072
msgid "ISDN Cards"
msgstr ""
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:879
+#: src/include/network/routines.rb:1076
#, fuzzy
msgid "DSL Devices"
msgstr "_Thiết bị:"
-#: src/include/network/routines.rb:884
+#: src/include/network/routines.rb:1081
msgid "All Network Devices"
msgstr ""
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:391
+#: src/include/network/services/host.rb:398
msgid "The hostname is invalid."
msgstr ""
@@ -3308,8 +3360,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:677
-#: src/include/network/services/dns.rb:690
+#: src/include/network/services/dns.rb:684
+#: src/include/network/services/dns.rb:697
msgid "Hostname and Domain Name"
msgstr ""
@@ -3336,28 +3388,28 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:495
+#: src/include/network/services/dns.rb:496
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:513
+#: src/include/network/services/dns.rb:520
msgid "The search list can have at most %1 domains."
msgstr ""
#. Popup::Error text
-#: src/include/network/services/dns.rb:519
+#: src/include/network/services/dns.rb:526
msgid "The search list can have at most %1 characters."
msgstr ""
#. Popup::Error text
-#: src/include/network/services/dns.rb:528
+#: src/include/network/services/dns.rb:535
msgid "The search domain '%1' is invalid."
msgstr ""
#. Standalone dialog only - embedded one is handled separately
#. via CWMTab
-#: src/include/network/services/dns.rb:718
+#: src/include/network/services/dns.rb:725
#, fuzzy
msgid "Hostname and Name Server Configuration"
msgstr "Cấu hình phẳng"
@@ -3392,29 +3444,29 @@
msgstr ""
#. Frame label
-#: src/include/network/services/host.rb:119
+#: src/include/network/services/host.rb:118
#, fuzzy
msgid "Current Hosts"
msgstr "Ngày hiện có :"
#. Table header label
-#: src/include/network/services/host.rb:131
+#: src/include/network/services/host.rb:130
#, fuzzy
msgid "Hostnames"
msgstr "Nhà"
#. Table header label
-#: src/include/network/services/host.rb:133
+#: src/include/network/services/host.rb:132
msgid "Host Aliases"
msgstr ""
#. TextEntry label
-#: src/include/network/services/host.rb:344
+#: src/include/network/services/host.rb:351
msgid "Hos&t Aliases"
msgstr ""
#. Popup::Error text
-#: src/include/network/services/host.rb:407
+#: src/include/network/services/host.rb:414
msgid "Alias name \"%1\" is invalid."
msgstr ""
@@ -3455,43 +3507,43 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:163
+#: src/include/network/services/routing.rb:161
#, fuzzy
msgid "&Destination"
msgstr "_Đích tạm"
-#: src/include/network/services/routing.rb:172
+#: src/include/network/services/routing.rb:167
msgid "Ge&nmask"
msgstr ""
-#: src/include/network/services/routing.rb:182
+#: src/include/network/services/routing.rb:175
msgid "&Gateway"
msgstr ""
-#: src/include/network/services/routing.rb:191
+#: src/include/network/services/routing.rb:181
#, fuzzy
msgid "De&vice"
msgstr "_Thiết bị:"
#. Popup::Error text
-#: src/include/network/services/routing.rb:252
+#: src/include/network/services/routing.rb:240
#, fuzzy
msgid "Destination is invalid."
msgstr "Thông tin định tuyến đích OSI"
#. Popup::Error text
-#: src/include/network/services/routing.rb:260
+#: src/include/network/services/routing.rb:248
msgid "Gateway IP address is invalid."
msgstr ""
#. Popup::Error text
-#: src/include/network/services/routing.rb:268
+#: src/include/network/services/routing.rb:256
msgid "Subnetmask is invalid."
msgstr ""
#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:426
+#: src/include/network/services/routing.rb:414
msgid "The default gateway is invalid."
msgstr ""
@@ -3736,7 +3788,7 @@
msgstr "Địa chỉ IP:"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783
+#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
#, fuzzy
msgid "Enable IPv6"
msgstr "Bật"
@@ -3837,7 +3889,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:533
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
msgid "Update configuration"
msgstr "Cập nhật cấu hình"
@@ -3862,7 +3914,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:621
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
msgid "Updating configuration..."
msgstr "Đang cập nhật cấu hình..."
@@ -3875,441 +3927,448 @@
msgstr "Đang cập nhật cấu hình..."
#. Summary text
-#: src/modules/DNS.rb:543
+#: src/modules/DNS.rb:538
msgid "Hostname: Set by DHCP"
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:549
+#: src/modules/DNS.rb:544
msgid "Hostname: %1"
msgstr ""
-#: src/modules/DNS.rb:557
+#: src/modules/DNS.rb:552
msgid "Hostname will not be written to /etc/hosts"
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:578
+#: src/modules/DNS.rb:573
msgid "Name Servers: %1"
msgstr ""
#. Summary text
-#: src/modules/DNS.rb:588
+#: src/modules/DNS.rb:583
#, fuzzy
msgid "Search List: %1"
msgstr "Tìm kiếm trong ảnh"
#. Check if there is anything to do
-#: src/modules/Host.rb:165
+#: src/modules/Host.rb:138
#, fuzzy
msgid "Update /etc/hosts"
msgstr "Cập nhật thiết lập"
-#: src/modules/Host.rb:167
+#: src/modules/Host.rb:140
#, fuzzy
msgid "Saving Hostname Configuration"
msgstr "Cấu hình phẳng"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:172
+#: src/modules/Host.rb:145
#, fuzzy
msgid "Updating /etc/hosts ..."
msgstr "Đang cập nhật cấu hình..."
#. Read dialog caption
-#: src/modules/Lan.rb:271
+#: src/modules/Lan.rb:272
#, fuzzy
msgid "Initializing Network Configuration"
msgstr "Cấu hình phẳng"
#. Progress stage 1/9
-#: src/modules/Lan.rb:284
+#: src/modules/Lan.rb:285
msgid "Detect network devices"
msgstr ""
#. Progress stage 2/9
-#: src/modules/Lan.rb:286
+#: src/modules/Lan.rb:287
#, fuzzy
msgid "Read driver information"
msgstr "Thông tin điện năng"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:289
#, fuzzy
msgid "Read device configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 4/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:291
#, fuzzy
msgid "Read network configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 5/9
-#: src/modules/Lan.rb:292
+#: src/modules/Lan.rb:293
msgid "Read firewall settings"
msgstr ""
#. Progress stage 6/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:295
#, fuzzy
msgid "Read hostname and DNS configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 7/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:297
#, fuzzy
msgid "Read installation information"
msgstr "Thông tin kết nối"
#. Progress stage 8/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:299
#, fuzzy
msgid "Read routing configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 9/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:301
msgid "Detect current status"
msgstr ""
#. Progress step 1/9
-#: src/modules/Lan.rb:314
+#: src/modules/Lan.rb:315
#, fuzzy
msgid "Detecting ndiswrapper..."
msgstr "Chế độ đo"
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:333
+#: src/modules/Lan.rb:334
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:341
+#: src/modules/Lan.rb:342
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
msgstr ""
#. Progress step 2/9
-#: src/modules/Lan.rb:355
+#: src/modules/Lan.rb:356
msgid "Detecting network devices..."
msgstr ""
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:363
+#: src/modules/Lan.rb:364
#, fuzzy
msgid "Reading device configuration..."
msgstr "Tải lại cấu hình"
#. Progress step 4/9
-#: src/modules/Lan.rb:369
+#: src/modules/Lan.rb:370
#, fuzzy
msgid "Reading network configuration..."
msgstr "Tải lại cấu hình"
#. Progress step 5/9
-#: src/modules/Lan.rb:378
+#: src/modules/Lan.rb:379
msgid "Reading firewall settings..."
msgstr ""
#. Progress step 6/9
-#: src/modules/Lan.rb:386
+#: src/modules/Lan.rb:387
#, fuzzy
msgid "Reading hostname and DNS configuration..."
msgstr "Tải lại cấu hình"
#. Progress step 7/9
-#: src/modules/Lan.rb:393
+#: src/modules/Lan.rb:394
msgid "Reading installation information..."
msgstr ""
#. Progress step 8/9
-#: src/modules/Lan.rb:399
+#: src/modules/Lan.rb:400
#, fuzzy
msgid "Reading routing configuration..."
msgstr "Tải lại cấu hình"
#. Progress step 9/9
-#: src/modules/Lan.rb:405
+#: src/modules/Lan.rb:406
#, fuzzy
msgid "Detecting current status..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:411 src/modules/Lan.rb:642
+#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:437
+#: src/modules/Lan.rb:438
msgid "To apply this change, a reboot is needed."
msgstr ""
#. Write dialog caption
-#: src/modules/Lan.rb:505
+#: src/modules/Lan.rb:506
#, fuzzy
msgid "Saving Network Configuration"
msgstr "Cấu hình phẳng"
#. Progress stage 2
-#: src/modules/Lan.rb:512
+#: src/modules/Lan.rb:513
#, fuzzy
msgid "Write drivers information"
msgstr "Thông tin điện năng"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:514
+#: src/modules/Lan.rb:515
#, fuzzy
msgid "Write device configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 4
-#: src/modules/Lan.rb:516
+#: src/modules/Lan.rb:517
#, fuzzy
msgid "Write network configuration"
msgstr "Kết nối mạng tuyến"
#. Progress stage 5
-#: src/modules/Lan.rb:518
+#: src/modules/Lan.rb:519
#, fuzzy
msgid "Write routing configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 6
-#: src/modules/Lan.rb:520
+#: src/modules/Lan.rb:521
#, fuzzy
msgid "Write hostname and DNS configuration"
msgstr "Tải lại cấu hình"
#. Progress stage 7
-#: src/modules/Lan.rb:522
+#: src/modules/Lan.rb:523
#, fuzzy
msgid "Set up network services"
msgstr "Khởi chạy dịch vụ tìm kiếm"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:526 src/modules/Remote.rb:197
+#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
msgid "Write firewall settings"
msgstr "Ghi thiết lập tường lửa"
#. Progress stage 9
-#: src/modules/Lan.rb:530
+#: src/modules/Lan.rb:531
#, fuzzy
msgid "Activate network services"
msgstr "Khởi chạy dịch vụ tìm kiếm"
#. Progress step 2
-#: src/modules/Lan.rb:546
+#: src/modules/Lan.rb:547
msgid "Writing /etc/modprobe.conf..."
msgstr ""
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:551
+#: src/modules/Lan.rb:552
msgid "Writing device configuration..."
msgstr ""
#. Progress step 4
-#: src/modules/Lan.rb:557
+#: src/modules/Lan.rb:558
#, fuzzy
msgid "Writing network configuration..."
msgstr "Kết nối mạng tuyến"
#. Progress step 5
-#: src/modules/Lan.rb:563
+#: src/modules/Lan.rb:564
#, fuzzy
msgid "Writing routing configuration..."
msgstr "Thông tin định tuyến đích OSI"
#. Progress step 6
-#: src/modules/Lan.rb:571
+#: src/modules/Lan.rb:572
msgid "Writing hostname and DNS configuration..."
msgstr ""
#. Progress step 7
-#: src/modules/Lan.rb:584
+#: src/modules/Lan.rb:585
msgid "Setting up network services..."
msgstr ""
#. Progress step 8
-#: src/modules/Lan.rb:592 src/modules/Remote.rb:211
+#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
msgid "Writing firewall settings..."
msgstr "Đang ghi thiết lập tường lửa..."
#. Progress step 9
-#: src/modules/Lan.rb:602
+#: src/modules/Lan.rb:603
msgid "Activating network services..."
msgstr ""
-#: src/modules/Lan.rb:638
+#: src/modules/Lan.rb:639
#, fuzzy
msgid "No network running"
msgstr "Không có kết nối mạng"
+#. 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:755
+#: src/modules/Lan.rb:782
#, fuzzy
msgid "Network Mode"
msgstr "T_ên mạng:"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:760
+#: src/modules/Lan.rb:787
#, fuzzy
msgid "Interfaces controlled by NetworkManager"
msgstr "Tiểu dụng Quản lý mạng"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:762
+#: src/modules/Lan.rb:789
#, fuzzy
msgid "Disable NetworkManager"
msgstr "Bật chạy _mạng"
#. network mode
-#: src/modules/Lan.rb:766
+#: src/modules/Lan.rb:793
msgid "Traditional network setup with NetControl - ifup"
msgstr ""
#. enable NetworkManager applet
#. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:769
+#: src/modules/Lan.rb:796
#, fuzzy
msgid "Enable NetworkManager"
msgstr "Bật chạy _mạng"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:775
+#: src/modules/Lan.rb:802
msgid "Support for IPv6 protocol is enabled"
msgstr ""
#. disable ipv6 support
-#: src/modules/Lan.rb:777
+#: src/modules/Lan.rb:804
#, fuzzy
msgid "Disable IPv6"
msgstr "Tắt"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:781
+#: src/modules/Lan.rb:808
msgid "Support for IPv6 protocol is disabled"
msgstr ""
#. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:199
+#: src/modules/LanItems.rb:193
#, fuzzy
msgid "connected"
msgstr "chưa kết nối"
-#: src/modules/LanItems.rb:200
+#: src/modules/LanItems.rb:194
msgid "datagram"
msgstr ""
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
+#: src/modules/LanItems.rb:1268
msgid "Started automatically at boot"
msgstr ""
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1272
msgid "Started automatically on cable connection"
msgstr ""
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1276
#, fuzzy
msgid "Managed by NetworkManager"
msgstr "Tiểu dụng Quản lý mạng"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1284
+#: src/modules/LanItems.rb:1280
msgid "Will not be started at all"
msgstr ""
-#: src/modules/LanItems.rb:1290
+#: src/modules/LanItems.rb:1286
msgid "Started manually"
msgstr ""
#. do nothing
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1298
#, fuzzy
msgid "IP address assigned using"
msgstr "Cần chèn phạm vi và địa chỉ IP."
-#: src/modules/LanItems.rb:1306
+#: src/modules/LanItems.rb:1302
#, fuzzy
msgid "IP address: %s/%s"
msgstr "Địa chỉ IP:"
-#: src/modules/LanItems.rb:1309
+#: src/modules/LanItems.rb:1305
#, fuzzy
msgid "IP address: %s, subnet mask %s"
msgstr "Cần chèn phạm vi và địa chỉ IP."
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1333
+#: src/modules/LanItems.rb:1329
#, fuzzy
msgid "Not configured"
msgstr "_Cấu hình"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415
+#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
#, fuzzy
msgid "Device Name: %s"
msgstr "_Thiết bị:"
-#: src/modules/LanItems.rb:1376
+#: src/modules/LanItems.rb:1372
msgid "Bonding slaves"
msgstr ""
-#: src/modules/LanItems.rb:1390
+#: src/modules/LanItems.rb:1386
msgid "enslaved in %s"
msgstr ""
-#: src/modules/LanItems.rb:1391
+#: src/modules/LanItems.rb:1387
msgid "Bonding master"
msgstr ""
-#: src/modules/LanItems.rb:1405
+#: src/modules/LanItems.rb:1401
#, fuzzy
msgid "Not connected"
msgstr "chưa kết nối"
-#: src/modules/LanItems.rb:1406
+#: src/modules/LanItems.rb:1402
msgid "No hwinfo"
msgstr ""
-#: src/modules/LanItems.rb:1421
+#: src/modules/LanItems.rb:1417
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 ""
-#: src/modules/LanItems.rb:1427
+#: src/modules/LanItems.rb:1423
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
msgstr ""
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1430
#, fuzzy
msgid "Needed firmware"
msgstr "Thông tin cần thiết"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1430
msgid "unknown"
msgstr "không biết"
#. Package containing SuSEfirewall2 services has to be installed before
#. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:159
+#: src/modules/Remote.rb:243
#, fuzzy
#| msgid "This package is not installed and it will not be installed."
msgid ""
@@ -4318,40 +4377,40 @@
msgstr "Gói này chưa được cài đặt và sẽ không được cài đặt."
#. Progress stage 2
-#: src/modules/Remote.rb:199
+#: src/modules/Remote.rb:295
#, fuzzy
msgid "Configure display manager"
msgstr "Cấu hình quản lý điện năng"
#. Progress stage 3
-#: src/modules/Remote.rb:204
+#: src/modules/Remote.rb:300
#, fuzzy
msgid "Restart the services"
msgstr "Chạy dịch vụ ngay bây giờ"
-#: src/modules/Remote.rb:207
+#: src/modules/Remote.rb:303
#, fuzzy
msgid "Saving Remote Administration Configuration"
msgstr "Cấu hình phẳng"
-#: src/modules/Remote.rb:216
+#: src/modules/Remote.rb:312
#, fuzzy
msgid "Configuring display manager..."
msgstr "Cấu hình quản lý điện năng"
-#: src/modules/Remote.rb:220
+#: src/modules/Remote.rb:316
#, fuzzy
msgid "Restarting the service..."
msgstr "Đang dò tìm thiết bị..."
#. Enable xinetd
#. Enable XDM
-#: src/modules/Remote.rb:246 src/modules/Remote.rb:254
+#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
msgid "Enabling service %{service} has failed"
msgstr ""
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:281
+#: src/modules/Remote.rb:377
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4359,33 +4418,33 @@
msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:408
msgid "Remote administration is enabled."
msgstr ""
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:408
msgid "Remote administration is disabled."
msgstr ""
#. Progress stage 1
-#: src/modules/Routing.rb:264
+#: src/modules/Routing.rb:261
#, fuzzy
msgid "Write IP forwarding settings"
msgstr "Ghi thiết lập tường lửa"
#. Progress stage 2
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:263
#, fuzzy
msgid "Write routing settings"
msgstr "Ghi thiết lập"
-#: src/modules/Routing.rb:269
+#: src/modules/Routing.rb:266
#, fuzzy
msgid "Saving Routing Configuration"
msgstr "Cấu hình"
#. Progress stage 1/2
-#: src/modules/Routing.rb:274
+#: src/modules/Routing.rb:271
#, fuzzy
msgid "Writing IP forwarding settings..."
msgstr "Đang ghi thiết lập tường lửa..."
@@ -4395,25 +4454,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:284
+#: src/modules/Routing.rb:281
#, fuzzy
msgid "Writing routing settings..."
msgstr "Đang ghi thiết lập..."
#. Summary text
-#: src/modules/Routing.rb:454
+#: src/modules/Routing.rb:434
#, fuzzy
msgid "Gateway: %s"
msgstr "Địa chỉ IP:"
#. Summary text
-#: src/modules/Routing.rb:458
+#: src/modules/Routing.rb:438
#, fuzzy
msgid "IP Forwarding for IPv4: %s"
msgstr "Bật chạy _mạng"
#. Summary text
-#: src/modules/Routing.rb:462
+#: src/modules/Routing.rb:442
#, fuzzy
msgid "IP Forwarding for IPv6: %s"
msgstr "Bật chạy _mạng"
@@ -4436,14 +4495,6 @@
msgstr "(Chưa kết nối)"
#, fuzzy
-#~ msgid "Configure mail now?"
-#~ msgstr "Cấu hình"
-
-#, fuzzy
-#~ msgid "Run configuration of %1?"
-#~ msgstr "Tải lại cấu hình"
-
-#, fuzzy
#~ msgid "Manual Network Card Configuration"
#~ msgstr "Cấu hình phẳng"
Modified: branches/plus-SLE12-SP2/yast/vi/po/nfs.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/nfs.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/nfs.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/nfs_server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/nfs_server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/nfs_server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -75,29 +75,29 @@
msgstr ""
#. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
#, fuzzy
msgid "NFS server is enabled"
msgstr "Ngưng đã bật"
#. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
#, fuzzy
msgid "NFS server is disabled"
msgstr "Chạy mạng bị tắt"
#. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
msgid "Required packages (%1) are not installed."
msgstr ""
#. error
#. error
-#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
+#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
msgid "No mount point specified."
msgstr ""
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
msgid ""
"The exports table already\n"
"contains this directory."
@@ -106,11 +106,11 @@
#. CLI action handler.
#. @param [Hash] options command options
#. @return whether successful
-#: src/clients/nfs_server.rb:325
+#: src/clients/nfs_server.rb:319
msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
msgstr ""
-#: src/clients/nfs_server.rb:336
+#: src/clients/nfs_server.rb:330
msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
msgstr ""
@@ -163,52 +163,44 @@
msgstr ""
#. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
#, fuzzy
msgid "&Directory to Export"
msgstr "Đường dẫn thư mục"
#. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
#, fuzzy
msgid "&Browse..."
msgstr "Duyệt"
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
msgid "Enter a non-empty export path. For example, /exports."
msgstr ""
#. error popup message
-#: src/include/nfs_server/ui.rb:105
+#: src/include/nfs_server/ui.rb:95
msgid "The exports table already contains this directory."
msgstr ""
-#. 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 dir does not exist
-#: src/include/nfs_server/ui.rb:126
+#: src/include/nfs_server/ui.rb:101
#, fuzzy
msgid "The directory does not exist. Create it?"
msgstr "Không có thư mục này."
#. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:136
+#: src/include/nfs_server/ui.rb:111
msgid "Select the Directory to Export"
msgstr ""
#. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
msgid "&Host Wild Card"
msgstr ""
#. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
#, fuzzy
msgid "O&ptions"
msgstr "Tùy chọn modem"
@@ -216,14 +208,14 @@
#. 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:250
+#: src/include/nfs_server/ui.rb:222
msgid ""
"'fsid=0' is not a valid option unless \n"
"NFSv4 is enabled (previous page).\n"
msgstr ""
#. error popup message
-#: src/include/nfs_server/ui.rb:268
+#: src/include/nfs_server/ui.rb:240
msgid ""
"Options for this wild card\n"
"are already set."
@@ -231,25 +223,25 @@
#. Opening NFS server dialog
#. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
+#: src/include/nfs_server/ui.rb:272
msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
msgstr ""
#. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:323
+#: src/include/nfs_server/ui.rb:295
msgid ""
"<P>Here, choose whether to start an NFS server on your computer\n"
"and export some of your directories to others.</P>"
msgstr ""
#. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:330
+#: src/include/nfs_server/ui.rb:302
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>"
msgstr ""
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
msgid ""
"<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
"and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave\n"
@@ -257,58 +249,58 @@
msgstr ""
#. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:349
+#: src/include/nfs_server/ui.rb:321
msgid ""
"<P>If the server and client must authenticate using GSS library, check the\n"
"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
msgstr ""
#. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
#, fuzzy
msgid "NFS Server"
msgstr "Không bao giờ"
#. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
msgid "&Start"
msgstr ""
#. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
#, fuzzy
msgid "Do &Not Start"
msgstr "&Không nhập"
#. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
#, fuzzy
msgid "Enable NFSv4"
msgstr "Bật"
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
#, fuzzy
msgid "Enable NFS&v4"
msgstr "Bật"
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
#, fuzzy
msgid "Enter NFSv4 do&main name:"
msgstr "Hãy nhập một miền đúng."
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
#, fuzzy
msgid "Enable &GSS Security"
msgstr "&Bảo mật"
#. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
#, fuzzy
msgid "NFS Server Configuration"
msgstr "Cấu hình"
#. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:515
+#: src/include/nfs_server/ui.rb:487
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"
@@ -316,82 +308,77 @@
msgstr ""
#. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:495
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"
"IP networks.</P>\n"
msgstr ""
-#. Help, part 3 of 4, variant for kernel space server
-#: src/include/nfs_server/ui.rb:536
+#. Help, part 3 of 4
+#: src/include/nfs_server/ui.rb:503
msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
msgstr ""
-#. 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 ""
-
#. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:551
+#: src/include/nfs_server/ui.rb:509
msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
msgstr ""
#. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
#, fuzzy
msgid "Add &Directory"
msgstr "Thư mục"
#. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
#, fuzzy
msgid "&Edit"
msgstr "Sửa đổi:"
#. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
#, fuzzy
msgid "De&lete"
msgstr "Xoá bỏ thẻ"
#. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
msgid "Host Wild Card"
msgstr ""
#. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
#, fuzzy
msgid "Options"
msgstr "Tùy chọn modem"
#. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
msgid "Add &Host"
msgstr ""
#. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
#, fuzzy
msgid "Ed&it"
msgstr "Sửa đổi:"
#. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
#, fuzzy
msgid "Dele&te"
msgstr "Xoá bỏ thẻ"
#. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
#, fuzzy
msgid "Directories to Export"
msgstr "Không có thư mục này."
#. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:181
+#: src/modules/NfsServer.rb:158
#, fuzzy
msgid ""
"Unable to create a missing directory:\n"
@@ -399,7 +386,7 @@
msgstr "Không thể tạo thư mục."
#. error popup message
-#: src/modules/NfsServer.rb:193
+#: src/modules/NfsServer.rb:170
msgid ""
"Unable to write to /etc/exports.\n"
"No changes will be made to the\n"
@@ -407,99 +394,89 @@
msgstr ""
#. dialog label
-#: src/modules/NfsServer.rb:228
+#: src/modules/NfsServer.rb:192
#, fuzzy
msgid "Writing NFS Server Configuration"
msgstr "Cấu hình phẳng"
#. progress stage label
-#: src/modules/NfsServer.rb:233
+#: src/modules/NfsServer.rb:197
msgid "Save /etc/exports"
msgstr ""
#. progress stage label
-#: src/modules/NfsServer.rb:235
+#: src/modules/NfsServer.rb:199
#, fuzzy
msgid "Restart services"
msgstr "Khởi chạy dịch vụ tìm kiếm"
#. progress step label
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:203
msgid "Saving /etc/exports..."
msgstr ""
#. progress step label
-#: src/modules/NfsServer.rb:241
+#: src/modules/NfsServer.rb:205
msgid "Restarting services..."
msgstr ""
#. final progress step label
-#: src/modules/NfsServer.rb:243
+#: src/modules/NfsServer.rb:207
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
#. help text
-#: src/modules/NfsServer.rb:251
+#: src/modules/NfsServer.rb:215
msgid "Writing NFS server settings. Please wait..."
msgstr ""
#. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:265
+#: src/modules/NfsServer.rb:229
#, fuzzy
msgid "Unable to write to idmapd.conf."
msgstr "Không thể đăng nhập."
-#: src/modules/NfsServer.rb:314
-#, fuzzy
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr "Không thể xoay {0} ảnh"
-
-#: src/modules/NfsServer.rb:321
-#, fuzzy
-msgid "Unable to restart idmapd."
-msgstr "Không thể xoay {0} ảnh"
-
-#: src/modules/NfsServer.rb:328
-#, fuzzy
-msgid "Unable to stop idmapd."
-msgstr "Không thể tải"
-
#. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:339
+#: src/modules/NfsServer.rb:266
msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
msgstr ""
-#: src/modules/NfsServer.rb:349
-msgid "'svcgssd' is already running. Unable to restart it."
-msgstr ""
+#: src/modules/NfsServer.rb:275
+#, fuzzy
+msgid "Unable to restart 'svcgssd' service."
+msgstr "Không thể xoay {0} ảnh"
-#: src/modules/NfsServer.rb:357
+#: src/modules/NfsServer.rb:283
msgid "'svcgssd' is running. Unable to stop it."
msgstr ""
#. error popup message
-#: src/modules/NfsServer.rb:376
+#: src/modules/NfsServer.rb:299
msgid ""
"Unable to restart the NFS server.\n"
"Your changes will be active after reboot.\n"
msgstr ""
#. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:399
+#: src/modules/NfsServer.rb:322
#, fuzzy
msgid "NFS Exports"
msgstr "Xuất"
#. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:417
+#: src/modules/NfsServer.rb:340
msgid "The NFSv4 domain for idmapping is %1."
msgstr ""
#, fuzzy
-#~ msgid "Unable to restart 'svcgssd' service."
+#~ msgid "Unable to restart idmapd."
#~ msgstr "Không thể xoay {0} ảnh"
#, fuzzy
+#~ msgid "Unable to stop idmapd."
+#~ msgstr "Không thể tải"
+
+#, fuzzy
#~ msgid "Directories"
#~ msgstr "Thư mục"
Modified: branches/plus-SLE12-SP2/yast/vi/po/nis.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/nis.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/nis.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/nis_server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/nis_server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/nis_server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/ntp-client.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/ntp-client.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/ntp-client.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -76,19 +76,19 @@
msgstr "&Cấu hình..."
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:381
+#: src/clients/ntp-client_proposal.rb:380
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
msgstr ""
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:393
+#: src/clients/ntp-client_proposal.rb:392
msgid "Synchronizing with NTP server..."
msgstr ""
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:439
+#: src/clients/ntp-client_proposal.rb:438
#, fuzzy
#| msgid "Connection to the wired network failed."
msgid "Connection to selected NTP server failed."
@@ -96,7 +96,7 @@
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:470
+#: src/clients/ntp-client_proposal.rb:469
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/vi/po/oneclickinstall.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/oneclickinstall.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/oneclickinstall.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/online-update-configuration.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/online-update-configuration.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/online-update-configuration.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/online-update.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/online-update.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/online-update.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/opensuse_mirror.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/opensuse_mirror.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/opensuse_mirror.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/packager.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/packager.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/packager.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-10-06 16:04+0200\n"
"PO-Revision-Date: 2006-08-28 15:42+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -201,8 +201,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:674
-#: src/clients/repositories.rb:687
+#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703
+#: src/clients/repositories.rb:716
#: src/include/packager/key_manager_dialogs.rb:306
msgid "Name"
msgstr "Tên"
@@ -409,7 +409,7 @@
#. TRANSLATORS: dialog help
#. TRANSLATORS: dialog help
#: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:91
+#: src/include/packager/repositories_include.rb:93
#, fuzzy
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr "<p>Xin hãy đợi một chút trong khi cài đặt gói.</p>"
@@ -489,7 +489,7 @@
#. re-initialize package information
#. force reinitialization
-#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744
+#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739
#, fuzzy
msgid "Installing Packages..."
msgstr "Đang cài đặt gói"
@@ -525,8 +525,8 @@
#. dialog caption
#. dialog caption
#. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
-#: src/modules/AddOnProduct.rb:682
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
+#: src/modules/AddOnProduct.rb:684
msgid "Initializing..."
msgstr "Đang khởi chạy..."
@@ -557,24 +557,24 @@
msgstr "Đang lưu cấu hình trình quản lý gói..."
#. default (minimal) priority of a repository
-#: src/clients/repositories.rb:55
+#: src/clients/repositories.rb:58
#, fuzzy
msgid "&Priority"
msgstr "&Cổng"
-#: src/clients/repositories.rb:57
+#: src/clients/repositories.rb:60
#, fuzzy
msgid "Keep Downloaded Packages"
msgstr "Đang tải xuống gói"
#. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/repositories.rb:72
+#: src/clients/repositories.rb:75
#, fuzzy
msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead."
msgstr "Môđun YaST2 này không hỗ trợ giao diện câu lệnh."
#. pad to 3 characters
-#: src/clients/repositories.rb:166
+#: src/clients/repositories.rb:169
#, fuzzy
msgid "Default"
msgstr "Tuyến mặc định:"
@@ -582,65 +582,81 @@
#. 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:195 src/clients/repositories.rb:260
+#: src/clients/repositories.rb:199 src/clients/repositories.rb:264
#, fuzzy
msgid "Unknown Name"
msgstr "Không biết thời gian"
#. displaye only repositories from the selected service
-#: src/clients/repositories.rb:326 src/clients/repositories.rb:362
-#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436
+#: 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
msgid "Unknown"
msgstr "Không biết"
#. label to be used instead of URL if not found
-#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1334
+#: src/clients/repositories.rb:337 src/clients/repositories.rb:376
+#: src/modules/AddOnProduct.rb:1336
#, fuzzy
msgid "URL: %1"
msgstr "URL:"
+#. 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 "Raw URL: %s"
+msgstr "URL:"
+
#. heading - in case repo name not found
-#: src/clients/repositories.rb:357
+#: src/clients/repositories.rb:372
#, fuzzy
msgid "Unknown Repository Name"
msgstr "Không biết thư mục này"
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:367
+#: src/clients/repositories.rb:382
#, fuzzy
msgid "Category: %1"
msgstr "Hạng mục"
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:377
+#: src/clients/repositories.rb:392
#, fuzzy
msgid "Service: %1"
msgstr "Dịch vụ"
#. #176013
-#: src/clients/repositories.rb:625
+#: src/clients/repositories.rb:640
#, fuzzy
msgid "All repositories"
msgstr "Kết quả: %1"
-#: src/clients/repositories.rb:628
+#: src/clients/repositories.rb:643
#, fuzzy
msgid "All services"
msgstr "Dịch vụ"
-#: src/clients/repositories.rb:637
+#: src/clients/repositories.rb:652
#, fuzzy
msgid "Service '%1'"
msgstr "Dịch vụ"
+#. 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:652
+#: src/clients/repositories.rb:681
msgid "View"
msgstr "Xem"
#. table header - priority of the repository - keep the translation as short as possible!
-#: src/clients/repositories.rb:667
+#: src/clients/repositories.rb:696
#, fuzzy
msgid "Priority"
msgstr "&Cổng"
@@ -648,7 +664,7 @@
#. 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:669 src/clients/repositories.rb:682
+#: src/clients/repositories.rb:698 src/clients/repositories.rb:711
#: src/modules/SourceManager.rb:393
msgid "Enabled"
msgstr "Dùng"
@@ -657,110 +673,110 @@
#. 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:672 src/clients/repositories.rb:685
+#: src/clients/repositories.rb:701 src/clients/repositories.rb:714
#, fuzzy
msgid "Autorefresh"
msgstr "&Bỏ qua cập nhật"
#. table header - service to which the repo belongs
-#: src/clients/repositories.rb:676
+#: src/clients/repositories.rb:705
msgid "Service"
msgstr "Dịch vụ"
#. table header - URL of the repo
#. table header - URL of the repo
-#: src/clients/repositories.rb:678 src/clients/repositories.rb:689
+#: src/clients/repositories.rb:707 src/clients/repositories.rb:718
msgid "URL"
msgstr "URL"
#. push button - change URL of the selected repository
-#: src/clients/repositories.rb:789
+#: src/clients/repositories.rb:818
msgid "&Replace..."
msgstr "&Thay thế..."
#. push button - refresh the selected repository now
-#: src/clients/repositories.rb:791
+#: src/clients/repositories.rb:820
#, fuzzy
msgid "Re&fresh Selected"
msgstr "Hạng mục đăng ký"
#. push button - disable/enable the selected repository
-#: src/clients/repositories.rb:793
+#: src/clients/repositories.rb:822
#, fuzzy
msgid "Status &on or off"
msgstr "Dùng cập nhật hoặ&c không"
#. push button - disable/enable automatic refresh of the selected repository
-#: src/clients/repositories.rb:795
+#: src/clients/repositories.rb:824
#, fuzzy
#| msgid "Refre&sh On or Off"
msgid "Refre&sh on or off"
msgstr "Dùng cập nhật hoặ&c không"
#. push button - set name of the selected repository
-#: src/clients/repositories.rb:797
+#: src/clients/repositories.rb:826
#, fuzzy
msgid "Set &Name..."
msgstr "Tê&n máy chủ"
#. label
-#: src/clients/repositories.rb:804
+#: src/clients/repositories.rb:833
#, fuzzy
msgid "Properties"
msgstr "Quá trình"
#. check box
-#: src/clients/repositories.rb:809
+#: src/clients/repositories.rb:838
#, fuzzy
msgid "&Enabled"
msgstr "Dùng"
#. check box
-#: src/clients/repositories.rb:815
+#: src/clients/repositories.rb:844
#, fuzzy
msgid "Automatically &Refresh"
msgstr "Tự động thay đổi"
#. push button label
-#: src/clients/repositories.rb:853
+#: src/clients/repositories.rb:882
#, fuzzy
msgid "&GPG Keys..."
msgstr "&Nhập chìa khóa..."
#. menu button label
-#: src/clients/repositories.rb:858
+#: src/clients/repositories.rb:887
msgid "Refresh"
msgstr "Cập nhật"
#. menu button label
-#: src/clients/repositories.rb:862
+#: src/clients/repositories.rb:891
msgid "Refresh all Autor&efreshed"
msgstr ""
#. menu button label
-#: src/clients/repositories.rb:864
+#: src/clients/repositories.rb:893
msgid "Refresh all &Enabled"
msgstr ""
#. dialog caption
-#: src/clients/repositories.rb:871
+#: src/clients/repositories.rb:900
#, fuzzy
msgid "Configured Software Repositories"
msgstr "Hạng mục đã cấu hình"
#. help
-#: src/clients/repositories.rb:874
+#: src/clients/repositories.rb:903
#, fuzzy
msgid ""
"<p>\n"
"Manage configured software repositories and services.</p>\n"
msgstr "Hạng mục đã cấu hình"
-#: src/clients/repositories.rb:880
+#: src/clients/repositories.rb:909
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:887
+#: src/clients/repositories.rb:916
msgid ""
"<p>\n"
"<b>Adding a new Repository or a Service</b><br>\n"
@@ -770,7 +786,7 @@
msgstr ""
#. help, continued
-#: src/clients/repositories.rb:899
+#: src/clients/repositories.rb:928
#, fuzzy
msgid ""
"<p>\n"
@@ -784,7 +800,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:910
+#: src/clients/repositories.rb:939
#, fuzzy
msgid ""
"<p>\n"
@@ -806,7 +822,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:926
+#: src/clients/repositories.rb:955
msgid ""
"<p>\n"
"<b>Modifying Status of a Repository or a Service</b><br>\n"
@@ -816,31 +832,31 @@
msgstr ""
#. help text, continued
-#: src/clients/repositories.rb:938
+#: src/clients/repositories.rb:967
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:946
+#: src/clients/repositories.rb:975
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:954
+#: src/clients/repositories.rb:983
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:960
+#: src/clients/repositories.rb:989
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:1005
+#: src/clients/repositories.rb:1034
#, fuzzy
msgid ""
"Unable to save changes to the repository\n"
@@ -851,7 +867,7 @@
#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329
+#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1329
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Chi tiết:"
@@ -859,19 +875,19 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Thử lại?"
#. popup headline
-#: src/clients/repositories.rb:1030
+#: src/clients/repositories.rb:1059
#, fuzzy
msgid "Abort Repository Configuration"
msgstr "Dừng cấu hình hạng mục"
#. popup message
-#: src/clients/repositories.rb:1032
+#: src/clients/repositories.rb:1061
#, fuzzy
msgid ""
"Abort the repository configuration?\n"
@@ -881,54 +897,54 @@
"Mọi thay đổi sẽ bị mất."
#. refresh also the combobox widget
-#: src/clients/repositories.rb:1329
+#: src/clients/repositories.rb:1364
msgid ""
"There is no service at URL:\n"
"%1"
msgstr ""
#. TODO: add help text
-#: src/clients/repositories.rb:1440
+#: src/clients/repositories.rb:1475
#, fuzzy
msgid "Refreshing Repositories"
msgstr "Đang chạy môđun %1..."
-#: src/clients/repositories.rb:1441
+#: src/clients/repositories.rb:1476
#, fuzzy
msgid "Refreshing Services"
msgstr "Đang chạy môđun %1..."
-#: src/clients/repositories.rb:1446
+#: src/clients/repositories.rb:1481
#, fuzzy
msgid "Refresh Repositories"
msgstr "Hạng mục đăng ký"
-#: src/clients/repositories.rb:1447
+#: src/clients/repositories.rb:1482
#, fuzzy
msgid "Refresh Services"
msgstr "Hạng mục đăng ký"
#. progress bar label
-#: src/clients/repositories.rb:1479
+#: src/clients/repositories.rb:1514
#, fuzzy
msgid "Refreshing Repository %1..."
msgstr "Đang chạy môđun %1..."
#. refreshing services
#. progress bar label
-#: src/clients/repositories.rb:1505
+#: src/clients/repositories.rb:1540
#, fuzzy
msgid "Refreshing Service %1..."
msgstr "Đang chạy môđun %1..."
#. yes-no popup
-#: src/clients/repositories.rb:1524
+#: src/clients/repositories.rb:1559
#, fuzzy
msgid "Delete the selected repository from the list?"
msgstr "Xoá hạng mục đã chọn khỏi danh sách?"
#. yes-no popup
-#: src/clients/repositories.rb:1538
+#: src/clients/repositories.rb:1573
#, fuzzy
msgid ""
"Delete service %1\n"
@@ -936,7 +952,7 @@
msgstr "Xoá hạng mục đã chọn khỏi danh sách?"
#. popup message
-#: src/clients/repositories.rb:1606
+#: src/clients/repositories.rb:1641
#, fuzzy
msgid ""
"For the selected repository, refresh\n"
@@ -946,7 +962,7 @@
"thể cập nhật."
#. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1768
+#: src/clients/repositories.rb:1803
msgid ""
"Repository %1\n"
"has been already added. Each repository should be added only once.\n"
@@ -955,7 +971,7 @@
msgstr ""
#. Error popup
-#: src/clients/repositories.rb:1836
+#: src/clients/repositories.rb:1871
#, fuzzy
msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
msgstr ""
@@ -1083,20 +1099,20 @@
"Cài đặt chúng bây giờ?\n"
#. start the repository manager
-#: src/clients/sw_single.rb:619
+#: src/clients/sw_single.rb:614
msgid ""
"Cannot configure online update repository \n"
"without having package %1 installed"
msgstr ""
-#: src/clients/sw_single.rb:645
+#: src/clients/sw_single.rb:640
msgid ""
"Cannot search packages in online repositories\n"
"without having package %1 installed"
msgstr ""
#. error report, %1 is a list of packages
-#: src/clients/sw_single.rb:673
+#: src/clients/sw_single.rb:668
#, fuzzy
#| msgid ""
#| "Following packages haven't been found on the medium:\n"
@@ -1446,50 +1462,50 @@
msgstr "Thật sự xoá bỏ '%1'?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:77
+#: src/include/packager/repositories_include.rb:79
#, fuzzy
msgid "Adding a New Repository"
msgstr "Đang thêm hạng mục..."
-#: src/include/packager/repositories_include.rb:81
+#: src/include/packager/repositories_include.rb:83
#, fuzzy
msgid "Check Repository Type"
msgstr "Chọn hạng mục SLP"
-#: src/include/packager/repositories_include.rb:82
+#: src/include/packager/repositories_include.rb:84
#, fuzzy
msgid "Add Repository"
msgstr "Kết quả: %1"
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
#, fuzzy
msgid "Read Repository License"
msgstr "Hạng mục đăng ký"
-#: src/include/packager/repositories_include.rb:86
+#: src/include/packager/repositories_include.rb:88
#, fuzzy
msgid "Checking Repository Type"
msgstr "Đang chạy môđun %1..."
-#: src/include/packager/repositories_include.rb:87
+#: src/include/packager/repositories_include.rb:89
#, fuzzy
msgid "Adding Repository"
msgstr "Đang thêm hạng mục..."
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
#, fuzzy
msgid "Reading Repository License"
msgstr "Đang chạy môđun %1..."
#. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:152
+#: src/include/packager/repositories_include.rb:154
#, fuzzy
msgid "Repository"
msgstr "Kết quả: %1"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:224
+#: src/include/packager/repositories_include.rb:226
#: src/modules/SourceManager.rb:330
#, fuzzy
#| msgid ""
@@ -1512,7 +1528,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:319
+#: src/include/packager/repositories_include.rb:321
#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
#, fuzzy
msgid ""
@@ -1523,19 +1539,19 @@
"từ URL '%1'."
#. error message
-#: src/include/packager/repositories_include.rb:331
+#: src/include/packager/repositories_include.rb:333
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:341
+#: src/include/packager/repositories_include.rb:343
msgid "Change the URL and try again?"
msgstr ""
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:418
+#: src/include/packager/repositories_include.rb:420
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
@@ -1548,19 +1564,19 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
+#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
msgid "An error occurred while preparing the installation system."
msgstr "Gặp lỗi khi đợi chuẩn bị hệ thống cài đặt."
#. error report
-#: src/modules/AddOnProduct.rb:653
+#: src/modules/AddOnProduct.rb:655
msgid "Control file %1 not found on media."
msgstr "Không tìm thấy tập tin điều khiển %1 trên đĩa."
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:894
+#: src/modules/AddOnProduct.rb:896
#, fuzzy
#| msgid "This package is not installed and it will not be installed."
msgid ""
@@ -1570,69 +1586,69 @@
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425
+#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
#, fuzzy
msgid "Unable to use additional products."
msgstr "Lỗi thêm sản phẩm thương mại."
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
+#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
#, fuzzy
msgid "%1, URL: %2"
msgstr "URL:"
-#: src/modules/AddOnProduct.rb:1328
+#: src/modules/AddOnProduct.rb:1330
#, fuzzy
msgid "URL: %1, Path: %2"
msgstr "URL: %1, Thư mục: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1359
+#: src/modules/AddOnProduct.rb:1361
#, fuzzy
msgid "Additional Products"
msgstr "Sản phẩm thương mại"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1365
+#: src/modules/AddOnProduct.rb:1367
msgid ""
"The installation repository also contains the listed additional repositories.\n"
"Select the ones you want to use.\n"
msgstr ""
-#: src/modules/AddOnProduct.rb:1376
+#: src/modules/AddOnProduct.rb:1378
#, fuzzy
msgid "Additional Products to Select"
msgstr "Chọn sản phẩm"
#. push button label
-#: src/modules/AddOnProduct.rb:1383
+#: src/modules/AddOnProduct.rb:1385
#, fuzzy
msgid "Add Selected &Products"
msgstr "Sản phẩm thương mại"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1515
+#: src/modules/AddOnProduct.rb:1517
#, fuzzy
#| msgid "Insert the add-on product CD"
msgid "Insert the addon %1 medium"
msgstr "Hãy đặt CD chứa sản phẩm thương mại vào ổ."
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1520
+#: src/modules/AddOnProduct.rb:1522
#, fuzzy
#| msgid "Insert the first installation medium."
msgid "Insert the %1 %2 medium"
msgstr "Hãy đặt đĩa cài đặt đầu tiên vào ổ."
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1572
+#: src/modules/AddOnProduct.rb:1574
#, fuzzy
msgid "Unable to add product %1."
msgstr "Lỗi thêm sản phẩm thương mại."
#. adding the product to the list of products (BNC #269625)
#. no such products
-#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
+#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772
#: src/modules/Packages.rb:471
#, fuzzy
msgid "Unknown Product"
@@ -2201,7 +2217,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
#, fuzzy
#| msgid "&SMB/CIFS"
msgid "S&MB/CIFS"
@@ -2273,7 +2289,7 @@
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1614
+#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
msgid "&Path to Directory or ISO Image"
msgstr "Đường &dẫn tới thư mục hoặc tập tin ISO"
@@ -2351,7 +2367,7 @@
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:919
+#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
msgid "Local Directory"
msgstr "Thư mục nội bộ"
@@ -2373,7 +2389,7 @@
msgstr "Máy chủ và thư mục"
#. popup message
-#: src/modules/SourceDialogs.rb:461
+#: src/modules/SourceDialogs.rb:468
#, fuzzy
msgid "The name of the repository cannot be empty."
msgstr ""
@@ -2381,43 +2397,43 @@
"thể cập nhật."
#. text entry
-#: src/modules/SourceDialogs.rb:473
+#: src/modules/SourceDialogs.rb:480
#, fuzzy
msgid "&Repository Name"
msgstr "Kết quả: %1"
#. help text
-#: src/modules/SourceDialogs.rb:488
+#: src/modules/SourceDialogs.rb:495
msgid ""
"<p><big><b>Repository Name</b></big><br>\n"
"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:502
+#: src/modules/SourceDialogs.rb:509
#, fuzzy
msgid "&Service Name"
msgstr "Tên máy &chủ"
#. help text
-#: src/modules/SourceDialogs.rb:510
+#: src/modules/SourceDialogs.rb:517
msgid ""
"<p><big><b>Service Name</b></big><br>\n"
"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
msgstr ""
#. popup message
-#: src/modules/SourceDialogs.rb:545
+#: src/modules/SourceDialogs.rb:552
msgid "URL cannot be empty."
msgstr "URL không thể rỗng."
#. text entry
-#: src/modules/SourceDialogs.rb:559
+#: src/modules/SourceDialogs.rb:566
msgid "&URL"
msgstr "&URL"
#. help text
-#: src/modules/SourceDialogs.rb:573
+#: src/modules/SourceDialogs.rb:580
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2427,24 +2443,24 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:746 src/modules/SourceDialogs.rb:1886
+#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
msgid "Edit Parts of the URL"
msgstr ""
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
#, fuzzy
msgid "Edit Complete URL"
msgstr "Việc tải lên hoàn thành."
#. help text
-#: src/modules/SourceDialogs.rb:765
+#: src/modules/SourceDialogs.rb:772
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
"to specify the NFS server host name and path on the server.</p>"
msgstr ""
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:779
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2453,28 +2469,28 @@
msgstr ""
#. radio button
-#: src/modules/SourceDialogs.rb:827
+#: src/modules/SourceDialogs.rb:834
msgid "&CD-ROM"
msgstr "&CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:829
+#: src/modules/SourceDialogs.rb:836
msgid "&DVD-ROM"
msgstr "&DVD-ROM"
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:841
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:934
+#: src/modules/SourceDialogs.rb:941
msgid "ISO Image File"
msgstr "Tập tin ISO"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:957
+#: src/modules/SourceDialogs.rb:964
#, fuzzy
msgid ""
"The entered path is not a directory\n"
@@ -2482,7 +2498,7 @@
msgstr "Tập tin chỉ ra không tồn tại."
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:987
+#: src/modules/SourceDialogs.rb:994
#, fuzzy
msgid ""
"The entered path is not a file\n"
@@ -2490,7 +2506,7 @@
msgstr "Tập tin chỉ ra không tồn tại."
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1011
+#: src/modules/SourceDialogs.rb:1018
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2498,19 +2514,19 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1032
+#: src/modules/SourceDialogs.rb:1039
#, fuzzy
msgid "&Path to Directory"
msgstr "Đường &dẫn tới thư mục hoặc tập tin ISO"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1040 src/modules/SourceDialogs.rb:1298
-#: src/modules/SourceDialogs.rb:1365
+#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
+#: src/modules/SourceDialogs.rb:1372
#, fuzzy
msgid "&Plain RPM Directory"
msgstr "Đường &dẫn tới thư mục hoặc tập tin ISO"
-#: src/modules/SourceDialogs.rb:1055
+#: src/modules/SourceDialogs.rb:1062
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2520,22 +2536,22 @@
msgstr ""
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1291
+#: src/modules/SourceDialogs.rb:1298
msgid "&USB Mass Storage Device"
msgstr ""
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1296 src/modules/SourceDialogs.rb:1363
+#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
#, fuzzy
msgid "&File System"
msgstr "Danh &sách tập tin"
-#: src/modules/SourceDialogs.rb:1297 src/modules/SourceDialogs.rb:1364
+#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
#, fuzzy
msgid "Dire&ctory"
msgstr "Thư mục"
-#: src/modules/SourceDialogs.rb:1302
+#: src/modules/SourceDialogs.rb:1309
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2548,7 +2564,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:1312 src/modules/SourceDialogs.rb:1379
+#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386
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"
@@ -2556,12 +2572,12 @@
msgstr ""
#. combobox title
-#: src/modules/SourceDialogs.rb:1362
+#: src/modules/SourceDialogs.rb:1369
#, fuzzy
msgid "&Disk Device"
msgstr "Thiết bị"
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1376
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2573,13 +2589,13 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1395
+#: src/modules/SourceDialogs.rb:1402
#, fuzzy
msgid "&Path to ISO Image"
msgstr "Đường &dẫn tới thư mục hoặc tập tin ISO"
#. push button
-#: src/modules/SourceDialogs.rb:1415
+#: src/modules/SourceDialogs.rb:1422
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2587,73 +2603,73 @@
msgstr ""
#. text entry
-#: src/modules/SourceDialogs.rb:1596
+#: src/modules/SourceDialogs.rb:1603
msgid "Server &Name"
msgstr "Tê&n máy chủ"
-#: src/modules/SourceDialogs.rb:1600
+#: src/modules/SourceDialogs.rb:1607
msgid "&Port"
msgstr "&Cổng"
#. text entry
-#: src/modules/SourceDialogs.rb:1605
+#: src/modules/SourceDialogs.rb:1612
msgid "&Share"
msgstr "&Chia sẻ"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1618
+#: src/modules/SourceDialogs.rb:1625
#, fuzzy
msgid "ISO &Image"
msgstr "Tập tin ISO"
#. text entry
-#: src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:1628
msgid "&Directory on Server"
msgstr "Thư mục trên máy chủ"
#. frame
-#: src/modules/SourceDialogs.rb:1626
+#: src/modules/SourceDialogs.rb:1633
msgid "Au&thentication"
msgstr "&Xác thực"
#. check box
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1640
msgid "&Anonymous"
msgstr "&Giấu tên"
#. text entry
-#: src/modules/SourceDialogs.rb:1642
+#: src/modules/SourceDialogs.rb:1649
#, fuzzy
msgid "&Workgroup or Domain"
msgstr "Nhóm làm việc hoặc Miền"
#. text entry
-#: src/modules/SourceDialogs.rb:1651
+#: src/modules/SourceDialogs.rb:1658
msgid "&User Name"
msgstr "&Tên người dùng"
#. password entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1665
msgid "&Password"
msgstr "&Mật khẩu"
#. radio button
-#: src/modules/SourceDialogs.rb:1733
+#: src/modules/SourceDialogs.rb:1740
msgid "&FTP"
msgstr "&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1736
+#: src/modules/SourceDialogs.rb:1743
msgid "H&TTP"
msgstr "H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1750
msgid "HTT&PS"
msgstr "HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1917
+#: src/modules/SourceDialogs.rb:1924
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"
@@ -2668,7 +2684,7 @@
msgstr ""
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1930
+#: src/modules/SourceDialogs.rb:1937
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"
@@ -2677,12 +2693,12 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1992
+#: src/modules/SourceDialogs.rb:1999
msgid "I would like to install an additional Add On Product"
msgstr ""
#. help text
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2126
#, fuzzy
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
@@ -2694,7 +2710,7 @@
"hoặc từ ổ cứng.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2128
+#: src/modules/SourceDialogs.rb:2135
#, fuzzy
msgid ""
"<p>\n"
@@ -2706,7 +2722,7 @@
"cần có bộ CD hoặc DVD.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2145
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2730,7 +2746,7 @@
"CD vào một thư mục.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2150
+#: src/modules/SourceDialogs.rb:2157
#, fuzzy
#| msgid ""
#| "<p>\n"
@@ -2749,27 +2765,27 @@
"CD thứ nhất, ví dụ /data/CD1.</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2165
+#: src/modules/SourceDialogs.rb:2172
#, fuzzy
msgid "Select the media type"
msgstr "Chọn tập tin là khóa riêng."
-#: src/modules/SourceDialogs.rb:2171
+#: src/modules/SourceDialogs.rb:2178
msgid "Insert the add-on product CD"
msgstr "Hãy đặt CD chứa sản phẩm thương mại vào ổ."
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2179
msgid "Insert the add-on product DVD"
msgstr "Hãy đặt DVD chứa sản phẩm thương mại vào ổ."
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2190
+#: src/modules/SourceDialogs.rb:2197
#, fuzzy
msgid "No USB disk was detected."
msgstr "Chưa phát hiện máy ảnh nào."
-#. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2393
+#. use three slashes as third slash means path
+#: src/modules/SourceDialogs.rb:2403
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2779,13 +2795,13 @@
msgstr ""
#. dialog caption
-#: src/modules/SourceDialogs.rb:2613
+#: src/modules/SourceDialogs.rb:2623
#, fuzzy
msgid "Media Type"
msgstr "Kiểm tra đĩa"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2637
+#: src/modules/SourceDialogs.rb:2647
#, fuzzy
#| msgid "Add-On Products"
msgid "Add On Product"
@@ -2794,7 +2810,7 @@
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2668
+#: src/modules/SourceDialogs.rb:2678
#, fuzzy
#| msgid "' is not valid."
msgid "URL scheme '%s' is not valid."
@@ -3028,10 +3044,6 @@
msgstr "Xin hãy bỏ chọn một vài gói."
#, fuzzy
-#~ msgid "Raw URL: %s"
-#~ msgstr "URL:"
-
-#, fuzzy
#~ msgid "Downloading patch RPM %1 (download size %2)"
#~ msgstr "Đang tải xuống gói %1 (%2)..."
Modified: branches/plus-SLE12-SP2/yast/vi/po/pam.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/pam.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/pam.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2011-05-10 06:42+0700\n"
"Last-Translator: haqduong \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/pkg-bindings.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/pkg-bindings.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/pkg-bindings.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -46,13 +46,13 @@
msgstr ""
#. error message
-#: src/Package.cc:658
+#: src/Package.cc:655
#, fuzzy
msgid "The package cannot be selected to install."
msgstr "Cần cài đặt những gói sau:"
#. error message
-#: src/Package.cc:664
+#: src/Package.cc:661
#, fuzzy
msgid "The package is not available."
msgstr "không có gói"
Modified: branches/plus-SLE12-SP2/yast/vi/po/printer.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/printer.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/printer.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -204,7 +204,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:1101
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -221,8 +221,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:220
-#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -360,7 +360,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:86
#, fuzzy
msgid "Description"
msgstr "&Mô tả"
@@ -476,8 +476,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:593
-#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590
+#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
#, fuzzy
msgid "Nothing Selected"
msgstr "Không tìm thấy gì"
@@ -2685,61 +2685,61 @@
#. Authors: Johannes Meixner
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:49
+#: src/include/printer/overview.rb:46
msgid "Show"
msgstr "Hiện"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:55
+#: src/include/printer/overview.rb:52
#, fuzzy
msgid "&Local"
msgstr "Chép _địa điểm"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:62
+#: src/include/printer/overview.rb:59
#, fuzzy
msgid "&Remote"
msgstr "Gỡ bỏ"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:80
msgid "Configuration"
msgstr "Cấu hình"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:83
msgid "Name"
msgstr "Tên"
#. 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:92
+#: src/include/printer/overview.rb:89
#, fuzzy
msgid "Location"
msgstr "Chép _địa điểm"
#. Header of a Table column with a list of print queues.
#. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:92
#, fuzzy
msgid "Default"
msgstr "Tuyến mặc định:"
#. Header of a Table column with a list of print queues.
#. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:98
+#: src/include/printer/overview.rb:95
msgid "Status"
msgstr "Trạng thái"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:110
+#: src/include/printer/overview.rb:107
#, fuzzy
msgid "Re&fresh List"
msgstr "&Cập nhật danh sách"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:115
+#: src/include/printer/overview.rb:112
#, fuzzy
msgid "Print &Test Page"
msgstr "kiểu rung động"
@@ -2750,7 +2750,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:131
+#: src/include/printer/overview.rb:128
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"
@@ -2763,7 +2763,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:143
+#: src/include/printer/overview.rb:140
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -2778,39 +2778,39 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:185
+#: src/include/printer/overview.rb:182
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:204
+#: src/include/printer/overview.rb:201
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:210
+#: src/include/printer/overview.rb:207
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:226 src/include/printer/overview.rb:237
+#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234
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:256
+#: src/include/printer/overview.rb:253
#, fuzzy
msgid "CUPS Server %1"
msgstr "Máy chủ DHCP"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:280
+#: src/include/printer/overview.rb:277
#, fuzzy
msgid "Testing if CUPS server is accessible..."
msgstr ""
@@ -2820,40 +2820,40 @@
#. 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:595 src/include/printer/overview.rb:681
-#: src/include/printer/overview.rb:1155
+#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678
+#: src/include/printer/overview.rb:1152
#, fuzzy
msgid "Select an entry."
msgstr "Chọn thẻ..."
-#: src/include/printer/overview.rb:608
+#: src/include/printer/overview.rb:605
#, fuzzy
msgid "Cannot Delete"
msgstr "Không xóa được chìa khóa TSIG."
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:610
+#: src/include/printer/overview.rb:607
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr ""
-#: src/include/printer/overview.rb:617
+#: src/include/printer/overview.rb:614
#, fuzzy
msgid "Confirm Deletion"
msgstr "Xác nhận cài đặt"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:619
+#: src/include/printer/overview.rb:616
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:623
+#: src/include/printer/overview.rb:620
#, fuzzy
msgid "Delete configuration %1"
msgstr "Tải lại cấu hình"
#. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:625
+#: src/include/printer/overview.rb:622
#, fuzzy
msgid "Do not delete it"
msgstr "Không thể xoá bỏ một phiên bản"
@@ -2865,36 +2865,36 @@
#. 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:640
+#: src/include/printer/overview.rb:637
#, fuzzy
msgid "Confirm Deletion of a Class"
msgstr "Xác nhận cài đặt"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:642
+#: src/include/printer/overview.rb:639
msgid "A deleted class cannot be re-created with this tool."
msgstr ""
-#: src/include/printer/overview.rb:688
+#: src/include/printer/overview.rb:685
#, fuzzy
msgid "Rejecting Print Jobs"
msgstr "Chạy mạng"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:690
+#: src/include/printer/overview.rb:687
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:700
+#: src/include/printer/overview.rb:697
#, fuzzy
msgid "Printout Disabled"
msgstr "Không dùng"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:702
+#: src/include/printer/overview.rb:699
msgid "The testpage cannot be printed because printout is disabled."
msgstr ""
@@ -2903,26 +2903,26 @@
#. 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:731
+#: src/include/printer/overview.rb:728
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:751 src/include/printer/overview.rb:920
+#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
#, fuzzy
msgid "Delete Pending Print Jobs For %1"
msgstr "Chạy mạng"
#. 'Yes' 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:756
msgid "Delete them before printing testpage"
msgstr ""
#. 'No' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:762
+#: src/include/printer/overview.rb:759
#, fuzzy
msgid "Print testpage after the other jobs"
msgstr "Hiển thị trợ giúp cho môđun này"
@@ -2931,7 +2931,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:775 src/include/printer/overview.rb:944
+#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941
#, fuzzy
msgid "Failed to delete all pending jobs for %1."
msgstr "Failed to parse: %s."
@@ -2951,30 +2951,30 @@
#. + (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:802
+#: src/include/printer/overview.rb:799
#, fuzzy
msgid "Test printout"
msgstr "Sản phẩm có"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:804
+#: src/include/printer/overview.rb:801
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:806
+#: src/include/printer/overview.rb:803
#, fuzzy
msgid "Single test page"
msgstr "kiểu rung động"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:808
+#: src/include/printer/overview.rb:805
msgid "Two test pages"
msgstr ""
#. 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:838
+#: src/include/printer/overview.rb:835
#, fuzzy
msgid "Failed to print testpage for %1."
msgstr "Failed to parse: %s."
@@ -2983,25 +2983,25 @@
#. 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:855
+#: src/include/printer/overview.rb:852
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:859
+#: src/include/printer/overview.rb:856
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:864
+#: src/include/printer/overview.rb:861
msgid "Testpage printout was successful"
msgstr ""
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:867
+#: src/include/printer/overview.rb:864
#, fuzzy
#| msgid "Operation failed"
msgid "Testpage printing failed"
@@ -3023,56 +3023,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:900
+#: src/include/printer/overview.rb:897
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:928
+#: src/include/printer/overview.rb:925
#, fuzzy
msgid "Delete all pending jobs"
msgstr "Chạy mạng"
#. 'No' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:931
+#: src/include/printer/overview.rb:928
#, fuzzy
msgid "Do not delete them"
msgstr "Không thể xoá bỏ một phiên bản"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1046
+#: src/include/printer/overview.rb:1043
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr ""
-#: src/include/printer/overview.rb:1051
+#: src/include/printer/overview.rb:1048
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:1068
+#: src/include/printer/overview.rb:1065
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:1078
+#: src/include/printer/overview.rb:1075
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:1105
+#: src/include/printer/overview.rb:1102
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr ""
-#: src/include/printer/overview.rb:1162
+#: src/include/printer/overview.rb:1159
#, fuzzy
msgid "Cannot Modify"
msgstr "Không gắn được đĩa mềm"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1164
+#: src/include/printer/overview.rb:1161
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/product-creator.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/product-creator.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/product-creator.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/proxy.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/proxy.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/proxy.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/rdp.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/rdp.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/rdp.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/rear.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/rear.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/rear.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -272,16 +272,16 @@
#: src/include/rear/ui.rb:698
#, fuzzy
+#| msgid "Analyzing your system..."
+msgid "Analyzing system"
+msgstr "Đang phân tích hệ thống..."
+
+#: src/include/rear/ui.rb:698
+#, fuzzy
#| msgid "Reading the previous settings..."
msgid "Reading rear settings"
msgstr "Đang đọc thiết lập trước đây..."
-#: src/include/rear/ui.rb:698
-#, fuzzy
-#| msgid "Analyzing your system..."
-msgid "Analyzing system"
-msgstr "Đang phân tích hệ thống..."
-
#: src/include/rear/ui.rb:699
#, fuzzy
#| msgid "Analyzing your system..."
Modified: branches/plus-SLE12-SP2/yast/vi/po/registration.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/registration.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/registration.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -60,7 +60,7 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:189
+#: src/clients/inst_scc.rb:186
#: 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
@@ -78,25 +78,25 @@
msgstr ""
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:204
+#: src/clients/scc_auto.rb:201
#, fuzzy
msgid "Registration was successfull."
msgstr "Đã cấu hình thành công"
#. remove possible duplicates
-#: src/clients/scc_auto.rb:232
+#: src/clients/scc_auto.rb:229
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:250
+#: src/clients/scc_auto.rb:247
#, fuzzy
#| msgid "Downloading Package"
msgid "Downloading SSL Certificate"
msgstr "Đang tải xuống gói"
-#: src/clients/scc_auto.rb:254
+#: src/clients/scc_auto.rb:251
#, fuzzy
msgid "Importing SSL Certificate"
msgstr "Tập tin chứng nhận của CA:"
@@ -104,8 +104,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:283
-#: src/lib/registration/registration_ui.rb:316
+#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
+#: src/lib/registration/registration_ui.rb:311
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -270,19 +270,30 @@
msgstr "Dấu chân: %1"
#. Error popup
-#: src/lib/registration/connect_helpers.rb:76
+#: 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
msgid "Connection time out."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:84
+#: src/lib/registration/connect_helpers.rb:93
#, fuzzy
#| msgid "Registration Code"
msgid "Check that this system is known to the registration server."
msgstr "Mã đăng ký"
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:90
+#: src/lib/registration/connect_helpers.rb:99
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -298,35 +309,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: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
+#: 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
#, fuzzy
#| msgid "Operation failed"
msgid "Registration failed."
msgstr "Thao tác thất bại."
-#: src/lib/registration/connect_helpers.rb:114
+#: src/lib/registration/connect_helpers.rb:123
#, fuzzy
msgid "Registration client error."
msgstr "Dữ liệu đăng ký sử dụng"
-#: src/lib/registration/connect_helpers.rb:116
+#: src/lib/registration/connect_helpers.rb:125
msgid ""
"Registration server error.\n"
"Retry registration later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:158
+#: src/lib/registration/connect_helpers.rb:167
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:188
+#: src/lib/registration/connect_helpers.rb:197
#, fuzzy
#| msgid "Details..."
msgid "Details: %s"
@@ -335,7 +346,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:217
+#: src/lib/registration/connect_helpers.rb:226
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -345,23 +356,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:229
+#: src/lib/registration/connect_helpers.rb:238
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:230
+#: src/lib/registration/connect_helpers.rb:239
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:251
+#: src/lib/registration/connect_helpers.rb:260
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:270
+#: src/lib/registration/connect_helpers.rb:279
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -369,26 +380,6 @@
"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 URL"
-msgid "Invalid URL."
-msgstr "URL không hợp lệ"
-
-#. 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
@@ -419,7 +410,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:269
+#: src/lib/registration/registration_ui.rb:267
msgid "Registering the System..."
msgstr ""
@@ -428,8 +419,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:148
-#: src/lib/registration/registration_ui.rb:353
+#: src/lib/registration/registration_ui.rb:146
+#: src/lib/registration/registration_ui.rb:346
#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating configuration..."
@@ -437,7 +428,7 @@
msgstr "Đang cập nhật cấu hình..."
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:165
+#: src/lib/registration/registration_ui.rb:163
#, fuzzy
#| msgid "Registration Code"
msgid "Synchronizing Products..."
@@ -449,31 +440,31 @@
#. @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:179
+#: src/lib/registration/registration_ui.rb:177
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
msgid "Loading Available Extensions and Modules..."
msgstr "Mã đăng ký"
-#: src/lib/registration/registration_ui.rb:193
+#: src/lib/registration/registration_ui.rb:191
#, fuzzy
#| msgid "Registration Code"
msgid "Loading Migration Products..."
msgstr "Mã đăng ký"
#. dialog title
-#: src/lib/registration/registration_ui.rb:210
+#: src/lib/registration/registration_ui.rb:208
#, fuzzy
msgid "Register Extensions and Modules"
msgstr "Mã đăng ký"
#. help text
-#: src/lib/registration/registration_ui.rb:214
+#: src/lib/registration/registration_ui.rb:212
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:239
+#: src/lib/registration/registration_ui.rb:237
#, fuzzy
msgid ""
"The registration server offers update repositories.\n"
@@ -481,7 +472,7 @@
msgstr "Mã đăng ký"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:243
+#: src/lib/registration/registration_ui.rb:241
msgid ""
"Would you like to enable these repositories during installation\n"
"in order to receive the latest updates?"
@@ -489,7 +480,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:247
+#: src/lib/registration/registration_ui.rb:245
msgid ""
"Would you like to enable these repositories during upgrade\n"
"in order to receive the latest updates?"
@@ -522,7 +513,7 @@
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:293
+#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
#, fuzzy
msgid "Saving repository configuration failed."
msgstr "Đang chạy trình duyệt..."
@@ -544,12 +535,12 @@
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:280
+#: src/lib/registration/sw_mgmt.rb:279
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:487
+#: src/lib/registration/sw_mgmt.rb:486
#, fuzzy
#| msgid "No product found in the catalog"
msgid ""
@@ -763,7 +754,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:140
+#: src/lib/registration/ui/base_system_registration_dialog.rb:133
#, fuzzy
#| msgid "Registration Code"
msgid "Registration &Code"
@@ -796,7 +787,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:138
+#: src/lib/registration/ui/base_system_registration_dialog.rb:131
#, fuzzy
#| msgid "Address"
msgid "&E-mail Address"
@@ -880,12 +871,12 @@
msgstr ""
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:149
+#: src/lib/registration/ui/base_system_registration_dialog.rb:142
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:184
+#: src/lib/registration/ui/base_system_registration_dialog.rb:177
msgid ""
"If you do not register your system we will not be able\n"
"to grant you access to the update repositories.\n"
@@ -898,7 +889,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:201
+#: src/lib/registration/ui/base_system_registration_dialog.rb:194
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"
@@ -909,7 +900,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:213
+#: src/lib/registration/ui/base_system_registration_dialog.rb:206
msgid ""
"If you skip product registration now, remember to register after\n"
"installation has completed."
@@ -917,10 +908,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:225
+#: src/lib/registration/ui/base_system_registration_dialog.rb:218
#, fuzzy
#| msgid "Novell Customer Center Configuration"
-msgid "Net&work Configuration..."
+msgid "Network Configuration..."
msgstr "Cấu hình Trung tâm khách hàng Novell"
#. SSL error message
@@ -971,6 +962,13 @@
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 URL"
+msgid "Invalid URL."
+msgstr "URL không hợp lệ"
+
#. input field label
#: src/lib/registration/ui/local_server_dialog.rb:106
#, fuzzy
@@ -1197,13 +1195,13 @@
msgstr ""
#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:211
+#: src/lib/registration/url_helpers.rb:203
#, fuzzy
#| msgid "Checking..."
msgid "Searching..."
msgstr "Đang kiểm tra..."
-#: src/lib/registration/url_helpers.rb:211
+#: src/lib/registration/url_helpers.rb:203
#, fuzzy
msgid "Looking up local registration servers..."
msgstr "1 mục của dữ liệu đăng ký"
Modified: branches/plus-SLE12-SP2/yast/vi/po/reipl.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/reipl.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/reipl.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \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:66
+#: src/clients/reipl_bootloader_finish.rb:64
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -39,7 +39,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:85
+#: src/clients/reipl_bootloader_finish.rb:83
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -48,7 +48,7 @@
"and LUN '%3'.\n"
msgstr ""
-#: src/clients/reipl_bootloader_finish.rb:99
+#: src/clients/reipl_bootloader_finish.rb:97
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/relocation-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/relocation-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/relocation-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/samba-client.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/samba-client.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/samba-client.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: samba-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-16 12:22+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -924,91 +924,91 @@
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:947
msgid "PAM Login"
msgstr ""
#. summary item
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:953
msgid "Use Kerberos"
msgstr ""
#. summary item
-#: src/modules/Kerberos.rb:961
+#: src/modules/Kerberos.rb:955
msgid "Do Not Use Kerberos"
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:965
+#: src/modules/Kerberos.rb:959
msgid "Default Realm"
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:972
+#: src/modules/Kerberos.rb:966
#, fuzzy
#| msgid " (Domain)"
msgid "Default Domain"
msgstr " (Miền)"
#. summary header
-#: src/modules/Kerberos.rb:979
+#: src/modules/Kerberos.rb:973
msgid "KDC Server Address"
msgstr ""
#. summary header
-#: src/modules/Kerberos.rb:983
+#: src/modules/Kerberos.rb:977
msgid "Clock Skew"
msgstr ""
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:999
+#: src/modules/Kerberos.rb:993
msgid "<b>KDC Server</b>: %1<br>"
msgstr ""
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:998
#, fuzzy
#| msgid "<p><b>Workgroup or Domain</b>: %1</p>"
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<p><b>Nhóm làm việc hoặc Miền</b>: %1</p>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1004
msgid "<b>Default Realm</b>: %1<br>"
msgstr ""
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1016
+#: src/modules/Kerberos.rb:1010
#, fuzzy
msgid "<b>Kerberos Authentication Enabled</b>: %1"
msgstr "&Xác thực ngoại tuyến"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "Có"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
msgid "No"
msgstr "Không"
#. summary line
-#: src/modules/Kerberos.rb:1028
+#: src/modules/Kerberos.rb:1022
msgid "Configuration Acquired via DNS"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1056
+#: src/modules/Kerberos.rb:1050
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
msgstr ""
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1059
+#: src/modules/Kerberos.rb:1053
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: branches/plus-SLE12-SP2/yast/vi/po/samba-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/samba-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/samba-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -250,7 +250,7 @@
"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 'systemctl restart smb' and 'systemctl restart nmb'"
+"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgstr ""
#. table entry description for smbpasswd-based SAM
Modified: branches/plus-SLE12-SP2/yast/vi/po/samba-users.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/samba-users.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/samba-users.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: samba-users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2011-05-14 11:43+0700\n"
"Last-Translator: Quang Duong Ha \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/scanner.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/scanner.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/scanner.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/security.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/security.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/security.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -121,269 +121,302 @@
#. Authors: Michal Svec
#.
#. $Id$
-#: src/include/security/dialogs.rb:64
+#: src/include/security/dialogs.rb:62
msgid "Unknown"
msgstr "Không biết"
-#: src/include/security/dialogs.rb:67
+#: src/include/security/dialogs.rb:65
msgid "Use magic SysRq keys"
msgstr ""
-#: src/include/security/dialogs.rb:68
+#: src/include/security/dialogs.rb:66
#, fuzzy
msgid "Use secure file permissions"
msgstr "<b>Quyền hạn xem</b>"
-#: src/include/security/dialogs.rb:71
+#: src/include/security/dialogs.rb:69
#, fuzzy
msgid "Remote access to the display manager"
msgstr "Truy cập từ xa đến trình quản lý màn hình"
-#: src/include/security/dialogs.rb:74
+#: src/include/security/dialogs.rb:72
msgid "Write back system time to the hardware clock"
msgstr ""
-#: src/include/security/dialogs.rb:77
+#: src/include/security/dialogs.rb:75
msgid "Always generate syslog message for cron scripts"
msgstr ""
-#: src/include/security/dialogs.rb:80
+#: src/include/security/dialogs.rb:78
msgid "Run the DHCP daemon in a chroot"
msgstr ""
-#: src/include/security/dialogs.rb:83
+#: src/include/security/dialogs.rb:81
msgid "Run the DHCP daemon as dhcp user"
msgstr ""
-#: src/include/security/dialogs.rb:86
+#: src/include/security/dialogs.rb:84
#, fuzzy
msgid "Remote root login in the display manager"
msgstr "Truy cập từ xa đến trình quản lý màn hình"
-#: src/include/security/dialogs.rb:89
+#: src/include/security/dialogs.rb:87
#, fuzzy
msgid "Remote access to the X server"
msgstr "Truy cập từ xa đến trình quản lý màn hình"
-#: src/include/security/dialogs.rb:92
+#: src/include/security/dialogs.rb:90
#, fuzzy
msgid "Remote access to the email delivery subsystem"
msgstr "Truy cập từ xa đến trình quản lý màn hình"
-#: src/include/security/dialogs.rb:95
+#: src/include/security/dialogs.rb:93
msgid "Restart services on update"
msgstr ""
-#: src/include/security/dialogs.rb:98
+#: src/include/security/dialogs.rb:96
#, fuzzy
msgid "Stop services on removal"
msgstr "Không dùng dịch vụ Samba"
-#: src/include/security/dialogs.rb:101
+#: src/include/security/dialogs.rb:99
msgid "Enable TCP syncookies"
msgstr ""
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:102
msgid "IPv4 forwarding"
msgstr ""
-#: src/include/security/dialogs.rb:105
+#: src/include/security/dialogs.rb:103
msgid "IPv6 forwarding"
msgstr ""
-#: src/include/security/dialogs.rb:106
+#: src/include/security/dialogs.rb:104
#, fuzzy
#| msgid "Enable the service"
msgid "Enable basic system services"
msgstr "Dùng dịch vụ"
-#: src/include/security/dialogs.rb:109
+#: src/include/security/dialogs.rb:107
#, fuzzy
#| msgid "Disable the service"
msgid "Disable extra services"
msgstr "Không dùng dịch vụ"
#. handle the special cases at first
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:150
#, fuzzy
msgid "Configure"
msgstr "&Cấu hình..."
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:152
msgid "Enabled"
msgstr "Dùng"
-#: src/include/security/dialogs.rb:156
+#: src/include/security/dialogs.rb:154
msgid "Disabled"
msgstr "Không dùng"
#. table header
#. table header
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
#, fuzzy
msgid "Security Setting"
msgstr "Thiết lập cao cấp"
-#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
+#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
msgid "Status"
msgstr "Trạng thái"
-#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
#, fuzzy
msgid "Security Status"
msgstr "Bảo mật"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:320
+#: src/include/security/dialogs.rb:318
msgid "Help"
msgstr "Trợ giúp"
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:363
+#: src/include/security/dialogs.rb:361
msgid " or "
msgstr ""
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:368
msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
msgstr ""
-#: src/include/security/dialogs.rb:372
+#: src/include/security/dialogs.rb:370
msgid "<P>All basic services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:380
+#: src/include/security/dialogs.rb:378
msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
msgstr ""
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:379
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:383
+#: src/include/security/dialogs.rb:381
msgid "<P>Only basic system services are enabled.</P>"
msgstr ""
-#: src/include/security/dialogs.rb:389
+#: src/include/security/dialogs.rb:387
#, fuzzy
msgid "Description"
msgstr "&Mô tả"
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
#, fuzzy
msgid "Security Overview"
msgstr "Xem lại các phím đặc biệt"
#. push button label
-#: src/include/security/dialogs.rb:426
+#: src/include/security/dialogs.rb:424
#, fuzzy
msgid "Change &Status"
msgstr "Tình trạng kết nối"
#. push button label
-#: src/include/security/dialogs.rb:429
+#: src/include/security/dialogs.rb:427
#, fuzzy
msgid "&Description"
msgstr "&Mô tả"
#. update the current value
-#: src/include/security/dialogs.rb:523
+#: src/include/security/dialogs.rb:521
#, fuzzy
#| msgid "Analyzing your system..."
msgid "Analyzing system"
msgstr "Đang phân tích hệ thống..."
#. Boot dialog caption
-#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr ""
#. Frame label
-#: src/include/security/dialogs.rb:601
+#: src/include/security/dialogs.rb:587
msgid "Boot Permissions"
msgstr ""
#. Misc dialog caption
-#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
msgid "Miscellaneous Settings"
msgstr ""
#. Password dialog caption
-#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
#, fuzzy
msgid "Password Settings"
msgstr "Mật khẩu :"
#. Frame label
-#: src/include/security/dialogs.rb:759
+#: src/include/security/dialogs.rb:753
msgid "Checks"
msgstr ""
#. Frame label
-#: src/include/security/dialogs.rb:774
+#: src/include/security/dialogs.rb:768
#, fuzzy
msgid "Password Age"
msgstr "Mật khẩu :"
#. Popup text
-#: src/include/security/dialogs.rb:852
+#: src/include/security/dialogs.rb:846
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
msgstr ""
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:869
+#: src/include/security/dialogs.rb:863
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
msgstr ""
#. Login dialog caption
-#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr ""
#. Frame label
-#: src/include/security/dialogs.rb:910
+#: src/include/security/dialogs.rb:904
#, fuzzy
msgid "Login"
msgstr "Biểu hình"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:41
+#: src/include/security/helps.rb:39
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
msgstr ""
#. Read dialog help 2/2
-#: src/include/security/helps.rb:45
+#: src/include/security/helps.rb:43
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
msgstr ""
#. Write dialog help 1/2
-#: src/include/security/helps.rb:49
+#: src/include/security/helps.rb:47
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
msgstr ""
#. Write dialog help 2/2
-#: src/include/security/helps.rb:53
+#: src/include/security/helps.rb:51
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.</p>"
msgstr ""
-#. Main dialog help 1/8
+#. 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 ""
+
+#. Boot dialog help 2/4
#: 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 ""
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:68
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from KDM.</p>\n"
+msgstr ""
+
+#. 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"
@@ -392,33 +425,33 @@
msgstr ""
#. Main dialog help 5/8
-#: src/include/security/helps.rb:67
+#: src/include/security/helps.rb:86
msgid ""
"<p><b>Workstation</b>: For a computer connected\n"
"to any type of network including the Internet.</p>"
msgstr ""
#. Main dialog help 6/8
-#: src/include/security/helps.rb:71
+#: src/include/security/helps.rb:90
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:75
+#: src/include/security/helps.rb:94
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
msgstr ""
#. Main dialog help 8/8
-#: src/include/security/helps.rb:79
+#: src/include/security/helps.rb:98
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr ""
#. Login dialog help 1/4
-#: src/include/security/helps.rb:81
+#: src/include/security/helps.rb:100
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -426,7 +459,7 @@
msgstr ""
#. Login dialog help 2/4
-#: src/include/security/helps.rb:87
+#: src/include/security/helps.rb:106
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"
@@ -435,7 +468,7 @@
msgstr ""
#. Login dialog help 3/4
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:113
msgid ""
"<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
"attempts is useful. It can warn you of unauthorized access to the\n"
@@ -444,7 +477,7 @@
msgstr ""
#. Login dialog help 4/4
-#: src/include/security/helps.rb:101
+#: src/include/security/helps.rb:120
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"
@@ -452,14 +485,14 @@
msgstr ""
#. Password dialog help 1/8
-#: src/include/security/helps.rb:107
+#: src/include/security/helps.rb:126
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
msgstr ""
#. Password dialog help 2/8
-#: src/include/security/helps.rb:111
+#: src/include/security/helps.rb:130
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"
@@ -467,7 +500,7 @@
msgstr ""
#. Password dialog help
-#: src/include/security/helps.rb:117
+#: src/include/security/helps.rb:136
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
"The minimum acceptable size for the new password reduced by the number\n"
@@ -477,7 +510,7 @@
msgstr ""
#. Password dialog help 4/8
-#: src/include/security/helps.rb:125
+#: src/include/security/helps.rb:144
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -485,12 +518,12 @@
msgstr ""
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:131
+#: src/include/security/helps.rb:150
msgid "<p><b>Password Encryption Method:</b></p>"
msgstr ""
#. Password dialog help 5b/8
-#: src/include/security/helps.rb:133
+#: src/include/security/helps.rb:152
msgid ""
"<p><b>DES</b>, the Linux default method, works in all network environments,\n"
"but it restricts you to passwords no longer than eight characters. If you need\n"
@@ -498,26 +531,26 @@
msgstr ""
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:139
+#: src/include/security/helps.rb:158
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>"
msgstr ""
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:143
+#: src/include/security/helps.rb:162
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:147
+#: src/include/security/helps.rb:166
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
msgstr ""
#. Password dialog help 8/8
-#: src/include/security/helps.rb:151
+#: src/include/security/helps.rb:170
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"
@@ -525,35 +558,35 @@
msgstr ""
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:157
+#: src/include/security/helps.rb:176
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
msgstr ""
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:161
+#: src/include/security/helps.rb:180
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
msgstr ""
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:165
+#: src/include/security/helps.rb:184
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
msgstr ""
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:169
+#: src/include/security/helps.rb:188
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
msgstr ""
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:173
+#: src/include/security/helps.rb:192
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"
@@ -571,7 +604,7 @@
msgstr ""
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:189
+#: src/include/security/helps.rb:208
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"
@@ -581,7 +614,7 @@
msgstr ""
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:197
+#: src/include/security/helps.rb:216
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"
@@ -590,7 +623,7 @@
msgstr ""
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:204
+#: src/include/security/helps.rb:223
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"
@@ -599,7 +632,7 @@
msgstr ""
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:211
+#: src/include/security/helps.rb:230
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"
@@ -610,21 +643,21 @@
msgstr ""
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:220
+#: src/include/security/helps.rb:239
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>"
msgstr ""
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:224
+#: src/include/security/helps.rb:243
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
msgstr ""
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:228
+#: src/include/security/helps.rb:247
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"
@@ -632,26 +665,26 @@
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:234
+#: src/include/security/helps.rb:253
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr ""
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:238
+#: src/include/security/helps.rb:257
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:242
+#: src/include/security/helps.rb:261
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr ""
#. an error message (rich text)
-#: src/include/security/helps.rb:246
+#: src/include/security/helps.rb:265
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:252
+#: src/include/security/helps.rb:271
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"
@@ -663,7 +696,7 @@
"logins, then disable this option.</P>"
msgstr ""
-#: src/include/security/helps.rb:262
+#: src/include/security/helps.rb:281
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"
@@ -671,23 +704,23 @@
"correct log messages.</P>"
msgstr ""
-#: src/include/security/helps.rb:268
+#: src/include/security/helps.rb:287
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:271
+#: src/include/security/helps.rb:290
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:274
+#: src/include/security/helps.rb:293
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:277
+#: src/include/security/helps.rb:296
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:280
+#: src/include/security/helps.rb:299
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"
@@ -699,13 +732,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:290
+#: src/include/security/helps.rb:309
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:293
+#: src/include/security/helps.rb:312
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"
@@ -717,7 +750,7 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:303
+#: src/include/security/helps.rb:322
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"
@@ -729,86 +762,38 @@
"reason to do so.</P>"
msgstr ""
-#: src/include/security/helps.rb:313
+#: src/include/security/helps.rb:332
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:316 src/include/security/helps.rb:320
+#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
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:319
+#: src/include/security/helps.rb:338
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:323
+#: src/include/security/helps.rb:342
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr ""
-#: src/include/security/helps.rb:324
+#: src/include/security/helps.rb:343
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 ""
-#: src/include/security/helps.rb:327
+#: src/include/security/helps.rb:346
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:330
+#: src/include/security/helps.rb:349
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:333
+#: src/include/security/helps.rb:352
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 ""
-
-#. TRANSLATORS: part of help text - default action (the default is
-#. reboot)
-#: src/include/security/helps.rb:348
-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 ""
-
-#. TRANSLATORS: part of help text - default action (the default is halt)
-#: src/include/security/helps.rb:355
-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 ""
-
-#. Boot dialog help 2/4
-#. TRANSLATORS: %s is help text - default action
-#: src/include/security/helps.rb:364
-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 ""
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:373
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from %s.</p>\n"
-msgstr ""
-
-#. 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
@@ -872,246 +857,173 @@
"maximum."
msgstr ""
-#. 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
+#. ComboBox label
+#: src/include/security/widgets.rb:100
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr ""
+
+#. ComboBox value
+#: src/include/security/widgets.rb:105
#, fuzzy
msgid "Ignore"
msgstr "Thêm"
-#: src/include/security/widgets.rb:88
+#. ComboBox value
+#: src/include/security/widgets.rb:107
msgid "Reboot"
msgstr ""
-#: src/include/security/widgets.rb:89
+#. ComboBox value
+#: src/include/security/widgets.rb:109
msgid "Halt"
msgstr ""
-#: src/include/security/widgets.rb:93
-msgid "Only root"
-msgstr ""
-
-#: src/include/security/widgets.rb:94
-msgid "All Users"
-msgstr ""
-
-#: src/include/security/widgets.rb:95
-msgid "Nobody"
-msgstr ""
-
-#. ComboBox label
-#: src/include/security/widgets.rb:117
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr ""
-
#. CheckBox label
-#: src/include/security/widgets.rb:126
+#: src/include/security/widgets.rb:116
msgid "Allow Remote &Graphical Login"
msgstr ""
#. CheckBox label
-#: src/include/security/widgets.rb:132
+#: src/include/security/widgets.rb:122
msgid "&Magic SysRq Keys"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:135
+#: src/include/security/widgets.rb:125
msgid "Disable"
msgstr "Tắt"
#. ComboBox value
-#: src/include/security/widgets.rb:137
+#: src/include/security/widgets.rb:127
msgid "Enable All Functions"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:144
+#: src/include/security/widgets.rb:134
msgid "&Delay after Incorrect Login Attempt"
msgstr ""
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
+#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
msgid "Maxim&um"
msgstr ""
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
+#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
msgid "M&inimum"
msgstr ""
#. ComboBox label
-#: src/include/security/widgets.rb:164
+#: src/include/security/widgets.rb:154
+msgid "&Shutdown Behaviour of KDM Login Manager:"
+msgstr ""
+
+#. ComboBox value
+#: src/include/security/widgets.rb:159
+msgid "Only root"
+msgstr ""
+
+#. ComboBox value
+#: src/include/security/widgets.rb:161
+msgid "All Users"
+msgstr ""
+
+#. ComboBox value
+#: src/include/security/widgets.rb:163
+msgid "Nobody"
+msgstr ""
+
+#. ComboBox label
+#: src/include/security/widgets.rb:170
#, fuzzy
#| msgid "System Information"
msgid "System Hybernation"
msgstr "Thông tin hệ thống"
#. ComboBox value
-#: src/include/security/widgets.rb:167
+#: src/include/security/widgets.rb:173
msgid "User on the active console"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:169
+#: src/include/security/widgets.rb:175
#, fuzzy
#| msgid "Lock screen on hibernate"
msgid "Anyone can hibernate"
msgstr "Khoá màn hình khi ngủ đông"
#. ComboBox value
-#: src/include/security/widgets.rb:171
+#: src/include/security/widgets.rb:177
#, fuzzy
#| msgid "Authentication"
msgid "Authentication always required"
msgstr "Xác thực"
#. ComboBox label
-#: src/include/security/widgets.rb:178
+#: src/include/security/widgets.rb:184
msgid "P&assword Encryption Method"
msgstr ""
#. CheckBox label
-#: src/include/security/widgets.rb:192
+#: src/include/security/widgets.rb:198
#, fuzzy
msgid "&Check New Passwords"
msgstr "Hiện các mật khẩu"
#. IntField label
-#: src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:211
msgid "Numb&er of Passwords to Remember"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:224
msgid "&Minimum Acceptable Password Length"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:226
+#: src/include/security/widgets.rb:232
msgid "&Days before Password Expires Warning"
msgstr ""
#. ComboBox label
-#: src/include/security/widgets.rb:234
+#: src/include/security/widgets.rb:240
#, fuzzy
msgid "&File Permissions"
msgstr "<b>Quyền hạn xem</b>"
#. ComboBox value
-#: src/include/security/widgets.rb:237
+#: src/include/security/widgets.rb:243
msgid "Easy"
msgstr ""
#. ComboBox value
-#: src/include/security/widgets.rb:239
+#: src/include/security/widgets.rb:245
#, fuzzy
msgid "Secure"
msgstr "Vuông"
#. ComboBox value
-#: src/include/security/widgets.rb:241
+#: src/include/security/widgets.rb:247
msgid "Paranoid"
msgstr ""
#. ComboBox label
-#: src/include/security/widgets.rb:248
+#: src/include/security/widgets.rb:254
msgid "&User Launching updatedb"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:255
+#: src/include/security/widgets.rb:261
msgid "Ma&ximum"
msgstr ""
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:267
msgid "&Minimum"
msgstr ""
-#. 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
-msgid "&Shutdown Behaviour of %s Login Manager:"
-msgstr ""
-
#: src/include/security/wizards.rb:53
#, fuzzy
msgid "Predefined Security Configurations"
@@ -1129,68 +1041,68 @@
msgstr "Đang chạy..."
#. Security read dialog caption
-#: src/modules/Security.rb:638
+#: src/modules/Security.rb:654
#, fuzzy
msgid "Saving Security Configuration"
msgstr "Cấu hình phẳng"
#. Progress stage 1/4
-#: src/modules/Security.rb:647
+#: src/modules/Security.rb:663
msgid "Write security settings"
msgstr ""
#. Progress stage 2/4
-#: src/modules/Security.rb:649
+#: src/modules/Security.rb:665
msgid "Write inittab settings"
msgstr ""
#. Progress stage 3/4
-#: src/modules/Security.rb:651
+#: src/modules/Security.rb:667
msgid "Write PAM settings"
msgstr ""
#. Progress stage 4/4
-#: src/modules/Security.rb:653
+#: src/modules/Security.rb:669
#, fuzzy
#| msgid "Update Settings"
msgid "Update system settings"
msgstr "Cập nhật thiết lập"
#. Progress step 1/5
-#: src/modules/Security.rb:657
+#: src/modules/Security.rb:673
msgid "Writing security settings..."
msgstr ""
#. Progress step 2/5
-#: src/modules/Security.rb:659
+#: src/modules/Security.rb:675
msgid "Writing inittab settings..."
msgstr ""
#. Progress step 3/5
-#: src/modules/Security.rb:661
+#: src/modules/Security.rb:677
msgid "Writing PAM settings..."
msgstr ""
#. Progress step 4/5
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:679
#, fuzzy
#| msgid "Writing the settings..."
msgid "Updating system settings..."
msgstr "Đang ghi các thiết lập..."
#. Progress step 5/5
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:681
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
#. Summary text
-#: src/modules/Security.rb:754
+#: src/modules/Security.rb:791
msgid "Current Security Level: Custom settings"
msgstr ""
#. Summary text
-#: src/modules/Security.rb:758
+#: src/modules/Security.rb:795
msgid "Current Security Level: %1"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/services-manager.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/services-manager.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/services-manager.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/slp-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/slp-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/slp-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: slp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2011-05-12 08:37+0700\n"
"Last-Translator: Quang Duong Ha \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/snapper.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/snapper.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/snapper.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -18,8 +18,32 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#. The main ()
-#: src/clients/snapper.rb:53
+#. 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
#, fuzzy
#| msgid "Configuration Completed"
msgid "Configuration of system snapshots"
@@ -27,8 +51,8 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251
-#: src/include/snapper/dialogs.rb:490
+#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
+#: src/include/snapper/dialogs.rb:496
#, fuzzy
#| msgid "D&escription"
msgid "Description"
@@ -36,7 +60,7 @@
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
+#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
#, fuzzy
#| msgid "&User Name"
msgid "User data"
@@ -44,39 +68,39 @@
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
msgid "Cleanup algorithm"
msgstr ""
-#. popup label, %1 is number
-#: src/include/snapper/dialogs.rb:158
-msgid "Modify Snapshot %1"
+#. popup label, %{num} is number
+#: src/include/snapper/dialogs.rb:153
+msgid "Modify Snapshot %{num}"
msgstr ""
-#. popup label, %1, %2 are numbers (range)
-#: src/include/snapper/dialogs.rb:166
-msgid "Modify Snapshots %1 - %2"
+#. popup label, %{pre} and %{post} are numbers
+#: src/include/snapper/dialogs.rb:159
+msgid "Modify Snapshot %{pre} and %{post}"
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:169
-msgid "Pre (%1)"
+#: src/include/snapper/dialogs.rb:161
+msgid "Pre (%{pre})"
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:173
-msgid "Post (%1)"
+#: src/include/snapper/dialogs.rb:165
+msgid "Post (%{post})"
msgstr ""
#. popup label
-#: src/include/snapper/dialogs.rb:249
+#: src/include/snapper/dialogs.rb:242
#, fuzzy
#| msgid "Create New Tag"
msgid "Create New Snapshot"
msgstr "Tạo thẻ mới"
#. radio button label
-#: src/include/snapper/dialogs.rb:262
+#: src/include/snapper/dialogs.rb:255
#, fuzzy
#| msgid "Read the winbind status"
msgid "Single snapshot"
@@ -84,89 +108,96 @@
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435
+#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
#, fuzzy
#| msgid "Prev"
msgid "Pre"
msgstr "Lùi"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:281
+#: src/include/snapper/dialogs.rb:274
msgid "Post, paired with:"
msgstr ""
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:352
+#: src/include/snapper/dialogs.rb:350
#, fuzzy
#| msgid "Really delete '%1'?"
-msgid "Really delete snapshot '%1'?"
+msgid "Really delete snapshot %{num}?"
msgstr "Thật sự xoá bỏ '%1'?"
+#. yes/no popup question
+#: src/include/snapper/dialogs.rb:357
+#, fuzzy
+#| msgid "Really delete '%1'?"
+msgid "Really delete snapshots %{pre} and %{post}?"
+msgstr "Thật sự xoá bỏ '%1'?"
+
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:365
+#: src/include/snapper/dialogs.rb:372
msgid "Snapshots"
msgstr ""
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:394
+#: src/include/snapper/dialogs.rb:401
msgid "Single"
msgstr ""
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:419
+#: src/include/snapper/dialogs.rb:426
msgid "Pre & Post"
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:454
+#: src/include/snapper/dialogs.rb:461
#, fuzzy
#| msgid "Read the winbind status"
msgid "Reading list of snapshots..."
msgstr "Đọc trạng thái winbind"
#. combo box label
-#: src/include/snapper/dialogs.rb:475
+#: src/include/snapper/dialogs.rb:481
#, fuzzy
#| msgid "Read current configuration"
msgid "Current Configuration"
msgstr "Đọc cấu hình hiện thời"
#. table header
-#: src/include/snapper/dialogs.rb:486
+#: src/include/snapper/dialogs.rb:492
msgid "ID"
msgstr ""
-#: src/include/snapper/dialogs.rb:487
+#: src/include/snapper/dialogs.rb:493
msgid "Type"
msgstr "Kiểu"
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:494
#, fuzzy
#| msgid "Start &Update"
msgid "Start Date"
msgstr "Bắt đầu &cập nhật"
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:495
#, fuzzy
#| msgid "Send Data"
msgid "End Date"
msgstr "Dữ liệu gửi"
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:497
#, fuzzy
#| msgid "Send Data"
msgid "User Data"
msgstr "Dữ liệu gửi"
#. button label
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:503
#, fuzzy
#| msgid "&Change"
msgid "Show Changes"
msgstr "&Thay đổi"
#. button label
-#: src/include/snapper/dialogs.rb:500
+#: src/include/snapper/dialogs.rb:506
#, fuzzy
#| msgid "Modified"
#| msgid_plural "Modified ({0})"
@@ -174,80 +205,80 @@
msgstr "Đã sửa đổi ({0})"
#. popup message
-#: src/include/snapper/dialogs.rb:542
+#: src/include/snapper/dialogs.rb:549
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:588
+#: src/include/snapper/dialogs.rb:634
msgid "Selected Snapshot Overview"
msgstr ""
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:626
+#: src/include/snapper/dialogs.rb:666
#, fuzzy
#| msgid "Next %1: %2"
msgid "%1: %2"
msgstr "Tiếp theo %1: %2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:645
+#: src/include/snapper/dialogs.rb:685
msgid "Calculating changed files..."
msgstr ""
#. busy popup message
-#: src/include/snapper/dialogs.rb:742
+#: src/include/snapper/dialogs.rb:695
msgid "Calculating file modifications..."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:750
+#: src/include/snapper/dialogs.rb:703
msgid "New file was created."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:754
+#: src/include/snapper/dialogs.rb:707
#, fuzzy
#| msgid "File name"
msgid "File was removed."
msgstr "Tên tập tin"
#. label
-#: src/include/snapper/dialogs.rb:759
+#: src/include/snapper/dialogs.rb:712
msgid "File content was not changed."
msgstr ""
#. label
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:718
#, fuzzy
#| msgid "Failed to initialize the catalog."
msgid "File does not exist in either snapshot."
msgstr "Lỗi bắt đầu thư mục."
#. label
-#: src/include/snapper/dialogs.rb:771
+#: src/include/snapper/dialogs.rb:724
msgid "File content was modified."
msgstr ""
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:734
msgid "File mode was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:796
+#: src/include/snapper/dialogs.rb:749
msgid "File user ownership was changed from '%1' to '%2'."
msgstr ""
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:812
+#: src/include/snapper/dialogs.rb:765
msgid "File group ownership was changed from '%1' to '%2'."
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:847
+#: src/include/snapper/dialogs.rb:782
#, fuzzy
#| msgid "Remove Tag From Selection"
#| msgid_plural "Remove Tags From Selection"
@@ -255,11 +286,11 @@
msgstr "Gỡ bỏ thẻ ra vùng chọn"
#. button label
-#: src/include/snapper/dialogs.rb:849
+#: src/include/snapper/dialogs.rb:784
msgid "Restore"
msgstr ""
-#: src/include/snapper/dialogs.rb:872
+#: src/include/snapper/dialogs.rb:807
#, fuzzy
#| msgid "Remove Tag From Selection"
#| msgid_plural "Remove Tags From Selection"
@@ -267,61 +298,61 @@
msgstr "Gỡ bỏ thẻ ra vùng chọn"
#. radio button label
-#: src/include/snapper/dialogs.rb:909
+#: src/include/snapper/dialogs.rb:844
msgid "Show the difference between snapshot and current system"
msgstr ""
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:921
+#: src/include/snapper/dialogs.rb:856
msgid "Show the difference between current and selected snapshot:"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:968
+#: src/include/snapper/dialogs.rb:903
msgid "Show the difference between first and second snapshot"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:979
+#: src/include/snapper/dialogs.rb:914
msgid "Show the difference between first snapshot and current system"
msgstr ""
#. radio button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:925
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:1031
-msgid "Time of taking the first snapshot:"
+#: src/include/snapper/dialogs.rb:954
+msgid "Time of taking the snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1036
-msgid "Time of taking the second snapshot:"
+#: src/include/snapper/dialogs.rb:962
+msgid "Time of taking the first snapshot:"
msgstr ""
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1044
-msgid "Time of taking the snapshot:"
+#: src/include/snapper/dialogs.rb:967
+msgid "Time of taking the second snapshot:"
msgstr ""
#. button label
-#: src/include/snapper/dialogs.rb:1066
+#: src/include/snapper/dialogs.rb:990
#, fuzzy
#| msgid "Open"
msgid "&Open"
msgstr "Mở"
#. button label
-#: src/include/snapper/dialogs.rb:1112
+#: src/include/snapper/dialogs.rb:1036
#, fuzzy
#| msgid "_Delete Selected Tag"
msgid "Restore Selected"
msgstr "_Xoá bỏ thẻ được chọn"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1186
+#: src/include/snapper/dialogs.rb:1121
msgid ""
"Do you want to delete the file\n"
"\n"
@@ -332,7 +363,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:1206 src/include/snapper/dialogs.rb:1224
+#: src/include/snapper/dialogs.rb:1142 src/include/snapper/dialogs.rb:1161
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -342,19 +373,19 @@
msgstr ""
#. popup message
-#: src/include/snapper/dialogs.rb:1259
+#: src/include/snapper/dialogs.rb:1187
#, 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 "Không có vá lỗi nào được chọn để cài đặt.\n"
#. popup headline
-#: src/include/snapper/dialogs.rb:1264
+#: src/include/snapper/dialogs.rb:1197
msgid "Restoring files"
msgstr ""
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1267
+#: src/include/snapper/dialogs.rb:1200
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
@@ -365,7 +396,7 @@
msgstr ""
#. Read dialog help
-#: src/include/snapper/helps.rb:36
+#: src/include/snapper/helps.rb:35
#, fuzzy
#| msgid ""
#| "<p><b><big>Saving Samba Client Configuration</big></b><br>\n"
@@ -378,30 +409,30 @@
"Xin hãy chờ...<br></p>\n"
#. Summary dialog help:
-#: src/include/snapper/helps.rb:40
+#: src/include/snapper/helps.rb:39
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 coupled together in the table.</p>\n"
-"<p>Select a snapshot or snapshot couple 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 paired together in the table.</p>\n"
+"<p>Select a snapshot or snapshot pair 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:49
+#: src/include/snapper/helps.rb:48
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 coupled 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 paired 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:59
+#: src/include/snapper/helps.rb:58
msgid ""
"<p><b><big>Snapshot Overview</big></b><p>\n"
"<p>\n"
@@ -412,172 +443,139 @@
"</p>\n"
msgstr ""
-#. popup error
-#: src/modules/Snapper.rb:91
-msgid "Snapshot '%1' was not found."
-msgstr ""
-
-#. 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:236 src/modules/Snapper.rb:264
-#: src/modules/Snapper.rb:284 src/modules/Snapper.rb:303
-msgid "Reason not known."
-msgstr ""
-
-#: src/modules/Snapper.rb:238
+#. 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
#, fuzzy
-#| msgid "Configuration Completed"
-msgid "Configuration not found."
-msgstr "Hoàn thành cấu hình"
+#| msgid "Failed to initialize the catalog."
+msgid "Failed to get config:\n"
+msgstr "Lỗi bắt đầu thư mục."
-#: src/modules/Snapper.rb:240
+#. Return the path to given snapshot
+#: src/modules/Snapper.rb:129
#, fuzzy
-#| msgid "Configuration Completed"
-msgid "Configuration is not valid."
-msgstr "Hoàn thành cấu hình"
-
-#. error popup
-#: src/modules/Snapper.rb:247
-#, fuzzy
#| msgid "Failed to initialize the catalog."
-msgid ""
-"Failed to initialize snapper library:\n"
-"%1"
+msgid "Failed to get snapshot mount point:\n"
msgstr "Lỗi bắt đầu thư mục."
-#: src/modules/Snapper.rb:266
-msgid "Snapshot was not found."
-msgstr ""
-
-#. error popup
-#: src/modules/Snapper.rb:271
+#. Create new snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:276
#, fuzzy
#| msgid "Failed to initialize the catalog."
-msgid ""
-"Failed to delete snapshot:\n"
-"%1"
+msgid "Failed to create new snapshot:\n"
msgstr "Lỗi bắt đầu thư mục."
-#. error popup
-#: src/modules/Snapper.rb:289
+#. Modify existing snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:291
#, fuzzy
#| msgid "Failed to initialize the catalog."
-msgid ""
-"Failed to modify snapshot:\n"
-"%1"
+msgid "Failed to modify snapshot:\n"
msgstr "Lỗi bắt đầu thư mục."
+#. Delete existing snapshot
+#. Return true on success
#: src/modules/Snapper.rb:306
-msgid "Wrong snapshot type given."
-msgstr ""
-
-#: src/modules/Snapper.rb:308
-msgid "'Pre' snapshot was not given."
-msgstr ""
-
-#: src/modules/Snapper.rb:310
-msgid "Given 'Pre' snapshot was not found."
-msgstr ""
-
-#. error popup
-#: src/modules/Snapper.rb:316
#, fuzzy
#| msgid "Failed to initialize the catalog."
-msgid ""
-"Failed to create new snapshot:\n"
-"%1"
+msgid "Failed to delete snapshot:\n"
msgstr "Lỗi bắt đầu thư mục."
#. Snapper read dialog caption
-#: src/modules/Snapper.rb:326
+#: src/modules/Snapper.rb:319
#, fuzzy
#| msgid "Initializing"
msgid "Initializing Snapper"
msgstr "Đang chạy"
-#. Progress stage 1/3
-#: src/modules/Snapper.rb:337
+#. Progress stage 1/2
+#: src/modules/Snapper.rb:324
#, fuzzy
+#| msgid "Reload configuration"
+msgid "Read list of configurations"
+msgstr "Tải lại cấu hình"
+
+#. Progress stage 2/2
+#: src/modules/Snapper.rb:326
+#, fuzzy
#| msgid "Read the winbind status"
-msgid "Read the list of snapshots"
+msgid "Read list of snapshots"
msgstr "Đọc trạng thái winbind"
-#. Progress step 1/3
-#: src/modules/Snapper.rb:341
-msgid "Reading the database..."
-msgstr "Đang đọc cơ sở dữ liệu..."
+#. Progress step 1/2
+#: src/modules/Snapper.rb:330
+#, fuzzy
+#| msgid "Reading current configuration..."
+msgid "Reading list of configurations"
+msgstr "Đang đọc cấu hình hiện thời..."
+#. Progress step 2/2
+#: src/modules/Snapper.rb:332
+#, fuzzy
+#| msgid "Read the winbind status"
+msgid "Reading list of snapshots"
+msgstr "Đọc trạng thái winbind"
+
#. Progress finished
-#: src/modules/Snapper.rb:343
+#: src/modules/Snapper.rb:334
msgid "Finished"
msgstr "Hoàn thành"
-#. error popup
-#: src/modules/Snapper.rb:352
+#: src/modules/Snapper.rb:344
+#, fuzzy
+#| msgid "Saving network configuration..."
+msgid "Querying snapper configurations failed:"
+msgstr "Đang lưu cấu hình mạng..."
+
+#: src/modules/Snapper.rb:349
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:395
+#: src/modules/Snapper.rb:399
#, fuzzy
#| msgid "Done Copying Files"
msgid "Restoring Files..."
msgstr "Sao chép xong tập tin."
#. log entry (%1 is file name)
-#: src/modules/Snapper.rb:424
+#: src/modules/Snapper.rb:428
#, fuzzy
#| msgid "Deleting %1"
msgid "Deleted %1\n"
msgstr "Đang xóa %1"
#. log entry (%1 is file name)
-#: src/modules/Snapper.rb:477
+#: src/modules/Snapper.rb:481
#, fuzzy
#| msgid "Skipped\n"
msgid "%1 skipped\n"
msgstr "Bỏ qua\n"
#, fuzzy
-#~| msgid "Really delete '%1'?"
-#~ msgid "Really delete snapshots %{pre} and %{post}?"
-#~ msgstr "Thật sự xoá bỏ '%1'?"
+#~| msgid "Configuration Completed"
+#~ msgid "Configuration not found."
+#~ msgstr "Hoàn thành cấu hình"
#, fuzzy
-#~| msgid "Failed to initialize the catalog."
-#~ msgid "Failed to get config:\n"
-#~ msgstr "Lỗi bắt đầu thư mục."
+#~| msgid "Configuration Completed"
+#~ msgid "Configuration is not valid."
+#~ msgstr "Hoàn thành cấu hình"
#, fuzzy
#~| msgid "Failed to initialize the catalog."
-#~ msgid "Failed to get snapshot mount point:\n"
+#~ msgid ""
+#~ "Failed to initialize snapper library:\n"
+#~ "%1"
#~ msgstr "Lỗi bắt đầu thư mục."
-#, fuzzy
-#~| msgid "Reload configuration"
-#~ msgid "Read list of configurations"
-#~ msgstr "Tải lại cấu hình"
-
-#, fuzzy
-#~| msgid "Reading current configuration..."
-#~ msgid "Reading list of configurations"
-#~ msgstr "Đang đọc cấu hình hiện thời..."
-
-#, fuzzy
-#~| msgid "Read the winbind status"
-#~ msgid "Reading list of snapshots"
-#~ msgstr "Đọc trạng thái winbind"
-
-#, fuzzy
-#~| msgid "Saving network configuration..."
-#~ msgid "Querying snapper configurations failed:"
-#~ msgstr "Đang lưu cấu hình mạng..."
+#~ msgid "Reading the database..."
+#~ msgstr "Đang đọc cơ sở dữ liệu..."
Modified: branches/plus-SLE12-SP2/yast/vi/po/sound.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/sound.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/sound.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2011-05-11 07:24+0700\n"
"Last-Translator: Quang Duong Ha \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/squid.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/squid.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/squid.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/sshd.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/sshd.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/sshd.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/storage.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/storage.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/storage.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -152,11 +152,7 @@
msgid "Not enough space available to propose separate /home."
msgstr ""
-#: src/clients/inst_disk_proposal.rb:283
-msgid "Nothing assigned as root filesystem. Cannot continue."
-msgstr ""
-
-#: src/clients/inst_disk_proposal.rb:304
+#: src/clients/inst_disk_proposal.rb:295
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -783,7 +779,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6250
+#: src/modules/StorageProposal.rb:6245
msgid "Propose Separate &Home Partition"
msgstr ""
@@ -802,7 +798,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:244
+#: src/include/partitioning/custom_part_check_generated.rb:251
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -812,7 +808,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:257
+#: src/include/partitioning/custom_part_check_generated.rb:264
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -822,7 +818,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:270
+#: src/include/partitioning/custom_part_check_generated.rb:277
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -832,7 +828,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:284
+#: src/include/partitioning/custom_part_check_generated.rb:291
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -843,7 +839,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:298
+#: src/include/partitioning/custom_part_check_generated.rb:305
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -853,7 +849,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:313
+#: src/include/partitioning/custom_part_check_generated.rb:320
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -866,7 +862,7 @@
msgstr ""
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:333
+#: src/include/partitioning/custom_part_check_generated.rb:340
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
@@ -876,7 +872,7 @@
msgstr ""
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:350
+#: src/include/partitioning/custom_part_check_generated.rb:357
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -888,7 +884,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:370
+#: src/include/partitioning/custom_part_check_generated.rb:377
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
@@ -899,7 +895,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:389
+#: src/include/partitioning/custom_part_check_generated.rb:396
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -911,11 +907,11 @@
"Really use this setup?\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:415
+#: src/include/partitioning/custom_part_check_generated.rb:416
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"%s\n"
+"\n"
"Really use this setup?\n"
msgstr ""
@@ -1014,53 +1010,53 @@
msgstr ""
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:601
+#: src/include/partitioning/custom_part_check_generated.rb:595
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:612
+#: src/include/partitioning/custom_part_check_generated.rb:606
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:622
+#: src/include/partitioning/custom_part_check_generated.rb:616
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
msgstr ""
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:655
+#: src/include/partitioning/custom_part_check_generated.rb:649
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
msgstr ""
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:666
+#: src/include/partitioning/custom_part_check_generated.rb:660
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:678
+#: src/include/partitioning/custom_part_check_generated.rb:672
msgid "It cannot be deleted while mounted."
msgstr ""
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:714
+#: src/include/partitioning/custom_part_check_generated.rb:708
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:790
+#: src/include/partitioning/custom_part_check_generated.rb:784
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
@@ -1069,7 +1065,7 @@
msgstr ""
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:808
+#: src/include/partitioning/custom_part_check_generated.rb:802
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1079,7 +1075,7 @@
msgstr ""
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:819
+#: src/include/partitioning/custom_part_check_generated.rb:813
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1089,7 +1085,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:830
+#: src/include/partitioning/custom_part_check_generated.rb:824
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1104,13 +1100,13 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6378
+#: src/include/partitioning/ep-dialogs.rb:768
+#: src/modules/StorageProposal.rb:6372
msgid "Do not forget what you enter here!"
msgstr ""
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:809
+#: src/include/partitioning/ep-dialogs.rb:771
msgid "Empty password allowed."
msgstr ""
@@ -1138,7 +1134,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:834
+#: src/include/partitioning/ep-dialogs.rb:796
#, fuzzy
msgid "&Enter a Password for your File System:"
msgstr "Nhập &mật khẩu:"
@@ -1150,7 +1146,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:818 src/modules/Storage.rb:4006
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
#, fuzzy
msgid "Reenter the Password for &Verification:"
msgstr "Nhập &mật khẩu:"
@@ -1171,7 +1167,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3962
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1180,7 +1176,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3970
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1490,7 +1486,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6231
+#: src/modules/StorageProposal.rb:6226
msgid "Enable Snapshots"
msgstr ""
@@ -1506,18 +1502,18 @@
msgid "Empty subvolume name not allowed."
msgstr "Tùy chọn đã được dùng."
-#: src/include/partitioning/custom_part_dialogs.rb:1671
+#: src/include/partitioning/custom_part_dialogs.rb:1670
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:1681
+#: src/include/partitioning/custom_part_dialogs.rb:1680
#, fuzzy
msgid "Subvolume name %1 already exists."
msgstr "Tùy chọn đã được dùng."
-#: src/include/partitioning/custom_part_dialogs.rb:1711
+#: src/include/partitioning/custom_part_dialogs.rb:1709
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -1549,7 +1545,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:746
+#: src/include/partitioning/ep-dialogs.rb:708
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1562,7 +1558,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:761
+#: src/include/partitioning/ep-dialogs.rb:723
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -1575,7 +1571,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:775
+#: src/include/partitioning/ep-dialogs.rb:737
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -1597,7 +1593,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:787
+#: src/include/partitioning/ep-dialogs.rb:749
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -1757,7 +1753,7 @@
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:482
+#: src/include/partitioning/custom_part_lib.rb:491
msgid ""
"\n"
"WARNING:\n"
@@ -1772,12 +1768,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:924
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:919
+#: src/include/partitioning/custom_part_lib.rb:946
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:929
+#: src/include/partitioning/custom_part_lib.rb:924
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -1785,28 +1781,28 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:940
-#: src/include/partitioning/custom_part_lib.rb:965
+#: src/include/partitioning/custom_part_lib.rb:935
+#: src/include/partitioning/custom_part_lib.rb:960
#, fuzzy
#| msgid "Amount:"
msgid "Unmount"
msgstr "Lượng:"
-#: src/include/partitioning/custom_part_lib.rb:956
+#: src/include/partitioning/custom_part_lib.rb:951
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:1002
+#: src/include/partitioning/custom_part_lib.rb:997
msgid "It is not possible to shrink the file system while it is mounted."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:1015
+#: src/include/partitioning/custom_part_lib.rb:1010
msgid "It is not possible to extend the file system while it is mounted."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:1021
msgid "It is not possible to resize the file system while it is mounted."
msgstr ""
@@ -2229,49 +2225,43 @@
msgstr "<p>Hãy chọn một hạng mục tương ứng với vấn đề của ngài.</p>"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:56
+#: src/include/partitioning/ep-dialogs.rb:55
#, fuzzy
-msgid "EFI Boot Partition"
-msgstr "Độ bão hoà"
-
-#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:64
-#, fuzzy
#| msgid "Open System"
msgid "Operating System"
msgstr "Hệ thống mở"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:69
+#: src/include/partitioning/ep-dialogs.rb:60
#, fuzzy
#| msgid "Search applications"
msgid "Data and ISV Applications"
msgstr "Tìm kiếm trong ứng dụng"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:75
+#: src/include/partitioning/ep-dialogs.rb:65
msgid "Swap"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:80
+#: src/include/partitioning/ep-dialogs.rb:70
msgid "Raw Volume (unformatted)"
msgstr ""
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:88
+#: src/include/partitioning/ep-dialogs.rb:78
msgid "Role"
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:120
+#: src/include/partitioning/ep-dialogs.rb:107
msgid ""
"<p>First, choose whether the partition should be\n"
"formatted and the desired file system type.</p>"
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:127
+#: src/include/partitioning/ep-dialogs.rb:114
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"
@@ -2279,63 +2269,63 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:137
+#: src/include/partitioning/ep-dialogs.rb:124
msgid ""
"<p>Then, choose whether the partition should\n"
"be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>"
msgstr ""
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:337
+#: src/include/partitioning/ep-dialogs.rb:309
#, fuzzy
msgid "Formatting Options"
msgstr "Độ bão hoà"
-#: src/include/partitioning/ep-dialogs.rb:345
+#: src/include/partitioning/ep-dialogs.rb:317
#, fuzzy
msgid "Format partition"
msgstr "Độ bão hoà"
-#: src/include/partitioning/ep-dialogs.rb:356
+#: src/include/partitioning/ep-dialogs.rb:328
#, fuzzy
msgid "Do not format partition"
msgstr "Không tìm thấy phân vùng Linux nào."
-#: src/include/partitioning/ep-dialogs.rb:372
+#: src/include/partitioning/ep-dialogs.rb:344
#, fuzzy
msgid "Do not mount partition"
msgstr "Không tìm thấy phân vùng Linux nào."
-#: src/include/partitioning/ep-dialogs.rb:391
+#: src/include/partitioning/ep-dialogs.rb:363
#, fuzzy
msgid "Mounting Options"
msgstr "Độ bão hoà"
-#: src/include/partitioning/ep-dialogs.rb:399
+#: src/include/partitioning/ep-dialogs.rb:371
#, fuzzy
msgid "Mount partition"
msgstr "Độ bão hoà"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
#, fuzzy
msgid "Mount Point"
msgstr "Điểm &gắn:"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:412
+#: src/include/partitioning/ep-dialogs.rb:384
#, fuzzy
msgid "Fs&tab Options..."
msgstr "_Phụ đề:"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:596
+#: src/include/partitioning/ep-dialogs.rb:558
#, fuzzy
msgid "Crypt files must be encrypted."
msgstr "Hệ thống tập tin ả_o"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:607
+#: src/include/partitioning/ep-dialogs.rb:569
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2344,17 +2334,17 @@
msgstr ""
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:623
+#: src/include/partitioning/ep-dialogs.rb:585
msgid "Crypt files require a mount point."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:637
+#: src/include/partitioning/ep-dialogs.rb:599
msgid "Tmpfs requires a mount point."
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:721
+#: src/include/partitioning/ep-dialogs.rb:683
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2364,7 +2354,7 @@
msgstr ""
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:734
+#: src/include/partitioning/ep-dialogs.rb:696
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2373,61 +2363,61 @@
"</p>\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:804
+#: src/include/partitioning/ep-dialogs.rb:766
#, fuzzy
#| msgid "All changes will be lost!"
msgid "All data stored on the volume will be lost!"
msgstr "Mọi thay đổi sẽ bị mất!"
-#: src/include/partitioning/ep-dialogs.rb:827
+#: src/include/partitioning/ep-dialogs.rb:789
#, fuzzy
msgid "Password"
msgstr "Mật &khẩu"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:924
+#: src/include/partitioning/ep-dialogs.rb:886
msgid "Resize not supported by underlying device."
msgstr ""
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:929
+#: src/include/partitioning/ep-dialogs.rb:891
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
"on this partition does not support resizing.\n"
msgstr ""
-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:915
msgid ""
"It is not possible to check whether a NTFS\n"
"can be resized while it is mounted."
msgstr ""
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:934
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
msgstr ""
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:999
+#: src/include/partitioning/ep-dialogs.rb:961
#, fuzzy
msgid "Resize Partition %1"
msgstr "Sửa đổi biểu tượng"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:1020
+#: src/include/partitioning/ep-dialogs.rb:982
msgid "Resize Logical Volume %1"
msgstr ""
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1052
+#: src/include/partitioning/ep-dialogs.rb:1014
#, fuzzy
msgid "Current size: %1"
msgstr "Cỡ: %1"
-#: src/include/partitioning/ep-dialogs.rb:1064
+#: src/include/partitioning/ep-dialogs.rb:1026
#, fuzzy
msgid "Currently used: %1"
msgstr "Trạng thái hiện thời: "
@@ -2436,8 +2426,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1077
-#: src/include/partitioning/ep-dialogs.rb:1114
+#: src/include/partitioning/ep-dialogs.rb:1039
+#: src/include/partitioning/ep-dialogs.rb:1076
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2450,21 +2440,21 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1087
+#: src/include/partitioning/ep-dialogs.rb:1049
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
msgid "Maximum Size (%1)"
msgstr ""
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1097
+#: src/include/partitioning/ep-dialogs.rb:1059
#, fuzzy
msgid "Minimum Size (%1)"
msgstr "Tự chạy"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1106
+#: src/include/partitioning/ep-dialogs.rb:1068
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
#, fuzzy
@@ -2472,14 +2462,14 @@
msgstr "Cỡ :"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1140
+#: src/include/partitioning/ep-dialogs.rb:1102
#, fuzzy
msgid "<p>Choose new size.</p>"
msgstr "<p>Hãy chọn một hạng mục tương ứng với vấn đề của ngài.</p>"
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1191
+#: src/include/partitioning/ep-dialogs.rb:1153
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2489,7 +2479,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:1234
+#: src/include/partitioning/ep-dialogs.rb:1196
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"
@@ -2498,13 +2488,13 @@
msgstr ""
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1310
+#: src/include/partitioning/ep-dialogs.rb:1272
#, fuzzy
msgid "Output of %1"
msgstr "_Xuất:"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1337
+#: src/include/partitioning/ep-dialogs.rb:1299
#, fuzzy
msgid "Rescanning disks..."
msgstr "Đang quét mạng..."
@@ -2705,64 +2695,64 @@
msgstr "Giá trị %1 sai."
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:549
+#: src/include/partitioning/ep-hd-dialogs.rb:548
#, fuzzy
msgid "Add Partition on %1"
msgstr "Sửa đổi biểu tượng"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:595
+#: src/include/partitioning/ep-hd-dialogs.rb:594
#, fuzzy
msgid "Edit Partition %1"
msgstr "Sửa đổi biểu tượng"
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:628
+#: src/include/partitioning/ep-hd-dialogs.rb:627
#, fuzzy
msgid "No space to moved partition %1."
msgstr "Độ bão hoà"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:638
+#: src/include/partitioning/ep-hd-dialogs.rb:637
msgid "Move partition %1 forward?"
msgstr ""
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:647
+#: src/include/partitioning/ep-hd-dialogs.rb:646
msgid "Move partition %1 backward?"
msgstr ""
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:666
+#: src/include/partitioning/ep-hd-dialogs.rb:665
#, fuzzy
msgid "Move partition %1?"
msgstr "Độ bão hoà"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:668
+#: src/include/partitioning/ep-hd-dialogs.rb:667
#, fuzzy
msgid "Forward"
msgstr "Cổng"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:670
+#: src/include/partitioning/ep-hd-dialogs.rb:669
#, fuzzy
#| msgid "&Back"
msgid "Backward"
msgstr "&Quay lại"
-#: src/include/partitioning/ep-hd-dialogs.rb:726
+#: src/include/partitioning/ep-hd-dialogs.rb:725
#, fuzzy
msgid "Confirm Deleting of All Partitions"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
-#: src/include/partitioning/ep-hd-dialogs.rb:728
+#: src/include/partitioning/ep-hd-dialogs.rb:727
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:733
+#: src/include/partitioning/ep-hd-dialogs.rb:732
#, fuzzy
msgid "Really delete all partitions on \"%1\"?"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
@@ -2770,61 +2760,56 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:251
+#: src/include/partitioning/ep-hd-lib.rb:245
#, fuzzy
msgid "No hard disk selected."
msgstr "Đang thử các ổ cứng"
#. 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:57 src/modules/Storage.rb:5250
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
msgid "The disk is in use and cannot be modified."
msgstr ""
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:92
+#: src/include/partitioning/ep-hd-lib.rb:86
msgid "Select new partition table type for %1."
msgstr ""
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:117
+#: src/include/partitioning/ep-hd-lib.rb:111
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:137
+#: src/include/partitioning/ep-hd-lib.rb:131
#, fuzzy
msgid "No disk selected."
msgstr "Đang thử các ổ cứng"
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:151
-#: src/include/partitioning/ep-lib.rb:202
+#: src/include/partitioning/ep-hd-lib.rb:145
+#: src/include/partitioning/ep-lib.rb:199
#, fuzzy
msgid "Really delete BIOS RAID %1?"
msgstr "Thật sự xoá bỏ không?"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:165
+#: src/include/partitioning/ep-hd-lib.rb:159
#, fuzzy
msgid "Really delete Partitioned RAID %1?"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:182
+#: src/include/partitioning/ep-hd-lib.rb:176
msgid "There are no partitions to delete on this disk."
msgstr ""
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:235
+#: src/include/partitioning/ep-hd-lib.rb:229
msgid "It is not possible to create a partition on %1."
msgstr ""
@@ -2832,52 +2817,52 @@
#. error popup
#. error popup
#. error popup
-#: 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
+#: 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
#, fuzzy
msgid "No partition selected."
msgstr "Phân vùng"
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:340
+#: src/include/partitioning/ep-hd-lib.rb:334
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:351
+#: src/include/partitioning/ep-hd-lib.rb:345
msgid "An extended partition cannot be edited."
msgstr ""
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:393
+#: src/include/partitioning/ep-hd-lib.rb:387
msgid ""
"The partition %1 is already created on disk\n"
"and cannot be moved."
msgstr ""
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:404
+#: src/include/partitioning/ep-hd-lib.rb:398
msgid "An extended partition cannot be moved."
msgstr ""
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:449
+#: src/include/partitioning/ep-hd-lib.rb:443
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:460
+#: src/include/partitioning/ep-hd-lib.rb:454
msgid "An extended partition cannot be resized."
msgstr ""
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:533
+#: src/include/partitioning/ep-hd-lib.rb:527
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -2887,54 +2872,54 @@
"partitions will be deleted.</p>\n"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:579
+#: src/include/partitioning/ep-hd-lib.rb:573
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
msgstr ""
-#: src/include/partitioning/ep-hd-lib.rb:586
+#: src/include/partitioning/ep-hd-lib.rb:580
#, fuzzy
msgid "Really delete these partitions?"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
-#: src/include/partitioning/ep-hd-lib.rb:602
+#: src/include/partitioning/ep-hd-lib.rb:596
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:615
+#: src/include/partitioning/ep-hd-lib.rb:609
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:644
+#: src/include/partitioning/ep-hd-lib.rb:638
#, fuzzy
msgid "Clone partition layout of %1"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
-#: src/include/partitioning/ep-hd-lib.rb:648
+#: src/include/partitioning/ep-hd-lib.rb:642
#, fuzzy
#| msgid "A&vailable are:"
msgid "Available target disks:"
msgstr "&Có:"
-#: src/include/partitioning/ep-hd-lib.rb:676
+#: src/include/partitioning/ep-hd-lib.rb:670
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:757
+#: src/include/partitioning/ep-hd-lib.rb:751
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
msgstr ""
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:768
+#: src/include/partitioning/ep-hd-lib.rb:762
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3195,28 +3180,28 @@
msgstr "Không có hạn sử dụng mật khẩu"
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:110
+#: src/include/partitioning/ep-lib.rb:107
msgid "Confirm Deleting Partition Used by LVM"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:112
+#: src/include/partitioning/ep-lib.rb:109
msgid ""
"The selected partition is used by volume group \"%1\".\n"
"To keep the system in a consistent state, the following volume group\n"
"and its logical volumes will be deleted:\n"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:120
+#: src/include/partitioning/ep-lib.rb:117
#, fuzzy
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr "Tùy chọn đã được dùng."
-#: src/include/partitioning/ep-lib.rb:130
+#: src/include/partitioning/ep-lib.rb:127
#, fuzzy
msgid "Confirm Deleting Partition Used by RAID"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
-#: src/include/partitioning/ep-lib.rb:132
+#: src/include/partitioning/ep-lib.rb:129
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
"To keep the system in a consistent state, the following\n"
@@ -3225,13 +3210,13 @@
# Type: select
# Description
-#: src/include/partitioning/ep-lib.rb:140
+#: src/include/partitioning/ep-lib.rb:137
#, fuzzy
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "kiểu nội suy cần dùng"
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:210
+#: src/include/partitioning/ep-lib.rb:207
#, fuzzy
msgid "Really delete all partitions on %1?"
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
@@ -3239,13 +3224,13 @@
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:262
+#: src/include/partitioning/ep-lib.rb:259
#, fuzzy
msgid "Really delete %1?"
msgstr "Thật sự xoá bỏ không?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:276
+#: src/include/partitioning/ep-lib.rb:273
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -3253,7 +3238,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:358
+#: src/include/partitioning/ep-lib.rb:340
#, fuzzy
msgid "Unpartitioned"
msgstr "Phân vùng"
@@ -3262,36 +3247,36 @@
#. 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:461
+#: src/include/partitioning/ep-lib.rb:443
#, fuzzy
msgid "Unallocated"
msgstr "Phân vùng"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:482
#, fuzzy
msgid "<p>No changes to partitioning.</p>"
msgstr "<p>Hãy chọn một hạng mục tương ứng với vấn đề của ngài.</p>"
-#: src/include/partitioning/ep-lib.rb:502
+#: src/include/partitioning/ep-lib.rb:484
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "<p>Hãy chọn một hạng mục tương ứng với vấn đề của ngài.</p>"
-#: src/include/partitioning/ep-lib.rb:505
+#: src/include/partitioning/ep-lib.rb:487
msgid "<p>No changes to storage settings.</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:507
+#: src/include/partitioning/ep-lib.rb:489
#, fuzzy
msgid "<p>Storage settings:</p>"
msgstr "<p><b>Thiết lập gia nhập</b></p>"
-#: src/include/partitioning/ep-lib.rb:516
+#: src/include/partitioning/ep-lib.rb:498
#, fuzzy
msgid "<p>Packages to install:</p>"
msgstr "<p><b>Thiết lập gia nhập</b></p>"
-#: src/include/partitioning/ep-lib.rb:518
+#: src/include/partitioning/ep-lib.rb:500
msgid "<p>No packages need to be installed.</p>"
msgstr ""
@@ -3393,13 +3378,13 @@
msgstr ""
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:282
+#: src/include/partitioning/ep-loop-dialogs.rb:281
#, fuzzy
msgid "Add Crypt File"
msgstr "Tập tin khoá riêng:"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:326
+#: src/include/partitioning/ep-loop-dialogs.rb:325
#, fuzzy
msgid "Edit Crypt File %1"
msgstr "Tập tin khoá riêng:"
@@ -3715,12 +3700,12 @@
msgstr "Dùng ISDN"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1029
+#: src/include/partitioning/ep-lvm-dialogs.rb:1028
msgid "Add Logical Volume on %1"
msgstr ""
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1076
+#: src/include/partitioning/ep-lvm-dialogs.rb:1075
#, fuzzy
msgid "Edit Logical Volume %1 on %2"
msgstr "Cỡ :"
@@ -3757,9 +3742,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:316
-#: src/include/partitioning/ep-lvm-lib.rb:368
-#: src/include/partitioning/ep-lvm-lib.rb:403
+#: src/include/partitioning/ep-lvm-lib.rb:315
+#: src/include/partitioning/ep-lvm-lib.rb:367
+#: src/include/partitioning/ep-lvm-lib.rb:402
msgid "No logical volume selected."
msgstr ""
@@ -3770,14 +3755,14 @@
msgstr "Thật sự xoá bỏ phiên bản « {0} » không?"
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:327
+#: src/include/partitioning/ep-lvm-lib.rb:326
msgid ""
"The volume %1 is a thin pool.\n"
"It cannot be edited."
msgstr ""
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:338
+#: src/include/partitioning/ep-lvm-lib.rb:337
msgid ""
"The volume %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
@@ -4132,18 +4117,18 @@
msgstr ""
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:643
+#: src/include/partitioning/ep-raid-dialogs.rb:642
msgid "Add RAID %1"
msgstr ""
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:677
+#: src/include/partitioning/ep-raid-dialogs.rb:676
#, fuzzy
msgid "Resize RAID %1"
msgstr "Gỡ _bỏ thẻ"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:723
+#: src/include/partitioning/ep-raid-dialogs.rb:722
msgid "Edit RAID %1"
msgstr ""
@@ -4422,7 +4407,7 @@
msgstr ""
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
msgid "Add tmpfs Mount"
msgstr ""
@@ -5171,51 +5156,38 @@
msgstr ""
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:936
-msgid "Operation not permitted on disk %{device}.\n"
+#: src/modules/Partitions.rb:930
+msgid "Operation not permitted on disk %1.\n"
msgstr ""
-#. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:941
+#. popup text %1 is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:940
msgid ""
"\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 ""
-
-#. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:953
-msgid ""
-"\n"
-"The partitioning on your disk %{device} is either not readable or not \n"
+"The partitioning on your disk %1 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 %{device} as they are or\n"
+"You can use the partitions on disk %1 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 ""
-#. popup text %{device} is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:965
+#. popup text %1 is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:958
msgid ""
"\n"
-"The disk %{device} does not contain a partition table but for\n"
+"The disk %1 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 %{device} as it is or\n"
+"You can use the partition on disk %1 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 ""
#. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:977
msgid ""
"\n"
"\n"
@@ -5225,7 +5197,7 @@
msgstr ""
#. popup text
-#: src/modules/Partitions.rb:991
+#: src/modules/Partitions.rb:989
msgid ""
"\n"
"\n"
@@ -5239,7 +5211,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:993
+#: src/modules/Storage.rb:992
#, fuzzy
msgid "Resize Not Possible:"
msgstr "_Đổi cỡ thành: "
@@ -5253,7 +5225,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:2696 src/modules/Storage.rb:3919
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5262,7 +5234,7 @@
msgstr ""
#. popup text
-#: src/modules/Storage.rb:3950
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5270,7 +5242,7 @@
msgstr ""
#. popup text
-#: src/modules/Storage.rb:3981
+#: src/modules/Storage.rb:3977
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5279,29 +5251,29 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4035
+#: src/modules/Storage.rb:4031
#, fuzzy
#| msgid "&Enter Password:"
msgid "&Enter Encryption Password:"
msgstr "Nhập &mật khẩu:"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4094
+#: src/modules/Storage.rb:4090
#, fuzzy
#| msgid "Private Key Password:"
msgid "Provide Password"
msgstr "Mật khẩu khoá riêng:"
-#: src/modules/Storage.rb:4113
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4124
#, fuzzy
msgid "Encrypted Volume Activation"
msgstr "Tạo phiên bản mới"
-#: src/modules/Storage.rb:4132
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5309,14 +5281,14 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4144
+#: src/modules/Storage.rb:4140
#, fuzzy
#| msgid "&Enter Password:"
msgid "Do you want to provide encryption passwords?"
msgstr "Nhập &mật khẩu:"
#. text in help field
-#: src/modules/Storage.rb:4201
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -5324,58 +5296,58 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4207
+#: src/modules/Storage.rb:4203
#, fuzzy
#| msgid "&Enter Password:"
msgid "Enter Encryption Password"
msgstr "Nhập &mật khẩu:"
-#: src/modules/Storage.rb:4210
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4223
+#: src/modules/Storage.rb:4219
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for any of the following devices:"
msgstr "YaST2 đã nhận ra các thiết bị sau"
#. label text, one device name follows
-#: src/modules/Storage.rb:4226
+#: src/modules/Storage.rb:4222
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for the following device:"
msgstr "YaST2 đã nhận ra các thiết bị sau"
-#: src/modules/Storage.rb:4239
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4263
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4349
+#: src/modules/Storage.rb:4345
msgid "IDE Disk"
msgstr ""
-#: src/modules/Storage.rb:4355
+#: src/modules/Storage.rb:4351
msgid "SCSI Disk"
msgstr ""
-#: src/modules/Storage.rb:4361
+#: src/modules/Storage.rb:4357
#, fuzzy
#| msgid "Hard Disk"
msgid "Disk"
msgstr "Ổ cứng"
-#: src/modules/Storage.rb:4389
+#: src/modules/Storage.rb:4385
#, fuzzy
msgid "DM RAID"
msgstr "Tạo đĩa CD"
-#: src/modules/Storage.rb:4402
+#: src/modules/Storage.rb:4398
#, fuzzy
msgid "MD RAID"
msgstr "Tạo đĩa CD"
@@ -5383,50 +5355,50 @@
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4897
+#: src/modules/Storage.rb:4893
msgid "Installing required packages failed."
msgstr "Cài đặt gói yêu cầu không thành công."
-#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
#, fuzzy
#| msgid "&Continue System Repair"
msgid "Continue despite the error?"
msgstr "&Tiếp tục sửa chữa hệ thống"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5262
+#: src/modules/Storage.rb:5252
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5288
+#: src/modules/Storage.rb:5278
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5302
+#: src/modules/Storage.rb:5292
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5331
+#: src/modules/Storage.rb:5321
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5340
+#: src/modules/Storage.rb:5330
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5369
+#: src/modules/Storage.rb:5359
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -5434,7 +5406,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5380
+#: src/modules/Storage.rb:5370
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -5442,7 +5414,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5402
+#: src/modules/Storage.rb:5392
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -5450,18 +5422,18 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5491
+#: src/modules/Storage.rb:5481
msgid "Nothing assigned as root filesystem!"
msgstr ""
-#: src/modules/Storage.rb:5492
+#: src/modules/Storage.rb:5482
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:6042
+#: src/modules/Storage.rb:6032
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -6098,43 +6070,54 @@
#. enable snapshots for root volume if desired
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4579 src/modules/StorageProposal.rb:5702
+#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr ""
+#. TRANSLATORS: checkbox text
+#: src/modules/StorageProposal.rb:6179
+#, fuzzy
+msgid "Create &LVM-based Proposal"
+msgstr "Tạo sự kết nối VPN"
+
+#. TRANSLATORS: checkbox text
+#: src/modules/StorageProposal.rb:6194
+#, fuzzy
+msgid "Encr&ypt Volume Group"
+msgstr "Tạo phiên bản mới"
+
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6217
+#: src/modules/StorageProposal.rb:6212
#, fuzzy
msgid "File System for Root Partition"
msgstr "Không tìm thấy phân vùng Linux nào."
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6264
+#: src/modules/StorageProposal.rb:6259
#, fuzzy
msgid "File System for Home Partition"
msgstr "Không tìm thấy phân vùng Linux nào."
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6282
+#: src/modules/StorageProposal.rb:6277
msgid "Enlarge &Swap for Suspend"
msgstr ""
-#: src/modules/StorageProposal.rb:6292
+#: src/modules/StorageProposal.rb:6287
#, fuzzy
#| msgid "Write catalog settings"
msgid "Proposal Settings"
msgstr "Ghi thiết lập hạng mục"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6307
+#: src/modules/StorageProposal.rb:6302
msgid ""
-"<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>"
+"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+"LVM-based proposal can be encrypted.</p>\n"
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6315
+#: src/modules/StorageProposal.rb:6309
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"
@@ -6143,52 +6126,36 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6324
+#: src/modules/StorageProposal.rb:6318
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:6331
+#: src/modules/StorageProposal.rb:6325
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:6356
+#: src/modules/StorageProposal.rb:6350
msgid "Enter your password for the proposal encryption."
msgstr ""
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6363
+#: src/modules/StorageProposal.rb:6357
msgid "Password:"
msgstr "Mật khẩu :"
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6374
+#: src/modules/StorageProposal.rb:6368
#, fuzzy
msgid "Reenter the password for verification:"
msgstr "Nhập &mật khẩu:"
-#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6572
-#, fuzzy
-msgid "&Partition-based Proposal"
-msgstr "Phân vùng"
-
-#: src/modules/StorageProposal.rb:6574
-#, fuzzy
-msgid "&LVM-based Proposal"
-msgstr "Tạo sự kết nối VPN"
-
-#: src/modules/StorageProposal.rb:6576
-#, fuzzy
-msgid "&Encrypted LVM-based Proposal"
-msgstr "Tạo sự kết nối VPN"
-
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -6236,10 +6203,6 @@
msgstr ""
#, fuzzy
-#~ msgid "Encr&ypt Volume Group"
-#~ msgstr "Tạo phiên bản mới"
-
-#, fuzzy
#~ msgid "Changes:"
#~ msgstr "Trang:"
@@ -6279,6 +6242,10 @@
#~ msgstr "Hệ thống tập tin ả_o"
#, fuzzy
+#~ msgid "&Partition Based"
+#~ msgstr "Phân vùng"
+
+#, fuzzy
#~ msgid "Device "
#~ msgstr "_Thiết bị:"
Modified: branches/plus-SLE12-SP2/yast/vi/po/support.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/support.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/support.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -33,54 +33,54 @@
msgstr ""
#. Command line parameters dialog caption
-#: src/include/support/dialogs.rb:46
+#: src/include/support/dialogs.rb:50
msgid "Supportconfig Overview Dialog"
msgstr ""
#. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:53
+#: src/include/support/dialogs.rb:57
#, fuzzy
#| msgid "SUSE Support"
msgid "Open SUSE Support Center"
msgstr "Hỗ trợ SUSE"
-#: src/include/support/dialogs.rb:58
+#: src/include/support/dialogs.rb:62
msgid "This will start a browser connecting to the SUSE Support Center Portal."
msgstr ""
-#: src/include/support/dialogs.rb:68
+#: src/include/support/dialogs.rb:72
msgid "Open"
msgstr "Mở"
-#: src/include/support/dialogs.rb:79
+#: src/include/support/dialogs.rb:83
msgid "Collect Data"
msgstr ""
-#: src/include/support/dialogs.rb:84
+#: src/include/support/dialogs.rb:88
msgid "This will create a tarball containing the collected log files."
msgstr ""
-#: src/include/support/dialogs.rb:96
+#: src/include/support/dialogs.rb:100
msgid "Create report tarball"
msgstr ""
-#: src/include/support/dialogs.rb:108
+#: src/include/support/dialogs.rb:112
msgid "Upload Data"
msgstr ""
-#: src/include/support/dialogs.rb:112
+#: src/include/support/dialogs.rb:116
msgid "This will upload the collected logs to the specified URL."
msgstr ""
-#: src/include/support/dialogs.rb:119
+#: src/include/support/dialogs.rb:123
msgid "Upload"
msgstr ""
-#: src/include/support/dialogs.rb:149
+#: src/include/support/dialogs.rb:153
msgid "Could not find any installed browser."
msgstr ""
-#: src/include/support/dialogs.rb:159
+#: src/include/support/dialogs.rb:163
msgid ""
"YaST will run a Web browser as superuser. Consider\n"
"running it as a non-provileged user and entering the URL\n"
@@ -88,183 +88,184 @@
"Start Web browser?\n"
msgstr ""
-#: src/include/support/dialogs.rb:201
+#: src/include/support/dialogs.rb:205
msgid "Supportconfig Upload Dialog"
msgstr ""
#. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:226
+#: src/include/support/dialogs.rb:230
msgid "Save as"
msgstr ""
-#: src/include/support/dialogs.rb:229
+#: src/include/support/dialogs.rb:233
msgid "Directory to Save"
msgstr ""
-#: src/include/support/dialogs.rb:239
+#: src/include/support/dialogs.rb:243
msgid "Package with log files"
msgstr ""
-#: src/include/support/dialogs.rb:253
+#: src/include/support/dialogs.rb:257
msgid "Upload log files tarball to URL"
msgstr ""
-#: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756
+#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760
msgid "Upload Target"
msgstr ""
#. }
-#: src/include/support/dialogs.rb:327
+#: src/include/support/dialogs.rb:331
msgid "Cannot write settings"
msgstr ""
-#: src/include/support/dialogs.rb:343
+#: src/include/support/dialogs.rb:347
msgid "Cannot write settings."
msgstr "Không ghi được các thiết lập."
-#: src/include/support/dialogs.rb:389
+#: src/include/support/dialogs.rb:393
msgid "Choose Directory Where to Save Tarball"
msgstr ""
#. Support::log_files["tmp_dir"]=save_dir;
-#: src/include/support/dialogs.rb:401
+#: src/include/support/dialogs.rb:405
msgid "Choose Log Files Tarball File"
msgstr ""
#. Command line parameters dialog caption
-#: src/include/support/dialogs.rb:421
+#: src/include/support/dialogs.rb:425
msgid "Supportconfig Parameters Configuration"
msgstr ""
-#: src/include/support/dialogs.rb:426
+#: src/include/support/dialogs.rb:430
msgid "Create a full file listing from '/'"
msgstr ""
-#: src/include/support/dialogs.rb:431
+#: src/include/support/dialogs.rb:435
msgid "Exclude detailed disk info and scans"
msgstr ""
-#: src/include/support/dialogs.rb:436
+#: src/include/support/dialogs.rb:440
msgid "Search root filesystem for eDirectory instances"
msgstr ""
-#: src/include/support/dialogs.rb:441
+#: src/include/support/dialogs.rb:445
msgid "Include full SLP service lists"
msgstr ""
-#: src/include/support/dialogs.rb:446
+#: src/include/support/dialogs.rb:450
msgid "Performs an rpm -V for each installed rpm"
msgstr ""
-#: src/include/support/dialogs.rb:451
+#: src/include/support/dialogs.rb:455
msgid "Include all log file lines, gather additional rotated logs"
msgstr ""
#. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:465
+#: src/include/support/dialogs.rb:469
msgid "Use Defaults (ignore /etc/supportconfig.conf)"
msgstr ""
-#: src/include/support/dialogs.rb:472
+#: src/include/support/dialogs.rb:476
msgid "Activates all support functions"
msgstr ""
-#: src/include/support/dialogs.rb:479
+#: src/include/support/dialogs.rb:483
msgid "Only gather a minimum amount of info"
msgstr ""
-#: src/include/support/dialogs.rb:487
+#: src/include/support/dialogs.rb:491
msgid "Use Custom (Expert) Settings"
msgstr ""
-#: src/include/support/dialogs.rb:489
+#: src/include/support/dialogs.rb:493
msgid "Expert Settings"
msgstr "Thiết lập cao cấp"
-#: src/include/support/dialogs.rb:495
+#: src/include/support/dialogs.rb:499
msgid "Options"
msgstr "Tùy chọn"
#. Support overview dialog caption
-#: src/include/support/dialogs.rb:584
+#: src/include/support/dialogs.rb:588
msgid "Supportconfig Expert Configuration"
msgstr ""
#. FIXME table header
-#: src/include/support/dialogs.rb:614
+#: src/include/support/dialogs.rb:618
msgid "Default Options"
msgstr ""
#. Support configure2 dialog caption
-#: src/include/support/dialogs.rb:680
+#: src/include/support/dialogs.rb:684
msgid "Supportconfig Contact Configuration"
msgstr ""
#. Support configure2 dialog contents
-#: src/include/support/dialogs.rb:685
+#: src/include/support/dialogs.rb:689
msgid "Contact Information"
msgstr ""
-#: src/include/support/dialogs.rb:690
+#: src/include/support/dialogs.rb:694
msgid "Company"
msgstr ""
-#: src/include/support/dialogs.rb:701
+#: src/include/support/dialogs.rb:705
msgid "Email Address"
msgstr ""
-#: src/include/support/dialogs.rb:708
+#: src/include/support/dialogs.rb:712
msgid "Name"
msgstr "Tên"
-#: src/include/support/dialogs.rb:715
+#: src/include/support/dialogs.rb:719
msgid "Phone Number"
msgstr ""
-#: src/include/support/dialogs.rb:722
+#: src/include/support/dialogs.rb:726
msgid "Store ID"
msgstr ""
-#: src/include/support/dialogs.rb:733
+#: src/include/support/dialogs.rb:737
msgid "Terminal ID"
msgstr ""
-#: src/include/support/dialogs.rb:744
+#: src/include/support/dialogs.rb:748
msgid "GPG UID"
msgstr ""
-#: src/include/support/dialogs.rb:751
+#: src/include/support/dialogs.rb:755
msgid "Upload Information"
msgstr ""
-#: src/include/support/dialogs.rb:770
+#: src/include/support/dialogs.rb:774
msgid "11-digit service request number"
msgstr ""
#. abort?
-#: src/include/support/dialogs.rb:847
+#: src/include/support/dialogs.rb:851
msgid "The SR number must be 11 digits"
msgstr ""
-#: src/include/support/dialogs.rb:865
+#: src/include/support/dialogs.rb:869
msgid "Collecting Data"
msgstr ""
-#: src/include/support/dialogs.rb:866
+#: src/include/support/dialogs.rb:870
msgid "Progress"
msgstr "Quá trình"
-#: src/include/support/dialogs.rb:931
+#. Remove ANSI escape codes for cursor movement (bnc#921233)
+#: src/include/support/dialogs.rb:939
msgid "Collected Data Review"
msgstr ""
#. FIXME use list of generated files, as well as directory prefix
#. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents"))
-#: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026
+#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034
msgid "File Name"
msgstr ""
-#: src/include/support/dialogs.rb:984
+#: src/include/support/dialogs.rb:992
msgid "Remove from Data"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/vi/po/sysconfig.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/sysconfig.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/sysconfig.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/tftp-server.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/tftp-server.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/tftp-server.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/timezone_db.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/timezone_db.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/timezone_db.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2011-05-10 18:27+0700\n"
"Last-Translator: Quang Duong Ha \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/tune.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/tune.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/tune.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/update.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/update.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/update.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
Modified: branches/plus-SLE12-SP2/yast/vi/po/users.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/users.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/users.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -137,6 +137,558 @@
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
+#, fuzzy
+msgid "User Authentication Method"
+msgstr "Xác thực:"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. radiobutton to select ldap user auth.
+#: src/clients/inst_auth.rb:141
+msgid "&LDAP"
+msgstr ""
+
+#. radiobutton to select nis user auth.
+#: src/clients/inst_auth.rb:143
+msgid "N&IS"
+msgstr ""
+
+#. radiobutton to select samba user auth.
+#. menubutton label
+#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr ""
+
+#. radiobutton to select samba user auth.
+#: src/clients/inst_auth.rb:147
+#, fuzzy
+msgid "&Windows Domain"
+msgstr "Thành viên của Miền Windows"
+
+#. radiobutton to select local user auth.
+#. radiobutton label
+#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
+#, fuzzy
+msgid "L&ocal (/etc/passwd)"
+msgstr "Không thể tạo thư mục."
+
+#. radiobutton to select local user auth.
+#. authentication type
+#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
+#, fuzzy
+msgid "eDirectory LDAP"
+msgstr "Đường dẫn thư mục"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. button label
+#. button label
+#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
+msgid "&Choose"
+msgstr ""
+
+#. frame title for authentication methods
+#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
+#, fuzzy
+msgid "Authentication Method"
+msgstr "Xác thực:"
+
+#. check box label
+#: src/clients/inst_auth.rb:303
+#, fuzzy
+msgid "Set Up &Kerberos Authentication"
+msgstr "Chọn tập tin cho chìa khóa xác thực"
+
+#. 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 ""
+
+#. check box label
+#. check box label
+#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
+#, fuzzy
+msgid "Select or Deselect &All"
+msgstr "Chọ&n tất cả"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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
+#, fuzzy
+msgid "Con&firm Password"
+msgstr "Mật khẩu :"
+
+#. text entry label
+#. text entry label
+#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
+msgid "&Test Keyboard Layout"
+msgstr ""
+
+#. push button
+#: src/clients/inst_root.rb:119
+#, fuzzy
+msgid "E&xpert Options..."
+msgstr "_Xuất vào đĩa CD..."
+
+#. 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 ""
+
+#. 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 ""
+
+#. help text, continued 3/5
+#. help text, continued 3/5
+#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
+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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. #-#-#-#-# 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 ""
+
+#. 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
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %1 characters."
+msgstr ""
+
+#. 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 "Really use this password?"
+msgstr "Mật khẩu root"
+
+#. 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 ""
+
+#. help text (shown in the 'busy' situation)
+#: src/clients/inst_user.rb:144
+msgid "Initialization of module for configuration of authentication..."
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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
+#, fuzzy
+msgid "Password Encryption Type"
+msgstr "Không có hạn sử dụng mật khẩu"
+
+#. 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 ""
+
+#. 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>Authentication</b><br></p>"
+msgstr "<p><b>Thiết lập gia nhập</b></p>"
+
+#. Help text for password expert dialog
+#: src/clients/inst_user_first.rb:168
+#, fuzzy
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Không có hạn sử dụng mật khẩu"
+
+#. 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
+#, fuzzy
+msgid "User's &Full Name"
+msgstr "Tên người dùng:"
+
+#. input field for login name
+#. input field for login name
+#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
+#, fuzzy
+msgid "&Username"
+msgstr "Tên _người dùng:"
+
+#. 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 ""
+
+#. checkbox label
+#. checkbox label
+#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
+#, fuzzy
+msgid "Receive S&ystem Mail"
+msgstr "Dữ liệu nhận"
+
+#. checkbox label
+#: src/clients/inst_user_first.rb:261
+#, fuzzy
+msgid "&Automatic Login"
+msgstr "WPA Tự động"
+
+#. dialog caption
+#: src/clients/inst_user_first.rb:283
+#, fuzzy
+msgid "Create New User"
+msgstr "Tạo phiên bản mới"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. help text for main add user dialog
+#: src/clients/inst_user_first.rb:453
+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 ""
+
+#. 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 ""
+
+#. additional help text about password
+#: src/clients/inst_user_first.rb:467
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 "Thiết lập cao cấp"
+
+#. summary label
+#: src/clients/inst_user_first.rb:625
+msgid "The authentication method is local /etc/passwd."
+msgstr ""
+
+#. summary label
+#: src/clients/inst_user_first.rb:628
+#, fuzzy
+msgid "The password encryption method is %s."
+msgstr "Không có hạn sử dụng mật khẩu"
+
+#. summary label, %s is a single user name or multiple usernames (comma separated)
+#: src/clients/inst_user_first.rb:635
+msgid "User %s will be imported."
+msgid_plural "Users %s will be imported."
+msgstr[0] ""
+
+#. pushbutton label
+#: src/clients/inst_user_first.rb:650
+msgid "&Change..."
+msgstr "&Thay đổi..."
+
+#. frame label
+#: src/clients/inst_user_first.rb:657
+msgid "Summary"
+msgstr "Tổng kết"
+
+#. yes/no popup question, %s is a number
+#: src/clients/inst_user_first.rb:709
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+
#. translators: command line help text for Users module
#: src/clients/users.rb:102
#, fuzzy
@@ -271,6 +823,12 @@
msgid "New UID of the user"
msgstr "Thư mục thêm"
+#. progress step title
+#: src/clients/users_finish.rb:63
+#, fuzzy
+msgid "Writing Users Configuration..."
+msgstr "Đang ghi cấu hình Kerberos..."
+
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -527,6 +1085,102 @@
msgid "Seconds"
msgstr ""
+#. 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 ""
+
+#. authentication type
+#. richtext label
+#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr ""
+
+#. authentication type
+#: src/clients/users_proposal.rb:46
+#, fuzzy
+msgid "Samba (Windows Domain)"
+msgstr "Thành viên của Miền Windows"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/clients/users_proposal.rb:69
+#, fuzzy
+msgid "<%1>Root Password<%2> set"
+msgstr "Mật khẩu root"
+
+#: src/clients/users_proposal.rb:74
+#, fuzzy
+msgid "<%1>Root Password<%2> not set"
+msgstr "Mật khẩu root"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/clients/users_proposal.rb:81
+msgid "No <%1>user<%2> configured"
+msgstr ""
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. % is LDAP/NIS etc.
+#: src/clients/users_proposal.rb:93
+#, fuzzy
+msgid "<%1>Authentication method<%2>: %3"
+msgstr "Xác thực:"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. % is LDAP/NIS etc.
+#: src/clients/users_proposal.rb:102
+#, fuzzy
+msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+msgstr "Xác thực:"
+
+#. summary line, %3 are user names (comma separated)
+#. <%1>,<%2> are HTML tags, leave untouched,
+#: src/clients/users_proposal.rb:116
+msgid "<%1>Users<%2> %3 selected for import"
+msgstr ""
+
+#. summary line, <%1>,<%2> are HTML tags, %3 user name
+#: src/clients/users_proposal.rb:124
+msgid "<%1>User<%2> %3 will be imported."
+msgstr ""
+
+#. 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 ""
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/clients/users_proposal.rb:143
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr ""
+
+#. summary line
+#: src/clients/users_proposal.rb:156
+#, fuzzy
+msgid "Password Encryption Method: %1"
+msgstr "Không có hạn sử dụng mật khẩu"
+
+#. rich text label
+#: src/clients/users_proposal.rb:170
+#, fuzzy
+msgid "User Settings"
+msgstr "Thiết lập cao cấp"
+
+#. menu button label
+#: src/clients/users_proposal.rb:173
+#, fuzzy
+msgid "&User"
+msgstr "Người dùng"
+
+#. menu button label
+#: src/clients/users_proposal.rb:175
+#, fuzzy
+msgid "&Root Password"
+msgstr "Mật khẩu root"
+
#. password entering label
#: src/include/users/cmdline.rb:55
#, fuzzy
@@ -692,22 +1346,6 @@
"enter the user's current password."
msgstr ""
-#. 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 ""
-
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -735,14 +1373,6 @@
msgstr "Chỉ mục thư mục chính của tôi"
#. text entry
-#. text entry
-#: src/include/users/dialogs.rb:403
-#: src/lib/users/dialogs/inst_user_first.rb:582
-#, fuzzy
-msgid "User's &Full Name"
-msgstr "Tên người dùng:"
-
-#. text entry
#: src/include/users/dialogs.rb:411
#, fuzzy
msgid "&First Name"
@@ -759,33 +1389,12 @@
msgid "For remote users, only additional group memberships can be changed."
msgstr ""
-#. 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
-#, fuzzy
-msgid "&Username"
-msgstr "Tên _người dùng:"
-
#. checkbox label
-#: src/include/users/dialogs.rb:446
-#, fuzzy
-msgid "Receive S&ystem Mail"
-msgstr "Dữ liệu nhận"
-
-#. checkbox label
#: src/include/users/dialogs.rb:456
#, fuzzy
msgid "A&utomatic Login"
msgstr "WPA Tự động"
-#. 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 ""
-
#. check box label
#: src/include/users/dialogs.rb:480
#, fuzzy
@@ -978,31 +1587,6 @@
msgid "Plu&g-Ins"
msgstr ""
-#. 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 ""
-
-#. 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 ""
-
-#. 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 "Really use this password?"
-msgstr "Mật khẩu root"
-
#. popup question
#: src/include/users/dialogs.rb:1308
#, fuzzy
@@ -1100,20 +1684,6 @@
msgid "Group &Data"
msgstr "Tên người dùng:"
-#. 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 ""
-
-#. encryption type
-#. TRANSLATORS: encryption type
-#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
-msgid "MD5"
-msgstr ""
-
#. help text 1/4
#: src/include/users/helps.rb:62
msgid ""
@@ -1123,24 +1693,6 @@
"</p>\n"
msgstr ""
-#. 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 ""
-
-#. 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 ""
-
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -1273,15 +1825,6 @@
"</p>\n"
msgstr ""
-#. 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 ""
-
#. help text 2/7
#: src/include/users/helps.rb:226
msgid ""
@@ -1307,21 +1850,6 @@
"</p>\n"
msgstr ""
-#. 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 ""
-
-#. 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 ""
-
#. 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>"
@@ -1978,9 +2506,7 @@
msgstr "Hệ thống mở"
#. 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
#, fuzzy
msgid "Local Users"
msgstr "tập tin trên &máy"
@@ -2070,11 +2596,6 @@
msgstr "Tên nhóm Samba"
#. richtext label
-#: src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr ""
-
-#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr ""
@@ -2094,11 +2615,6 @@
msgid "&SSSD"
msgstr ""
-#. menubutton label
-#: src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr ""
-
#. tab header
#: src/include/users/widgets.rb:168
#, fuzzy
@@ -2227,11 +2743,6 @@
"</p>"
msgstr ""
-#. 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
#, fuzzy
@@ -2244,26 +2755,6 @@
msgid "Encryption Type"
msgstr "Kiểu nội suy"
-#. 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 ""
-
-#. 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 ""
@@ -2543,12 +3034,6 @@
#. 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 ""
-
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
#, fuzzy
msgid "System"
@@ -2854,13 +3339,6 @@
msgid "Package %1 is not available for installation."
msgstr "Không thể dùng cho cài đặt"
-#. 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 ""
-
#. dialog caption
#: src/include/users/wizards.rb:102
#, fuzzy
@@ -2880,367 +3358,6 @@
msgid "Initializing..."
msgstr "Đang chạy..."
-#. 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
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-
-#. 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
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-
-#. @see Implements ::Installation::FinishClient#title
-#: src/lib/users/clients/users_finish.rb:55
-#, fuzzy
-msgid "Writing Users Configuration..."
-msgstr "Đang ghi cấu hình Kerberos..."
-
-#. 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 "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Không có hạn sử dụng mật khẩu"
-
-#. 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
-#, fuzzy
-msgid "Password Encryption Type"
-msgstr "Không có hạn sử dụng mật khẩu"
-
-#. 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 ""
-
-#. Label: get password for user root
-#: src/lib/users/dialogs/inst_root_first.rb:76
-msgid "&Password for root User"
-msgstr ""
-
-#. Label: get same password again for verification
-#: src/lib/users/dialogs/inst_root_first.rb:84
-#, fuzzy
-msgid "Con&firm Password"
-msgstr "Mật khẩu :"
-
-#. text entry label
-#: src/lib/users/dialogs/inst_root_first.rb:89
-msgid "&Test Keyboard Layout"
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. help text, continued 3
-#: src/lib/users/dialogs/inst_root_first.rb:120
-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 ""
-
-#. 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 ""
-
-#. Title for root-password dialogue
-#: src/lib/users/dialogs/inst_root_first.rb:148
-msgid "Password for the System Administrator \"root\""
-msgstr ""
-
-#. #-#-#-#-# 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 ""
-
-#. reenable suggestion
-#: src/lib/users/dialogs/inst_user_first.rb:133
-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 ""
-
-#: src/lib/users/dialogs/inst_user_first.rb:137
-#, fuzzy
-msgid "Create new user"
-msgstr "Tạo phiên bản mới"
-
-#: src/lib/users/dialogs/inst_user_first.rb:141
-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 ""
-
-#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
-#: src/lib/users/dialogs/inst_user_first.rb:148
-msgid ""
-"<p>\n"
-"The password length should be between %{min}\n"
-" and %{max} characters.\n"
-"</p>\n"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/lib/users/dialogs/inst_user_first.rb:182
-msgid "Import User Data from a Previous Installation"
-msgstr ""
-
-#: 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 Configuration"
-msgid "Skip User Creation"
-msgstr "&Bỏ qua cấu hình"
-
-#: 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
-#, fuzzy
-msgid "Local User"
-msgstr "tập tin trên &máy"
-
-#. 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"
-msgstr "Tạo phiên bản mới"
-
-#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:536
-msgid "&Import User Data from a Previous Installation"
-msgstr ""
-
-#: src/lib/users/dialogs/inst_user_first.rb:546
-#, fuzzy
-msgid "Choose Users"
-msgstr "Hệ thống mở"
-
-#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:562
-#, fuzzy
-#| msgid "&Skip Configuration"
-msgid "&Skip User Creation"
-msgstr "&Bỏ qua cấu hình"
-
-#. checkbox label
-#: src/lib/users/dialogs/inst_user_first.rb:618
-#, fuzzy
-msgid "&Automatic Login"
-msgstr "WPA Tự động"
-
-#: src/lib/users/dialogs/inst_user_first.rb:625
-#, fuzzy
-msgid "No users selected"
-msgstr "Chưa phát hiện máy ảnh nào."
-
-#: src/lib/users/dialogs/inst_user_first.rb:627
-msgid "%d user will be imported"
-msgid_plural "%d users will be imported"
-msgstr[0] ""
-
-#. selection box label
-#: src/lib/users/dialogs/users_to_import.rb:58
-msgid "&Select Users to Read"
-msgstr ""
-
-#. check box label
-#: src/lib/users/dialogs/users_to_import.rb:66
-#, fuzzy
-msgid "Select or Deselect &All"
-msgstr "Chọ&n tất cả"
-
-#. 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 "Không có hạn sử dụng mật khẩu"
-
-#. 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"
-msgstr "Không có hạn sử dụng mật khẩu"
-
-#. rich text label
-#: src/lib/users/proposal.rb:75
-#, fuzzy
-msgid "User Settings"
-msgstr "Thiết lập cao cấp"
-
-#. menu button label
-#: src/lib/users/proposal.rb:78
-#, fuzzy
-msgid "&User"
-msgstr "Người dùng"
-
-#. menu button label
-#: src/lib/users/proposal.rb:80
-#, fuzzy
-msgid "&Root Password"
-msgstr "Mật khẩu root"
-
-#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/lib/users/proposal.rb:92
-#, fuzzy
-msgid "<%1>Root Password<%2> set"
-msgstr "Mật khẩu root"
-
-#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/lib/users/proposal.rb:95
-#, fuzzy
-msgid "<%1>Root Password<%2> not set"
-msgstr "Mật khẩu root"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/lib/users/proposal.rb:104
-msgid "No <%1>user<%2> configured"
-msgstr ""
-
-#. TRANSLATORS: summary line, %d is the number of users
-#: src/lib/users/proposal.rb:110
-msgid "<a href=%s>%d user</a> will be imported"
-msgid_plural "<a href=%s>%d users</a> will be imported"
-msgstr[0] ""
-
-#. 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 ""
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/lib/users/proposal.rb:127
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr ""
-
-#. 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 "Không có hạn sử dụng mật khẩu"
-
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
msgid "root"
@@ -3717,7 +3834,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:716
+#: src/modules/Users.pm:740
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -3729,231 +3846,231 @@
msgstr ""
#. error message
-#: src/modules/Users.pm:964
+#: src/modules/Users.pm:988
msgid "Multiple users satisfy the input conditions."
msgstr ""
#. progress caption
-#: src/modules/Users.pm:1542
+#: src/modules/Users.pm:1566
#, fuzzy
msgid "Initializing User and Group Configuration"
msgstr "Cấu hình phẳng"
#. progress stage label
-#: src/modules/Users.pm:1549
+#: src/modules/Users.pm:1573
#, fuzzy
msgid "Read the default login settings"
msgstr "Đọc thiết lập trước đây"
#. progress stage label
-#: src/modules/Users.pm:1551
+#: src/modules/Users.pm:1575
#, fuzzy
msgid "Read the default system settings"
msgstr "Đọc thiết lập trước đây"
#. progress stage label
-#: src/modules/Users.pm:1553
+#: src/modules/Users.pm:1577
#, fuzzy
msgid "Read the configuration type"
msgstr "Tải lại cấu hình"
#. progress stage label
-#: src/modules/Users.pm:1555
+#: src/modules/Users.pm:1579
#, fuzzy
msgid "Read the user custom settings"
msgstr "Đọc thiết lập trước đây"
#. progress stage label
-#: src/modules/Users.pm:1557
+#: src/modules/Users.pm:1581
msgid "Read users and groups"
msgstr ""
#. progress stage label
-#: src/modules/Users.pm:1559
+#: src/modules/Users.pm:1583
msgid "Build the cache structures"
msgstr ""
#. progress step label
-#: src/modules/Users.pm:1563
+#: src/modules/Users.pm:1587
#, fuzzy
msgid "Reading the default login settings..."
msgstr "Đang đọc thiết lập trước đây..."
#. progress step label
-#: src/modules/Users.pm:1565
+#: src/modules/Users.pm:1589
#, fuzzy
msgid "Reading the default system settings..."
msgstr "Đang đọc thiết lập trước đây..."
#. progress step label
-#: src/modules/Users.pm:1567
+#: src/modules/Users.pm:1591
#, fuzzy
msgid "Reading the configuration type..."
msgstr "Tải lại cấu hình"
#. progress step label
-#: src/modules/Users.pm:1569
+#: src/modules/Users.pm:1593
#, fuzzy
msgid "Reading custom settings..."
msgstr "Đang đọc thiết lập trước đây..."
#. progress step label
-#: src/modules/Users.pm:1571
+#: src/modules/Users.pm:1595
#, fuzzy
msgid "Reading users and groups..."
msgstr "Đang đọc trạng thái winbind..."
#. progress step label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1597
msgid "Building the cache structures..."
msgstr ""
#. final progress step label
-#: src/modules/Users.pm:1575 src/modules/Users.pm:4290
+#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
#, fuzzy
msgid "Finished"
msgstr "_Tìm"
#. error message
-#: src/modules/Users.pm:2131
+#: src/modules/Users.pm:2155
#, fuzzy
msgid "User does not exist."
msgstr "Không có thư mục này."
#. error message
-#: src/modules/Users.pm:2383
+#: src/modules/Users.pm:2407
#, fuzzy
msgid "Group does not exist."
msgstr "Không có thư mục này."
#. progress caption
-#: src/modules/Users.pm:4252
+#: src/modules/Users.pm:4276
#, fuzzy
msgid "Writing User and Group Configuration"
msgstr "Cấu hình phẳng"
#. progress stage label
-#: src/modules/Users.pm:4261
+#: src/modules/Users.pm:4285
msgid "Write LDAP users and groups"
msgstr ""
#. progress stage label
-#: src/modules/Users.pm:4263
+#: src/modules/Users.pm:4287
#, fuzzy
msgid "Write groups"
msgstr "Nhóm được phép"
#. progress stage label
-#: src/modules/Users.pm:4265
+#: src/modules/Users.pm:4289
#, fuzzy
msgid "Check for deleted users"
msgstr "Đang kiểm tra thông tin xác thực..."
#. progress stage label
-#: src/modules/Users.pm:4267
+#: src/modules/Users.pm:4291
#, fuzzy
msgid "Write users"
msgstr "Hiện các mật khẩu"
#. progress stage label
-#: src/modules/Users.pm:4269
+#: src/modules/Users.pm:4293
#, fuzzy
msgid "Write passwords"
msgstr "Hiện các mật khẩu"
#. progress stage label
-#: src/modules/Users.pm:4271
+#: src/modules/Users.pm:4295
#, fuzzy
msgid "Write the custom settings"
msgstr "Ghi thiết lập"
#. progress stage label
-#: src/modules/Users.pm:4273
+#: src/modules/Users.pm:4297
#, fuzzy
msgid "Write the default login settings"
msgstr "Ghi thiết lập hạng mục"
#. progress step label
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4300
#, fuzzy
msgid "Writing LDAP users and groups..."
msgstr "Đang ghi thiết lập..."
#. progress step label
-#: src/modules/Users.pm:4278
+#: src/modules/Users.pm:4302
#, fuzzy
msgid "Writing groups..."
msgstr "Đang ghi thiết lập..."
#. progress step label
-#: src/modules/Users.pm:4280
+#: src/modules/Users.pm:4304
#, fuzzy
msgid "Checking deleted users..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. progress step label
-#: src/modules/Users.pm:4282
+#: src/modules/Users.pm:4306
#, fuzzy
msgid "Writing users..."
msgstr "Đang ghi thiết lập..."
#. progress step label
-#: src/modules/Users.pm:4284
+#: src/modules/Users.pm:4308
#, fuzzy
msgid "Writing passwords..."
msgstr "Hiện các mật khẩu"
#. progress step label
-#: src/modules/Users.pm:4286
+#: src/modules/Users.pm:4310
#, fuzzy
msgid "Writing the custom settings..."
msgstr "Đang ghi thiết lập..."
#. progress step label
-#: src/modules/Users.pm:4288
+#: src/modules/Users.pm:4312
#, fuzzy
msgid "Writing the default login settings..."
msgstr "Đang ghi thiết lập..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4373
+#: src/modules/Users.pm:4397
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4409 src/modules/Users.pm:4444
-#: src/modules/Users.pm:4720
+#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
+#: src/modules/Users.pm:4744
#, fuzzy
msgid "An error occurred while removing users."
msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4422 src/modules/Users.pm:4570
+#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr ""
#. error message
-#: src/modules/Users.pm:4559
+#: src/modules/Users.pm:4583
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4761 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
#, fuzzy
msgid "An error occurred while setting forwarding for root's mail."
msgstr "gặp lỗi khi đợi dữ liệu trên ổ cắm"
#. error popup
-#: src/modules/Users.pm:4837
+#: src/modules/Users.pm:4861
msgid "No UID is available for this type of user."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4868
+#: src/modules/Users.pm:4892
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -3961,7 +4078,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:4899
+#: src/modules/Users.pm:4923
#, fuzzy
msgid ""
"The user ID entered is already in use.\n"
@@ -3969,7 +4086,7 @@
msgstr "Tên này đã được dùng"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4912
+#: src/modules/Users.pm:4936
#, fuzzy, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -3978,7 +4095,7 @@
msgstr "Tên này đã được dùng"
#. popup question
-#: src/modules/Users.pm:4927
+#: src/modules/Users.pm:4951
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -3987,7 +4104,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:4941
+#: src/modules/Users.pm:4965
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -3995,14 +4112,14 @@
"Really change the user type to 'system'?"
msgstr ""
-#: src/modules/Users.pm:4975
+#: src/modules/Users.pm:4999
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
msgstr ""
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:4979
+#: src/modules/Users.pm:5003
msgid ""
"There is a conflict between the entered\n"
"username and an existing username. %1\n"
@@ -4010,14 +4127,14 @@
msgstr ""
#. error popup
-#: src/modules/Users.pm:5009
+#: src/modules/Users.pm:5033
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
msgstr ""
#. error popup
-#: src/modules/Users.pm:5016
+#: src/modules/Users.pm:5040
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4025,7 +4142,7 @@
msgstr ""
#. error popup
-#: src/modules/Users.pm:5079
+#: src/modules/Users.pm:5103
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4033,7 +4150,7 @@
msgstr ""
#. error popup
-#: src/modules/Users.pm:5102
+#: src/modules/Users.pm:5126
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4041,14 +4158,14 @@
msgstr ""
#. error message
-#: src/modules/Users.pm:5113
+#: src/modules/Users.pm:5137
msgid ""
"The home directory is used by another user.\n"
"Try again."
msgstr ""
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5155
+#: src/modules/Users.pm:5179
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4056,7 +4173,7 @@
msgstr ""
#. yes/no popup
-#: src/modules/Users.pm:5166
+#: src/modules/Users.pm:5190
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4064,7 +4181,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5173
+#: src/modules/Users.pm:5197
#, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4073,7 +4190,7 @@
msgstr ""
#. yes/no popup
-#: src/modules/Users.pm:5182
+#: src/modules/Users.pm:5206
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4083,19 +4200,19 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5210
+#: src/modules/Users.pm:5234
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
msgstr ""
#. error popup
-#: src/modules/Users.pm:5230
+#: src/modules/Users.pm:5254
msgid "No GID is available for this type of group."
msgstr ""
#. error popup
-#: src/modules/Users.pm:5263
+#: src/modules/Users.pm:5287
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4103,7 +4220,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5293
+#: src/modules/Users.pm:5317
#, fuzzy
msgid ""
"The group ID entered is already in use.\n"
@@ -4111,7 +4228,7 @@
msgstr "Tên này đã được dùng"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5305
+#: src/modules/Users.pm:5329
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4120,7 +4237,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5320
+#: src/modules/Users.pm:5344
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4129,7 +4246,7 @@
msgstr ""
#. popup question
-#: src/modules/Users.pm:5334
+#: src/modules/Users.pm:5358
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4138,14 +4255,14 @@
msgstr ""
#. error popup
-#: src/modules/Users.pm:5353
+#: src/modules/Users.pm:5377
msgid ""
"No group name entered.\n"
"Try again."
msgstr ""
#. error popup
-#: src/modules/Users.pm:5370
+#: src/modules/Users.pm:5394
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4153,7 +4270,7 @@
msgstr ""
#. error popup
-#: src/modules/Users.pm:5383
+#: src/modules/Users.pm:5407
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4162,20 +4279,20 @@
msgstr ""
#. error popup
-#: src/modules/Users.pm:5391
+#: src/modules/Users.pm:5415
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
"Try another one."
msgstr ""
-#: src/modules/Users.pm:5507
+#: src/modules/Users.pm:5531
#, fuzzy, perl-format
msgid "User %s does not exist."
msgstr "Không có thư mục này."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5561
+#: src/modules/Users.pm:5585
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4183,7 +4300,7 @@
msgstr ""
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5568
+#: src/modules/Users.pm:5592
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4191,23 +4308,23 @@
msgstr ""
#. summary label
-#: src/modules/Users.pm:6581
+#: src/modules/Users.pm:6603
msgid "<h3>Users</h3>"
msgstr ""
#. summary label
-#: src/modules/Users.pm:6591
+#: src/modules/Users.pm:6613
msgid "<h3>Groups</h3>"
msgstr ""
#. summary label
-#: src/modules/Users.pm:6602
+#: src/modules/Users.pm:6624
#, fuzzy
msgid "<h3>Login Settings</h3>"
msgstr "<p><b>Thiết lập gia nhập</b></p>"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6604
+#: src/modules/Users.pm:6626
#, fuzzy
msgid "User %1 configured for automatic login"
msgstr "Đọc hạng mục đã cấu hình"
@@ -4226,22 +4343,22 @@
msgstr ""
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:124
+#: src/modules/UsersPluginKerberos.pm:122
#, fuzzy
msgid "Kerberos Configuration"
msgstr "Cấu hình toàn cầu"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:135
+#: src/modules/UsersPluginKerberos.pm:133
msgid "No Kerberos Management for Groups"
msgstr ""
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:138
+#: src/modules/UsersPluginKerberos.pm:136
msgid "Manage Kerberos Principials"
msgstr ""
-#: src/modules/UsersPluginKerberos.pm:262
+#: src/modules/UsersPluginKerberos.pm:260
msgid "Cannot execute kadmin.local."
msgstr ""
@@ -4373,7 +4490,7 @@
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:379
+#: src/modules/UsersSimple.pm:505
msgid ""
"The password may only contain the following characters:\n"
"0-9, a-z, A-Z, and any of \"`~!@#$%^&* ,.;:._-+/|?='{[(<>)]}\\\".\n"
@@ -4381,7 +4498,7 @@
msgstr ""
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:414
+#: src/modules/UsersSimple.pm:540
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4391,7 +4508,7 @@
msgstr ""
#. error popup
-#: src/modules/UsersSimple.pm:494
+#: src/modules/UsersSimple.pm:620
msgid ""
"The user's full name cannot contain\n"
"\":\" or \",\" characters.\n"
@@ -4399,37 +4516,37 @@
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:521
+#: src/modules/UsersSimple.pm:647
msgid "You have used the group name as a part of the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:524
+#: src/modules/UsersSimple.pm:650
msgid "You have used the username as a part of the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:533
+#: src/modules/UsersSimple.pm:659
msgid "You have used only lowercase letters for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:541
+#: src/modules/UsersSimple.pm:667
msgid "You have used only uppercase letters for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:548
+#: src/modules/UsersSimple.pm:674
msgid "You have used a palindrome for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:556
+#: src/modules/UsersSimple.pm:682
msgid "You have used only digits for the password."
msgstr ""
#. popup question
-#: src/modules/UsersSimple.pm:578
+#: src/modules/UsersSimple.pm:704
#, perl-format
msgid ""
"The password is too long for the current encryption method.\n"
@@ -4437,7 +4554,7 @@
msgstr ""
#. error message
-#: src/modules/UsersSimple.pm:665
+#: src/modules/UsersSimple.pm:791
#, fuzzy, perl-format
msgid ""
"The password is too simple:\n"
@@ -4445,20 +4562,20 @@
msgstr "Không có hạn sử dụng mật khẩu"
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:679
+#: src/modules/UsersSimple.pm:805
#, perl-format
msgid "The password should have at least %i characters."
msgstr ""
#. error popup
-#: src/modules/UsersSimple.pm:700
+#: src/modules/UsersSimple.pm:826
msgid ""
"No username entered.\n"
"Try again."
msgstr ""
#. error popup
-#: src/modules/UsersSimple.pm:710
+#: src/modules/UsersSimple.pm:836
#, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -4466,7 +4583,7 @@
msgstr ""
#. error popup
-#: src/modules/UsersSimple.pm:739
+#: src/modules/UsersSimple.pm:865
msgid ""
"The username may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4475,21 +4592,23 @@
msgstr ""
#. error popup
-#: src/modules/UsersSimple.pm:760
+#: src/modules/UsersSimple.pm:886
msgid ""
"There is a conflict between the entered\n"
"username and an existing username.\n"
"Try another one."
msgstr ""
+#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:982
+#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
#, fuzzy
msgid "Retrieving %1 extension..."
msgstr "Ghi chú về phát hành..."
+#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:996
+#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
#, fuzzy
msgid "Releasing %1 extension..."
msgstr "Ghi chú về phát hành..."
@@ -4556,63 +4675,6 @@
msgstr ""
#, fuzzy
-#~ msgid "User Authentication Method"
-#~ msgstr "Xác thực:"
-
-#, fuzzy
-#~ msgid "&Windows Domain"
-#~ msgstr "Thành viên của Miền Windows"
-
-#, fuzzy
-#~ msgid "L&ocal (/etc/passwd)"
-#~ msgstr "Không thể tạo thư mục."
-
-#, fuzzy
-#~ msgid "eDirectory LDAP"
-#~ msgstr "Đường dẫn thư mục"
-
-#, fuzzy
-#~ msgid "Authentication Method"
-#~ msgstr "Xác thực:"
-
-#, fuzzy
-#~ msgid "Set Up &Kerberos Authentication"
-#~ msgstr "Chọn tập tin cho chìa khóa xác thực"
-
-#, fuzzy
-#~ msgid "E&xpert Options..."
-#~ msgstr "_Xuất vào đĩa CD..."
-
-#, fuzzy
-#~ msgid "<p><b>Authentication</b><br></p>"
-#~ msgstr "<p><b>Thiết lập gia nhập</b></p>"
-
-#~ msgid "Expert Settings"
-#~ msgstr "Thiết lập cao cấp"
-
-#, fuzzy
-#~ msgid "The password encryption method is %s."
-#~ msgstr "Không có hạn sử dụng mật khẩu"
-
-#~ msgid "&Change..."
-#~ msgstr "&Thay đổi..."
-
-#~ msgid "Summary"
-#~ msgstr "Tổng kết"
-
-#, fuzzy
-#~ msgid "Samba (Windows Domain)"
-#~ msgstr "Thành viên của Miền Windows"
-
-#, fuzzy
-#~ msgid "<%1>Authentication method<%2>: %3"
-#~ msgstr "Xác thực:"
-
-#, fuzzy
-#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-#~ msgstr "Xác thực:"
-
-#, fuzzy
#~| msgid "No Password Expiration"
#~ msgid "No Password Entered"
#~ msgstr "Không có hạn sử dụng mật khẩu"
Modified: branches/plus-SLE12-SP2/yast/vi/po/vm.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/vm.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/vm.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -30,12 +30,12 @@
msgstr "Đang cấu hình thiết bị %s cho mạng tuyến..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:157
+#: src/modules/VirtConfig.rb:158
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:176
+#: src/modules/VirtConfig.rb:177
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -43,24 +43,24 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
+#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
#, fuzzy
msgid "Verify Installed Packages"
msgstr "Gói đã &cài"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:195
+#: src/modules/VirtConfig.rb:196
#, fuzzy
msgid "Network Bridge Configuration"
msgstr "Cấu hình mạng"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:210
+#: src/modules/VirtConfig.rb:211
msgid "Configuring the VM Server (domain 0)"
msgstr ""
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:213
+#: src/modules/VirtConfig.rb:214
#, fuzzy
msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
msgstr ""
@@ -68,143 +68,143 @@
"Cấu hình máy chủ SLP ở đây.<br></p>\n"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:217
+#: src/modules/VirtConfig.rb:218
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 ""
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:221
+#: src/modules/VirtConfig.rb:222
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr ""
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:225
+#: src/modules/VirtConfig.rb:226
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr ""
#. error popup
-#: src/modules/VirtConfig.rb:230
+#: src/modules/VirtConfig.rb:231
msgid "The installation will be aborted."
msgstr ""
-#: src/modules/VirtConfig.rb:233
+#: src/modules/VirtConfig.rb:234
#, fuzzy
msgid "Choose Hypervisor(s) to install"
msgstr "Lựa chọn đã yêu cầu chưa được cài đặt."
-#: src/modules/VirtConfig.rb:236
+#: src/modules/VirtConfig.rb:237
msgid "Server: Minimal system to get a running Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:238
#, fuzzy
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "Đang cấu hình thiết bị %s cho mạng tuyến..."
-#: src/modules/VirtConfig.rb:250
+#: src/modules/VirtConfig.rb:251
msgid "KVM Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:252
+#: src/modules/VirtConfig.rb:253
#, fuzzy
#| msgid "NIS Server"
msgid "KVM server"
msgstr "Máy chủ NIS"
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:254
msgid "KVM tools"
msgstr ""
-#: src/modules/VirtConfig.rb:258
+#: src/modules/VirtConfig.rb:259
msgid "libvirt LXC containers"
msgstr ""
-#: src/modules/VirtConfig.rb:260
+#: src/modules/VirtConfig.rb:261
msgid "libvirt LXC daemon"
msgstr ""
-#: src/modules/VirtConfig.rb:288
+#: src/modules/VirtConfig.rb:289
msgid "Software to connect to Virtualization server"
msgstr ""
-#: src/modules/VirtConfig.rb:290
+#: src/modules/VirtConfig.rb:291
#, fuzzy
msgid "Virtualization client tools"
msgstr "Lựa chọn đã yêu cầu chưa được cài đặt."
-#: src/modules/VirtConfig.rb:306
+#: src/modules/VirtConfig.rb:307
msgid "Xen Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:308
+#: src/modules/VirtConfig.rb:309
#, fuzzy
msgid "Xen server"
msgstr "Lùi"
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:310
msgid "Xen tools"
msgstr ""
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:387
+#: src/modules/VirtConfig.rb:388
#, fuzzy
msgid "Package installation failed\n"
msgstr "Hướng"
-#: src/modules/VirtConfig.rb:395
+#: src/modules/VirtConfig.rb:396
msgid "Package installation failed for lxc\n"
msgstr ""
-#: src/modules/VirtConfig.rb:402
+#: src/modules/VirtConfig.rb:403
msgid "Package installation failed for sled client pattern\n"
msgstr ""
-#: src/modules/VirtConfig.rb:412
+#: src/modules/VirtConfig.rb:413
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:425
+#: src/modules/VirtConfig.rb:426
msgid "Running in text mode. Install graphical components anyway?"
msgstr ""
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:438
+#: src/modules/VirtConfig.rb:439
#, fuzzy
msgid "Checking packages..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:441
+#: src/modules/VirtConfig.rb:442
msgid "Installing packages..."
msgstr ""
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
+#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
msgid "Cannot install required packages."
msgstr ""
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:463
+#: src/modules/VirtConfig.rb:464
#, fuzzy
#| msgid "Updating configuration..."
msgid "Updating grub2 configuration files..."
msgstr "Đang cập nhật cấu hình..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:477
+#: src/modules/VirtConfig.rb:484
#, fuzzy
msgid "Configuring Default Network Bridge..."
msgstr "Đang cấu hình thiết bị %s cho mạng tuyến..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:498
+#: src/modules/VirtConfig.rb:505
#, fuzzy
msgid "Network Bridge."
msgstr "Chạy mạng"
-#: src/modules/VirtConfig.rb:499
+#: src/modules/VirtConfig.rb:506
msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
msgstr ""
@@ -217,29 +217,29 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:568
+#: src/modules/VirtConfig.rb:567
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:571
+#: src/modules/VirtConfig.rb:570
msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:574
+#: src/modules/VirtConfig.rb:573
msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
msgstr ""
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:576
#, fuzzy
msgid "Xen Hypervisor and tools are installed."
msgstr "Lựa chọn đã yêu cầu chưa được cài đặt."
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:577
#, fuzzy
msgid "Virtualization client tools are installed."
msgstr "Lựa chọn đã yêu cầu chưa được cài đặt."
-#: src/modules/VirtConfig.rb:579
+#: src/modules/VirtConfig.rb:578
#, fuzzy
msgid "Libvirt LXC components are installed."
msgstr "Lựa chọn đã yêu cầu chưa được cài đặt."
Modified: branches/plus-SLE12-SP2/yast/vi/po/vpn.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/vpn.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/vpn.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -225,14 +225,14 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:442
+#: src/lib/vpn/ipsec.rb:439
#, fuzzy
#| msgid "This name is already in use"
msgid "The user name is already used."
msgstr "Tên này đã được dùng"
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:506
+#: src/lib/vpn/ipsec.rb:503
#, fuzzy
#| msgid "Cannot import VPN connection"
msgid "Cannot find a matching client connection."
@@ -327,114 +327,114 @@
msgstr ""
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:289
+#: src/lib/vpn/main_dialog.rb:285
msgid "Please enter gateway IP before editing credentials."
msgstr ""
#. Render a table of configured gateway and client connections.
-#: src/lib/vpn/main_dialog.rb:365
+#: src/lib/vpn/main_dialog.rb:361
msgid "Name"
msgstr "Tên"
-#: src/lib/vpn/main_dialog.rb:365
+#: src/lib/vpn/main_dialog.rb:361
#, fuzzy
#| msgid "D&escription"
msgid "Description"
msgstr "&Mô tả"
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:380
+#: src/lib/vpn/main_dialog.rb:376
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:390
+#: src/lib/vpn/main_dialog.rb:386
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:391
+#: src/lib/vpn/main_dialog.rb:387
msgid "All IPv6 networks (::/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:393
+#: src/lib/vpn/main_dialog.rb:389
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:395
#, fuzzy
#| msgid "Connections"
msgid "Connection name: "
msgstr "Kết nối"
-#: src/lib/vpn/main_dialog.rb:400
+#: src/lib/vpn/main_dialog.rb:396
msgid "Type"
msgstr "Kiểu"
-#: src/lib/vpn/main_dialog.rb:402
+#: src/lib/vpn/main_dialog.rb:398
#, fuzzy
#| msgid "Samba Server"
msgid "Gateway (Server)"
msgstr "Máy chủ Samba"
-#: src/lib/vpn/main_dialog.rb:403
+#: src/lib/vpn/main_dialog.rb:399
#, fuzzy
#| msgid "NFS Client"
msgid "Client"
msgstr "Máy khách NFS"
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:406
msgid "The scenario is"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:412
+#: src/lib/vpn/main_dialog.rb:408
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413
+#: src/lib/vpn/main_dialog.rb:409
msgid "Secure communication with a certificate"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:414
+#: src/lib/vpn/main_dialog.rb:410
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:415
+#: src/lib/vpn/main_dialog.rb:411
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
+#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
#, fuzzy
#| msgid "Checking credentials..."
msgid "Edit Credentials"
msgstr "Đang kiểm tra thông tin xác thực..."
-#: src/lib/vpn/main_dialog.rb:420
+#: src/lib/vpn/main_dialog.rb:416
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:417
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:425
+#: src/lib/vpn/main_dialog.rb:421
msgid "The gateway requires authentication"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:423
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:428
+#: src/lib/vpn/main_dialog.rb:424
#, fuzzy
#| msgid "CA Certificate File:"
msgid "By a certificate"
msgstr "Tập tin chứng nhận của CA:"
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:426
msgid "VPN gateway IP"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:434
+#: src/lib/vpn/main_dialog.rb:430
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -533,36 +533,36 @@
msgstr ""
#. Install packages
-#: src/modules/IPSecConf.rb:174
+#: src/modules/IPSecConf.rb:172
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Failed to install IPSec packages."
msgstr "Lỗi cài đặt những gói đã yêu cầu."
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:182
+#: src/modules/IPSecConf.rb:180
#, fuzzy
#| msgid "Failed to parse: %s."
msgid "Failed to start IPSec daemon."
msgstr "Failed to parse: %s."
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:212
+#: src/modules/IPSecConf.rb:210
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr ""
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:228
+#: src/modules/IPSecConf.rb:225
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:232 src/modules/IPSecConf.rb:237
+#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234
msgid "Failed to restart SuSE firewall."
msgstr ""
-#: src/modules/IPSecConf.rb:243
+#: src/modules/IPSecConf.rb:240
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"
@@ -570,33 +570,33 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:279
#, fuzzy
#| msgid "Join Settings"
msgid "VPN Global Settings"
msgstr "Thiết lập gia nhập"
-#: src/modules/IPSecConf.rb:283
+#: src/modules/IPSecConf.rb:280
msgid "Enable VPN (IPSec) daemon: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:284
-msgid "Reduce TCP MSS: %s"
+#: src/modules/IPSecConf.rb:281
+msgid "Reduce TCP MSS to 1024: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:285
+#: src/modules/IPSecConf.rb:282
#, fuzzy
#| msgid "Create VPN Connection"
msgid "Gateway and Connections"
msgstr "Tạo sự kết nối VPN"
#. Gateway summary
-#: src/modules/IPSecConf.rb:291
+#: src/modules/IPSecConf.rb:288
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:295
+#: src/modules/IPSecConf.rb:292
#, fuzzy
#| msgid "Blink when connecting"
msgid "A client connecting to "
Modified: branches/plus-SLE12-SP2/yast/vi/po/yast2-apparmor.vi.po
===================================================================
--- branches/plus-SLE12-SP2/yast/vi/po/yast2-apparmor.vi.po 2016-08-17 13:06:26 UTC (rev 96334)
+++ branches/plus-SLE12-SP2/yast/vi/po/yast2-apparmor.vi.po 2016-08-17 13:06:31 UTC (rev 96335)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"