Author: keichwa
Date: 2015-10-01 13:25:19 +0200 (Thu, 01 Oct 2015)
New Revision: 92984
Modified:
trunk/yast/vi/po/autoinst.vi.po
trunk/yast/vi/po/bootloader.vi.po
trunk/yast/vi/po/crowbar.vi.po
trunk/yast/vi/po/kdump.vi.po
trunk/yast/vi/po/ncurses-pkg.vi.po
trunk/yast/vi/po/qt-pkg.vi.po
trunk/yast/vi/po/registration.vi.po
trunk/yast/vi/po/storage.vi.po
trunk/yast/vi/po/vpn.vi.po
Log:
merged
Modified: trunk/yast/vi/po/autoinst.vi.po
===================================================================
--- trunk/yast/vi/po/autoinst.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/autoinst.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -31,7 +31,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:360
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
msgid "This may take a while"
msgstr "Có thể cần chờ một chút"
@@ -54,12 +54,12 @@
#. command line options
#. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. Import users configuration from the profile
+#.
#. Backup
#. Now check if there any classes defined in theis pre final control file
#: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
#: src/clients/inst_autosetup_upgrade.rb:484
#: src/modules/AutoInstallRules.rb:1001
msgid ""
@@ -511,89 +511,102 @@
#. Uwe Gansert
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr ""
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
msgid "Execute pre-install user scripts"
msgstr ""
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
#, fuzzy
msgid "Configure General Settings "
msgstr "Cấu hình"
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
#, fuzzy
msgid "Set up language"
msgstr "Đặt phạm vị ngày"
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:60
msgid "Create partition plans"
msgstr ""
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
#, fuzzy
msgid "Configure Bootloader"
msgstr "Cấu hình"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
#, fuzzy
#| msgid "Registration Code"
msgid "Registration"
msgstr "Mã đăng ký"
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
#, fuzzy
msgid "Configure Software selections"
msgstr "Cấu hình"
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:64
msgid "Configure Systemd Default Target"
msgstr ""
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+msgid "Configure users and groups"
+msgstr "Cấu hình"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
msgid "Executing pre-install user scripts..."
msgstr ""
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring general settings..."
msgstr ""
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
#, fuzzy
msgid "Setting up language..."
msgstr "Đặt phạm vị ngày"
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
msgid "Creating partition plans..."
msgstr ""
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
msgid "Configuring Bootloader..."
msgstr ""
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
msgid "Registering the system..."
msgstr ""
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
#, fuzzy
msgid "Configuring Software selections..."
msgstr "Đang cấu hình thiết bị %s cho mạng tuyến..."
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
#, fuzzy
msgid "Configuring Systemd Default Target..."
msgstr "_Cấu hình VPN..."
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:77
+msgid "Importing users and groups configuration..."
+msgstr ""
+
+#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
msgid "Preparing System for Automated Installation"
msgstr ""
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. Second stage of installation will not be called but a
+#. network configuration is available. So this will be written
+#. while the general inst_finish process at the end of the
+#. first stage. But for the installation workflow the linuxrc
+#. network settings will be taken. (bnc#944942)
+#: src/clients/inst_autosetup.rb:183
#, fuzzy
#| msgid "Add-On Products"
msgid "Handling Add-On Products..."
@@ -602,20 +615,20 @@
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
#, fuzzy
msgid "Configuring language..."
msgstr "_Cấu hình VPN..."
#. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:273
+#: src/clients/inst_autosetup.rb:290
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
msgstr ""
#. Software
-#: src/clients/inst_autosetup.rb:331
+#: src/clients/inst_autosetup.rb:344
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -1610,7 +1623,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
msgid "Checking XML with RNG validation..."
msgstr ""
@@ -1620,7 +1633,7 @@
msgstr ""
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
msgid "Checking XML with RNC validation..."
msgstr ""
@@ -2260,7 +2273,7 @@
#. @param [String] result_profile the resulting control file path
#. @return [Boolean] true on success
#. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:746
+#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr ""
@@ -2738,7 +2751,7 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:359
+#: src/modules/Profile.rb:351
#, fuzzy
msgid "Collecting configuration data..."
msgstr "Cấu hình thành phần"
@@ -2746,7 +2759,7 @@
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:462
+#: src/modules/Profile.rb:454
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr ""
@@ -2754,7 +2767,7 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:536
+#: src/modules/Profile.rb:528
#, fuzzy
msgid "Could not write section %1 to file %2."
msgstr "Không ghi được các thiết lập vào %1."
@@ -2762,7 +2775,7 @@
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:703 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr ""
Modified: trunk/yast/vi/po/bootloader.vi.po
===================================================================
--- trunk/yast/vi/po/bootloader.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/bootloader.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2011-05-08 17:43+0700\n"
"Last-Translator: haqduong \n"
"Language-Team: Vietnamese \n"
@@ -350,7 +350,7 @@
msgstr ""
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:56
+#: src/include/bootloader/grub2/dialogs.rb:57
#, fuzzy
#| msgid "Boot Loader Options"
msgid "Boot Code Options"
@@ -425,30 +425,20 @@
msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:35
-msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
-msgstr ""
-
-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:38
msgid "O&ptional Kernel Command Line Parameter"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:42
+#: src/include/bootloader/grub2/helps.rb:39
#, fuzzy
-#| msgid "Distribution:"
-msgid "D&istributor"
-msgstr "Bản phân phối:"
-
-#: src/include/bootloader/grub2/helps.rb:43
-#, fuzzy
msgid "&Vga Mode"
msgstr "Chế độ"
-#: src/include/bootloader/grub2/helps.rb:44
+#: src/include/bootloader/grub2/helps.rb:40
msgid "Probe Foreign OS"
msgstr ""
-#: src/include/bootloader/grub2/helps.rb:45
+#: src/include/bootloader/grub2/helps.rb:41
msgid "Protective MBR flag"
msgstr ""
@@ -543,7 +533,7 @@
#. F#300779 - Install diskless client (NFS-root)
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
#. kokso: additional warning that root partition is nfs type -> bootloader will not be installed
-#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237
+#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
msgid "The boot partition is of type NFS. Bootloader cannot be installed."
msgstr ""
@@ -839,7 +829,7 @@
msgstr ""
#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:101
+#: src/include/bootloader/routines/lilolike.rb:108
msgid "Order of Hard Disks: %1"
msgstr ""
@@ -1025,49 +1015,49 @@
msgstr "Đừng làm gì"
#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:178
+#: src/lib/bootloader/proposal_client.rb:174
msgid "No boot loader is selected for installation. Your system might not be bootable."
msgstr "Không có boot loader nào được chọn cho việc cài đặt. Hệ thống của bạn có thể không thể khởi động."
#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:187
+#: src/lib/bootloader/proposal_client.rb:183
msgid "Because of the partitioning, the bootloader cannot be installed properly"
msgstr "Chương trình khởi động không thể cài đặt đúng do phân vùng."
#. FATE#303643 Enable one-click changes in bootloader proposal
#.
-#: src/modules/BootGRUB2.rb:194
+#: src/modules/BootGRUB2.rb:168
msgid "Install bootcode into MBR (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:198
+#: src/modules/BootGRUB2.rb:172
msgid "Do not install bootcode into MBR (install</a>)"
msgstr ""
#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:211
+#: src/modules/BootGRUB2.rb:185
msgid "Install bootcode into /boot partition (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:215
+#: src/modules/BootGRUB2.rb:189
msgid "Do not install bootcode into /boot partition (install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:221
+#: src/modules/BootGRUB2.rb:195
msgid "Install bootcode into \"/\" partition (do not install</a>)"
msgstr ""
-#: src/modules/BootGRUB2.rb:225
+#: src/modules/BootGRUB2.rb:199
msgid "Do not install bootcode into \"/\" partition (install</a>)"
msgstr ""
#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:235
+#: src/modules/BootGRUB2.rb:209
msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
msgstr ""
#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:243
+#: src/modules/BootGRUB2.rb:217
#, fuzzy
#| msgid "Change Location: %1"
msgid "Change Location: %s"
@@ -1077,22 +1067,22 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100
+#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
msgid "Boot Loader Type: %1"
msgstr ""
#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:263
+#: src/modules/BootGRUB2.rb:237
msgid " (extended)"
msgstr ""
#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:271
+#: src/modules/BootGRUB2.rb:245
msgid " (MBR)"
msgstr ""
-#: src/modules/BootGRUB2.rb:278
+#: src/modules/BootGRUB2.rb:252
msgid "Status Location: %1"
msgstr "Trạng thái vị trí: %1"
@@ -1129,86 +1119,100 @@
msgstr ""
#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:243
+#: src/modules/BootSupportCheck.rb:239
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
+#. activate set or there is already activate flag
+#: src/modules/BootSupportCheck.rb:248
+msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
+msgstr ""
+
+#: src/modules/BootSupportCheck.rb:255
+msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
+msgstr ""
+
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:144
+#: src/modules/Bootloader.rb:146
msgid "Check boot loader"
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
+#: src/modules/Bootloader.rb:148
msgid "Read partitioning"
msgstr ""
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
+#: src/modules/Bootloader.rb:150
msgid "Load boot loader settings"
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:152
+#: src/modules/Bootloader.rb:154
#, fuzzy
msgid "Checking boot loader..."
msgstr "Đang kiểm tra thông tin xác thực..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
+#: src/modules/Bootloader.rb:156
msgid "Reading partitioning..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
+#: src/modules/Bootloader.rb:158
msgid "Loading boot loader settings..."
msgstr ""
#. dialog header
-#: src/modules/Bootloader.rb:160
+#: src/modules/Bootloader.rb:162
#, fuzzy
msgid "Initializing Boot Loader Configuration"
msgstr "Cấu hình phẳng"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:279
+#: src/modules/Bootloader.rb:281
#, fuzzy
msgid "Create initrd"
msgstr "Tạo đĩa CD"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
+#: src/modules/Bootloader.rb:283
#, fuzzy
msgid "Save boot loader configuration files"
msgstr "Tải lại cấu hình"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
+#: src/modules/Bootloader.rb:285
#, fuzzy
msgid "Install boot loader"
msgstr "Không thể tải"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:287
+#: src/modules/Bootloader.rb:289
msgid "Creating initrd..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
+#: src/modules/Bootloader.rb:291
msgid "Saving boot loader configuration files..."
msgstr ""
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
+#: src/modules/Bootloader.rb:293
msgid "Installing boot loader..."
msgstr ""
#. progress line
-#: src/modules/Bootloader.rb:297
+#: src/modules/Bootloader.rb:299
#, fuzzy
msgid "Saving Boot Loader Configuration"
msgstr "Cấu hình phẳng"
+#, fuzzy
+#~| msgid "Distribution:"
+#~ msgid "D&istributor"
+#~ msgstr "Bản phân phối:"
+
#~ msgid "Delete a global option or option of a section"
#~ msgstr "Xóa một tùy chọn toàn cục hoặc một tùy chọn của một mục"
Modified: trunk/yast/vi/po/crowbar.vi.po
===================================================================
--- trunk/yast/vi/po/crowbar.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/crowbar.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -445,7 +445,7 @@
#. popup message %1 is FQDN
#: src/include/crowbar/complex.rb:1731
msgid ""
-"The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
+"The Crowbar Admin Server has been deployed. Changing the network is\n"
"currently not supported.\n"
"\n"
"You can visit the Crowbar web UI on http://%1:3000/"
@@ -495,7 +495,7 @@
#: src/include/crowbar/helps.rb:49
msgid ""
"<p>\n"
-"See the SUSE Cloud deployment guide for details on the network\n"
+"See the product deployment guide for details on the network\n"
"configuration and on using this YaST module.\n"
"</p>"
msgstr ""
Modified: trunk/yast/vi/po/kdump.vi.po
===================================================================
--- trunk/yast/vi/po/kdump.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/kdump.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -336,12 +336,12 @@
msgid "Kdump immediate reboots: %1"
msgstr ""
-#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259
+#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262
#, fuzzy
msgid "Enabled"
msgstr "Dùng"
-#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260
+#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263
#, fuzzy
msgid "Disabled"
msgstr "Không dùng"
@@ -385,14 +385,17 @@
#. TRANSLATORS: CommandLine printed text
#: src/clients/kdump.rb:747
-msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten."
+msgid ""
+"Kernel option \"crashkernel\" includes ranges and/or redundant values.\n"
+"It will be rewritten."
msgstr ""
+#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
-#. Popup::Message(crash_value);
-#. delete crashkernel paramter from bootloader
-#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570
-#: src/modules/Kdump.rb:589
+#. start kdump at boot
+#. delete crashkernel parameter from bootloader
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
+#: src/modules/Kdump.rb:500
msgid "To apply changes a reboot is necessary."
msgstr ""
@@ -411,39 +414,39 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:761 src/clients/kdump.rb:787 src/clients/kdump.rb:816
-#: src/clients/kdump.rb:1048 src/clients/kdump.rb:1065
-#: src/clients/kdump.rb:1082 src/clients/kdump.rb:1099
-#: src/clients/kdump.rb:1114 src/clients/kdump.rb:1130
-#: src/clients/kdump.rb:1153 src/clients/kdump.rb:1173
-#: src/clients/kdump.rb:1193 src/clients/kdump.rb:1207
-#: src/clients/kdump.rb:1230 src/clients/kdump.rb:1250
+#: src/clients/kdump.rb:764 src/clients/kdump.rb:790 src/clients/kdump.rb:819
+#: src/clients/kdump.rb:1051 src/clients/kdump.rb:1068
+#: src/clients/kdump.rb:1085 src/clients/kdump.rb:1102
+#: src/clients/kdump.rb:1117 src/clients/kdump.rb:1133
+#: src/clients/kdump.rb:1156 src/clients/kdump.rb:1176
+#: src/clients/kdump.rb:1196 src/clients/kdump.rb:1210
+#: src/clients/kdump.rb:1233 src/clients/kdump.rb:1253
msgid "Wrong options were used."
msgstr ""
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:778
+#: src/clients/kdump.rb:781
msgid "Dump level was set."
msgstr ""
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:782 src/clients/kdump.rb:807
+#: src/clients/kdump.rb:785 src/clients/kdump.rb:810
msgid "Wrong value of option."
msgstr ""
#. TRANSLATORS: CommandLine printed text
-#: src/clients/kdump.rb:803
+#: src/clients/kdump.rb:806
msgid "Dump format was set."
msgstr ""
#. TRANSLATORS: CommandLine printed text help
-#: src/clients/kdump.rb:810
+#: src/clients/kdump.rb:813
msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:830
+#: src/clients/kdump.rb:833
#, fuzzy
msgid "File %1 does not exist."
msgstr "Dịch vụ %1 không tồn tại."
@@ -452,8 +455,8 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:852 src/clients/kdump.rb:886 src/clients/kdump.rb:935
-#: src/clients/kdump.rb:969 src/clients/kdump.rb:1016
+#: src/clients/kdump.rb:855 src/clients/kdump.rb:889 src/clients/kdump.rb:938
+#: src/clients/kdump.rb:972 src/clients/kdump.rb:1019
msgid "Value for \"dir\" missing."
msgstr ""
@@ -461,33 +464,33 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957
-#: src/clients/kdump.rb:983
+#: src/clients/kdump.rb:869 src/clients/kdump.rb:919 src/clients/kdump.rb:960
+#: src/clients/kdump.rb:986
msgid "Value for \"server\" missing."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:995
+#: src/clients/kdump.rb:998
msgid "Value for \"share\" missing."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1037
+#: src/clients/kdump.rb:1040
msgid "Wrong value for target."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1148
+#: src/clients/kdump.rb:1151
msgid "Wrong value of options \"no\"."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1168
+#: src/clients/kdump.rb:1171
msgid "Wrong value for option \"server\"."
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1188
+#: src/clients/kdump.rb:1191
#, fuzzy
#| msgid "Invalid value for option '%1': %2"
msgid "Wrong value for option \"user\"."
@@ -495,16 +498,16 @@
#. TRANSLATORS: CommandLine error message
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245
+#: src/clients/kdump.rb:1228 src/clients/kdump.rb:1248
msgid "Wrong value for option \"email\"."
msgstr ""
-#: src/clients/kdump.rb:1257
+#: src/clients/kdump.rb:1260
msgid "Firmware-assisted dump: %{status}"
msgstr ""
#. TRANSLATORS: CommandLine error message
-#: src/clients/kdump.rb:1275
+#: src/clients/kdump.rb:1278
msgid "No option has been defined."
msgstr ""
@@ -526,121 +529,108 @@
msgstr "Không dùng"
#. TRANSLATORS: RadioButtonGroup Label
-#: src/include/kdump/dialogs.rb:53
+#: src/include/kdump/dialogs.rb:57
#, fuzzy
msgid "Enable/Disable Kdump"
msgstr "&Dùng hoặc không"
-#: src/include/kdump/dialogs.rb:58
+#: src/include/kdump/dialogs.rb:62
#, fuzzy
msgid "Enable Kd&ump"
msgstr "Dùng"
-#: src/include/kdump/dialogs.rb:59
+#: src/include/kdump/dialogs.rb:63
#, fuzzy
msgid "&Disable Kdump"
msgstr "Không dùng"
-#. "handle" : HandleEnableDisalbeKdump,
-#: src/include/kdump/dialogs.rb:79
-msgid "Total System Memory [MB]:"
-msgstr ""
-
-#: src/include/kdump/dialogs.rb:86
-msgid "Usable Memory [MB]:"
-msgstr ""
-
-#: src/include/kdump/dialogs.rb:95
-msgid "Kdump Memor&y [MB]"
-msgstr ""
-
#. ---------============ Dump Filtering screen=============------------
-#: src/include/kdump/dialogs.rb:134
+#: src/include/kdump/dialogs.rb:111
#, fuzzy
msgid "Include in Dumping"
msgstr "Bao gồm trong đăng ký"
-#: src/include/kdump/dialogs.rb:141
+#: src/include/kdump/dialogs.rb:118
msgid "&Pages Filled with Zero"
msgstr ""
#. `VStretch ()
-#: src/include/kdump/dialogs.rb:147
+#: src/include/kdump/dialogs.rb:124
#, fuzzy
msgid "Cach&e Pages"
msgstr "Gói"
-#: src/include/kdump/dialogs.rb:157
+#: src/include/kdump/dialogs.rb:134
msgid "Cache Priva&te Pages"
msgstr ""
-#: src/include/kdump/dialogs.rb:162
+#: src/include/kdump/dialogs.rb:139
#, fuzzy
msgid "&User Data Pages"
msgstr "&Tên người dùng"
-#: src/include/kdump/dialogs.rb:163
+#: src/include/kdump/dialogs.rb:140
msgid "&Free Pages"
msgstr ""
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:191
+#: src/include/kdump/dialogs.rb:168
msgid "&Dump Format"
msgstr ""
-#: src/include/kdump/dialogs.rb:194
+#: src/include/kdump/dialogs.rb:171
#, fuzzy
msgid "&No Dump"
msgstr "Số bản _sao :"
-#: src/include/kdump/dialogs.rb:195
+#: src/include/kdump/dialogs.rb:172
msgid "&ELF Format"
msgstr ""
-#: src/include/kdump/dialogs.rb:196
+#: src/include/kdump/dialogs.rb:173
#, fuzzy
msgid "C&ompressed Format"
msgstr "Nén"
-#: src/include/kdump/dialogs.rb:197
+#: src/include/kdump/dialogs.rb:174
#, fuzzy
msgid "&LZO Compressed Format"
msgstr "Nén"
#. ---------============ Dump Target screen=============------------
-#: src/include/kdump/dialogs.rb:217
+#: src/include/kdump/dialogs.rb:194
#, fuzzy
msgid "&Select Target"
msgstr "Chọn thẻ"
-#: src/include/kdump/dialogs.rb:221
+#: src/include/kdump/dialogs.rb:198
msgid "Local Directory"
msgstr "Thư mục nội bộ"
-#: src/include/kdump/dialogs.rb:222 src/include/kdump/uifunctions.rb:106
+#: src/include/kdump/dialogs.rb:199 src/include/kdump/uifunctions.rb:106
#, fuzzy
msgid "FTP"
msgstr "&FTP"
-#: src/include/kdump/dialogs.rb:223
+#: src/include/kdump/dialogs.rb:200
msgid "SSH"
msgstr "SSH"
-#: src/include/kdump/dialogs.rb:224
+#: src/include/kdump/dialogs.rb:201
msgid "SFTP"
msgstr ""
-#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173
+#: src/include/kdump/dialogs.rb:202 src/include/kdump/uifunctions.rb:173
#, fuzzy
msgid "NFS"
msgstr "&NFS..."
-#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188
+#: src/include/kdump/dialogs.rb:203 src/include/kdump/uifunctions.rb:188
msgid "CIFS (SMB)"
msgstr ""
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:251
+#: src/include/kdump/dialogs.rb:228
#, fuzzy
msgid "&SMTP Server"
msgstr "Máy chủ NTP"
@@ -649,7 +639,7 @@
#. text entry
#. text entry
#. text entry
-#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130
+#: src/include/kdump/dialogs.rb:240 src/include/kdump/uifunctions.rb:130
#: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212
msgid "&User Name"
msgstr "&Tên người dùng"
@@ -658,132 +648,152 @@
#. password entry
#. password entry
#. password entry
-#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133
+#: src/include/kdump/dialogs.rb:252 src/include/kdump/uifunctions.rb:133
#: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215
msgid "&Password"
msgstr "Mật &khẩu"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:287
+#: src/include/kdump/dialogs.rb:264
#, fuzzy
msgid "Notification &To"
msgstr "Xác thực: %1"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:303
+#: src/include/kdump/dialogs.rb:280
#, fuzzy
msgid "Notifica&tion CC"
msgstr "Xác thực: %1"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:320
+#: src/include/kdump/dialogs.rb:297
#, fuzzy
msgid "Custom Kdump &Kernel"
msgstr "Đã vẽ kiểu tự chọn"
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:332
+#: src/include/kdump/dialogs.rb:309
msgid "Kdump Co&mmand Line"
msgstr ""
#. TRANSLATORS: TextEntry Label
-#: src/include/kdump/dialogs.rb:344
+#: src/include/kdump/dialogs.rb:321
#, fuzzy
msgid "Kdump Command &Line Append"
msgstr "Câu lệnh '%1'"
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:361
+#: src/include/kdump/dialogs.rb:338
msgid "&Enable Immediate Reboot After Saving the Core"
msgstr ""
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:375
+#: src/include/kdump/dialogs.rb:352
#, fuzzy
msgid "Enable Copy Ke&rnel into the Dump Directory"
msgstr "Không thể tạo thư mục."
#. TRANSLATORS: CheckBox Label
-#: src/include/kdump/dialogs.rb:389
+#: src/include/kdump/dialogs.rb:366
msgid "Enable &Delete Old Dump Images"
msgstr ""
#. TRANSLATORS: IntField Label
-#: src/include/kdump/dialogs.rb:406
+#: src/include/kdump/dialogs.rb:383
#, fuzzy
msgid "N&umber of Old Dumps"
msgstr "Số bản _sao :"
#. "handle" :
-#: src/include/kdump/dialogs.rb:427
+#: src/include/kdump/dialogs.rb:408
msgid "Kdump Memory"
msgstr ""
-#: src/include/kdump/dialogs.rb:432
+#: src/include/kdump/dialogs.rb:413
msgid "Kdump Start-Up"
msgstr ""
-#: src/include/kdump/dialogs.rb:433
+#: src/include/kdump/dialogs.rb:414
#, fuzzy
msgid "Start-Up"
msgstr "Bắt đầu &cập nhật"
-#: src/include/kdump/dialogs.rb:448
+#: src/include/kdump/dialogs.rb:429
msgid "Kdump - Dump Filtering"
msgstr ""
-#: src/include/kdump/dialogs.rb:449
+#: src/include/kdump/dialogs.rb:430
msgid "Dump Filtering"
msgstr ""
-#: src/include/kdump/dialogs.rb:455
+#: src/include/kdump/dialogs.rb:436
msgid "Saving Target for Kdump Image"
msgstr ""
-#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463
+#: src/include/kdump/dialogs.rb:443 src/include/kdump/dialogs.rb:444
#, fuzzy
msgid "Dump Target"
msgstr "Đích iSCSI"
-#: src/include/kdump/dialogs.rb:469
+#: src/include/kdump/dialogs.rb:450
#, fuzzy
msgid "SMTP Server"
msgstr "Máy chủ NTP"
-#: src/include/kdump/dialogs.rb:479
+#: src/include/kdump/dialogs.rb:460
#, fuzzy
#| msgid "Destination Address:"
msgid "Notification Email Addresses"
msgstr "Địa chỉ đích:"
-#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488
+#: src/include/kdump/dialogs.rb:468 src/include/kdump/dialogs.rb:469
msgid "Email Notification"
msgstr ""
-#: src/include/kdump/dialogs.rb:501
+#: src/include/kdump/dialogs.rb:482
#, fuzzy
msgid "Custom Kernel for Kdump"
msgstr "Đã vẽ kiểu tự chọn"
-#: src/include/kdump/dialogs.rb:506
+#: src/include/kdump/dialogs.rb:487
#, fuzzy
msgid "Command Line"
msgstr "Câu lệnh '%1'"
-#: src/include/kdump/dialogs.rb:514
+#: src/include/kdump/dialogs.rb:495
#, fuzzy
msgid "Dump Settings"
msgstr "Thiết lập cao cấp"
-#: src/include/kdump/dialogs.rb:527
+#: src/include/kdump/dialogs.rb:508
#, fuzzy
msgid "Kdump Expert Settings"
msgstr "Thiết lập cao cấp"
-#: src/include/kdump/dialogs.rb:528
+#: src/include/kdump/dialogs.rb:509
msgid "Expert Settings"
msgstr "Thiết lập cao cấp"
+#: src/include/kdump/dialogs.rb:529
+msgid "Kdump &Low Memory [MiB]"
+msgstr ""
+
+#: src/include/kdump/dialogs.rb:531
+msgid "Kdump Memor&y [MiB]"
+msgstr ""
+
+#: src/include/kdump/dialogs.rb:537
+msgid "Total System Memory [MiB]:"
+msgstr ""
+
+#: src/include/kdump/dialogs.rb:544
+msgid "Usable Memory [MiB]:"
+msgstr ""
+
+#: src/include/kdump/dialogs.rb:567
+msgid "Kdump &High Memory [MiB]"
+msgstr ""
+
#. Enable/Disable Kdump - RadioButtons 1/1
#: src/include/kdump/helps.rb:36
msgid ""
@@ -1199,159 +1209,163 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1439
-msgid "Kernel option includes several ranges. Rewrite it?"
+#: src/include/kdump/uifunctions.rb:1449
+msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr ""
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1467
+#: src/include/kdump/uifunctions.rb:1482
msgid "Use &Firmware-Assisted Dump"
msgstr ""
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:495
+#: src/modules/Kdump.rb:412
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:605
+#: src/modules/Kdump.rb:514
#, fuzzy
msgid "Initializing kdump Configuration"
msgstr "Khởi chạy cấu hình CASA"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:614 src/modules/Kdump.rb:622
+#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
#, fuzzy
msgid "Reading the config file..."
msgstr "Đang đọc cấu hình hiện thời..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:525
#, fuzzy
msgid "Reading kernel boot options..."
msgstr "Không đọc được thiết lập hiện thời."
#. Progress stage 4/4
-#. Progress finished 3/4
-#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626
-#, fuzzy
-msgid "Reading available memory..."
-msgstr "Đang dò tìm hạng mục..."
+#: src/modules/Kdump.rb:527
+msgid "Calculating memory limits..."
+msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:533
#, fuzzy
msgid "Reading partitions of disks..."
msgstr "Đang đọc thiết lập trước đây..."
+#. Progress finished 3/4
+#: src/modules/Kdump.rb:535
+#, fuzzy
+msgid "Reading available memory and calibrating usage..."
+msgstr "Đang dò tìm hạng mục..."
+
#. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:547
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr ""
#. Error message
-#: src/modules/Kdump.rb:646
+#: src/modules/Kdump.rb:555
#, fuzzy
msgid "Cannot read kernel boot options."
msgstr "Không đọc được thiết lập hiện thời."
#. Error message
-#: src/modules/Kdump.rb:653
+#: src/modules/Kdump.rb:563
#, fuzzy
msgid "Cannot read available memory."
msgstr "Không đọc được hạng mục."
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:679
+#: src/modules/Kdump.rb:589
#, fuzzy
msgid "Saving kdump Configuration"
msgstr "Đang lưu cấu hình CASA"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:708
+#: src/modules/Kdump.rb:618
msgid "Write the settings"
msgstr "Ghi thiết lập"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:710
+#: src/modules/Kdump.rb:620
#, fuzzy
msgid "Update boot options"
msgstr "Cập nhật thiết lập"
#. Progress step 1/2
-#: src/modules/Kdump.rb:714
+#: src/modules/Kdump.rb:624
msgid "Writing the settings..."
msgstr "Đang ghi thiết lập..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:716
+#: src/modules/Kdump.rb:626
#, fuzzy
msgid "Updating boot options..."
msgstr "Đang cập nhật cấu hình..."
#. Progress finished
-#: src/modules/Kdump.rb:718
+#: src/modules/Kdump.rb:628
msgid "Finished"
msgstr "Hoàn thành"
#. Error message
-#: src/modules/Kdump.rb:728
+#: src/modules/Kdump.rb:638
msgid "Cannot write settings."
msgstr "Không ghi được thiết lập."
#. Error message
-#: src/modules/Kdump.rb:737
+#: src/modules/Kdump.rb:647
msgid "Adding crashkernel parameter to bootloader fault."
msgstr ""
-#. Create a textual summary and a list of unconfigured cards
+#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:851
+#: src/modules/Kdump.rb:758
msgid "Kdump status: %1"
msgstr ""
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:759
#, fuzzy
msgid "enabled"
msgstr "Dùng"
-#: src/modules/Kdump.rb:852
+#: src/modules/Kdump.rb:759
#, fuzzy
msgid "disabled"
msgstr "Không dùng"
-#: src/modules/Kdump.rb:859
-msgid "Value of crashkernel option: %1"
+#: src/modules/Kdump.rb:766
+msgid "Value(s) of crashkernel option: %1"
msgstr ""
-#: src/modules/Kdump.rb:866
+#: src/modules/Kdump.rb:773
#, fuzzy
msgid "Dump format: %1"
msgstr "Dấu chân: %1"
-#: src/modules/Kdump.rb:873
+#: src/modules/Kdump.rb:780
#, fuzzy
msgid "Target of dumps: %1"
msgstr "Số bản _sao :"
-#: src/modules/Kdump.rb:880
+#: src/modules/Kdump.rb:787
#, fuzzy
msgid "Number of dumps: %1"
msgstr "Số bản _sao :"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:972
+#: src/modules/Kdump.rb:879
msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
msgstr ""
#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:1065
+#: src/modules/Kdump.rb:974
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: trunk/yast/vi/po/ncurses-pkg.vi.po
===================================================================
--- trunk/yast/vi/po/ncurses-pkg.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/ncurses-pkg.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-08-02 16:44+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -86,14 +86,14 @@
#. add the Cancel button
#. begin: the label of the Cancel button
#: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836
-#: src/NCPkgStrings.cc:684
+#: src/NCPkgStrings.cc:691
msgid "&Cancel"
msgstr "&Dừng"
#. add the OK button
#. the label of an Accept button
#: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841
-#: src/NCPkgStrings.cc:698
+#: src/NCPkgStrings.cc:705
msgid "&Accept"
msgstr "&Chấp nhận"
@@ -1098,36 +1098,42 @@
msgid "&OK"
msgstr "&OK"
+#. begin: the label of the Contiunue button
+#: src/NCPkgStrings.cc:684
+#, fuzzy
+msgid "C&ontinue"
+msgstr "&Vẫn tiếp tục"
+
#. the label of the Yes button
-#: src/NCPkgStrings.cc:691
+#: src/NCPkgStrings.cc:698
msgid "&Yes"
msgstr "&Có"
#. the label of the No button
-#: src/NCPkgStrings.cc:705
+#: src/NCPkgStrings.cc:712
msgid "&No"
msgstr "&Không"
#. the label of the Solve button - 'try again' implies that user
#. has to make some action (#213602)
-#: src/NCPkgStrings.cc:713
+#: src/NCPkgStrings.cc:720
msgid "&OK -- Try Again"
msgstr "&OK -- Thử lại"
#. text for a Notify popup
-#: src/NCPkgStrings.cc:721
+#: src/NCPkgStrings.cc:728
#, fuzzy
msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>"
msgstr "<p>Mọi lựa chọn của bạn sẽ bị mất khi thoát bằng Dừng.<br>Thực sự thoát?</p>"
#. the label of language table
-#: src/NCPkgStrings.cc:729
+#: src/NCPkgStrings.cc:736
#, fuzzy
msgid "Available Languages"
msgstr "&Có:"
#. the label of language table
-#: src/NCPkgStrings.cc:736
+#: src/NCPkgStrings.cc:743
#, fuzzy
msgid "Available Repositories"
msgstr "Những máy &có:"
@@ -1136,67 +1142,84 @@
#. (the list shows all patches which are needed)
#. static const std::string value = _( "Installable Patches" );
#. static const std::string value = _( "Relevant Patches" );
-#: src/NCPkgStrings.cc:746
+#: src/NCPkgStrings.cc:753
#, fuzzy
msgid "Needed Patches"
msgstr "Vá lỗi &mới"
#. A label for a list of YOU Patches - keep it short - max. 25 chars!
#. (the list shows all patches which are already installed)
-#: src/NCPkgStrings.cc:754
+#: src/NCPkgStrings.cc:761
msgid "Installed Patches"
msgstr "Vá lỗi đã cài"
#. A common label for a list of YOU Patches - keep it short - max. 25 chars!
-#: src/NCPkgStrings.cc:762
+#: src/NCPkgStrings.cc:769
msgid "Online Update Patches"
msgstr "Vá lỗi cập nhật trực tuyến"
#. the label Filter: Update Problem ( keep it short - max. 25 chars )
-#: src/NCPkgStrings.cc:769
+#: src/NCPkgStrings.cc:776
msgid "Update Problem -- see help"
msgstr "Có vấn đề cập nhật -- hãy xem trợ giúp"
#. the label for Filter: Search results
-#: src/NCPkgStrings.cc:776
+#: src/NCPkgStrings.cc:783
msgid "Search Results"
msgstr "Kết quả tìm kiếm"
#. the headline of the dependency popup
-#: src/NCPkgStrings.cc:783
+#: src/NCPkgStrings.cc:790
msgid "Package Dependencies"
msgstr "Sự phụ thuộc gói"
#. help text package status
-#: src/NCPkgStrings.cc:790
+#: src/NCPkgStrings.cc:797
msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>"
msgstr "<b>Danh sách vấn đề cập nhật</b><br><p>Những gói trong danh sách này không thể tự động cập nhật.</p><p>Những nguyên nhân có thể:</p><p>Chúng đã được thay thế bởi những gói khác.</p><p>Không có phiên bản mới hơn trên các nguồn cài đặt.</p><p>Chúng là các gói của công ty thứ ba</p><p>Cần phải tự chọn hành động thực hiện với chúng. Hành động an toàn nhất là xóa chúng.</p>"
#. column header source RPM installation (keep it short!)
-#: src/NCPkgStrings.cc:797
+#: src/NCPkgStrings.cc:804
msgid "Source"
msgstr "Nguồn"
#. menu entry Update List
-#: src/NCPkgStrings.cc:805
+#: src/NCPkgStrings.cc:812
msgid "&Update List"
msgstr "&Danh sách cập nhật"
#. part of the patch description
-#: src/NCPkgStrings.cc:812
+#: src/NCPkgStrings.cc:819
msgid "<b>Patch: </b>"
msgstr "<b>Vá lỗi: </b>"
#. info line is shown if YOU patch list is empty
-#: src/NCPkgStrings.cc:819
+#: src/NCPkgStrings.cc:826
msgid "No patches available"
msgstr "Không có vá lỗi nào"
-#: src/NCPkgStrings.cc:825
+#: src/NCPkgStrings.cc:832
msgid "Script"
msgstr "Script"
+#: src/NCPkgStrings.cc:838
#, fuzzy
+msgid "Incompatible Package Versions"
+msgstr "Qu&an hệ gói"
+
+#: src/NCPkgStrings.cc:845
+msgid "<p>You are trying to install multiversion-capable and non-multiversion-capable versions of this package at the same time.</p>"
+msgstr ""
+
+#: src/NCPkgStrings.cc:854
+msgid "<p>This version is multiversion-capable.</p><p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>"
+msgstr ""
+
+#: src/NCPkgStrings.cc:864
+msgid "<p>This version is not multiversion-capable.</p><p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones.<p>"
+msgstr ""
+
+#, fuzzy
#~ msgid "<p>Kind \"recommended\" means you should install the patch. \"security\" is a security patch and we highly recommend to install it.</p>"
#~ msgstr "<p>Chế độ \"khuyên dùng\" có nghĩa là bạn nên cài đặt vá lỗi. \"bảo mật\" là vá lỗi bảo mật và rất nên cài đặt nó. Vá lỗi \"YaST2\" sẽ luôn luôn được cài đặt đầu tiên. Các vá lỗi khác cần được cài đặt trong lần chạy thứ hai.</p>"
Modified: trunk/yast/vi/po/qt-pkg.vi.po
===================================================================
--- trunk/yast/vi/po/qt-pkg.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/qt-pkg.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2006-08-28 21:56+0400\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -52,7 +52,7 @@
msgstr "Tìm kiếm"
#. DEBUG
-#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113
+#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:114
#, fuzzy
msgid "&Keywords"
msgstr "Từ khóa"
@@ -93,8 +93,8 @@
#: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305
#: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259
#: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398
-#: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258
-#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219
+#: src/YQPkgSearchFilterView.cc:249 src/YQPkgTextDialog.cc:258
+#: src/YQPkgVersionsView.cc:413 src/YQSimplePatchSelector.cc:219
msgid "&Cancel"
msgstr "&Dừng"
@@ -403,7 +403,7 @@
msgstr "Ngoài lựa chọn của người dùng, những gói sau đã được thay đổi để giải quyết sự phụ thuộc:"
#: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326
-#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428
+#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:412
msgid "C&ontinue"
msgstr "Tiếp tụ&c"
@@ -1376,15 +1376,11 @@
msgid "Unmaintained Packages"
msgstr "Đang gỡ bỏ gói"
-#. horizontal
-#. vertical
-#: src/YQPkgRepoFilterView.cc:180
+#: src/YQPkgRepoFilterView.cc:177
msgid "Search"
msgstr "Tìm kiếm"
-#. horizontal
-#. vertical
-#: src/YQPkgRepoFilterView.cc:199
+#: src/YQPkgRepoFilterView.cc:192
msgid "Installation Summary"
msgstr "Tổng kết cài đặt"
@@ -1398,44 +1394,44 @@
msgstr "zzz Tất cả"
#. Search button
-#: src/YQPkgSearchFilterView.cc:92
+#: src/YQPkgSearchFilterView.cc:93
msgid "&Search"
msgstr "Tìm &kiếm"
#.
#. Where to search
#.
-#: src/YQPkgSearchFilterView.cc:105
+#: src/YQPkgSearchFilterView.cc:106
msgid "Search in"
msgstr "Tìm trong"
-#: src/YQPkgSearchFilterView.cc:111
+#: src/YQPkgSearchFilterView.cc:112
#, fuzzy
#| msgid "Name"
msgid "Nam&e"
msgstr "Tên"
-#: src/YQPkgSearchFilterView.cc:115
+#: src/YQPkgSearchFilterView.cc:116
msgid "Su&mmary"
msgstr "Tổng &kết"
-#: src/YQPkgSearchFilterView.cc:117
+#: src/YQPkgSearchFilterView.cc:118
msgid "Descr&iption"
msgstr "&Mô tả"
-#: src/YQPkgSearchFilterView.cc:122
+#: src/YQPkgSearchFilterView.cc:123
#, fuzzy
#| msgid "&Provides"
msgid "RPM \"P&rovides\""
msgstr "&Nội dung gói"
-#: src/YQPkgSearchFilterView.cc:124
+#: src/YQPkgSearchFilterView.cc:125
#, fuzzy
#| msgid "&Requires"
msgid "RPM \"Re&quires\""
msgstr "&Yêu cầu"
-#: src/YQPkgSearchFilterView.cc:127
+#: src/YQPkgSearchFilterView.cc:128
#, fuzzy
msgid "File list"
msgstr "Danh sách tập tin"
@@ -1443,40 +1439,40 @@
#.
#. Search mode
#.
-#: src/YQPkgSearchFilterView.cc:142
+#: src/YQPkgSearchFilterView.cc:143
msgid "Search &Mode:"
msgstr "&Chế độ tìm:"
#. Caution: combo box items must be inserted in the same order as enum SearchMode!
-#: src/YQPkgSearchFilterView.cc:155
+#: src/YQPkgSearchFilterView.cc:156
msgid "Contains"
msgstr "Nội dung"
-#: src/YQPkgSearchFilterView.cc:156
+#: src/YQPkgSearchFilterView.cc:157
msgid "Begins with"
msgstr "Bắt đầu với"
-#: src/YQPkgSearchFilterView.cc:157
+#: src/YQPkgSearchFilterView.cc:158
msgid "Exact Match"
msgstr "Tương ứng chính xác"
-#: src/YQPkgSearchFilterView.cc:158
+#: src/YQPkgSearchFilterView.cc:159
msgid "Use Wild Cards"
msgstr "Dùng ký tự thay thế"
-#: src/YQPkgSearchFilterView.cc:159
+#: src/YQPkgSearchFilterView.cc:160
msgid "Use Regular Expression"
msgstr "Dùng biểu thức chính quy"
-#: src/YQPkgSearchFilterView.cc:166
+#: src/YQPkgSearchFilterView.cc:167
msgid "Case Sensiti&ve"
msgstr "Tính ho&a thường"
-#: src/YQPkgSearchFilterView.cc:244
+#: src/YQPkgSearchFilterView.cc:248
msgid "Searching..."
msgstr "Đang tìm..."
-#: src/YQPkgSearchFilterView.cc:330
+#: src/YQPkgSearchFilterView.cc:334
msgid "No Results."
msgstr "Không có kết quả."
@@ -1485,7 +1481,7 @@
#. if it's a user error (e.g., syntax error in regular expression) or
#. an internal error. But there is a "Details" button that will return
#. the original (translated) error message.
-#: src/YQPkgSearchFilterView.cc:345
+#: src/YQPkgSearchFilterView.cc:349
#, fuzzy
msgid "Query Error"
msgstr "Lỗi"
@@ -1617,14 +1613,14 @@
msgstr ""
#. Translators: Popup dialog text. Try to keep the lines about the same length.
-#: src/YQPkgVersionsView.cc:398
+#: src/YQPkgVersionsView.cc:382
msgid ""
"You are trying to install multiversion-capable\n"
"and non-multiversion-capable versions of this\n"
"package at the same time."
msgstr ""
-#: src/YQPkgVersionsView.cc:406
+#: src/YQPkgVersionsView.cc:390
msgid ""
"This version is multiversion-capable.\n"
"\n"
@@ -1633,7 +1629,7 @@
"\"Cancel\" to unselect this version and keep the other one."
msgstr ""
-#: src/YQPkgVersionsView.cc:415
+#: src/YQPkgVersionsView.cc:399
msgid ""
"This version is not multiversion-capable.\n"
"\n"
@@ -1643,7 +1639,7 @@
msgstr ""
#. Dialog heading
-#: src/YQPkgVersionsView.cc:423
+#: src/YQPkgVersionsView.cc:407
#, fuzzy
msgid "Incompatible Package Versions"
msgstr "Đang gỡ bỏ gói"
@@ -1657,11 +1653,11 @@
#. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE
#. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^
#. %1 %2 %3 %4 %5
-#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586
+#: src/YQPkgVersionsView.cc:533 src/YQPkgVersionsView.cc:570
msgid "%1-%2 from %3 with priority %4 and vendor %5"
msgstr ""
-#: src/YQPkgVersionsView.cc:570
+#: src/YQPkgVersionsView.cc:554
msgid "This version is installed in your system."
msgstr "Phiên bản này đã được cài đặt trên hệ thống."
Modified: trunk/yast/vi/po/registration.vi.po
===================================================================
--- trunk/yast/vi/po/registration.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/registration.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -63,7 +63,7 @@
#: src/clients/inst_scc.rb:186
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
#: src/lib/registration/ui/base_system_registration_dialog.rb:48
-#: src/lib/registration/ui/migration_repos_workflow.rb:270
+#: src/lib/registration/ui/migration_repos_workflow.rb:287
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
#, fuzzy
@@ -104,8 +104,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:247
-#: src/lib/registration/registration_ui.rb:277
+#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
+#: src/lib/registration/registration_ui.rb:311
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -343,24 +343,36 @@
msgid "Details: %s"
msgstr "Chi tiết..."
+#. TRANSLATORS: multiline error message - a SSL certificate has been
+#. imported but the registration server still cannot be accessed securely,
+#. user has to solve the certificate issue manually.
+#: src/lib/registration/connect_helpers.rb:226
+msgid ""
+"A certificate has been already imported\n"
+"but the server connection still cannot be trusted.\n"
+"\n"
+"Please fix the certificate issue manually, ensure that the server\n"
+"can be connected securely and start the YaST module again."
+msgstr ""
+
#. progress label
-#: src/lib/registration/connect_helpers.rb:222
+#: src/lib/registration/connect_helpers.rb:238
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:223
+#: src/lib/registration/connect_helpers.rb:239
msgid "Importing '%s' certificate..."
msgstr ""
#. try to use a translatable message first, if not found then use
#. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:244
+#: src/lib/registration/connect_helpers.rb:260
msgid "Secure connection error: %s"
msgstr ""
#. TRANSLATORS: error message, %s is a server URL,
#. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:263
+#: src/lib/registration/connect_helpers.rb:279
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -398,50 +410,61 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:233
+#: src/lib/registration/registration_ui.rb:267
msgid "Registering the System..."
msgstr ""
#. updating base product registration, %s is a new base product name
+#. updating product registration, %s is a product name
#. updating registered addon/extension, %s is an extension name
+#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:312
+#: src/lib/registration/registration_ui.rb:146
+#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating configuration..."
msgid "Updating to %s ..."
msgstr "Đang cập nhật cấu hình..."
+#. TRANSLATORS: progress label
+#: src/lib/registration/registration_ui.rb:163
+#, fuzzy
+#| msgid "Registration Code"
+msgid "Synchronizing Products..."
+msgstr "Mã đăng ký"
+
#. load available addons from SCC server
#. the result is cached to avoid reloading when going back and forth in the
#. installation workflow
#. @return [ArrayRegistration::Addon] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:143
-#: src/lib/registration/ui/autoyast_config_workflow.rb:109
+#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
msgid "Loading Available Extensions and Modules..."
msgstr "Mã đăng ký"
-#: src/lib/registration/registration_ui.rb:157
+#: src/lib/registration/registration_ui.rb:191
#, fuzzy
#| msgid "Registration Code"
msgid "Loading Migration Products..."
msgstr "Mã đăng ký"
#. dialog title
-#: src/lib/registration/registration_ui.rb:174
+#: src/lib/registration/registration_ui.rb:208
#, fuzzy
msgid "Register Extensions and Modules"
msgstr "Mã đăng ký"
#. help text
-#: src/lib/registration/registration_ui.rb:178
+#: src/lib/registration/registration_ui.rb:212
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr ""
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:203
+#: src/lib/registration/registration_ui.rb:237
#, fuzzy
msgid ""
"The registration server offers update repositories.\n"
@@ -449,14 +472,18 @@
msgstr "Mã đăng ký"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:207
-msgid "Would you like to enable these repositories during installation\n"
+#: src/lib/registration/registration_ui.rb:241
+msgid ""
+"Would you like to enable these repositories during installation\n"
+"in order to receive the latest updates?"
msgstr ""
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:211
-msgid "Would you like to enable these repositories during upgrade\n"
+#: src/lib/registration/registration_ui.rb:245
+msgid ""
+"Would you like to enable these repositories during upgrade\n"
+"in order to receive the latest updates?"
msgstr ""
#. indent size used in summary text
@@ -465,44 +492,55 @@
msgid "Certificate:"
msgstr "Tập tin chứng nhận của CA:"
+#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed
+#. when a migration repository cannot be accessed, there are [Skip]
+#. and [Abort] buttons displayed below the question
+#: src/lib/registration/sw_mgmt.rb:97
+msgid ""
+"Repository '%s'\n"
+"cannot be loaded.\n"
+"\n"
+"Skip the repository or abort?"
+msgstr ""
+
#. create UI label for a base product
#. @param base_product [Hash] Product (hash from pkg-bindings)
#. @return [String] UI Label
-#: src/lib/registration/sw_mgmt.rb:147
+#: src/lib/registration/sw_mgmt.rb:192
#, fuzzy
msgid "Unknown product"
msgstr "Không biết thư mục này"
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248
+#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
#, fuzzy
msgid "Saving repository configuration failed."
msgstr "Đang chạy trình duyệt..."
#. # error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223
+#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267
msgid "Updating service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:218
+#: src/lib/registration/sw_mgmt.rb:262
msgid "Adding service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:230
+#: src/lib/registration/sw_mgmt.rb:274
msgid "Saving service '%s' failed."
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:235
+#: src/lib/registration/sw_mgmt.rb:279
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:438
+#: src/lib/registration/sw_mgmt.rb:486
#, fuzzy
#| msgid "No product found in the catalog"
msgid ""
@@ -937,8 +975,17 @@
msgid "&Local Registration Server URL"
msgstr "Mã đăng ký"
+#. TRANSLATORS: error message, %s are details
+#. TRANSLATORS: error message, %s are details
+#: src/lib/registration/ui/media_addon_workflow.rb:95
+#: src/lib/registration/ui/wizard_client.rb:57
+#, fuzzy
+#| msgid "Internal Zone"
+msgid "Internal error: %s"
+msgstr "Vùng ở trong"
+
#. register the base system if not already registered
-#: src/lib/registration/ui/media_addon_workflow.rb:130
+#: src/lib/registration/ui/media_addon_workflow.rb:132
msgid ""
"The base system has to be registered in order to register the '%s' add-on.\n"
"Skip the base system and the add-on registration?"
@@ -946,9 +993,8 @@
#. TRANSLATORS: dialog title
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:47
-#, fuzzy
-msgid "Migration Repositories"
-msgstr "&Danh sách cập nhật"
+msgid "Repositories used for Migration"
+msgstr ""
#. TRANSLATORS: help text
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:50
@@ -958,9 +1004,9 @@
#. TRANSLATORS: Multiselection widget label
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:85
#, fuzzy
-#| msgid "Select the Private Key File"
-msgid "Select the Migration Repositories"
-msgstr "Chọn tập tin là khóa riêng."
+#| msgid "Select File for the Authentication Key"
+msgid "Select the Repositories used for Migration"
+msgstr "Chọn tập tin cho chìa khóa xác thực"
#. TRANSLATORS: Push button label, starts the repository management module
#: src/lib/registration/ui/migration_repos_selection_dialog.rb:89
@@ -980,92 +1026,79 @@
msgid "Priority: %s"
msgstr ""
-#. a dummy message which will be used later, just make sure we have it
-#. before the translation deadline...
-#. TRANSLATORS: popup question, confirm installing the available
-#. updates now
-#: src/lib/registration/ui/migration_repos_workflow.rb:50
+#. TRANSLATORS: a popup message with [Continue] [Cancel] buttons,
+#. pressing [Continue] starts the registration module, [Cancel] aborts
+#. the online migration
+#: src/lib/registration/ui/migration_repos_workflow.rb:145
msgid ""
-"Online updates are available for installation.\n"
-"It is recommended to install all updates before proceeding.\n"
-"\n"
-"Would you like to install the updates now?"
+"The system is not registered,\n"
+"to run the online migration you need\n"
+"to register the system first."
msgstr ""
-#. TRANSLATORS: error message, %s are details
-#: src/lib/registration/ui/migration_repos_workflow.rb:86
-#, fuzzy
-#| msgid "Internal Zone"
-msgid "Internal error: %s"
-msgstr "Vùng ở trong"
-
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:170
+#: src/lib/registration/ui/migration_repos_workflow.rb:183
msgid "No installed product found."
msgstr ""
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:199
+#: src/lib/registration/ui/migration_repos_workflow.rb:212
msgid "No migration product found."
msgstr ""
-#. TRANSLATORS: Progress label
-#: src/lib/registration/ui/migration_repos_workflow.rb:246
-#, fuzzy
-#| msgid "Registration Code"
-msgid "Registering Migration Products..."
-msgstr "Mã đăng ký"
-
#. TRANSLATORS: progress message
-#: src/lib/registration/ui/migration_repos_workflow.rb:272
+#: src/lib/registration/ui/migration_repos_workflow.rb:289
#, fuzzy
msgid "Preparing Migration Repositories..."
msgstr "&Danh sách cập nhật"
#. TRANSLATORS: dialog title
-#: src/lib/registration/ui/migration_selection_dialog.rb:61
+#: src/lib/registration/ui/migration_selection_dialog.rb:62
msgid "Select the Migration Target"
msgstr ""
#. TRANSLATORS: help text (1/3)
-#: src/lib/registration/ui/migration_selection_dialog.rb:64
+#: src/lib/registration/ui/migration_selection_dialog.rb:65
msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>"
msgstr ""
#. TRANSLATORS: help text (2/3)
-#: src/lib/registration/ui/migration_selection_dialog.rb:67
+#: src/lib/registration/ui/migration_selection_dialog.rb:68
msgid "<p>Only one migration target from the list can be selected.</p>"
msgstr ""
#. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:69
+#: src/lib/registration/ui/migration_selection_dialog.rb:70
msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>"
msgstr ""
-#. TRANSLATORS: check button label
-#: src/lib/registration/ui/migration_selection_dialog.rb:70
-#: src/lib/registration/ui/migration_selection_dialog.rb:139
+#: src/lib/registration/ui/migration_selection_dialog.rb:71
#, fuzzy
#| msgid "Manual Interaction Required"
msgid "Manually Select Migration Repositories"
msgstr "Yêu cầu tác động của người dùng"
#. TRANSLATORS: error popup, no target migration is selected
-#: src/lib/registration/ui/migration_selection_dialog.rb:96
+#: src/lib/registration/ui/migration_selection_dialog.rb:97
#, fuzzy
#| msgid "Select File for the Authentication Key"
msgid "Select the target migration."
msgstr "Chọn tập tin cho chìa khóa xác thực"
+#. TRANSLATORS: check button label
+#: src/lib/registration/ui/migration_selection_dialog.rb:138
+msgid "Manually Adjust the Repositories for Migration"
+msgstr ""
+
#. TRANSLATORS: selection box label
-#: src/lib/registration/ui/migration_selection_dialog.rb:151
+#: src/lib/registration/ui/migration_selection_dialog.rb:153
#, fuzzy
#| msgid "P&ossible Solutions"
msgid "Possible Migration Targets"
msgstr "Giải &pháp có thể"
#. TRANSLATORS: RichText header (details for the selected item)
-#: src/lib/registration/ui/migration_selection_dialog.rb:189
+#: src/lib/registration/ui/migration_selection_dialog.rb:191
#, fuzzy
#| msgid "Configuration summary..."
msgid "Migration Summary"
@@ -1077,38 +1110,38 @@
#. using the selected migration.
#. %{url} is the URL of the registration server (SMT)
#. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:212
+#: src/lib/registration/ui/migration_selection_dialog.rb:214
msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration."
msgstr ""
#. this is rather a theoretical case, but anyway....
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:223
+#: src/lib/registration/ui/migration_selection_dialog.rb:225
msgid "%s <b>will be installed.</b>"
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %s is a product name, e.g. "SUSE Linux Enterprise Server 12"
-#: src/lib/registration/ui/migration_selection_dialog.rb:240
+#: src/lib/registration/ui/migration_selection_dialog.rb:242
msgid "%s <b>stays unchanged.</b>"
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12"
#. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64"
-#: src/lib/registration/ui/migration_selection_dialog.rb:250
+#: src/lib/registration/ui/migration_selection_dialog.rb:252
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr ""
#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:255
+#: src/lib/registration/ui/migration_selection_dialog.rb:257
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr ""
#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:285
+#: src/lib/registration/ui/migration_selection_dialog.rb:290
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1174,6 +1207,20 @@
msgstr "1 mục của dữ liệu đăng ký"
#, fuzzy
+#~ msgid "Migration Repositories"
+#~ msgstr "&Danh sách cập nhật"
+
+#, fuzzy
+#~| msgid "Select the Private Key File"
+#~ msgid "Select the Migration Repositories"
+#~ msgstr "Chọn tập tin là khóa riêng."
+
+#, fuzzy
+#~| msgid "Registration Code"
+#~ msgid "Registering Migration Products..."
+#~ msgstr "Mã đăng ký"
+
+#, fuzzy
#~ msgid "SSL Certificate"
#~ msgstr "Tập tin chứng nhận của CA:"
Modified: trunk/yast/vi/po/storage.vi.po
===================================================================
--- trunk/yast/vi/po/storage.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/storage.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:53+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2006-07-12 07:27+0200\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \n"
@@ -798,7 +798,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:246
+#: src/include/partitioning/custom_part_check_generated.rb:251
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -808,7 +808,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:259
+#: src/include/partitioning/custom_part_check_generated.rb:264
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -818,7 +818,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:272
+#: src/include/partitioning/custom_part_check_generated.rb:277
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -828,7 +828,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:286
+#: src/include/partitioning/custom_part_check_generated.rb:291
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -837,8 +837,19 @@
"Really use this setup?\n"
msgstr ""
+#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
+#. other /boot partition, we should warn the user.
+#: src/include/partitioning/custom_part_check_generated.rb:305
+msgid ""
+"Warning:\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:301
+#: src/include/partitioning/custom_part_check_generated.rb:320
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -851,7 +862,7 @@
msgstr ""
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:321
+#: src/include/partitioning/custom_part_check_generated.rb:340
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
@@ -861,7 +872,7 @@
msgstr ""
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:338
+#: src/include/partitioning/custom_part_check_generated.rb:357
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -873,19 +884,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:360
+#: src/include/partitioning/custom_part_check_generated.rb:377
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
-"(approx. %1) is required. Consider creating one.\n"
-"Partitions assigned to /boot will automatically be changed to\n"
-"type 0x41 PReP/CHRP.\n"
+"(approx. %1) is required. Consider creating one\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:380
+#: src/include/partitioning/custom_part_check_generated.rb:396
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -897,7 +907,7 @@
"Really use this setup?\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:400
+#: src/include/partitioning/custom_part_check_generated.rb:416
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -906,7 +916,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:417
+#: 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"
@@ -917,7 +927,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:435
+#: 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"
@@ -932,7 +942,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:457
+#: 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"
@@ -947,13 +957,13 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:480
+#: 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:488
+#: 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"
@@ -966,7 +976,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:504
+#: src/include/partitioning/custom_part_check_generated.rb:520
msgid ""
"\n"
"You chose to install onto an existing partition that will not be\n"
@@ -975,7 +985,7 @@
msgstr ""
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:511
+#: 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"
@@ -984,7 +994,7 @@
msgstr ""
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:518
+#: 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"
@@ -992,7 +1002,7 @@
msgstr ""
#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:524
+#: 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"
@@ -1000,53 +1010,53 @@
msgstr ""
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:579
+#: src/include/partitioning/custom_part_check_generated.rb:595
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:590
+#: src/include/partitioning/custom_part_check_generated.rb:606
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
msgstr ""
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:600
+#: src/include/partitioning/custom_part_check_generated.rb:616
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
msgstr ""
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:633
+#: src/include/partitioning/custom_part_check_generated.rb:649
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
msgstr ""
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:644
+#: src/include/partitioning/custom_part_check_generated.rb:660
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
msgstr ""
-#: src/include/partitioning/custom_part_check_generated.rb:656
+#: src/include/partitioning/custom_part_check_generated.rb:672
msgid "It cannot be deleted while mounted."
msgstr ""
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:692
+#: src/include/partitioning/custom_part_check_generated.rb:708
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:768
+#: src/include/partitioning/custom_part_check_generated.rb:784
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
@@ -1055,7 +1065,7 @@
msgstr ""
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:786
+#: src/include/partitioning/custom_part_check_generated.rb:802
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1065,7 +1075,7 @@
msgstr ""
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:797
+#: src/include/partitioning/custom_part_check_generated.rb:813
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1075,7 +1085,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:808
+#: src/include/partitioning/custom_part_check_generated.rb:824
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1084,30 +1094,30 @@
msgstr ""
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:71
+#: src/include/partitioning/custom_part_dialogs.rb:70
msgid "Enter your Password for the Encrypted File System."
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:75
+#: src/include/partitioning/custom_part_dialogs.rb:74
#: src/include/partitioning/ep-dialogs.rb:768
#: src/modules/StorageProposal.rb:6372
msgid "Do not forget what you enter here!"
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:79
+#: src/include/partitioning/custom_part_dialogs.rb:78
#: src/include/partitioning/ep-dialogs.rb:771
msgid "Empty password allowed."
msgstr ""
#. heading text, %1 is replaced by device name (e.g. /dev/hda1)
-#: src/include/partitioning/custom_part_dialogs.rb:85
+#: src/include/partitioning/custom_part_dialogs.rb:84
msgid "Password for Encrypted File System on %1"
msgstr ""
#. translator comment: %1 is the device name, %2 is a directory
#. example: "...password for device /dev/hda6 mounted on /var"
-#: src/include/partitioning/custom_part_dialogs.rb:106
+#: src/include/partitioning/custom_part_dialogs.rb:105
#, fuzzy
msgid ""
"Enter your encryption password for\n"
@@ -1115,7 +1125,7 @@
msgstr "Nhập &mật khẩu:"
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:122
+#: src/include/partitioning/custom_part_dialogs.rb:121
msgid "Enter your Password for the Encrypted File System"
msgstr ""
@@ -1123,7 +1133,7 @@
#. Please use newline if label is longer than 40 characters
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/include/partitioning/custom_part_dialogs.rb:137
+#: src/include/partitioning/custom_part_dialogs.rb:136
#: src/include/partitioning/ep-dialogs.rb:796
#, fuzzy
msgid "&Enter a Password for your File System:"
@@ -1135,19 +1145,19 @@
#. Please use newline if label is longer than 40 characters
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/include/partitioning/custom_part_dialogs.rb:148
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001
+#: src/include/partitioning/custom_part_dialogs.rb:147
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
#, fuzzy
msgid "Reenter the Password for &Verification:"
msgstr "Nhập &mật khẩu:"
#. Cancel button
-#: src/include/partitioning/custom_part_dialogs.rb:160
+#: src/include/partitioning/custom_part_dialogs.rb:159
msgid "&Skip"
msgstr "&Bỏ qua"
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:189
+#: src/include/partitioning/custom_part_dialogs.rb:188
msgid ""
"The first and the second version\n"
"of the password do not match!\n"
@@ -1156,8 +1166,8 @@
#. popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:197
-#: src/modules/Storage.rb:3957
+#: src/include/partitioning/custom_part_dialogs.rb:196
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1165,31 +1175,31 @@
#. popup text
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:204
-#: src/modules/Storage.rb:3965
+#: src/include/partitioning/custom_part_dialogs.rb:203
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:238
+#: src/include/partitioning/custom_part_dialogs.rb:237
msgid "No floating point number."
msgstr ""
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:362
+#: src/include/partitioning/custom_part_dialogs.rb:361
msgid "File system options:"
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:444
+#: src/include/partitioning/custom_part_dialogs.rb:443
msgid ""
"The character '/' is no longer permitted in a volume label.\n"
"Change your volume label so that it does not contain this character.\n"
msgstr ""
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:467
+#: src/include/partitioning/custom_part_dialogs.rb:466
msgid ""
"<p><b>Mount in /etc/fstab by:</b>\n"
"Normally, a file system to mount is identified in /etc/fstab\n"
@@ -1200,7 +1210,7 @@
msgstr ""
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:480
+#: src/include/partitioning/custom_part_dialogs.rb:479
msgid ""
"<p><b>Volume Label:</b>\n"
"The name entered in this field is used as the volume label. This usually makes sense only \n"
@@ -1209,49 +1219,49 @@
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:495
+#: src/include/partitioning/custom_part_dialogs.rb:494
msgid "Mount in /etc/fstab by"
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:502
+#: src/include/partitioning/custom_part_dialogs.rb:501
#, fuzzy
msgid "&Device Name"
msgstr "Tên thiết bị modem"
#. label text
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:509
-#: src/include/partitioning/custom_part_dialogs.rb:545
+#: src/include/partitioning/custom_part_dialogs.rb:508
+#: src/include/partitioning/custom_part_dialogs.rb:544
msgid "Volume &Label"
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:516
+#: src/include/partitioning/custom_part_dialogs.rb:515
#, fuzzy
msgid "&UUID"
msgstr "ID: %1"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:526
+#: src/include/partitioning/custom_part_dialogs.rb:525
#, fuzzy
msgid "Device &ID"
msgstr "_Thiết bị:"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:533
+#: src/include/partitioning/custom_part_dialogs.rb:532
#, fuzzy
msgid "Device &Path"
msgstr "Đường dẫn thư mục"
#. heading text
-#: src/include/partitioning/custom_part_dialogs.rb:673
+#: src/include/partitioning/custom_part_dialogs.rb:672
#, fuzzy
msgid "Fstab Options:"
msgstr "_Phụ đề:"
#. popup text %1 is a number
-#: src/include/partitioning/custom_part_dialogs.rb:847
+#: src/include/partitioning/custom_part_dialogs.rb:846
msgid ""
"\n"
"Maximum volume label length for the selected file system\n"
@@ -1259,66 +1269,66 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:870
+#: src/include/partitioning/custom_part_dialogs.rb:869
msgid "Provide a volume label to mount by label."
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:881
+#: src/include/partitioning/custom_part_dialogs.rb:880
msgid "This volume label is already in use. Select a different one."
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1050
+#: src/include/partitioning/custom_part_dialogs.rb:1046
#, fuzzy
msgid "File &System"
msgstr "Hệ thống tập tin ả_o"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1057
+#: src/include/partitioning/custom_part_dialogs.rb:1053
#, fuzzy
msgid "O&ptions..."
msgstr "Tùy chọn modem"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1073
+#: src/include/partitioning/custom_part_dialogs.rb:1069
#, fuzzy
msgid "&Encrypt Device"
msgstr "Hệ thống tập tin ả_o"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1148
+#: src/include/partitioning/custom_part_dialogs.rb:1144
msgid "File system &ID:"
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1180
+#: src/include/partitioning/custom_part_dialogs.rb:1176
#, fuzzy
msgid "Format"
msgstr "Cổng"
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1190
+#: src/include/partitioning/custom_part_dialogs.rb:1186
msgid "Do ¬ format"
msgstr ""
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1200
+#: src/include/partitioning/custom_part_dialogs.rb:1196
msgid "&Format"
msgstr ""
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1253
+#: src/include/partitioning/custom_part_dialogs.rb:1249
msgid "Fs&tab Options"
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1260
+#: src/include/partitioning/custom_part_dialogs.rb:1256
msgid "&Mount Point"
msgstr ""
#. popup text %1 is a partition name, %2 a dirctory
-#: src/include/partitioning/custom_part_dialogs.rb:1272
+#: src/include/partitioning/custom_part_dialogs.rb:1268
msgid ""
"\n"
"The selected partition (%1) is currently mounted on %2.\n"
@@ -1333,7 +1343,7 @@
msgstr ""
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1301
+#: src/include/partitioning/custom_part_dialogs.rb:1297
msgid ""
"\n"
"The file system on the partition cannot be shrunk by YaST2.\n"
@@ -1341,7 +1351,7 @@
msgstr ""
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1308
+#: src/include/partitioning/custom_part_dialogs.rb:1304
msgid ""
"\n"
"The file system on the logical volume cannot be shrunk by YaST2.\n"
@@ -1349,22 +1359,22 @@
msgstr ""
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1320
+#: src/include/partitioning/custom_part_dialogs.rb:1316
msgid "You risk losing data if you shrink this partition."
msgstr ""
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1326
+#: src/include/partitioning/custom_part_dialogs.rb:1322
msgid "You risk losing data if you shrink this logical volume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1330
+#: src/include/partitioning/custom_part_dialogs.rb:1326
#, fuzzy
msgid "Continue?"
msgstr "_Cấu hình"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1346
+#: src/include/partitioning/custom_part_dialogs.rb:1342
msgid ""
"\n"
"The file system on the selected partition cannot be extended by YaST2.\n"
@@ -1372,28 +1382,28 @@
msgstr ""
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1353
+#: src/include/partitioning/custom_part_dialogs.rb:1349
msgid ""
"\n"
"The file system on the selected logical volume cannot be extended by YaST2.\n"
"Only fat, ext2, ext3, ext4, xfs, and reiser allow extending a file system."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1361
+#: src/include/partitioning/custom_part_dialogs.rb:1357
#, fuzzy
msgid "Continue resizing?"
msgstr "_Cấu hình"
#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1378
+#: src/include/partitioning/custom_part_dialogs.rb:1374
msgid "You decreased a partition with a reiser file system on it."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1380
+#: src/include/partitioning/custom_part_dialogs.rb:1376
msgid "You decreased a logical volume with a reiser file system on it."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1387
+#: src/include/partitioning/custom_part_dialogs.rb:1383
msgid ""
"\n"
"It is possible to shrink a reiser file system, but this feature is not\n"
@@ -1403,7 +1413,7 @@
msgstr ""
#. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1441
+#: src/include/partitioning/custom_part_dialogs.rb:1437
msgid ""
"The selected device contains partitions that are currently mounted:\n"
"%1\n"
@@ -1412,7 +1422,7 @@
msgstr ""
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1464
+#: src/include/partitioning/custom_part_dialogs.rb:1460
msgid ""
"\n"
"The selected device contains at least one LVM partition\n"
@@ -1422,7 +1432,7 @@
msgstr ""
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1475
+#: src/include/partitioning/custom_part_dialogs.rb:1471
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1432,7 +1442,7 @@
msgstr ""
#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1486
+#: src/include/partitioning/custom_part_dialogs.rb:1482
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1441,69 +1451,69 @@
msgstr ""
#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1547
+#: src/include/partitioning/custom_part_dialogs.rb:1543
msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1552
+#: src/include/partitioning/custom_part_dialogs.rb:1548
msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
msgstr ""
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1566
+#: src/include/partitioning/custom_part_dialogs.rb:1562
#, fuzzy
#| msgid "&Existing Neighbours"
msgid "Existing Subvolumes:"
msgstr "&Máy cùng nhóm"
#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1572
+#: src/include/partitioning/custom_part_dialogs.rb:1568
msgid "New Subvolume"
msgstr ""
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1578
+#: src/include/partitioning/custom_part_dialogs.rb:1574
msgid "Add new"
msgstr ""
#. button text
#. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1584
+#: src/include/partitioning/custom_part_dialogs.rb:1580
#: src/modules/DualMultiSelectionBox.rb:147
msgid "Remove"
msgstr "Gỡ bỏ"
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1596
+#: src/include/partitioning/custom_part_dialogs.rb:1592
#: src/modules/StorageProposal.rb:6226
msgid "Enable Snapshots"
msgstr ""
#. heading text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1607
-#: src/include/partitioning/custom_part_lib.rb:420
+#: src/include/partitioning/custom_part_dialogs.rb:1603
+#: src/include/partitioning/custom_part_lib.rb:409
msgid "Subvolume Handling"
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1666
#, fuzzy
msgid "Empty subvolume name not allowed."
msgstr "Tùy chọn đã được dùng."
-#: src/include/partitioning/custom_part_dialogs.rb:1674
+#: src/include/partitioning/custom_part_dialogs.rb:1670
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
msgstr ""
-#: src/include/partitioning/custom_part_dialogs.rb:1684
+#: src/include/partitioning/custom_part_dialogs.rb:1680
#, fuzzy
msgid "Subvolume name %1 already exists."
msgstr "Tùy chọn đã được dùng."
-#: src/include/partitioning/custom_part_dialogs.rb:1713
+#: src/include/partitioning/custom_part_dialogs.rb:1709
msgid "Modifications done so far in this dialog will be lost."
msgstr ""
@@ -1630,17 +1640,17 @@
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:62
+#: src/include/partitioning/custom_part_lib.rb:51
msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:89
+#: src/include/partitioning/custom_part_lib.rb:78
msgid "You cannot use the mount point %1 for RAID."
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:108
+#: src/include/partitioning/custom_part_lib.rb:97
msgid ""
"You have selected to not automatically mount at start-up a file system\n"
"that may contain files that the system needs to work properly.\n"
@@ -1651,7 +1661,7 @@
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:131
+#: src/include/partitioning/custom_part_lib.rb:120
msgid ""
"You have assigned an encrypted file system to a partition\n"
"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
@@ -1660,7 +1670,7 @@
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:169
+#: src/include/partitioning/custom_part_lib.rb:158
msgid ""
"You have set a file system as mountable by users. The file system\n"
"may contain files that need to be executable.\n"
@@ -1674,41 +1684,41 @@
#. @param [Hash{String => map}] targetMap the TargetMap
#. @param mount mount point
#. @return [Boolean]
-#: src/include/partitioning/custom_part_lib.rb:216
+#: src/include/partitioning/custom_part_lib.rb:205
#, fuzzy
msgid "Mount point must not be empty."
msgstr "URL không thể rỗng."
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:221
+#: src/include/partitioning/custom_part_lib.rb:210
msgid "Swap devices must have swap as mount point."
msgstr ""
#. error popup
-#: src/include/partitioning/custom_part_lib.rb:225
+#: src/include/partitioning/custom_part_lib.rb:214
msgid "Only swap devices may have swap as mount point."
msgstr ""
#. && mount!="swap" )
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:240
+#: src/include/partitioning/custom_part_lib.rb:229
msgid "This mount point is already in use. Select a different one."
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:250
+#: src/include/partitioning/custom_part_lib.rb:239
msgid ""
"FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n"
"This is not possible."
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:259
+#: src/include/partitioning/custom_part_lib.rb:248
msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point."
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:268
+#: src/include/partitioning/custom_part_lib.rb:257
msgid ""
"You cannot use any of the following mount points:\n"
"/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n"
@@ -1716,12 +1726,12 @@
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:277
+#: src/include/partitioning/custom_part_lib.rb:266
msgid "Your mount point must start with a \"/\" "
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:283
+#: src/include/partitioning/custom_part_lib.rb:272
msgid ""
"It is not allowed to assign the mount point swap\n"
"to a device without a swap file system."
@@ -1729,21 +1739,21 @@
#. warning message, %1 is replaced by fs name (e.g. Ext3)
#. %2 is prelaced by a size (e.g. 10 MB)
-#: src/include/partitioning/custom_part_lib.rb:310
+#: src/include/partitioning/custom_part_lib.rb:299
msgid ""
"Your partition is too small to use %1.\n"
"The minimum size for this file system is %2.\n"
msgstr ""
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:380
+#: src/include/partitioning/custom_part_lib.rb:369
msgid ""
"It is not allowed to assign a mount point\n"
"to a device with nonexistent or unknown file system."
msgstr ""
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:502
+#: src/include/partitioning/custom_part_lib.rb:491
msgid ""
"\n"
"WARNING:\n"
@@ -1758,12 +1768,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:948
-#: src/include/partitioning/custom_part_lib.rb:975
+#: src/include/partitioning/custom_part_lib.rb:919
+#: src/include/partitioning/custom_part_lib.rb:946
msgid "The file system is currently mounted on %1."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:953
+#: src/include/partitioning/custom_part_lib.rb:924
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -1771,28 +1781,28 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:964
-#: src/include/partitioning/custom_part_lib.rb:989
+#: src/include/partitioning/custom_part_lib.rb:935
+#: src/include/partitioning/custom_part_lib.rb:960
#, fuzzy
#| msgid "Amount:"
msgid "Unmount"
msgstr "Lượng:"
-#: src/include/partitioning/custom_part_lib.rb:980
+#: src/include/partitioning/custom_part_lib.rb:951
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:997
msgid "It is not possible to shrink the file system while it is mounted."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:1039
+#: src/include/partitioning/custom_part_lib.rb:1010
msgid "It is not possible to extend the file system while it is mounted."
msgstr ""
-#: src/include/partitioning/custom_part_lib.rb:1050
+#: src/include/partitioning/custom_part_lib.rb:1021
msgid "It is not possible to resize the file system while it is mounted."
msgstr ""
@@ -2757,7 +2767,7 @@
#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
msgid "The disk is in use and cannot be modified."
msgstr ""
@@ -3247,20 +3257,29 @@
msgid "<p>No changes to partitioning.</p>"
msgstr "<p>Hãy chọn một hạng mục tương ứng với vấn đề của ngài.</p>"
-#: src/include/partitioning/ep-lib.rb:485
+#: src/include/partitioning/ep-lib.rb:484
#, fuzzy
msgid "<p>Changes to partitioning:</p>"
msgstr "<p>Hãy chọn một hạng mục tương ứng với vấn đề của ngài.</p>"
-#: src/include/partitioning/ep-lib.rb:490
+#: src/include/partitioning/ep-lib.rb:487
msgid "<p>No changes to storage settings.</p>"
msgstr ""
-#: src/include/partitioning/ep-lib.rb:493
+#: src/include/partitioning/ep-lib.rb:489
#, fuzzy
msgid "<p>Storage settings:</p>"
msgstr "<p><b>Thiết lập gia nhập</b></p>"
+#: src/include/partitioning/ep-lib.rb:498
+#, fuzzy
+msgid "<p>Packages to install:</p>"
+msgstr "<p><b>Thiết lập gia nhập</b></p>"
+
+#: src/include/partitioning/ep-lib.rb:500
+msgid "<p>No packages need to be installed.</p>"
+msgstr ""
+
#. heading
#. tree node label
#: src/include/partitioning/ep-log.rb:43
@@ -5192,7 +5211,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:991
+#: src/modules/Storage.rb:992
#, fuzzy
msgid "Resize Not Possible:"
msgstr "_Đổi cỡ thành: "
@@ -5206,7 +5225,7 @@
#. mark swap-partitions with pseudo Mountpoint swap in targetMap
#. @param [Hash{String => map}] target Disk map
#. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2691 src/modules/Storage.rb:3914
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5215,7 +5234,7 @@
msgstr ""
#. popup text
-#: src/modules/Storage.rb:3945
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5223,7 +5242,7 @@
msgstr ""
#. popup text
-#: src/modules/Storage.rb:3976
+#: src/modules/Storage.rb:3977
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -5232,29 +5251,29 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4030
+#: src/modules/Storage.rb:4031
#, fuzzy
#| msgid "&Enter Password:"
msgid "&Enter Encryption Password:"
msgstr "Nhập &mật khẩu:"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4089
+#: src/modules/Storage.rb:4090
#, fuzzy
#| msgid "Private Key Password:"
msgid "Provide Password"
msgstr "Mật khẩu khoá riêng:"
-#: src/modules/Storage.rb:4108
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr ""
-#: src/modules/Storage.rb:4123
+#: src/modules/Storage.rb:4124
#, fuzzy
msgid "Encrypted Volume Activation"
msgstr "Tạo phiên bản mới"
-#: src/modules/Storage.rb:4127
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5262,14 +5281,14 @@
"during an update or if they contain an encrypted LVM physical volume."
msgstr ""
-#: src/modules/Storage.rb:4139
+#: src/modules/Storage.rb:4140
#, fuzzy
#| msgid "&Enter Password:"
msgid "Do you want to provide encryption passwords?"
msgstr "Nhập &mật khẩu:"
#. text in help field
-#: src/modules/Storage.rb:4196
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -5277,96 +5296,109 @@
msgstr ""
#. header text
-#: src/modules/Storage.rb:4202
+#: src/modules/Storage.rb:4203
#, fuzzy
#| msgid "&Enter Password:"
msgid "Enter Encryption Password"
msgstr "Nhập &mật khẩu:"
-#: src/modules/Storage.rb:4205
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr ""
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4218
+#: src/modules/Storage.rb:4219
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for any of the following devices:"
msgstr "YaST2 đã nhận ra các thiết bị sau"
#. label text, one device name follows
-#: src/modules/Storage.rb:4221
+#: src/modules/Storage.rb:4222
#, fuzzy
#| msgid "YaST2 detected the following device"
msgid "Provide password for the following device:"
msgstr "YaST2 đã nhận ra các thiết bị sau"
-#: src/modules/Storage.rb:4234
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr ""
-#: src/modules/Storage.rb:4258
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr ""
-#: src/modules/Storage.rb:4344
+#: src/modules/Storage.rb:4345
msgid "IDE Disk"
msgstr ""
-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4351
msgid "SCSI Disk"
msgstr ""
-#: src/modules/Storage.rb:4356
+#: src/modules/Storage.rb:4357
#, fuzzy
#| msgid "Hard Disk"
msgid "Disk"
msgstr "Ổ cứng"
-#: src/modules/Storage.rb:4384
+#: src/modules/Storage.rb:4385
#, fuzzy
msgid "DM RAID"
msgstr "Tạo đĩa CD"
-#: src/modules/Storage.rb:4397
+#: src/modules/Storage.rb:4398
#, fuzzy
msgid "MD RAID"
msgstr "Tạo đĩa CD"
+#. TODO: more informative error message, but the Package module does
+#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5223
+#: src/modules/Storage.rb:4893
+msgid "Installing required packages failed."
+msgstr ""
+
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#, fuzzy
+#| msgid "&Continue System Repair"
+msgid "Continue despite the error?"
+msgstr "&Tiếp tục sửa chữa hệ thống"
+
+#. TRANSLATORS: error popup
+#: src/modules/Storage.rb:5252
msgid "Partitions cannot be created since other partitions on the disk are used."
msgstr ""
-#: src/modules/Storage.rb:5249
+#: src/modules/Storage.rb:5278
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5263
+#: src/modules/Storage.rb:5292
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5321
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
"that is needed to run the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5301
+#: src/modules/Storage.rb:5330
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
"data needed to perform the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5359
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -5374,7 +5406,7 @@
"the installation.\n"
msgstr ""
-#: src/modules/Storage.rb:5341
+#: src/modules/Storage.rb:5370
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -5382,7 +5414,7 @@
msgstr ""
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5363
+#: src/modules/Storage.rb:5392
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -5390,18 +5422,18 @@
msgstr ""
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5452
+#: src/modules/Storage.rb:5481
msgid "Nothing assigned as root filesystem!"
msgstr ""
-#: src/modules/Storage.rb:5453
+#: src/modules/Storage.rb:5482
msgid "Installation will most certainly fail fatally!"
msgstr ""
#. Set rather than Add, there might be some packs left over
#. from previous 'MakeProposal' we don't need now
#. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6003
+#: src/modules/Storage.rb:6032
msgid "Adding the following resolvables failed: %1"
msgstr ""
@@ -5416,12 +5448,6 @@
msgid "System error code was: %1"
msgstr ""
-#: src/modules/StorageClients.rb:159
-#, fuzzy
-#| msgid "&Continue System Repair"
-msgid "Continue despite the error?"
-msgstr "&Tiếp tục sửa chữa hệ thống"
-
#. Label: get password for device
#. Please use newline if label is longer than 40 characters
#: src/modules/StorageClients.rb:199
Modified: trunk/yast/vi/po/vpn.vi.po
===================================================================
--- trunk/yast/vi/po/vpn.vi.po 2015-10-01 11:25:18 UTC (rev 92983)
+++ trunk/yast/vi/po/vpn.vi.po 2015-10-01 11:25:19 UTC (rev 92984)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan Vĩnh Thịnh \n"
"Language-Team: Vietnamese \n"
@@ -196,36 +196,43 @@
msgid "Client - Certificate"
msgstr "Tập tin chứng nhận của ứng dụng khách:"
+#. Load parameters from connections of known scenarios
+#: src/lib/vpn/ipsec.rb:239
+msgid ""
+"ipsec.conf and ipsec.secrets have been manipulated outside of this module.\n"
+"Continue using the module will remove your customisation."
+msgstr ""
+
#. Create a new connection, by default it is a site-to-site client. Return true if successful.
-#: src/lib/vpn/ipsec.rb:303
+#: src/lib/vpn/ipsec.rb:310
#, fuzzy
#| msgid "This name is already in use"
msgid "The connection name is already used."
msgstr "Tên này đã được dùng"
#. Find an unused gateway scenario
-#: src/lib/vpn/ipsec.rb:320
+#: src/lib/vpn/ipsec.rb:327
msgid ""
"You may only have one gateway connection per scenario.\n"
"All of gateway scenarios are already used."
msgstr ""
#. Warn against duplicated configuration
-#: src/lib/vpn/ipsec.rb:337
+#: src/lib/vpn/ipsec.rb:344
msgid ""
"The scenario is already configured with another gateway.\n"
"You may not have two gateways operating under one scenario."
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:432
+#: src/lib/vpn/ipsec.rb:439
#, fuzzy
#| msgid "This name is already in use"
msgid "The user name is already used."
msgstr "Tên này đã được dùng"
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:496
+#: src/lib/vpn/ipsec.rb:503
#, fuzzy
#| msgid "Cannot import VPN connection"
msgid "Cannot find a matching client connection."