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