Mailinglist Archive: opensuse-translation-commit (61 mails)

< Previous Next >
[opensuse-translation-commit] r97355 - branches/SLE12-SP3/yast/zh_TW/po
Author: keichwa
Date: 2017-05-23 07:02:49 +0000 (Tue, 23 May 2017)
New Revision: 97355

Modified:
branches/SLE12-SP3/yast/zh_TW/po/add-on.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/autoinst.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/bootloader.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/cio.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/cluster.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/control.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/country.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/firewall.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/firstboot.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/installation.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/iscsi-lio-server.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/kdump.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/network.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/packager.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/registration.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/reipl.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/rpm-groups.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/s390.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/samba-server.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/scanner.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/smt.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/storage.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/update.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/vm.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/xpram.zh_TW.po
branches/SLE12-SP3/yast/zh_TW/po/yast2-apparmor.zh_TW.po
Log:
merged

Modified: branches/SLE12-SP3/yast/zh_TW/po/add-on.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/add-on.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/add-on.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-17 17:45+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -81,13 +81,14 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>媒體:%1,路徑:%2,產品:%3</li>\n"

-#. set addon specific sig-handling
-#: src/clients/add-on_auto.rb:186
+#. revert back to the unexpanded URL to have the original URL
+#. in the saved /etc/zypp/repos.d file
+#: src/clients/add-on_auto.rb:191
msgid "Make the add-on \"%1\" available via \"%2\"."
msgstr "透過「%2」使附加產品「%1」生效。"

#. just report error
-#: src/clients/add-on_auto.rb:193
+#: src/clients/add-on_auto.rb:198
msgid "Failed to add add-on product."
msgstr "無法新增附加產品。"

@@ -475,6 +476,5 @@
"\n"
"您要跳過使用附加產品嗎?"

-#: control/installation.glade.translations.glade:4
-msgid "Language Installation"
-msgstr "語言安裝"
+#~ msgid "Language Installation"
+#~ msgstr "語言安裝"

Modified: branches/SLE12-SP3/yast/zh_TW/po/autoinst.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/autoinst.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/autoinst.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-09 02:27+0000\n"
+"POT-Creation-Date: 2017-04-19 02:27+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -53,7 +53,7 @@
#. 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:184 src/clients/inst_autosetup.rb:463
+#: src/clients/inst_autoinit.rb:184 src/clients/inst_autosetup.rb:476
#: src/clients/inst_autosetup_upgrade.rb:485
#: src/modules/AutoInstallRules.rb:997
msgid ""
@@ -596,7 +596,7 @@

#. Adding selections (defined in PackageAI) to libzypp and solving
#. package dependencies.
-#: src/clients/inst_autosetup.rb:361
+#: src/clients/inst_autosetup.rb:374
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"

Modified: branches/SLE12-SP3/yast/zh_TW/po/bootloader.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/bootloader.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/bootloader.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:27+0000\n"
+"POT-Creation-Date: 2017-04-19 02:27+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -159,74 +159,76 @@
#. @return a list of summary lines
#. Display bootloader summary
#. @return a list of summary lines
-#: src/lib/bootloader/grub2.rb:106 src/lib/bootloader/grub2efi.rb:76
+#: src/lib/bootloader/grub2.rb:99 src/lib/bootloader/grub2efi.rb:76
msgid "Boot Loader Type: %1"
msgstr "開機載入程式類型:%1"

-#: src/lib/bootloader/grub2.rb:110
+#: src/lib/bootloader/grub2.rb:103 src/lib/bootloader/grub2efi.rb:84
msgid "Enable Trusted Boot: %1"
msgstr "啟用可信開機︰%1"

-#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2efi.rb:85
msgid "yes"
msgstr "是"

-#: src/lib/bootloader/grub2.rb:111 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2.rb:104 src/lib/bootloader/grub2efi.rb:81
+#: src/lib/bootloader/grub2efi.rb:85
msgid "no"
msgstr "否"

-#: src/lib/bootloader/grub2.rb:117
+#: src/lib/bootloader/grub2.rb:110
msgid "Status Location: %1"
msgstr "狀態位置:%1"

#. part of summary, %1 is a list of hard disks device names
-#: src/lib/bootloader/grub2.rb:181
+#: src/lib/bootloader/grub2.rb:174
msgid "Order of Hard Disks: %1"
msgstr "硬碟的順序:%1"

#. TRANSLATORS: extended is here for extended partition. Keep translation
short.
-#: src/lib/bootloader/grub2.rb:193
+#: src/lib/bootloader/grub2.rb:186
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/lib/bootloader/grub2.rb:198
+#: src/lib/bootloader/grub2.rb:191
msgid " (MBR)"
msgstr " (MBR)"

-#: src/lib/bootloader/grub2.rb:219
+#: src/lib/bootloader/grub2.rb:212
msgid "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not
install</a>)"
msgstr "將開機碼載入 MBR (<a href=\"disable_boot_mbr\">不安裝</a>)"

-#: src/lib/bootloader/grub2.rb:223
+#: src/lib/bootloader/grub2.rb:216
msgid "Do not install bootcode into MBR (<a
href=\"enable_boot_mbr\">install</a>)"
msgstr "不要將開機碼載入 MBR (<a href=\"enable_boot_mbr\">安裝</a>)"

#. check for separated boot partition, use root otherwise
-#: src/lib/bootloader/grub2.rb:233
+#: src/lib/bootloader/grub2.rb:226
msgid "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do
not install</a>)"
msgstr "將開機碼載入 /boot 分割區 (<a href=\"disable_boot_mbr\">不安裝</a>)"

-#: src/lib/bootloader/grub2.rb:238
+#: src/lib/bootloader/grub2.rb:231
msgid "Do not install bootcode into /boot partition (<a
href=\"enable_boot_boot\">install</a>)"
msgstr "不要將開機碼載入 /boot 分割區 (<a href=\"enable_boot_mbr\">安裝</a>)"

-#: src/lib/bootloader/grub2.rb:244
+#: src/lib/bootloader/grub2.rb:237
msgid "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do
not install</a>)"
msgstr "將開機碼載入「/」分割區 (<a href=\"disable_boot_mbr\">不安裝</a>)"

-#: src/lib/bootloader/grub2.rb:249
+#: src/lib/bootloader/grub2.rb:242
msgid "Do not install bootcode into \"/\" partition (<a
href=\"enable_boot_root\">install</a>)"
msgstr "不要將開機碼安裝到「/」分割區 (<a href=\"enable_boot_root\">安裝</a>)"

#. no location chosen, so warn user that it is problem unless he is sure
-#: src/lib/bootloader/grub2.rb:274
+#: src/lib/bootloader/grub2.rb:267
msgid "Warning: No location for bootloader stage1 selected.Unless you know
what you are doing please select above location."
msgstr "警告︰沒有為開機載入程式 stage1 選取位置。如果您不確定要執行的操作,請選取上述位置。"

#. TRANSLATORS: title for list of location proposals
-#: src/lib/bootloader/grub2.rb:282
+#: src/lib/bootloader/grub2.rb:275
msgid "Change Location: %s"
msgstr "變更位置:%s"

@@ -344,14 +346,21 @@

#. TRANSLATORS: TrustedGRUB2 is a name, don't translate it
#: src/lib/bootloader/grub2_widgets.rb:301
+#, fuzzy
+#| msgid ""
+#| "<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
+#| "instead of regular GRUB2.</p>\n"
+#| "<p>It means measuring the integrity of the boot process,\n"
+#| "with the help from the hardware (a TPM, Trusted Platform Module,\n"
+#| "chip).</p>\n"
+#| "<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
+#| "setup (the setting may be named Security Chip, for example).</p>\n"
msgid ""
"<p><b>Trusted Boot</b> will install TrustedGRUB2\n"
"instead of regular GRUB2.</p>\n"
"<p>It means measuring the integrity of the boot process,\n"
"with the help from the hardware (a TPM, Trusted Platform Module,\n"
"chip).</p>\n"
-"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
-"setup (the setting may be named Security Chip, for example).</p>\n"
msgstr ""
"<p><b>可信開機</b>將會安裝 TrustedGRUB2\n"
"而非一般的 GRUB2。</p>\n"
@@ -361,10 +370,16 @@
"<p>您需要先確認 BIOS\n"
" 設定中啟用了「可信開機」(例如,該設定可能名為安全性晶片)。</p>\n"

+#: src/lib/bootloader/grub2_widgets.rb:307
+msgid ""
+"<p>First you need to make sure Trusted Boot is enabled in the BIOS\n"
+"setup (the setting may be named Security Chip, for example).</p>\n"
+msgstr ""
+
#. check for file size does not work, since FS reports it 4096
#. even if the file is in fact empty and a single byte cannot
#. be read, therefore testing real reading (details: bsc#994556)
-#: src/lib/bootloader/grub2_widgets.rb:327
+#: src/lib/bootloader/grub2_widgets.rb:331
msgid ""
"Trusted Platform Module not found.\n"
"Make sure it is enabled in BIOS.\n"
@@ -375,30 +390,30 @@
"否則,系統將不會開機。"

#. Represents grub password protection widget
-#: src/lib/bootloader/grub2_widgets.rb:347
+#: src/lib/bootloader/grub2_widgets.rb:351
msgid "Prot&ect Boot Loader with Password"
msgstr "使用密碼保護開機載入程式(&E)"

#. TRANSLATORS: checkbox entry
-#: src/lib/bootloader/grub2_widgets.rb:353
+#: src/lib/bootloader/grub2_widgets.rb:357
msgid "P&rotect Entry Modification Only"
msgstr "僅啟用項目修改防護(&R)"

#. TRANSLATORS: text entry, please keep it short
-#: src/lib/bootloader/grub2_widgets.rb:359
+#: src/lib/bootloader/grub2_widgets.rb:363
msgid "&Password for GRUB2 User 'root'"
msgstr "GRUB2 使用者 root 的密碼(&P)"

#. text entry
-#: src/lib/bootloader/grub2_widgets.rb:362
+#: src/lib/bootloader/grub2_widgets.rb:366
msgid "Re&type Password"
msgstr "再次輸入密碼(&T)"

-#: src/lib/bootloader/grub2_widgets.rb:373
+#: src/lib/bootloader/grub2_widgets.rb:377
msgid "The password must not be empty."
msgstr "密碼不可是空的。"

-#: src/lib/bootloader/grub2_widgets.rb:380
+#: src/lib/bootloader/grub2_widgets.rb:384
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
@@ -407,7 +422,7 @@
"不符合。請重新輸入密碼。"

#. special value as we do not know password, so it mean user do not change it
-#: src/lib/bootloader/grub2_widgets.rb:433
+#: src/lib/bootloader/grub2_widgets.rb:437
msgid ""
"<p><b>Protect Boot Loader with Password</b><br>\n"
"At boot time, modifying or even booting any entry will require the password.
If <b>Protect Entry Modification Only</b> is checked then booting any entry is
not restricted but modifying entries requires the password (which is the way
GRUB 1 behaved). As side-effect of this option, rd.shell=0 is added to kernel
parameters, to prevent an unauthorized access to the initrd shell.<br>YaST will
only accept the password if you repeat it in <b>Retype Password</b>. The
password applies to the GRUB2 user 'root' which is distinct from the Linux
'root'. YaST currently does not supportother GRUB2 users. If you need them, use
a separate GRUB2 script.</p>"
@@ -416,7 +431,7 @@
"在開機時,修改任何項目甚至將其開機都需要提供密碼。如果核取<b>僅啟用項目修改防護</b>,則將任何項目開機都不會受到限制,但修改項目需要提供密碼 (這是
GRUB 1 的運作方式)。由於此選項具有副作用,因此將 rd.shell=0 新增至核心參數,以防止對 initrd
外圍程序進行未授權存取。<br>僅當您在<b>再次輸入密碼</b>中重複輸入了密碼時,YaST 才接受該密碼。密碼適用於 GRUB2 使用者 root (與
Linux 的使用者 root 不同)。YaST 目前不支援其他 GRUB2 使用者。若您需要用到它們,請使用單獨的 GRUB2 程序檔。</p>"

#. Translators: do not translate the quoted parts like "unit"
-#: src/lib/bootloader/grub2_widgets.rb:466
+#: src/lib/bootloader/grub2_widgets.rb:470
msgid ""
"<p>When a graphical console is used it allows to use various display
resolutions. The <tt>auto</tt> option tries to find the best one when booting
starts.</p>\n"
"<p>When a serial console is used the boot output will be printed to a serial
device like <tt>ttyS0</tt>. At least the <tt>--unit</tt> option has to be
specified, and the complete syntax is <tt>%s</tt>. Other parts are optional and
if not set, a default is used. <tt>NUM</tt> in commands stands for a positive
number like 8. Example parameters are <tt>serial --speed=38400
--unit=0</tt>.</p>"
@@ -425,12 +440,12 @@
"<p>使用序列主控台時,開機輸出會列印到類似 <tt>ttyS0</tt> 的序列裝置上。完整語法為 <tt>%s</tt>。除
<tt>--unit</tt> 選項必須指定外,其他部分可選用 (如果不設定,便會使用預設值)。指令中的 <tt>NUM</tt> 表示某個正數,如
8。參數範例︰<tt>serial --speed=38400 --unit=0</tt>。</p>"

#. there's mode specified, use it
-#: src/lib/bootloader/grub2_widgets.rb:503
+#: src/lib/bootloader/grub2_widgets.rb:507
msgid "To enable serial console you must provide the corresponding arguments."
msgstr "若要啟用序列主控台,您必須提供對應的引數。"

#. Translators: do not translate "unit"
-#: src/lib/bootloader/grub2_widgets.rb:510
+#: src/lib/bootloader/grub2_widgets.rb:514
msgid ""
"To enable the serial console you must provide the corresponding arguments.\n"
"The \"unit\" argument is required, the complete syntax is:\n"
@@ -440,7 +455,7 @@
"需要指定「unit」引數,完整的語法為︰\n"
"%s"

-#: src/lib/bootloader/grub2_widgets.rb:551
+#: src/lib/bootloader/grub2_widgets.rb:555
msgid "Choose new graphical theme file"
msgstr "選擇新的圖形化主題檔案"

@@ -448,40 +463,40 @@
#. to be substituted in a command like
#. "serial --unit=NUM --speed=NUM --parity={odd|even|no} --word=NUM --stop=NUM"
#. so do not use punctuation
-#: src/lib/bootloader/grub2_widgets.rb:567
+#: src/lib/bootloader/grub2_widgets.rb:571
msgid "NUM"
msgstr "NUM"

-#: src/lib/bootloader/grub2_widgets.rb:574
+#: src/lib/bootloader/grub2_widgets.rb:578
msgid "Use &graphical console"
msgstr "使用圖形化主控台(&G)"

-#: src/lib/bootloader/grub2_widgets.rb:579
+#: src/lib/bootloader/grub2_widgets.rb:583
msgid "&Console resolution"
msgstr "主控台解析度(&C)"

-#: src/lib/bootloader/grub2_widgets.rb:584
+#: src/lib/bootloader/grub2_widgets.rb:588
msgid "&Console theme"
msgstr "主控台主題(&C)"

-#: src/lib/bootloader/grub2_widgets.rb:615
+#: src/lib/bootloader/grub2_widgets.rb:619
msgid "Autodetect by grub2"
msgstr "由 grub2 自動偵測"

-#: src/lib/bootloader/grub2_widgets.rb:623
+#: src/lib/bootloader/grub2_widgets.rb:627
msgid "Use &serial console"
msgstr "使用序列主控台(&S)"

-#: src/lib/bootloader/grub2_widgets.rb:630
+#: src/lib/bootloader/grub2_widgets.rb:634
msgid "&Console arguments"
msgstr "主控台引數(&C)"

#. represent choosing default section to boot
-#: src/lib/bootloader/grub2_widgets.rb:647
+#: src/lib/bootloader/grub2_widgets.rb:651
msgid "&Default Boot Section"
msgstr "預設開機區段(&D)"

-#: src/lib/bootloader/grub2_widgets.rb:651
+#: src/lib/bootloader/grub2_widgets.rb:655
msgid ""
"<p> By pressing <b>Set as Default</b> you mark the selected section as\n"
"the default. When booting, the boot loader will provide a boot menu and\n"
@@ -498,40 +513,40 @@
"可以變更開機載入程式功能表中的區段順序。</p>\n"

#. Represents stage1 location for bootloader
-#: src/lib/bootloader/grub2_widgets.rb:686
+#: src/lib/bootloader/grub2_widgets.rb:690
msgid "Boot Loader Location"
msgstr "開機載入程式位置"

-#: src/lib/bootloader/grub2_widgets.rb:740
+#: src/lib/bootloader/grub2_widgets.rb:744
msgid "Custom boot device have to be specied if checked"
msgstr "若核取則必須指定自訂開機裝置"

-#: src/lib/bootloader/grub2_widgets.rb:768
+#: src/lib/bootloader/grub2_widgets.rb:772
msgid "Boo&t from Boot Partition"
msgstr "從開機分割區開機(&T)"

-#: src/lib/bootloader/grub2_widgets.rb:769
+#: src/lib/bootloader/grub2_widgets.rb:773
msgid "Boo&t from Root Partition"
msgstr "從根分割區開機(&T)"

-#: src/lib/bootloader/grub2_widgets.rb:770
+#: src/lib/bootloader/grub2_widgets.rb:774
msgid "Boot from &Master Boot Record"
msgstr "從主開機記錄開機(&M)"

-#: src/lib/bootloader/grub2_widgets.rb:771
+#: src/lib/bootloader/grub2_widgets.rb:775
msgid "Boot from &Extended Partition"
msgstr "從延伸分割區開機(&E)"

-#: src/lib/bootloader/grub2_widgets.rb:782
+#: src/lib/bootloader/grub2_widgets.rb:786
msgid "C&ustom Boot Partition"
msgstr "自訂開機分割區(&U)"

#. Represents button that open Device Map edit dialog
-#: src/lib/bootloader/grub2_widgets.rb:795
+#: src/lib/bootloader/grub2_widgets.rb:799
msgid "&Edit Disk Boot Order"
msgstr "編輯磁碟開機順序(&E)"

-#: src/lib/bootloader/grub2_widgets.rb:801
+#: src/lib/bootloader/grub2_widgets.rb:805
msgid ""
"<p><big><b>Disks Order</b></big><br>\n"
"To specify the order of the disks according to the order in BIOS, use\n"
@@ -546,17 +561,17 @@
"要移除磁碟,按<b>移除</b>。</p>"

#. represents Tab with kernel related configuration
-#: src/lib/bootloader/grub2_widgets.rb:822
+#: src/lib/bootloader/grub2_widgets.rb:826
msgid "&Kernel Parameters"
msgstr "核心參數(&K)"

#. Represent tab with options related to stage1 location and bootloader type
-#: src/lib/bootloader/grub2_widgets.rb:847
+#: src/lib/bootloader/grub2_widgets.rb:851
msgid "Boot Co&de Options"
msgstr "開機碼選項(&D)"

#. Represents bootloader specific options like its timeout, default section or
password protection
-#: src/lib/bootloader/grub2_widgets.rb:913
+#: src/lib/bootloader/grub2_widgets.rb:921
msgid "Boot&loader Options"
msgstr "開機載入程式選項(&L)"


Modified: branches/SLE12-SP3/yast/zh_TW/po/cio.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/cio.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/cio.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: cio\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-21 00:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:45+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -40,13 +40,13 @@
msgstr "已使用"

#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "是"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "no"
msgstr "否"

-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
-msgstr "是"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
msgid "Filter channels"

Modified: branches/SLE12-SP3/yast/zh_TW/po/cluster.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/cluster.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/cluster.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: cluster\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2017-04-06 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -92,7 +92,7 @@
msgid "Redundant IP Address"
msgstr "備援 IP 位址"

-#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:117 src/include/cluster/dialogs.rb:504
msgid "Node ID"
msgstr "節點 ID"

@@ -124,7 +124,7 @@
msgstr "設定了多路廣播傳輸時,必須填寫預期投票數"

#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1429
+#: src/include/cluster/dialogs.rb:1432
msgid "The Multicast Address has to be fulfilled"
msgstr "必須填寫多路廣播位址"

@@ -137,61 +137,61 @@
msgstr "僅當使用多個介面時,才可以選擇被動或主動。請設定為被動。"

#. BNC#871970, change member address struct to memberaddr
-#: src/include/cluster/dialogs.rb:441
+#: src/include/cluster/dialogs.rb:444
msgid "Transport:"
msgstr "傳輸:"

-#: src/include/cluster/dialogs.rb:449
+#: src/include/cluster/dialogs.rb:452
msgid "Channel"
msgstr "通道"

-#: src/include/cluster/dialogs.rb:454 src/include/cluster/dialogs.rb:475
+#: src/include/cluster/dialogs.rb:457 src/include/cluster/dialogs.rb:478
msgid "Bind Network Address:"
msgstr "結合網路位址:"

-#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1365
+#: src/include/cluster/dialogs.rb:463 src/include/cluster/dialogs.rb:481
+#: src/include/cluster/dialogs.rb:1368
msgid "Multicast Address:"
msgstr "多路廣播位址:"

-#: src/include/cluster/dialogs.rb:462 src/include/cluster/dialogs.rb:479
-msgid "Multicast Port:"
-msgstr "多路廣播連接埠:"
+#: src/include/cluster/dialogs.rb:465 src/include/cluster/dialogs.rb:482
+msgid "Port:"
+msgstr "連接埠:"

-#: src/include/cluster/dialogs.rb:469
+#: src/include/cluster/dialogs.rb:472
msgid "Redundant Channel"
msgstr "備援通道"

-#: src/include/cluster/dialogs.rb:485
+#: src/include/cluster/dialogs.rb:488
msgid "Cluster Name:"
msgstr "叢集名稱:"

-#: src/include/cluster/dialogs.rb:486
+#: src/include/cluster/dialogs.rb:489
msgid "Expected Votes:"
msgstr "預期投票數︰"

-#: src/include/cluster/dialogs.rb:490
+#: src/include/cluster/dialogs.rb:493
msgid "rrp mode:"
msgstr "rrp 模式:"

-#: src/include/cluster/dialogs.rb:495
+#: src/include/cluster/dialogs.rb:498
msgid "Auto Generate Node ID"
msgstr "自動產生節點 ID"

-#: src/include/cluster/dialogs.rb:500
+#: src/include/cluster/dialogs.rb:503
msgid "Member Address:"
msgstr "成員位址:"

-#: src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:504
msgid "IP"
msgstr "IP"

-#: src/include/cluster/dialogs.rb:501
+#: src/include/cluster/dialogs.rb:504
msgid "Redundant IP"
msgstr "備援 IP"

#. BNC#879596, check the corosync.conf format
-#: src/include/cluster/dialogs.rb:541
+#: src/include/cluster/dialogs.rb:544
msgid ""
" NOTICE: Detected old corosync configuration.\n"
" Please reconfigure the member list and confirm all other settings."
@@ -200,123 +200,123 @@
"請重新設定成員清單並確認所有其他設定。"

#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:717
+#: src/include/cluster/dialogs.rb:720
msgid "Enable Security Auth"
msgstr "啟用安全性驗證"

-#: src/include/cluster/dialogs.rb:721
+#: src/include/cluster/dialogs.rb:724
msgid "For a newly created cluster, push the button below to generate
/etc/corosync/authkey."
msgstr "對於新建立的叢集,請按下面的按鈕以產生 /etc/corosync/authkey。"

-#: src/include/cluster/dialogs.rb:726
+#: src/include/cluster/dialogs.rb:729
msgid "To join an existing cluster, please copy /etc/corosync/authkey from
other nodes manually."
msgstr "若要加入現有叢集,請從其他節點手動複製 /etc/corosync/authkey。"

-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:755
msgid "Failed to create /etc/corosync/authkey"
msgstr "無法建立 /etc/corosync/authkey"

-#: src/include/cluster/dialogs.rb:754
+#: src/include/cluster/dialogs.rb:757
msgid "Create /etc/corosync/authkey succeeded"
msgstr "建立 /etc/corosync/authkey 成功"

-#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:818 src/include/cluster/dialogs.rb:888
msgid "Running"
msgstr "執行中"

-#: src/include/cluster/dialogs.rb:817
+#: src/include/cluster/dialogs.rb:820
msgid "Not running"
msgstr "尚未執行"

#. servie:cluster is the name of
/etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:853
+#: src/include/cluster/dialogs.rb:856
msgid "Booting"
msgstr "開機時"

-#: src/include/cluster/dialogs.rb:863
+#: src/include/cluster/dialogs.rb:866
msgid "On -- Start pacemaker during boot"
msgstr "開啟 -- 開機期間啟動 Pacemaker"

-#: src/include/cluster/dialogs.rb:870
+#: src/include/cluster/dialogs.rb:873
msgid "Off -- Start pacemaker manually"
msgstr "關閉 -- 手動啟動 Pacemaker"

-#: src/include/cluster/dialogs.rb:879
+#: src/include/cluster/dialogs.rb:882
msgid "Switch On and Off"
msgstr "開啟與關閉"

-#: src/include/cluster/dialogs.rb:884
+#: src/include/cluster/dialogs.rb:887
msgid "Current Status: "
msgstr "目前的狀態:"

-#: src/include/cluster/dialogs.rb:893
+#: src/include/cluster/dialogs.rb:896
msgid "Start pacemaker Now"
msgstr "立即啟動 pacemaker"

-#: src/include/cluster/dialogs.rb:894
+#: src/include/cluster/dialogs.rb:897
msgid "Stop pacemaker Now"
msgstr "立即停止 pacemaker"

#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:992
+#: src/include/cluster/dialogs.rb:995
msgid "Sync Host"
msgstr "同步主機"

-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:999 src/include/cluster/dialogs.rb:1011
msgid "Add"
msgstr "新增"

-#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1000 src/include/cluster/dialogs.rb:1012
msgid "Del"
msgstr "刪除"

-#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
+#: src/include/cluster/dialogs.rb:1001 src/include/cluster/dialogs.rb:1013
msgid "Edit"
msgstr "編輯"

-#: src/include/cluster/dialogs.rb:1004
+#: src/include/cluster/dialogs.rb:1007
msgid "Sync File"
msgstr "同步檔案"

-#: src/include/cluster/dialogs.rb:1011
+#: src/include/cluster/dialogs.rb:1014
msgid "Add Suggested Files"
msgstr "新增建議的檔案"

-#: src/include/cluster/dialogs.rb:1020
+#: src/include/cluster/dialogs.rb:1023
msgid "Generate Pre-Shared-Keys"
msgstr "產生預先共用金鑰"

#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1145
+#: src/include/cluster/dialogs.rb:1148
msgid "Csync2 Status Unknown"
msgstr "Csync2 狀態未知"

-#: src/include/cluster/dialogs.rb:1148
+#: src/include/cluster/dialogs.rb:1151
msgid "Turn csync2 ON"
msgstr "開啟 csync2"

-#: src/include/cluster/dialogs.rb:1151
+#: src/include/cluster/dialogs.rb:1154
msgid "Turn csync2 OFF"
msgstr "關閉 csync2"

-#: src/include/cluster/dialogs.rb:1181
+#: src/include/cluster/dialogs.rb:1184
msgid "Enter a hostname"
msgstr "輸入主機名稱"

-#: src/include/cluster/dialogs.rb:1195
+#: src/include/cluster/dialogs.rb:1198
msgid "Edit the hostname"
msgstr "編輯主機名稱"

-#: src/include/cluster/dialogs.rb:1209
+#: src/include/cluster/dialogs.rb:1212
msgid "Enter a filename to synchronize"
msgstr "輸入要同步的檔案名稱"

-#: src/include/cluster/dialogs.rb:1224
+#: src/include/cluster/dialogs.rb:1227
msgid "Edit the filename"
msgstr "編輯檔案名稱"

#. key file exist
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1259
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
@@ -325,12 +325,12 @@
"是否要覆寫它?"

#. remove exist key file
-#: src/include/cluster/dialogs.rb:1266
+#: src/include/cluster/dialogs.rb:1269
msgid "Delete key file %1 failed."
msgstr "刪除金鑰檔案 %1 失敗。"

#. generate key file
-#: src/include/cluster/dialogs.rb:1280
+#: src/include/cluster/dialogs.rb:1283
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -338,12 +338,12 @@
"已產生金鑰檔案 %1。\n"
"按一下「新增建議的檔案」按鈕可將它新增到同步清單。"

-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1290
msgid "Key generation failed."
msgstr "產生金鑰失敗。"

#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1349
+#: src/include/cluster/dialogs.rb:1352
msgid ""
"Conntrackd is a daemon which helps to duplicate firewall status between
cluster nodes.\n"
"YaST can help to configure some basic aspects of conntrackd.\n"
@@ -353,23 +353,23 @@
"YaST 可以幫助設定 conntrackd 的某些基本方面。\n"
"您需要使用 ocf:heartbeat:conntrackd 將它啟動。"

-#: src/include/cluster/dialogs.rb:1360
+#: src/include/cluster/dialogs.rb:1363
msgid "Dedicated Interface:"
msgstr "專用介面:"

-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1366
msgid "IP:"
msgstr "IP:"

-#: src/include/cluster/dialogs.rb:1366
+#: src/include/cluster/dialogs.rb:1369
msgid "Group Number:"
msgstr "群組編號:"

-#: src/include/cluster/dialogs.rb:1370
+#: src/include/cluster/dialogs.rb:1373
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr "產生 /etc/conntrackd/conntrackd.conf"

-#: src/include/cluster/dialogs.rb:1437
+#: src/include/cluster/dialogs.rb:1440
msgid "The Group Number must be a positive integer"
msgstr "群組編號必須是正整數"

@@ -588,3 +588,6 @@
#: src/modules/Cluster.rb:536
msgid "Cannot write settings."
msgstr "無法寫入設定。"
+
+#~ msgid "Multicast Port:"
+#~ msgstr "多路廣播連接埠:"

Modified: branches/SLE12-SP3/yast/zh_TW/po/control.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/control.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/control.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -58,10 +58,16 @@

#. TRANSLATORS: dialog help
#: control/control.SLES.glade.translations.glade:21
+#, fuzzy
+#| msgid ""
+#| "<p>The system roles adjustments are in the range from package selection up
\n"
+#| "to disk partitioning. By choosing a system role, the system is \n"
+#| "configured accordingly to match the use case of the role. The settings \n"
+#| "defined by a role can be overridden in the next steps if necessary.</p>"
msgid ""
-"<p>The system roles adjustments are in the range from package selection up \n"
-"to disk partitioning. By choosing a system role, the system is \n"
-"configured accordingly to match the use case of the role. The settings \n"
+"<p>The system roles adjustments are in the range from package selection up\n"
+"to disk partitioning. By choosing a system role, the system is\n"
+"configured accordingly to match the use case of the role. The settings\n"
"defined by a role can be overridden in the next steps if necessary.</p>"
msgstr ""
"<p>系統角色調整涵蓋從套件選擇到\n"
@@ -111,10 +117,8 @@
#: control/control.SLES.glade.translations.glade:37
#: control/control.SLES.glade.translations.glade:38
#: control/control.SLES.glade.translations.glade:39
+#: control/control.SLES.glade.translations.glade:43
#: control/control.SLES.glade.translations.glade:44
-#: control/control.SLES.glade.translations.glade:45
-#: control/control.SLES.glade.translations.glade:82
-#: control/control.SLES.glade.translations.glade:83
msgid "Installation Settings"
msgstr "安裝設定"

@@ -127,183 +131,167 @@
msgstr "進階"

#: control/control.SLES.glade.translations.glade:42
-msgid "Live Installation Settings"
-msgstr "Live 安裝設定"
-
-#: control/control.SLES.glade.translations.glade:43
msgid "Update Settings"
msgstr "更新設定"

+#: control/control.SLES.glade.translations.glade:45
#: control/control.SLES.glade.translations.glade:46
-#: control/control.SLES.glade.translations.glade:47
msgid "Network Configuration"
msgstr "網路組態"

-#: control/control.SLES.glade.translations.glade:48
+#: control/control.SLES.glade.translations.glade:47
msgid "Network Services Configuration"
msgstr "網路服務組態"

+#: control/control.SLES.glade.translations.glade:48
#: control/control.SLES.glade.translations.glade:49
#: control/control.SLES.glade.translations.glade:50
-#: control/control.SLES.glade.translations.glade:51
msgid "Hardware Configuration"
msgstr "硬體組態"

-#: control/control.SLES.glade.translations.glade:52
-#: control/control.SLES.glade.translations.glade:89
-#: control/control.SLES.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:51
+#: control/control.SLES.glade.translations.glade:74
+#: control/control.SLES.glade.translations.glade:104
msgid "Preparation"
msgstr "準備"

-#: control/control.SLES.glade.translations.glade:53
-#: control/control.SLES.glade.translations.glade:76
-#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:52
+#: control/control.SLES.glade.translations.glade:75
msgid "Load Linuxrc Network Configuration"
msgstr "載入 Linuxrc 網路組態"

-#: control/control.SLES.glade.translations.glade:54
-#: control/control.SLES.glade.translations.glade:77
-#: control/control.SLES.glade.translations.glade:91
+#: control/control.SLES.glade.translations.glade:53
+#: control/control.SLES.glade.translations.glade:76
msgid "Network Autosetup"
msgstr "網路自動設定"

-#: control/control.SLES.glade.translations.glade:55
-#: control/control.SLES.glade.translations.glade:92
-#: control/control.SLES.glade.translations.glade:108
-#: control/control.SLES.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:54
+#: control/control.SLES.glade.translations.glade:77
+#: control/control.SLES.glade.translations.glade:93
+#: control/control.SLES.glade.translations.glade:105
msgid "Installer Update"
msgstr "安裝程式更新"

-#: control/control.SLES.glade.translations.glade:56
+#: control/control.SLES.glade.translations.glade:55
#: control/control.SLES.glade.translations.glade:78
-#: control/control.SLES.glade.translations.glade:93
msgid "Welcome"
msgstr "歡迎使用"

-#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:56
#: control/control.SLES.glade.translations.glade:79
-#: control/control.SLES.glade.translations.glade:94
msgid "Network Activation"
msgstr "網路啟用"

-#: control/control.SLES.glade.translations.glade:58
-#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:57
+#: control/control.SLES.glade.translations.glade:80
msgid "Disk Activation"
msgstr "磁碟啟用"

+#: control/control.SLES.glade.translations.glade:58
#: control/control.SLES.glade.translations.glade:59
-#: control/control.SLES.glade.translations.glade:60
-#: control/control.SLES.glade.translations.glade:96
-#: control/control.SLES.glade.translations.glade:121
+#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:106
msgid "System Analysis"
msgstr "系統分析"

-#: control/control.SLES.glade.translations.glade:61
-#: control/control.SLES.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:60
+#: control/control.SLES.glade.translations.glade:83
msgid "Add-On Products"
msgstr "附加產品"

-#: control/control.SLES.glade.translations.glade:62
-#: control/control.SLES.glade.translations.glade:80
+#: control/control.SLES.glade.translations.glade:61
msgid "Disk"
msgstr "磁碟"

-#: control/control.SLES.glade.translations.glade:63
-#: control/control.SLES.glade.translations.glade:81
+#: control/control.SLES.glade.translations.glade:62
msgid "Time Zone"
msgstr "時區"

-#: control/control.SLES.glade.translations.glade:64
-#: control/control.SLES.glade.translations.glade:75
+#: control/control.SLES.glade.translations.glade:63
msgid "Installation"
msgstr "安裝"

-#: control/control.SLES.glade.translations.glade:65
+#: control/control.SLES.glade.translations.glade:64
msgid "Installation Summary"
msgstr "安裝摘要"

+#: control/control.SLES.glade.translations.glade:65
#: control/control.SLES.glade.translations.glade:66
-#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:68
#: control/control.SLES.glade.translations.glade:69
#: control/control.SLES.glade.translations.glade:70
#: control/control.SLES.glade.translations.glade:71
#: control/control.SLES.glade.translations.glade:72
#: control/control.SLES.glade.translations.glade:73
-#: control/control.SLES.glade.translations.glade:74
-#: control/control.SLES.glade.translations.glade:84
-#: control/control.SLES.glade.translations.glade:85
-#: control/control.SLES.glade.translations.glade:86
-#: control/control.SLES.glade.translations.glade:87
-#: control/control.SLES.glade.translations.glade:88
-#: control/control.SLES.glade.translations.glade:112
-#: control/control.SLES.glade.translations.glade:113
-#: control/control.SLES.glade.translations.glade:115
-#: control/control.SLES.glade.translations.glade:116
-#: control/control.SLES.glade.translations.glade:117
-#: control/control.SLES.glade.translations.glade:118
-#: control/control.SLES.glade.translations.glade:135
-#: control/control.SLES.glade.translations.glade:136
+#: control/control.SLES.glade.translations.glade:97
+#: control/control.SLES.glade.translations.glade:98
+#: control/control.SLES.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:101
+#: control/control.SLES.glade.translations.glade:102
+#: control/control.SLES.glade.translations.glade:103
+#: control/control.SLES.glade.translations.glade:120
+#: control/control.SLES.glade.translations.glade:121
msgid "Perform Installation"
msgstr "執行安裝"

-#: control/control.SLES.glade.translations.glade:68
-#: control/control.SLES.glade.translations.glade:103
-#: control/control.SLES.glade.translations.glade:114
-#: control/control.SLES.glade.translations.glade:130
+#: control/control.SLES.glade.translations.glade:67
+#: control/control.SLES.glade.translations.glade:88
+#: control/control.SLES.glade.translations.glade:99
+#: control/control.SLES.glade.translations.glade:115
msgid "Installer Cleanup"
msgstr "安裝程式清理"

-#: control/control.SLES.glade.translations.glade:97
-#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:82
+#: control/control.SLES.glade.translations.glade:107
msgid "System for Update"
msgstr "要更新的系統"

-#: control/control.SLES.glade.translations.glade:99
-#: control/control.SLES.glade.translations.glade:125
+#: control/control.SLES.glade.translations.glade:84
+#: control/control.SLES.glade.translations.glade:110
msgid "Update"
msgstr "更新"

-#: control/control.SLES.glade.translations.glade:100
+#: control/control.SLES.glade.translations.glade:85
msgid "Update Summary"
msgstr "更新摘要"

-#: control/control.SLES.glade.translations.glade:101
-#: control/control.SLES.glade.translations.glade:102
-#: control/control.SLES.glade.translations.glade:104
-#: control/control.SLES.glade.translations.glade:105
-#: control/control.SLES.glade.translations.glade:106
-#: control/control.SLES.glade.translations.glade:127
-#: control/control.SLES.glade.translations.glade:128
-#: control/control.SLES.glade.translations.glade:129
-#: control/control.SLES.glade.translations.glade:131
-#: control/control.SLES.glade.translations.glade:132
-#: control/control.SLES.glade.translations.glade:133
-#: control/control.SLES.glade.translations.glade:134
-#: control/control.SLES.glade.translations.glade:139
-#: control/control.SLES.glade.translations.glade:140
+#: control/control.SLES.glade.translations.glade:86
+#: control/control.SLES.glade.translations.glade:87
+#: control/control.SLES.glade.translations.glade:89
+#: control/control.SLES.glade.translations.glade:90
+#: control/control.SLES.glade.translations.glade:91
+#: control/control.SLES.glade.translations.glade:112
+#: control/control.SLES.glade.translations.glade:113
+#: control/control.SLES.glade.translations.glade:114
+#: control/control.SLES.glade.translations.glade:116
+#: control/control.SLES.glade.translations.glade:117
+#: control/control.SLES.glade.translations.glade:118
+#: control/control.SLES.glade.translations.glade:119
+#: control/control.SLES.glade.translations.glade:124
+#: control/control.SLES.glade.translations.glade:125
msgid "Perform Update"
msgstr "執行更新"

-#: control/control.SLES.glade.translations.glade:107
+#: control/control.SLES.glade.translations.glade:92
msgid "Base Installation"
msgstr "基本安裝"

+#: control/control.SLES.glade.translations.glade:94
+#: control/control.SLES.glade.translations.glade:95
+#: control/control.SLES.glade.translations.glade:96
+#: control/control.SLES.glade.translations.glade:108
#: control/control.SLES.glade.translations.glade:109
-#: control/control.SLES.glade.translations.glade:110
#: control/control.SLES.glade.translations.glade:111
-#: control/control.SLES.glade.translations.glade:123
-#: control/control.SLES.glade.translations.glade:124
-#: control/control.SLES.glade.translations.glade:126
msgid "AutoYaST Settings"
msgstr "AutoYaST 設定"

-#: control/control.SLES.glade.translations.glade:137
-#: control/control.SLES.glade.translations.glade:141
+#: control/control.SLES.glade.translations.glade:122
+#: control/control.SLES.glade.translations.glade:126
msgid "Configuration"
msgstr "組態"

-#: control/control.SLES.glade.translations.glade:138
-#: control/control.SLES.glade.translations.glade:142
+#: control/control.SLES.glade.translations.glade:123
+#: control/control.SLES.glade.translations.glade:127
msgid "System Configuration"
msgstr "系統組態"

@@ -331,18 +319,17 @@
"</p>\n"
" "

-#: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:51
msgid "Load linuxrc Network Configuration"
msgstr "載入 linuxrc 網路組態"

+#: control/control.SLED.glade.translations.glade:36
#: control/control.SLED.glade.translations.glade:37
-#: control/control.SLED.glade.translations.glade:38
msgid "User Settings"
msgstr "使用者設定"

-#: control/control.SLED.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:38
msgid "Installation Overview"
msgstr "安裝總覽"

@@ -406,7 +393,9 @@
msgid "KDE Plasma Desktop"
msgstr "KDE Plasma 桌面"

+#. TRANSLATORS: a label for a system role
#: control/control.openSUSE.glade.translations.glade:23
+#: control/control.openSUSE.glade.translations.glade:49
msgid "Server (Text Mode)"
msgstr "伺服器 (文字模式)"

@@ -426,11 +415,113 @@
msgid "Enlightenment Desktop"
msgstr "Enlightenment 桌面"

+#. TRANSLATORS: dialog caption
+#: control/control.openSUSE.glade.translations.glade:29
+#: control/control.openSUSE.glade.translations.glade:72
+#, fuzzy
+#| msgid "Computer"
+msgid "Computer Role"
+msgstr "電腦"
+
+#. TRANSLATORS: label in a dialog
+#: control/control.openSUSE.glade.translations.glade:31
+#, fuzzy
+#| msgid ""
+#| "System Roles are predefined use cases which tailor the system\n"
+#| "for the selected scenario."
+msgid ""
+"Computer Role is a predefined use case which tailor the system\n"
+"for the selected scenario."
+msgstr ""
+"系統角色是預先定義的使用案例,使用案例可調整系統,\n"
+"以適合所選的案例。"
+
+#. TRANSLATORS: dialog help
+#: control/control.openSUSE.glade.translations.glade:34
+#, fuzzy
+#| msgid ""
+#| "<p>The system roles adjustments are in the range from package selection up
\n"
+#| "to disk partitioning. By choosing a system role, the system is \n"
+#| "configured accordingly to match the use case of the role. The settings \n"
+#| "defined by a role can be overridden in the next steps if necessary.</p>"
+msgid ""
+"<p>The computer role adjustments are in the range from package selection up\n"
+"to running additional services. By choosing a computer role, the system is\n"
+"configured accordingly to match the use case of the role. For the
<em>Custom</em> role\n"
+"an additional dialog is displayed which allows manual software pattern
selection. </p>"
+msgstr ""
+"<p>系統角色調整涵蓋從套件選擇到\n"
+"磁碟分割的範圍。選擇系統角色後,會對系統\n"
+"進行相應設定,以符合角色的使用案例。若需要,\n"
+"可在後續步驟中覆寫角色所定義的設定。</p>"
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:39
+msgid "Workstation with KDE Plasma"
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:40
+#, fuzzy
+#| msgid ""
+#| "KDE is a powerful and intuitive desktop\n"
+#| "environment that uses Kontact as mailer,\n"
+#| "Dolphin as file manager, and offers\n"
+#| "both Firefox and Konqueror as Web browsers.\n"
+msgid ""
+"KDE is a powerful and intuitive desktop environment that uses Kontact as
mailer,\n"
+"Dolphin as file manager, and offers both Firefox and Konqueror as Web
browsers.\n"
+" "
+msgstr ""
+"KDE 是一個功能強大的直覺式桌面\n"
+"環境,使用 Kontact 管理郵件、\n"
+"Dolphin 檔案管理員並提供 \n"
+"Firefox 與 Konqueror 兩種網路瀏覽器。\n"
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:44
+msgid "Workstation with GNOME"
+msgstr ""
+
#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:71
+#, fuzzy
+#| msgid ""
+#| "GNOME is a powerful and intuitive desktop\n"
+#| "environment that uses Evolution as mailer,\n"
+#| "Firefox as browser, and Nautilus as file manager.\n"
+msgid ""
+"GNOME is a powerful and intuitive desktop environment that uses Evolution as
mailer,\n"
+"Firefox as browser, and Nautilus as file manager.\n"
+" "
+msgstr ""
+"GNOME 是一個功能強大的直覺式桌面\n"
+"環境,使用 Evolution 管理郵件、\n"
+"Firefox 瀏覽器以及 Nautilus 檔案管理員。\n"
+
+#: control/control.openSUSE.glade.translations.glade:50
+msgid "Server is usefull when computer should not have interaction with user
and have only command line."
+msgstr ""
+
+#. TRANSLATORS: a label for a system role
+#: control/control.openSUSE.glade.translations.glade:52
+msgid "Custom"
+msgstr "自定"
+
+#: control/control.openSUSE.glade.translations.glade:53
+msgid "Custom role runs additional dialog where user can select software that
fits his requirements."
+msgstr ""
+
+#: control/control.openSUSE.glade.translations.glade:74
+#, fuzzy
+#| msgid "Server Pattern Selection"
+msgid "Custom Pattern Selection"
+msgstr "伺服器模式選項"
+
+#: control/control.openSUSE.glade.translations.glade:98
msgid "Online Repositories"
msgstr "線上儲存庫"

-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "桌面選擇"
+#~ msgid "Live Installation Settings"
+#~ msgstr "Live 安裝設定"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "桌面選擇"

Modified: branches/SLE12-SP3/yast/zh_TW/po/country.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/country.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/country.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-25 02:28+0000\n"
+"POT-Creation-Date: 2017-05-17 19:06+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -41,7 +41,7 @@

#. summary label
#. summary label
-#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1388
+#: keyboard/src/clients/keyboard.rb:160 keyboard/src/modules/Keyboard.rb:1402
msgid "Current Keyboard Layout: %1"
msgstr "目前鍵盤配置: %1"

@@ -57,11 +57,9 @@

#. menue label text
#. title for selection box 'keyboard layout'
-#. widget label
#. menu button label
#: keyboard/src/clients/keyboard_proposal.rb:93
#: keyboard/src/include/keyboard/dialogs.rb:187
-#: keyboard/src/lib/y2country/widgets.rb:40
#: language/src/clients/country_simple_proposal.rb:78
msgid "&Keyboard Layout"
msgstr "鍵盤配置(&K)"
@@ -204,25 +202,12 @@
msgid "System Keyboard Configuration"
msgstr "系統鍵盤組態"

-#. help text for keyboard selection widget
-#: keyboard/src/lib/y2country/widgets.rb:80
-msgid ""
-"<p>\n"
-"Choose the <b>Keyboard layout</b> to be used during\n"
-"installation and on the installed system.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"選擇安裝期間和\n"
-"安裝的系統上要使用的<b>鍵盤配置</b>。\n"
-"</p>\n"
-
#. label text: user can choose the keyboard from the updated system
#. or continue with the one defined by his language.
#. 2 radio-buttons follow this label.
#. Such keyboard layout is used only for the time of the update,
#. it is not saved to the system.
-#: keyboard/src/modules/Keyboard.rb:1299
+#: keyboard/src/modules/Keyboard.rb:1313
msgid ""
"You are currently using a keyboard layout\n"
"different from the one in the system to update.\n"
@@ -234,7 +219,7 @@

#. Executes the command to set the keyboard in X11, reporting
#. any error to the user
-#: keyboard/src/modules/Keyboard.rb:1498
+#: keyboard/src/modules/Keyboard.rb:1513
msgid "Failed to set X11 keyboard to '%s'"
msgstr "無法將 X11 鍵盤設為「%s」"

@@ -342,8 +327,8 @@

#. summary label
#. summary label
-#: language/src/clients/language.rb:266 language/src/modules/Language.rb:851
-#: language/src/modules/Language.rb:885
+#: language/src/clients/language.rb:266 language/src/modules/Language.rb:850
+#: language/src/modules/Language.rb:884
msgid "Additional Languages: %1"
msgstr "其他語言: %1"

@@ -604,7 +589,7 @@

#. TRANSLATORS: Error message. Strings marked %{...} will be replaced
#. with variable content - do not translate them, please.
-#: language/src/modules/Language.rb:407
+#: language/src/modules/Language.rb:406
msgid ""
"Language '%{language}' was not found within the list of supported languages\n"
"available at %{directory}.\n"
@@ -618,19 +603,19 @@

#. summary label
#. summary label
-#: language/src/modules/Language.rb:795 language/src/modules/Language.rb:867
+#: language/src/modules/Language.rb:794 language/src/modules/Language.rb:866
msgid "Primary Language: %1"
msgstr "主要語言: %1"

#. work-around for following in order not to depend on yast2-packager
#. PackageSlideShow::InitPkgData (false);
#. "value" : PackageSlideShow::total_size_to_install / 1024 , // kilobytes
-#: language/src/modules/Language.rb:1040
+#: language/src/modules/Language.rb:1039
msgid "Installing Packages..."
msgstr "正在安裝套件..."

#. continue/cancel message
-#: language/src/modules/Language.rb:1131
+#: language/src/modules/Language.rb:1130
msgid ""
"Translation of the primary language is not complete.\n"
"Some texts may be displayed in English.\n"
@@ -639,18 +624,18 @@
"部分文字可以能英文顯示。\n"

#. popup message
-#: language/src/modules/Language.rb:1345
+#: language/src/modules/Language.rb:1344
msgid ""
"Only minimal support for the selected language is included on this media.\n"
-"Enable online repositories later in order to get the appropriate support\n"
+"Add the Language add-on CD as an additional repository in order to get the
appropriate support\n"
"for this language.\n"
msgstr ""
"此媒體中僅包含所選語言的最小支援。\n"
-"請稍後啟用線上儲存庫,\n"
-"以獲得此語言的適當支援。\n"
+"請新增語言附加 CD 做為額外的儲存庫,\n"
+"以得到此語言的更佳支援。\n"

#. popup message (user selected CJK language in text mode)
-#: language/src/modules/Language.rb:1374
+#: language/src/modules/Language.rb:1373
msgid ""
"The selected language cannot be used in text mode. English is used for\n"
"installation, but the selected language will be used for the new system."
@@ -702,8 +687,8 @@
#. label text (Clock setting)
#. AutoYaST interface function: Return the summary of Timezone configuration
as a map.
#. @return summary string (html)
-#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:749
-#: timezone/src/modules/Timezone.rb:985
+#: timezone/src/clients/timezone.rb:184 timezone/src/modules/Timezone.rb:733
+#: timezone/src/modules/Timezone.rb:969
msgid "UTC"
msgstr "UTC"

@@ -960,315 +945,287 @@

#. label text, Clock setting: local time (not UTC)
#. label text, Clock setting: local time (not UTC)
-#: timezone/src/modules/Timezone.rb:753 timezone/src/modules/Timezone.rb:989
+#: timezone/src/modules/Timezone.rb:737 timezone/src/modules/Timezone.rb:973
msgid "Local Time"
msgstr "本地時間"

#. label text
#. label text
-#: timezone/src/modules/Timezone.rb:757 timezone/src/modules/Timezone.rb:993
+#: timezone/src/modules/Timezone.rb:741 timezone/src/modules/Timezone.rb:977
msgid "Hardware Clock Set To"
msgstr "硬體時鐘設為"

#. summary label
-#: timezone/src/modules/Timezone.rb:771
+#: timezone/src/modules/Timezone.rb:755
msgid "NTP configured"
msgstr "NTP 已設定"

#. summary label
-#: timezone/src/modules/Timezone.rb:997
+#: timezone/src/modules/Timezone.rb:981
msgid "Current Time Zone: %1"
msgstr "目前時區: %1"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:46
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:46
+#: keyboard/src/data/keyboard_raw.ycp:35
msgid "English (US)"
msgstr "英語 (美國)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:58
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:58
+#: keyboard/src/data/keyboard_raw.ycp:47
msgid "English (UK)"
msgstr "英語 (英國)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:70
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:70
+#: keyboard/src/data/keyboard_raw.ycp:59
msgid "German"
msgstr "德語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:82
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:82
+#: keyboard/src/data/keyboard_raw.ycp:71
msgid "German (with deadkeys)"
msgstr "德語 (含廢鍵)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:94
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:94
+#: keyboard/src/data/keyboard_raw.ycp:83
msgid "German (Switzerland)"
msgstr "德語 (瑞士)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:106
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:106
+#: keyboard/src/data/keyboard_raw.ycp:95
msgid "French"
msgstr "法語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:118
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:118
+#: keyboard/src/data/keyboard_raw.ycp:107
msgid "French (Switzerland)"
msgstr "法語 (瑞士)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:130
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:130
+#: keyboard/src/data/keyboard_raw.ycp:119
msgid "French (Canada)"
msgstr "法語 (加拿大)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:143
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:143
+#: keyboard/src/data/keyboard_raw.ycp:132
msgid "Canadian (Multilingual)"
msgstr "加拿大語 (多語)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:157
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:156
+#: keyboard/src/data/keyboard_raw.ycp:145
msgid "Spanish"
msgstr "西班牙語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:169
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:168
+#: keyboard/src/data/keyboard_raw.ycp:157
msgid "Spanish (Latin America)"
msgstr "西班牙語 (拉丁美洲)"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:181
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:180
+#: keyboard/src/data/keyboard_raw.ycp:169
msgid "Spanish (CP 850)"
msgstr "西班牙語 (CP 850)"

#. keyboard layout
+#: keyboard/src/data/keyboard_raw.ycp:181
+msgid "Spanish (Asturian variant)"
+msgstr "西班牙語 (阿斯圖里亞語變體)"
+
+#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:193
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:204
msgid "Italian"
msgstr "義大利語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:205
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:216
msgid "Portuguese"
msgstr "葡萄牙語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:217
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:228
msgid "Portuguese (Brazil)"
msgstr "葡萄牙語 (巴西)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:229
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:240
msgid "Portuguese (Brazil -- US accents)"
msgstr "葡萄牙語 (巴西 -- 美國腔)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:241
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:252
msgid "Greek"
msgstr "希臘語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:253
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:264
msgid "Dutch"
msgstr "荷蘭語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:265
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:276
msgid "Danish"
msgstr "丹麥語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:277
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:288
msgid "Norwegian"
msgstr "挪威語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:289
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:300
msgid "Swedish"
msgstr "瑞典語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:301
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:312
msgid "Finnish"
msgstr "芬蘭語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:313
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:324
msgid "Czech"
msgstr "捷克語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:328
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:336
msgid "Czech (qwerty)"
msgstr "捷克語 (qwerty)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:343
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:348
msgid "Slovak"
msgstr "斯洛伐克語"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:358
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:360
msgid "Slovak (qwerty)"
msgstr "斯洛伐克語 (qwerty)"

#. keyboard layout
#: keyboard/src/data/keyboard_raw.ycp:373
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:372
msgid "Slovene"
msgstr "斯洛維尼亞語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:388
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:384
+#: keyboard/src/data/keyboard_raw.ycp:387
msgid "Hungarian"
msgstr "匈牙利語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:403
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:396
+#: keyboard/src/data/keyboard_raw.ycp:401
msgid "Polish"
msgstr "波蘭語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:418
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:408
+#: keyboard/src/data/keyboard_raw.ycp:415
msgid "Russian"
msgstr "俄語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:432
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:420
+#: keyboard/src/data/keyboard_raw.ycp:429
msgid "Serbian"
msgstr "塞爾維亞語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:444
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:432
+#: keyboard/src/data/keyboard_raw.ycp:441
msgid "Estonian"
msgstr "愛沙尼亞語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:456
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:444
+#: keyboard/src/data/keyboard_raw.ycp:453
msgid "Lithuanian"
msgstr "立陶宛語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:468
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:456
+#: keyboard/src/data/keyboard_raw.ycp:465
msgid "Turkish"
msgstr "土耳其語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:479
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:467
+#: keyboard/src/data/keyboard_raw.ycp:476
msgid "Croatian"
msgstr "克羅埃西亞語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:502
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:479
+#: keyboard/src/data/keyboard_raw.ycp:498
msgid "Japanese"
msgstr "日語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:514
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:491
+#: keyboard/src/data/keyboard_raw.ycp:510
msgid "Belgian"
msgstr "比利時語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:526
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:503
+#: keyboard/src/data/keyboard_raw.ycp:522
msgid "Dvorak"
msgstr "Dvorak"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:538
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:515
+#: keyboard/src/data/keyboard_raw.ycp:534
msgid "Icelandic"
msgstr "冰島語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:550
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:527
+#: keyboard/src/data/keyboard_raw.ycp:546
msgid "Ukrainian"
msgstr "烏克蘭語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:572
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:539
+#: keyboard/src/data/keyboard_raw.ycp:568
msgid "Khmer"
msgstr "高棉語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:594
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:551
+#: keyboard/src/data/keyboard_raw.ycp:590
msgid "Korean"
msgstr "韓語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:616
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:563
+#: keyboard/src/data/keyboard_raw.ycp:612
msgid "Arabic"
msgstr "阿拉伯語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:637
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:574
+#: keyboard/src/data/keyboard_raw.ycp:633
msgid "Tajik"
msgstr "塔吉克語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:651
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:586
+#: keyboard/src/data/keyboard_raw.ycp:647
msgid "Traditional Chinese"
msgstr "繁體中文"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:673
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:598
+#: keyboard/src/data/keyboard_raw.ycp:669
msgid "Simplified Chinese"
msgstr "簡體中文"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:695
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:610
+#: keyboard/src/data/keyboard_raw.ycp:691
msgid "Romanian"
msgstr "羅馬尼亞語"

#. keyboard layout
-#: keyboard/src/data/keyboard_raw.ycp:716
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:621
+#: keyboard/src/data/keyboard_raw.ycp:712
msgid "US International"
msgstr "美國國際"

-#. keyboard layout
-#: keyboard/src/data/keyboard_raw_opensuse.ycp:192
-msgid "Spanish (Asturian variant)"
-msgstr "西班牙語 (阿斯圖里亞語變體)"
+#~ msgid ""
+#~ "<p>\n"
+#~ "Choose the <b>Keyboard layout</b> to be used during\n"
+#~ "installation and on the installed system.\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "選擇安裝期間和\n"
+#~ "安裝的系統上要使用的<b>鍵盤配置</b>。\n"
+#~ "</p>\n"
+
+#~ msgid ""
+#~ "Only minimal support for the selected language is included on this
media.\n"
+#~ "Enable online repositories later in order to get the appropriate support\n"
+#~ "for this language.\n"
+#~ msgstr ""
+#~ "此媒體中僅包含所選語言的最小支援。\n"
+#~ "請稍後啟用線上儲存庫,\n"
+#~ "以獲得此語言的適當支援。\n"

Modified: branches/SLE12-SP3/yast/zh_TW/po/firewall.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/firewall.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/firewall.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:27+0200\n"
+"POT-Creation-Date: 2017-04-11 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -671,7 +671,7 @@
#. TRANSLATORS: combo box
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:280
-#: src/include/firewall/uifunctions.rb:865
+#: src/include/firewall/uifunctions.rb:886
msgid "&Service to Allow"
msgstr "要允許的服務(&S)"

@@ -820,7 +820,7 @@
#. TRANSLATORS: select box
#: src/include/firewall/subdialogs.rb:573
#: src/include/firewall/subdialogs.rb:1092
-#: src/include/firewall/uifunctions.rb:1980
+#: src/include/firewall/uifunctions.rb:2001
msgid "&Protocol"
msgstr "通訊協定(&P)"

@@ -1199,55 +1199,78 @@

#. Function stops Firewall services and sets firewall
#. to be stopped after exiting YaST
-#: src/include/firewall/uifunctions.rb:147
+#: src/include/firewall/uifunctions.rb:148
msgid "Stopping firewall..."
msgstr "正在停止防火牆..."

+#. TRANSLATORS: action which failed, used later
+#: src/include/firewall/uifunctions.rb:161
+#, fuzzy
+#| msgid "Device could not be opened."
+msgid "The firewall could not be stopped."
+msgstr "無法開啟設備。"
+
+#. TRANSLATORS: action which failed, used later
+#: src/include/firewall/uifunctions.rb:164
+#, fuzzy
+#| msgid "Firewall not running or would not be started."
+msgid "The firewall could not be started."
+msgstr "防火牆沒有執行或將不會啟動。"
+
+#. TRANSLATORS: %s is action that failed
+#: src/include/firewall/uifunctions.rb:169
+#, fuzzy
+#| msgid "Please install yast2-registration and try again."
+msgid ""
+"%s\n"
+"Please verify your system and try again."
+msgstr "請安裝 yast2-registration 後再試一次。"
+
#. TRANSLATORS: table item, connected with firewall zone of interface
-#: src/include/firewall/uifunctions.rb:184
+#: src/include/firewall/uifunctions.rb:205
msgid "No zone assigned"
msgstr "沒有指定的區域"

#. TRANSLATORS: table item, "User defined string" instead of Device_name
-#: src/include/firewall/uifunctions.rb:224
+#: src/include/firewall/uifunctions.rb:245
msgid "Custom string"
msgstr "自訂字串"

#. interface could be unassigned
#. TRANSLATORAS: selection box item, connected with firewall zone of interface
-#: src/include/firewall/uifunctions.rb:288
+#: src/include/firewall/uifunctions.rb:309
msgid "No Zone Assigned"
msgstr "沒有指定的區域"

#. TRANSLATORS: error message, %1 stands for the port number
-#: src/include/firewall/uifunctions.rb:487
+#: src/include/firewall/uifunctions.rb:508
msgid "Port number %1 is invalid."
msgstr "埠編號 %1 無效。"

#. TRANSLATORS: error message, %1 stands for the port number,
#. %2 stands for, e.g., port range, where the wrong port definition %1 was
found
-#: src/include/firewall/uifunctions.rb:492
+#: src/include/firewall/uifunctions.rb:513
msgid "Port number %1 in definition %2 is invalid."
msgstr "定義 %2 中的埠編號 %1 無效。"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:500
+#: src/include/firewall/uifunctions.rb:521
msgid "Invalid Port Definition"
msgstr "無效的埠定義"

#. TRANSLATORS: popup message, %1 stands for the maximal port number
#. that is possible to use in port-range
-#: src/include/firewall/uifunctions.rb:506
+#: src/include/firewall/uifunctions.rb:527
msgid "The port number must be in the interval from 1 to %1 (inclusive)."
msgstr "埠號碼必須在 1 到 %1 (含) 的間隔中。"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:584
+#: src/include/firewall/uifunctions.rb:605
msgid "Invalid Port Range Definition"
msgstr "無效的埠範圍定義"

#. TRANSLATORS: popup message, %1 is a port-range defined by user
-#: src/include/firewall/uifunctions.rb:587
+#: src/include/firewall/uifunctions.rb:608
msgid ""
"Port range %1 is invalid.\n"
"It must be defined as the min_port_number:max_port_number and\n"
@@ -1258,12 +1281,12 @@
" max_port_number 必須大於 min_port_number。"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:604
+#: src/include/firewall/uifunctions.rb:625
msgid "Unknown Port Name"
msgstr "未知的埠名稱。"

#. TRANSLATORS: popup message, %1 is a port-name
-#: src/include/firewall/uifunctions.rb:607
+#: src/include/firewall/uifunctions.rb:628
msgid ""
"Port name %1 is unknown in your current system.\n"
"It probably would not work.\n"
@@ -1274,12 +1297,12 @@
"真的要使用此埠嗎?\n"

#. TRANSLATORS: popup headline
-#: src/include/firewall/uifunctions.rb:636
+#: src/include/firewall/uifunctions.rb:657
msgid "Invalid Additional Service Definition"
msgstr "無效的其他服務定義"

#. TRANSLATORS: popup message, %1 stands for the wrong settings (might be
quite long)
-#: src/include/firewall/uifunctions.rb:639
+#: src/include/firewall/uifunctions.rb:660
msgid ""
"It appears that the additional service settings\n"
"%1\n"
@@ -1298,22 +1321,22 @@
#. )
#. (!IsThisExpertConfiguration() ?
#. TRANSLATORS: informative label
-#: src/include/firewall/uifunctions.rb:1035
+#: src/include/firewall/uifunctions.rb:1056
msgid "Masquerading needs at least one external interface and one other
interface."
msgstr "偽裝至少需要一個外部介面與一個其他介面。"

#. TRANSLATORS: popup message
-#: src/include/firewall/uifunctions.rb:1056
+#: src/include/firewall/uifunctions.rb:1077
msgid "This entry must be completed."
msgstr "必須完成此項目。"

#. TRANSLATORS: popup message, right port definition is two lines below this
message
-#: src/include/firewall/uifunctions.rb:1080
+#: src/include/firewall/uifunctions.rb:1101
msgid "Wrong port definition."
msgstr "錯誤的埠定義。"

#. TRANSLATORS: popup error message
-#: src/include/firewall/uifunctions.rb:1107
+#: src/include/firewall/uifunctions.rb:1128
msgid ""
"Wrong port definition.\n"
"No port number found for this port name.\n"
@@ -1324,17 +1347,17 @@
"請使用埠號碼而非埠名稱。\n"

#. TRANSLATORS: popup message, right definition is two lines below this message
-#: src/include/firewall/uifunctions.rb:1136
+#: src/include/firewall/uifunctions.rb:1157
msgid "Invalid IP definition."
msgstr "無效的 IP 定義。"

#. TRANSLATORS: check box
-#: src/include/firewall/uifunctions.rb:1463
+#: src/include/firewall/uifunctions.rb:1484
msgid "&Log Not Accepted Broadcast Packets"
msgstr "記錄不接受的廣播封包(&L)"

#. TRANSLATORS: popup question
-#: src/include/firewall/uifunctions.rb:1524
+#: src/include/firewall/uifunctions.rb:1545
msgid ""
"Firewall automatic starting has been disabled\n"
"but firewall is currently running.\n"
@@ -1347,71 +1370,71 @@
"您要在寫入新的組態後停用防火牆嗎?\n"

#. network is mandatory
-#: src/include/firewall/uifunctions.rb:1703
-#: src/include/firewall/uifunctions.rb:1910
+#: src/include/firewall/uifunctions.rb:1724
+#: src/include/firewall/uifunctions.rb:1931
msgid "Invalid network definition '%1'"
msgstr "無效的網路定義 %1"

#. destination port is optional
#. source port is optional
-#: src/include/firewall/uifunctions.rb:1721
-#: src/include/firewall/uifunctions.rb:1752
+#: src/include/firewall/uifunctions.rb:1742
+#: src/include/firewall/uifunctions.rb:1773
msgid "Invalid port range '%1'"
msgstr "無效的埠範圍 %1"

-#: src/include/firewall/uifunctions.rb:1733
-#: src/include/firewall/uifunctions.rb:1764
-#: src/include/firewall/uifunctions.rb:1924
+#: src/include/firewall/uifunctions.rb:1754
+#: src/include/firewall/uifunctions.rb:1785
+#: src/include/firewall/uifunctions.rb:1945
msgid "Invalid port name or number '%1'"
msgstr "無效的埠名稱或號碼 %1"

-#: src/include/firewall/uifunctions.rb:1827
+#: src/include/firewall/uifunctions.rb:1848
msgid "All services using UDP"
msgstr "所有使用 UDP 的服務"

-#: src/include/firewall/uifunctions.rb:1829
+#: src/include/firewall/uifunctions.rb:1850
msgid "All services using TCP"
msgstr "所有使用 TCP 的服務"

-#: src/include/firewall/uifunctions.rb:1831
+#: src/include/firewall/uifunctions.rb:1852
msgid "Samba browsing"
msgstr "Samba 瀏覽"

-#: src/include/firewall/uifunctions.rb:1833
+#: src/include/firewall/uifunctions.rb:1854
msgid "SLP browsing"
msgstr "SLP 瀏覽"

-#: src/include/firewall/uifunctions.rb:1845
+#: src/include/firewall/uifunctions.rb:1866
msgid "All networks"
msgstr "所有網路"

-#: src/include/firewall/uifunctions.rb:1847
+#: src/include/firewall/uifunctions.rb:1868
msgid "Subnet: %1"
msgstr "子網路:%1"

#. hard-coded default
-#: src/include/firewall/uifunctions.rb:1952
+#: src/include/firewall/uifunctions.rb:1973
msgid "&Zone"
msgstr "區域(&Z)"

-#: src/include/firewall/uifunctions.rb:1956
+#: src/include/firewall/uifunctions.rb:1977
msgid "&Network"
msgstr "網路(&N)"

-#: src/include/firewall/uifunctions.rb:1963
+#: src/include/firewall/uifunctions.rb:1984
msgid "&Service"
msgstr "服務(&S)"

-#: src/include/firewall/uifunctions.rb:1969
+#: src/include/firewall/uifunctions.rb:1990
msgid "User-defined service"
msgstr "使用者定義服務"

-#: src/include/firewall/uifunctions.rb:1994
+#: src/include/firewall/uifunctions.rb:2015
msgid "Po&rt"
msgstr "連接埠(&R)"

#. redraw table
-#: src/include/firewall/uifunctions.rb:2089
+#: src/include/firewall/uifunctions.rb:2110
msgid "Select an item to delete."
msgstr "選取要刪除的項目。"


Modified: branches/SLE12-SP3/yast/zh_TW/po/firstboot.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/firstboot.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/firstboot.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-21 00:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -113,13 +113,13 @@
msgstr "標籤"

#: src/clients/firstboot_config.rb:68
+msgid "Module Name"
+msgstr "模組名稱"
+
+#: src/clients/firstboot_config.rb:68
msgid "Status"
msgstr "狀態"

-#: src/clients/firstboot_config.rb:68
-msgid "Module Name"
-msgstr "模組名稱"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""

Modified: branches/SLE12-SP3/yast/zh_TW/po/installation.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/installation.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/installation.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-26 01:30+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -14,6 +14,22 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

+#: src/lib/services-manager/clients/services-manager_finish.rb:11
+#, fuzzy
+#| msgid "Adapting system services ..."
+msgid "Setting default target and system services ..."
+msgstr "正在調整系統服務..."
+
+#. Proposal client for Network configuration
+#: src/lib/network/clients/network_proposal.rb:19
+#: src/lib/network/clients/network_proposal.rb:20
+msgid "Network Configuration"
+msgstr "網路組態"
+
+#: src/lib/network/clients/network_proposal.rb:25
+msgid "preformatted_proposal"
+msgstr ""
+
#. help for the dialog - busy message
#: src/include/installation/inst_inc_all.rb:52
msgid "<p>Initializing the installation...</p>"
@@ -512,7 +528,7 @@
#. download release notes now
#. push button
#: src/lib/installation/clients/inst_complex_welcome.rb:178
-#: src/lib/installation/clients/inst_download_release_notes.rb:137
+#: src/lib/installation/clients/inst_download_release_notes.rb:206
#: src/lib/installation/clients/inst_system_analysis.rb:294
msgid "Re&lease Notes..."
msgstr "版本說明(&L)..."
@@ -849,14 +865,14 @@
#. FIXME: use a better title (reused existing texts because of text freeze)
#. TRANSLATORS: dialog caption
#. bug #302384
-#: src/lib/installation/clients/inst_download_release_notes.rb:145
+#: src/lib/installation/clients/inst_download_release_notes.rb:214
#: src/lib/installation/clients/inst_initialization.rb:56
#: src/lib/installation/clients/inst_installation_options.rb:149
msgid "Initializing"
msgstr "正在啟始化"

#. TRANSLATORS: dialog progress message
-#: src/lib/installation/clients/inst_download_release_notes.rb:145
+#: src/lib/installation/clients/inst_download_release_notes.rb:214
#: src/lib/installation/clients/inst_initialization.rb:44
msgid "Initializing the installation..."
msgstr "正在啟始化安裝..."
@@ -910,37 +926,37 @@
msgstr "已完成"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:457
+#: src/lib/installation/clients/inst_finish.rb:460
msgid "Copy files to installed system"
msgstr "將檔案複製到已安裝的系統"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:464
+#: src/lib/installation/clients/inst_finish.rb:467
msgid "Save configuration"
msgstr "儲存組態"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:471
+#: src/lib/installation/clients/inst_finish.rb:474
msgid "Save installation settings"
msgstr "儲存安裝設定"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:480
+#: src/lib/installation/clients/inst_finish.rb:483
msgid "Install boot manager"
msgstr "安裝開機管理員"

#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:487
+#: src/lib/installation/clients/inst_finish.rb:490
msgid "Prepare system for initial boot"
msgstr "準備第一次啟動系統"

#. some steps are called in live installer only
-#: src/lib/installation/clients/inst_finish.rb:550
+#: src/lib/installation/clients/inst_finish.rb:553
msgid "Client %1 returned invalid data."
msgstr "用戶端 %1 傳回無效的資料。"

#. FIXME: looks like product specific finish steps are not used at all
-#: src/lib/installation/clients/inst_finish.rb:582
+#: src/lib/installation/clients/inst_finish.rb:585
msgid "Checking stage: %1..."
msgstr "正在檢查階段:%1 ..."

@@ -964,6 +980,19 @@
msgid "Preparing the initial system configuration..."
msgstr "正在準備啟始系統組態..."

+#. Shows a dialog allowing the user to modify the invalid URL, modifying the
+#. /etc/install.inf file with the new value. In case of cancelled or empty,
+#. the URL will be completely removed.
+#.
+#. @param regurl [String]
+#: src/lib/installation/clients/inst_install_inf.rb:52
+msgid ""
+"If you decide to cancel, the custom URL\n"
+"will be completelly ignored.\n"
+"\n"
+"Really cancel URL modification?"
+msgstr ""
+
#. dialog caption
#: src/lib/installation/clients/inst_installation_options.rb:80
msgid "Installation Options"
@@ -1084,49 +1113,6 @@
"設定網路組態失敗。\n"
"請檢查記錄檔案 %1,以取得詳細資訊。"

-#. TRANSLATORS: help text, part 1
-#: src/lib/installation/clients/inst_new_desktop.rb:57
-msgid ""
-"<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a number
\n"
-"of different desktop environments. Below you see a list of the 2 major ones
\n"
-"<b>GNOME</b> and <b>KDE</b>.</p>"
-msgstr ""
-"<p>在 Linux 系統上<b>選擇</b>具有最高優先程度。<i>openSUSE</i> 提供了\n"
-"一些不同的桌面環境。下面您可以看到兩個主要環境的清單\n"
-"<b>GNOME</b> 和 <b>KDE</b>。</p>"
-
-#. TRANSLATORS: help text, part 3
-#: src/lib/installation/clients/inst_new_desktop.rb:63
-msgid ""
-"<p>You may select alternative desktop environments (or one of minimal
installation patterns)\n"
-"that could fit your needs better using the <b>Other</b> option . Later in the
software \n"
-"selection or after installation, you can change your selection or add
additional desktop \n"
-"environments. This screen allows you to set the default.</p>"
-msgstr ""
-"<p>您可以使用<b>其他</b>選項,選擇其他更適合您需求的桌面環境\n"
-"(或最小安裝模式的環境)。在之後的軟體\n"
-"選擇或安裝完後,您可以變更您的選擇或是新增\n"
-"其他的桌面環境。這個畫面可讓您設定預設值。</p>"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_new_desktop.rb:121
-msgid "Desktop Selection"
-msgstr "桌面選擇"
-
-#. UI wait loop
-#: src/lib/installation/clients/inst_new_desktop.rb:190
-msgid ""
-"No desktop type was selected.\n"
-"Select the desired desktop environment."
-msgstr ""
-"未選取桌面類型。\n"
-"請選取所需的桌面環境。"
-
-#. BNC #449818
-#: src/lib/installation/clients/inst_new_desktop.rb:383
-msgid "Other"
-msgstr "其他"
-
#. hide the RN button and set the release notes for SlideShow (bnc#871158)
#: src/lib/installation/clients/inst_prepareprogress.rb:56
msgid "Cannot find base product. Release notes will not be shown."
@@ -1330,36 +1316,22 @@
"無法啟始化軟體儲存庫。\n"
"正在中止安裝。"

-#. TRANSLATORS: error message
-#: src/lib/installation/clients/inst_update_installer.rb:232
-msgid ""
-"<p>Cannot obtain the installer update repository URL\n"
-"from the registration server.</p>"
-msgstr ""
-"<p>無法從註冊伺服器獲取\n"
-"安裝程式更新儲存庫 URL。</p>"
-
-#. TRANSLATORS: part of an error message, %s is the default repository
-#. URL from control.xml
-#: src/lib/installation/clients/inst_update_installer.rb:238
-msgid "<p>The default URL %s will be used.<p>"
-msgstr "<p>將使用預設 URL %s。<p>"
-
-#. Ask the user to chose a registration server
+#. Return the self-update URLs
#.
-#. @param services [Array<SlpServiceClass::Service>] Array of registration
servers
-#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc
if SCC is selected;
-#. :cancel if the dialog was dismissed.
-#: src/lib/installation/clients/inst_update_installer.rb:315
+#. @return [Array<URI>] self-update URLs
+#.
+#. @see #default_self_update_url
+#. @see #custom_self_update_url
+#: src/lib/installation/clients/inst_update_installer.rb:181
+#, fuzzy
+#| msgid "The registration module is not available."
msgid ""
-"Select a detected registration server from the list\n"
-"to search for installer updates."
-msgstr ""
-"從清單中選取一個偵測到的註冊\n"
-"伺服器以搜尋安裝程式更新。"
+"The registration URL provided is not valid.\n"
+"Skipping installer update.\n"
+msgstr "註冊模組無法使用。"

#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:396
+#: src/lib/installation/clients/inst_update_installer.rb:233
msgid ""
"A valid update could not be found at\n"
"%s.\n"
@@ -1370,7 +1342,7 @@
"\n"

#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:402
+#: src/lib/installation/clients/inst_update_installer.rb:240
msgid ""
"Could not fetch update from\n"
"%s.\n"
@@ -1388,7 +1360,7 @@
#. @param reason [String] reason why user want to check his network
configuration
#. @return [Boolean] true if the network configuration client was launched;
#. false if the network is not configured.
-#: src/lib/installation/clients/inst_update_installer.rb:432
+#: src/lib/installation/clients/inst_update_installer.rb:264
msgid ""
"\n"
"Would you like to check your network configuration\n"
@@ -1401,7 +1373,7 @@
#. Note: the proxy cannot be configured in the YaST installer yet,
#. it needs to be set via the "proxy" boot option.
#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:477
+#: src/lib/installation/clients/inst_update_installer.rb:302
msgid ""
"Downloading the optional installer updates from \n"
"%s\n"
@@ -1422,26 +1394,26 @@
"如果您需要代理伺服器以存取更新儲存庫,請使用「proxy」開機參數。\n"

#. TRANSLATORS: progress label
-#: src/lib/installation/clients/inst_update_installer.rb:586
+#: src/lib/installation/clients/inst_update_installer.rb:388
msgid "Add Update Repository"
msgstr "新增更新儲存庫"

-#: src/lib/installation/clients/inst_update_installer.rb:587
+#: src/lib/installation/clients/inst_update_installer.rb:389
msgid "Download the Packages"
msgstr "下載套件"

-#: src/lib/installation/clients/inst_update_installer.rb:588
+#: src/lib/installation/clients/inst_update_installer.rb:390
msgid "Apply the Packages"
msgstr "套用套件"

-#: src/lib/installation/clients/inst_update_installer.rb:589
+#: src/lib/installation/clients/inst_update_installer.rb:391
msgid "Restart"
msgstr "重新啟動"

#. TRANSLATORS: dialog title
#. TRANSLATORS: progress title
-#: src/lib/installation/clients/inst_update_installer.rb:600
-#: src/lib/installation/clients/inst_update_installer.rb:602
+#: src/lib/installation/clients/inst_update_installer.rb:402
+#: src/lib/installation/clients/inst_update_installer.rb:404
msgid "Updating the Installer..."
msgstr "正在更新安裝程式..."

@@ -1450,7 +1422,7 @@
#. @return [Hash, nil] current profile if fetched or exists; nil otherwise
#.
#. @see Yast::Profile.current
-#: src/lib/installation/clients/inst_update_installer.rb:673
+#: src/lib/installation/clients/inst_update_installer.rb:475
msgid ""
"Error while parsing the control file.\n"
"\n"
@@ -1761,6 +1733,17 @@
msgid "Saving proxy configuration..."
msgstr "正在儲存代理組態..."

+#. This is a step of base installation finish and is responsible of write the
+#. specific configuration for the current system role.
+#.
+#. It has been added for CaaSP Roles (FATE#321754) and currently only
+#. the 'worker_role' has an special behavior.
+#: src/lib/installation/clients/roles_finish.rb:35
+#, fuzzy
+#| msgid "Writing device configuration..."
+msgid "Writing specific role configuration ..."
+msgstr "正在寫入裝置組態..."
+
#. progress step title
#: src/lib/installation/clients/save_config_finish.rb:134
msgid "Saving time zone..."
@@ -1891,6 +1874,14 @@
msgid "Copying log files to installed system..."
msgstr "正在將記錄檔案複製到已安裝的系統..."

+#. We do not need to create a wizard dialog in installation, but it's
+#. helpful when testing all manually on a running system
+#: src/lib/installation/dialogs/desktop_roles.rb:25
+#, fuzzy
+#| msgid "Computer"
+msgid "Computer Role"
+msgstr "電腦"
+
#. Event callback for the 'ok' button
#: src/lib/installation/dialogs/ssh_import.rb:65
msgid "I would like to import SSH keys from a previous installation"
@@ -1915,20 +1906,6 @@
msgid "Import SSH Configuration"
msgstr "輸入 SSH 組態"

-#. TODO: Add the registration process
-#: src/lib/installation/dialogs/worker_role.rb:45
-msgid "Dashboard U&RL"
-msgstr "儀表板 URL(&R)"
-
-#: src/lib/installation/dialogs/worker_role.rb:52
-msgid "Worker Registration"
-msgstr "工作者註冊"
-
-#. FIXME: This client is a POC and still under definition
-#: src/lib/installation/dialogs/worker_role.rb:58
-msgid "Enter the url of the admin dashboard to register as a worker"
-msgstr "輸入管理員儀表板的 URL 以使用工作者身分註冊"
-
#. progress step title
#: src/lib/installation/prep_shrink.rb:34
msgid "Shrinking PREP partition..."
@@ -2170,7 +2147,7 @@
msgstr "正在啟用遠端管理..."

#. A Continue-Cancel popup
-#: src/lib/installation/select_system_role.rb:97
+#: src/lib/installation/select_system_role.rb:92
msgid "Changing the system role may undo adjustments you may have done."
msgstr "變更系統角色可能會復原您所做的調整。"

@@ -2224,6 +2201,26 @@
msgid "SSH host keys will be copied from %s"
msgstr "將從 %s 複製 SSH 主機金鑰"

+#. Ask the user to chose a registration server
+#.
+#. @param services [Array<SlpServiceClass::Service>] Array of registration
servers
+#. @return [SlpServiceClass::Service,Symbol] Registration service to use; :scc
if SCC is selected;
+#. :cancel if the dialog was dismissed.
+#: src/lib/installation/update_repositories_finder.rb:250
+msgid ""
+"Select a detected registration server from the list\n"
+"to search for installer updates."
+msgstr ""
+"從清單中選取一個偵測到的註冊\n"
+"伺服器以搜尋安裝程式更新。"
+
+#. sets flag if online repositories dialog should be shown
+#: src/lib/installation/widgets/online_repos.rb:13
+#, fuzzy
+#| msgid "Configured Repositories"
+msgid "Configure On-line Repositories"
+msgstr "已設定的儲存庫"
+
#. autoyast tried to read a file but had no success.
#: src/lib/transfer/file_from_url.rb:156
msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
@@ -2320,3 +2317,55 @@
msgstr ""
"安裝程序無法自動解析套件相依性。\n"
"將會開啟軟體管理員,以便您手動解析相依性。"
+
+#~ msgid ""
+#~ "<p>At Linux <b>choice</b> is a top priority. <i>openSUSE</i> offers a
number \n"
+#~ "of different desktop environments. Below you see a list of the 2 major
ones \n"
+#~ "<b>GNOME</b> and <b>KDE</b>.</p>"
+#~ msgstr ""
+#~ "<p>在 Linux 系統上<b>選擇</b>具有最高優先程度。<i>openSUSE</i> 提供了\n"
+#~ "一些不同的桌面環境。下面您可以看到兩個主要環境的清單\n"
+#~ "<b>GNOME</b> 和 <b>KDE</b>。</p>"
+
+#~ msgid ""
+#~ "<p>You may select alternative desktop environments (or one of minimal
installation patterns)\n"
+#~ "that could fit your needs better using the <b>Other</b> option . Later in
the software \n"
+#~ "selection or after installation, you can change your selection or add
additional desktop \n"
+#~ "environments. This screen allows you to set the default.</p>"
+#~ msgstr ""
+#~ "<p>您可以使用<b>其他</b>選項,選擇其他更適合您需求的桌面環境\n"
+#~ "(或最小安裝模式的環境)。在之後的軟體\n"
+#~ "選擇或安裝完後,您可以變更您的選擇或是新增\n"
+#~ "其他的桌面環境。這個畫面可讓您設定預設值。</p>"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "桌面選擇"
+
+#~ msgid ""
+#~ "No desktop type was selected.\n"
+#~ "Select the desired desktop environment."
+#~ msgstr ""
+#~ "未選取桌面類型。\n"
+#~ "請選取所需的桌面環境。"
+
+#~ msgid "Other"
+#~ msgstr "其他"
+
+#~ msgid ""
+#~ "<p>Cannot obtain the installer update repository URL\n"
+#~ "from the registration server.</p>"
+#~ msgstr ""
+#~ "<p>無法從註冊伺服器獲取\n"
+#~ "安裝程式更新儲存庫 URL。</p>"
+
+#~ msgid "<p>The default URL %s will be used.<p>"
+#~ msgstr "<p>將使用預設 URL %s。<p>"
+
+#~ msgid "Dashboard U&RL"
+#~ msgstr "儀表板 URL(&R)"
+
+#~ msgid "Worker Registration"
+#~ msgstr "工作者註冊"
+
+#~ msgid "Enter the url of the admin dashboard to register as a worker"
+#~ msgstr "輸入管理員儀表板的 URL 以使用工作者身分註冊"

Modified: branches/SLE12-SP3/yast/zh_TW/po/iscsi-lio-server.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/iscsi-lio-server.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/iscsi-lio-server.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: iscsi-lio-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:28+0000\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -90,6 +90,7 @@
msgstr "名稱"

#: src/include/iscsi-lio-server/dialogs.rb:149
+#: src/include/iscsi-lio-server/widgets.rb:336
msgid "Path"
msgstr "路徑"

@@ -546,14 +547,14 @@
msgid "Selected Path is already in use!"
msgstr "選取的路徑已在使用中!"

-#: src/include/iscsi-lio-server/widgets.rb:336
-msgid "Path:"
-msgstr "路徑︰"
-
#: src/include/iscsi-lio-server/widgets.rb:339
msgid "Browse"
msgstr "瀏覽"

+#: src/include/iscsi-lio-server/widgets.rb:344
+msgid "Name (autogenerated when empty)"
+msgstr ""
+
#: src/include/iscsi-lio-server/widgets.rb:359
msgid "Select file or device"
msgstr "選取檔案或裝置"
@@ -567,8 +568,8 @@
msgstr "目標 LUN"

#: src/include/iscsi-lio-server/widgets.rb:470
-msgid "Change:"
-msgstr "變更:"
+msgid "Change"
+msgstr "變更"

#: src/include/iscsi-lio-server/widgets.rb:563
msgid "Target LUN %1 used more than once!"
@@ -579,7 +580,9 @@
msgstr "至少需要啟用一項驗證!"

#: src/include/iscsi-lio-server/widgets.rb:645
-msgid "Initiator name:"
+#, fuzzy
+#| msgid "Initiator name:"
+msgid "Initiator name"
msgstr "啟動器名稱︰"

#: src/include/iscsi-lio-server/widgets.rb:648
@@ -602,7 +605,9 @@
#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
#: src/include/iscsi-lio-server/widgets.rb:704
-msgid "New initiator name:"
+#, fuzzy
+#| msgid "New initiator name:"
+msgid "New initiator name"
msgstr "新啟動器名稱︰"

#: src/include/iscsi-lio-server/widgets.rb:750
@@ -828,3 +833,9 @@
#: src/modules/IscsiLioServer.rb:425
msgid "Configuration summary..."
msgstr "組態摘要..."
+
+#~ msgid "Path:"
+#~ msgstr "路徑︰"
+
+#~ msgid "Change:"
+#~ msgstr "變更:"

Modified: branches/SLE12-SP3/yast/zh_TW/po/kdump.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/kdump.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/kdump.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kdump\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-16 02:29+0000\n"
+"POT-Creation-Date: 2017-03-31 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -362,7 +362,7 @@
#. Force value to false, so it's actually rewritten
#. TRANSLATORS: CommandLine printed text
#. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:513
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:535
msgid "To apply changes a reboot is necessary."
msgstr "若要套用變更,必須重新開機。"

@@ -1230,7 +1230,7 @@

#. @param update_command [String] a command for .target.bash
#. @return [Boolean] whether successful
-#: src/modules/Kdump.rb:414
+#: src/modules/Kdump.rb:427
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
@@ -1239,129 +1239,129 @@
"如需詳細資料,請參閱 %{log}。"

#. Kdump read dialog caption
-#: src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:545
msgid "Initializing kdump Configuration"
msgstr "啟始化 kdump 組態"

#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:532 src/modules/Kdump.rb:540
+#: src/modules/Kdump.rb:554 src/modules/Kdump.rb:562
msgid "Reading the config file..."
msgstr "正在讀取組態檔案..."

#. Progress stage 3/4
-#: src/modules/Kdump.rb:534
+#: src/modules/Kdump.rb:556
msgid "Reading kernel boot options..."
msgstr "正在讀取核心開機選項..."

#. Progress stage 4/4
-#: src/modules/Kdump.rb:536
+#: src/modules/Kdump.rb:558
msgid "Calculating memory limits..."
msgstr "正在計算記憶體限制..."

#. Progress step 2/4
-#: src/modules/Kdump.rb:542
+#: src/modules/Kdump.rb:564
msgid "Reading partitions of disks..."
msgstr "正在讀取磁碟分割區..."

#. Progress finished 3/4
-#: src/modules/Kdump.rb:544
+#: src/modules/Kdump.rb:566
msgid "Reading available memory and calibrating usage..."
msgstr "正在讀取可用記憶體並校正使用量..."

#. Error message
-#: src/modules/Kdump.rb:556
+#: src/modules/Kdump.rb:578
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "無法讀取組態檔案 /etc/sysconfig/kdump"

#. Error message
-#: src/modules/Kdump.rb:564
+#: src/modules/Kdump.rb:586
msgid "Cannot read kernel boot options."
msgstr "無法讀取核心開機選項。"

#. Error message
-#: src/modules/Kdump.rb:572
+#: src/modules/Kdump.rb:594
msgid "Cannot read available memory."
msgstr "無法讀取可用的記憶體。"

#. Kdump read dialog caption
-#: src/modules/Kdump.rb:598
+#: src/modules/Kdump.rb:620
msgid "Saving kdump Configuration"
msgstr "儲存 kdump 組態"

#. Progress stage 1/2
-#: src/modules/Kdump.rb:627
+#: src/modules/Kdump.rb:649
msgid "Write the settings"
msgstr "寫入設定"

#. Progress stage 2/2
-#: src/modules/Kdump.rb:629
+#: src/modules/Kdump.rb:651
msgid "Update boot options"
msgstr "更新開機選項"

#. Progress step 1/2
-#: src/modules/Kdump.rb:633
+#: src/modules/Kdump.rb:655
msgid "Writing the settings..."
msgstr "正在寫入設定..."

#. Progress step 2/2
-#: src/modules/Kdump.rb:635
+#: src/modules/Kdump.rb:657
msgid "Updating boot options..."
msgstr "正在更新開機選項..."

#. Progress finished
-#: src/modules/Kdump.rb:637
+#: src/modules/Kdump.rb:659
msgid "Finished"
msgstr "已完成"

#. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:669
msgid "Cannot write settings."
msgstr "無法寫入設定。"

#. Error message
-#: src/modules/Kdump.rb:656
+#: src/modules/Kdump.rb:678
msgid "Adding crashkernel parameter to bootloader fault."
msgstr "將 crashkernel 參數新增至開機載入程式錯誤。"

#. Create a textual summary
#. @return summary of the current configuration
-#: src/modules/Kdump.rb:774
+#: src/modules/Kdump.rb:796
msgid "Kdump status: %1"
msgstr "Kdump 狀態︰%1"

-#: src/modules/Kdump.rb:775
+#: src/modules/Kdump.rb:797
msgid "enabled"
msgstr "已啟用"

-#: src/modules/Kdump.rb:775
+#: src/modules/Kdump.rb:797
msgid "disabled"
msgstr "已停用"

-#: src/modules/Kdump.rb:782
+#: src/modules/Kdump.rb:804
msgid "Value(s) of crashkernel option: %1"
msgstr "crashkernel 選項的值︰%1"

-#: src/modules/Kdump.rb:789
+#: src/modules/Kdump.rb:811
msgid "Dump format: %1"
msgstr "傾印格式︰%1"

-#: src/modules/Kdump.rb:796
+#: src/modules/Kdump.rb:818
msgid "Target of dumps: %1"
msgstr "傾印目標︰%1"

-#: src/modules/Kdump.rb:803
+#: src/modules/Kdump.rb:825
msgid "Number of dumps: %1"
msgstr "傾印數︰%1"

#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with
actual sizes later
-#: src/modules/Kdump.rb:895
+#: src/modules/Kdump.rb:917
msgid "Warning! There might not be enough free space. %{required} required,
but only %{available} are available."
msgstr "警告!可用的空間可能不足。需要 %{required},但可用空間只有 %{available}。"

#. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:992
+#: src/modules/Kdump.rb:1025
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."

Modified: branches/SLE12-SP3/yast/zh_TW/po/network.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/network.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/network.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-01 02:29+0000\n"
+"POT-Creation-Date: 2017-04-08 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -574,7 +574,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:473
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:510
msgid "Routing Configuration"
msgstr "路由組態"

@@ -660,7 +660,9 @@
msgstr "閘道"

#. Table header label
+#. Table header 3/4
#: src/clients/routing.rb:208 src/include/network/lan/address.rb:101
+#: src/include/network/services/routing.rb:89
msgid "Netmask"
msgstr "網路遮罩"

@@ -741,13 +743,13 @@

#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1458
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1456
msgid "Warning: no encryption is used."
msgstr "警告:未使用加密。"

#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1460
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1458
msgid "Change."
msgstr "變更。"

@@ -2254,17 +2256,26 @@
"讓您知道「其他的項目應該在這裡」而已。</p>\n"

#: src/include/network/lan/help.rb:99
+#, fuzzy
+#| msgid ""
+#| "<p>For each route, enter destination network IP address, gateway
address,\n"
+#| "and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
+#| "the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.</p>\n"
msgid ""
"<p>For each route, enter destination network IP address, gateway address,\n"
-"and netmask. To omit any of these values, use a dash sign \"-\". Select\n"
-"the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.</p>\n"
+"and netmask. You can use either IPv4 netmask or prefix length when defining\n"
+"network part of route. Prefix length has to be prefixed using '/'.\n"
+"To omit any of these values, use a dash sign \"-\". Select\n"
+"the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.\n"
+"Please note that in case of IPv6 networks only prefix length is accepted\n"
+"for netmask definition.</p>\n"
msgstr ""
"<p>為每個路由輸入目的地網路 IP 位址、閘道位址\n"
"與網路遮罩。若要省略這些值的任何一個,請使用破折號「-」。\n"
"同時請選取要透過其將流量路由至已定義網路的裝置,「-」表示任何介面的別名。</p>\n"

#. Routing dialog help 2/2
-#: src/include/network/lan/help.rb:105
+#: src/include/network/lan/help.rb:109
msgid ""
"<p>Enable <b>IPv4 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2272,7 +2283,7 @@
"<p>如果此系統是路由器,則啟用<b>「IPv4 轉遞」</b>(將封包從外部網路轉遞到\n"
"內部網路)。\n"

-#: src/include/network/lan/help.rb:109
+#: src/include/network/lan/help.rb:113
msgid ""
"<p>Enable <b>IPv6 Forwarding</b> (forwarding packets from external networks\n"
"to the internal one) if this system is a router.\n"
@@ -2284,7 +2295,7 @@
"<b>警告:</b>IPv6 轉遞會停用 IPv6 無狀態位址\n"
"自動組態 (SLAAC)。"

-#: src/include/network/lan/help.rb:115
+#: src/include/network/lan/help.rb:119
msgid ""
"<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is
not enough. \n"
"You should enable masquerading and/or set at least one redirect rule in the\n"
@@ -2294,7 +2305,7 @@
"應該啟用偽裝,並且/或者在防火牆組態中至少\n"
"設定一個重新導向規則。請使用 YaST 防火牆模組。</p>\n"

-#: src/include/network/lan/help.rb:121
+#: src/include/network/lan/help.rb:125
msgid ""
"<p>If you are using DHCP to get an IP address, check whether you get\n"
"also a hostname via DHCP. The hostname will be set automatically by the DHCP
client.\n"
@@ -2312,7 +2323,7 @@
"「任何」選項。不過,如果有多重主目錄系統連接至\n"
"多個 DHCP 網路,此選項可能會導致異常行為。</p>\n"

-#: src/include/network/lan/help.rb:131
+#: src/include/network/lan/help.rb:135
msgid ""
"<p><b>Assign Hostname to Loopback IP</b> associates your hostname with \n"
"the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is
a \n"
@@ -2326,7 +2337,7 @@
"選擇此選項會很有用。若非如此,請慎用此選項,\n"
"尤其是在此電腦提供某些網路服務的情況下更應小心。</p>\n"

-#: src/include/network/lan/help.rb:139
+#: src/include/network/lan/help.rb:143
msgid ""
"<p>Enter the name servers and domain search list for resolving \n"
"hostnames. Usually they can be obtained by DHCP.</p>\n"
@@ -2335,7 +2346,7 @@
"搜尋清單。通常這些可用 DHCP 取得。</p>\n"

#. resolver dialog help
-#: src/include/network/lan/help.rb:143
+#: src/include/network/lan/help.rb:147
msgid ""
"<p>A name server is a computer that translates hostnames into\n"
"IP addresses. This value must be entered as an <b>IP address</b>\n"
@@ -2346,7 +2357,7 @@
"(例如 192.168.0.42),而不是主機名稱。</p>\n"

#. resolver dialog help
-#: src/include/network/lan/help.rb:149
+#: src/include/network/lan/help.rb:153
msgid ""
"<p>Search domain is the domain name where hostname searching starts.\n"
"The primary search domain is usually the same as the domain name of\n"
@@ -2358,7 +2369,7 @@
"相同 (例如,suse.de)。可能還有其他搜尋網域\n"
"(像是 suse.com)。請以逗號或空格隔開網域。</p>\n"

-#: src/include/network/lan/help.rb:156
+#: src/include/network/lan/help.rb:160
msgid ""
"<p>Enter the short name for this computer (e.g. <i>mymachine</i>) and the DNS
domain\n"
"(e.g. <i>example.com</i>) that it belongs to. The domain is especially
important if this \n"
@@ -2370,7 +2381,7 @@
"網域就格外重要。使用 <i>hostname</i> 指令可以檢視電腦的\n"
"主機名稱。</p>"

-#: src/include/network/lan/help.rb:163
+#: src/include/network/lan/help.rb:167
msgid ""
"<p>Select the way how the DNS configuration will be modified (name servers,\n"
"search list, the content of <i>/etc/resolv.conf</i>). Normally, it is
handled\n"
@@ -2386,7 +2397,7 @@
"合併。此為預設選項。<b>「使用預設規則」</b>\n"
"對大部份組態而言已經足夠。</p>\n"

-#: src/include/network/lan/help.rb:171
+#: src/include/network/lan/help.rb:175
msgid ""
"<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be\n"
"allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file\n"
@@ -2408,7 +2419,7 @@

#. Address dialog help 1-6/8: dynamic address preferred
#. Address dialog help 1/8
-#: src/include/network/lan/help.rb:183
+#: src/include/network/lan/help.rb:187
msgid ""
"<p><b><big>Address Setup</big></b></p>\n"
"<p>Select <b>No Address Setup</b> if you do not want to assign an IP address
to this device.\n"
@@ -2418,12 +2429,12 @@
"<p>若不想為此裝置指定 IP 位址,請選取<b>無位址設定</b>。\n"
"這在結合乙太網路裝置時特別有用。</p>\n"

-#: src/include/network/lan/help.rb:188
+#: src/include/network/lan/help.rb:192
msgid "<p>Check <b>iBFT</b> if you want to keep the network configured in your
BIOS.</p>\n"
msgstr "<p>如果您想要確保在 BIOS 中設定網路,請核取 <b>iBFT</b>。</p>\n"

#. Address dialog help 2/8
-#: src/include/network/lan/help.rb:192
+#: src/include/network/lan/help.rb:196
msgid ""
"<p>Select <b>Dynamic Address</b> if you do not have a static IP address \n"
"assigned by the system administrator or your Internet provider.</p>\n"
@@ -2432,7 +2443,7 @@
"靜態 IP 位址,請選取<b>「動態位址」</b>。</p>\n"

#. Address dialog help 3/8
-#: src/include/network/lan/help.rb:196
+#: src/include/network/lan/help.rb:200
msgid ""
"<p>Choose one of the dynamic address assignment methods. Select <b>DHCP</b>\n"
"if you have a DHCP server running on your local network. Network addresses \n"
@@ -2443,7 +2454,7 @@
"從該伺服器自動取得。</p>\n"

#. Address dialog help 4/8
-#: src/include/network/lan/help.rb:202
+#: src/include/network/lan/help.rb:206
msgid ""
"<p>To search for an IP address and assign it statically, select \n"
"<b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP +
Zeroconf\n"
@@ -2454,7 +2465,7 @@
"否則,必須<b>靜態</b>指定網路位址。</p>\n"

#. Address dialog help 5/8
-#: src/include/network/lan/help.rb:209
+#: src/include/network/lan/help.rb:213
msgid ""
"<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for
your computer, and the \n"
" <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>)\n"
@@ -2465,7 +2476,7 @@
"</p>\n"

#. Address dialog help 6/8
-#: src/include/network/lan/help.rb:216
+#: src/include/network/lan/help.rb:220
msgid ""
"<p>For <b>Static Address Setup</b> enter the static IP address for your
computer (for example: <tt>192.168.100.99</tt>) and\n"
"the network mask (usually <tt>255.255.255.0</tt> or just length of prefix
<tt>/24</tt>).Optionally, you can enter\n"
@@ -2476,7 +2487,7 @@
"輸入完全合格主機名稱。主機名稱將被寫入 <tt>/etc/hosts</tt>。</p>\n"

#. Address dialog help 8/8
-#: src/include/network/lan/help.rb:222
+#: src/include/network/lan/help.rb:226
msgid ""
"<p>Contact your <b>network administrator</b> for more information about\n"
"the network configuration.</p>"
@@ -2484,7 +2495,7 @@
"<p>如需網路組態的詳細資訊,\n"
"請聯絡<b>網路管理員</b>。</p>"

-#: src/include/network/lan/help.rb:226
+#: src/include/network/lan/help.rb:230
msgid ""
"<p>DHCP configuration is not recommended for this product.\n"
"Components of this product might not work with DHCP.</p>"
@@ -2492,7 +2503,7 @@
"<p>不建議此產品使用 DHCP 組態。\n"
"此產品的元件可能無法使用 DHCP。</p>"

-#: src/include/network/lan/help.rb:230
+#: src/include/network/lan/help.rb:234
msgid ""
"<p><b><big>Firewall Zone</big></b></p>\n"
"<p>Select the firewall zone to put the interface into. If you\n"
@@ -2510,11 +2521,11 @@
"流量。若您未選取區域,且沒有其他介面存在,\n"
"則將停用防火牆。</p>"

-#: src/include/network/lan/help.rb:240
+#: src/include/network/lan/help.rb:244
msgid "<p><b>Mandatory Interface</b> specifies whether the network service
reports failure if the interface fails to start at boot time.</p>"
msgstr "<p><b>強制介面</b>可指定當介面無法在開機時啟動時,網路服務是否報告失敗。</p>"

-#: src/include/network/lan/help.rb:244
+#: src/include/network/lan/help.rb:248
msgid ""
"<p><b><big>Maximum Transfer Unit</big></b></p>\n"
"<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,\n"
@@ -2530,7 +2541,7 @@
"尤其在低速的撥號連接中。您可以選取其中一個建議值,\n"
"或定義其他值。</p>\n"

-#: src/include/network/lan/help.rb:253
+#: src/include/network/lan/help.rb:257
msgid ""
"<p>Select the slave devices for the bond device.\n"
"Only devices with the device activation set to <b>Never</b> and with <b>No
Address Setup</b> are available.</p>"
@@ -2539,12 +2550,12 @@
"您只能選擇「裝置啟動」設定為<b>「永不」</b>,且 IP 設定為<b>「無位址設定」</b>的裝置。</p>"

#. DHCP dialog help 1/7
-#: src/include/network/lan/help.rb:257
+#: src/include/network/lan/help.rb:261
msgid "<p><b><big>DHCP Client Options</big></b></p>"
msgstr "<p><b><big>DHCP 用戶端選項</big></b></p>"

#. DHCP dialog help 2/7
-#: src/include/network/lan/help.rb:259
+#: src/include/network/lan/help.rb:263
msgid ""
"<p>The <b>DHCP Client Identifier</b>, if left empty, defaults to\n"
"the hardware address of the network interface. It must be different for
each\n"
@@ -2559,7 +2570,7 @@
"請在此處指定唯一且不限格式的識別碼。</p>"

#. DHCP dialog help 3/7
-#: src/include/network/lan/help.rb:267
+#: src/include/network/lan/help.rb:271
msgid ""
"<p>The <b>Hostname to Send</b> specifies a string used for the\n"
"hostname option field when the DHCP client sends messages to the DHCP server.
Some \n"
@@ -2580,7 +2591,7 @@
"若不想傳送主機名稱,請將該欄位保留空白。</p>\n"

#. Aliases dialog help 1/4
-#: src/include/network/lan/help.rb:278
+#: src/include/network/lan/help.rb:282
msgid ""
"<p><b><big>Additional Addresses</big></b></p>\n"
"<p>Configure additional addresses of an interface in this table.</p>\n"
@@ -2589,7 +2600,7 @@
"<p>在此表中設定介面的其他位址。</p>\n"

#. Aliases dialog help 2/4
-#: src/include/network/lan/help.rb:282
+#: src/include/network/lan/help.rb:286
msgid ""
"<p>Enter an <b>IPv4 Address Label</b>, an <b>IP Address</b>, and\n"
"the <b>Netmask</b>.</p>"
@@ -2598,7 +2609,7 @@
"<b>「網路遮罩」</b>。</p>"

#. Aliases dialog help 3/4
-#: src/include/network/lan/help.rb:286
+#: src/include/network/lan/help.rb:290
msgid ""
"<p><b>IPv4 Address Label</b>, formerly known as Alias Name, is optional and
legacy. The total\n"
"length of interface name (inclusive of the colon and label) is\n"
@@ -2609,14 +2620,14 @@
"限制為 15 個字元。過時的 ifconfig 公用程式會截掉第 9 個字元後面的部分。</p>"

#. Aliases dialog help 3/4, #83766
-#: src/include/network/lan/help.rb:292
+#: src/include/network/lan/help.rb:296
msgid "<p>Do not include the interface name in the label. For example, enter
<b>foo</b> instead of <b>eth0:foo</b>.</p>"
msgstr "<p>請不要在標籤中包含介面名稱。例如,請輸入 <b>foo</b> 而不是 <b>eth0:foo</b>。</p>"

#. shared between WirelessDialog and WirelessKeyPopup
#. this is suited to the button-switched key typing
#. Translators: dialog help
-#: src/include/network/lan/help.rb:299
+#: src/include/network/lan/help.rb:303
msgid ""
"<p>Choose between three <b>Key Input Types</b> for your key.\n"
"<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
@@ -2645,7 +2656,7 @@
"</p> \n"

#. Wireless dialog help
-#: src/include/network/lan/help.rb:314
+#: src/include/network/lan/help.rb:318
msgid ""
"<p>Here, set the most important settings\n"
"for wireless networking.</p>"
@@ -2653,7 +2664,7 @@
"<p>可在此處設定無線網路連接的\n"
"最重要設定。</p>"

-#: src/include/network/lan/help.rb:317
+#: src/include/network/lan/help.rb:321
msgid ""
"<p>The <b>Operating Mode</b> depends on the network topology. The mode\n"
"can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n"
@@ -2667,7 +2678,7 @@
"稱為<i>基礎結構模式</i>) 或<b>「主要」</b> (網路卡\n"
"做為存取點)。</p>\n"

-#: src/include/network/lan/help.rb:324
+#: src/include/network/lan/help.rb:328
msgid ""
"<p>Set the <b>Network Name (ESSID)</b> used to identify\n"
"cells that are part of the same virtual network. All stations in a\n"
@@ -2685,7 +2696,7 @@
"情況下,您的無線區域網路卡可使用最強的訊號強度來與存取點\n"
"建立關聯。</p>\n"

-#: src/include/network/lan/help.rb:333
+#: src/include/network/lan/help.rb:337
msgid ""
"<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
"It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
@@ -2721,7 +2732,7 @@
"驗證模式。這僅能運作於\n"
"<b>「管理的」</b>操作模式。</p>\n"

-#: src/include/network/lan/help.rb:351
+#: src/include/network/lan/help.rb:355
msgid ""
"<p>To use WEP, enter the\n"
"WEP encryption key to use. It can have a key\n"
@@ -2736,7 +2747,7 @@
"乃是動態產生,因此您只需要輸入 40 至 232 個位元。</p>\n"

#. Wireless dialog help
-#: src/include/network/lan/help.rb:359
+#: src/include/network/lan/help.rb:363
msgid ""
"<p>To use WPA-PSK (sometimes referred to as WPA Home),\n"
"enter the preshared key. This\n"
@@ -2752,7 +2763,7 @@
"仍可能發生字典攻擊。請避免使用\n"
"易於猜到的字做為密碼片語。</p>\n"

-#: src/include/network/lan/help.rb:367
+#: src/include/network/lan/help.rb:371
msgid ""
"<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
"enter some additional parameters in the next dialog.</p>\n"
@@ -2760,7 +2771,7 @@
"<p>若要使用 WPA-EAP (有時稱為 WPA Enterprise),\n"
"請在下一個對話方塊中輸入其他某些參數。</p>\n"

-#: src/include/network/lan/help.rb:370
+#: src/include/network/lan/help.rb:374
msgid ""
"<p>These values will be written to the interface configuration file\n"
"'ifcfg-*' in '/etc/sysconfig/network'. If you need additional settings,\n"
@@ -3674,11 +3685,6 @@
msgid "Default IPv6 &Gateway"
msgstr "預設 IPv6 閘道(&G)"

-#. Table header 3/4
-#: src/include/network/services/routing.rb:89
-msgid "Genmask"
-msgstr "網路遮罩"
-
#. CheckBox label
#: src/include/network/services/routing.rb:110
msgid "Enable &IPv4 Forwarding"
@@ -3697,40 +3703,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:163
+#: src/include/network/services/routing.rb:181
msgid "&Destination"
msgstr "目的地(&D)"

-#: src/include/network/services/routing.rb:171
-msgid "Ge&nmask"
+#: src/include/network/services/routing.rb:189
+msgid "&Netmask"
msgstr "網路遮罩(&N)"

-#: src/include/network/services/routing.rb:180
+#: src/include/network/services/routing.rb:198
msgid "&Gateway"
msgstr "閘道(&G)"

-#: src/include/network/services/routing.rb:188
+#: src/include/network/services/routing.rb:206
msgid "De&vice"
msgstr "裝置(&V)"

#. Popup::Error text
-#: src/include/network/services/routing.rb:247
+#: src/include/network/services/routing.rb:261
msgid "Destination is invalid."
msgstr "目的地無效。"

#. Popup::Error text
-#: src/include/network/services/routing.rb:255
+#: src/include/network/services/routing.rb:269
msgid "Gateway IP address is invalid."
msgstr "閘道 IP 位址無效。"

#. Popup::Error text
-#: src/include/network/services/routing.rb:263
+#: src/include/network/services/routing.rb:277
msgid "Subnetmask is invalid."
msgstr "子網路遮罩無效。"

#. #178538 - disable routing dialog when NetworkManager is used
#. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:422
+#: src/include/network/services/routing.rb:436
msgid "The default gateway is invalid."
msgstr "預設閘道無效。"

@@ -4399,27 +4405,27 @@
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1339 src/modules/LanItems.rb:1343
-#: src/modules/LanItems.rb:1347
+#: src/modules/LanItems.rb:1337 src/modules/LanItems.rb:1341
+#: src/modules/LanItems.rb:1345
msgid "Started automatically at boot"
msgstr "開機時自動啟動"

#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1351
+#: src/modules/LanItems.rb:1349
msgid "Started automatically on cable connection"
msgstr "在電纜連接上自動啟動"

#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1355
+#: src/modules/LanItems.rb:1353
msgid "Managed by NetworkManager"
msgstr "由 NetworkManager 管理"

#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1359
+#: src/modules/LanItems.rb:1357
msgid "Will not be started at all"
msgstr "完全不會啟動"

-#: src/modules/LanItems.rb:1365
+#: src/modules/LanItems.rb:1363
msgid "Started manually"
msgstr "手動啟動"

@@ -4431,50 +4437,50 @@
#.
#. @param [Hash] dev_map a device's sysconfig map (in form "option" => "value")
#. @return [Array] list of strings, one string is intended for one "bullet"
-#: src/modules/LanItems.rb:1395
+#: src/modules/LanItems.rb:1393
msgid "IP address assigned using"
msgstr "IP 位址指定方式"

-#: src/modules/LanItems.rb:1399
+#: src/modules/LanItems.rb:1397
msgid "IP address: %s/%s"
msgstr "IP 位址:%s/%s"

-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1400
msgid "IP address: %s, subnet mask %s"
msgstr "IP 位址:%s,子網路遮罩:%s"

#. FIXME: side effect: sets @type. No reason for that. It should only build
item
#. overview. Check and remove.
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1446 src/modules/LanItems.rb:1502
+#: src/modules/LanItems.rb:1444 src/modules/LanItems.rb:1500
msgid "Device Name: %s"
msgstr "裝置名稱:%s"

-#: src/modules/LanItems.rb:1471
+#: src/modules/LanItems.rb:1469
msgid "Bonding master"
msgstr "結合主要"

-#: src/modules/LanItems.rb:1474
+#: src/modules/LanItems.rb:1472
msgid "Bridge"
msgstr "橋接器"

-#: src/modules/LanItems.rb:1476
+#: src/modules/LanItems.rb:1474
msgid "enslaved in %s"
msgstr "從屬於 %s"

-#: src/modules/LanItems.rb:1490
+#: src/modules/LanItems.rb:1488
msgid "Not connected"
msgstr "未連接"

-#: src/modules/LanItems.rb:1491
+#: src/modules/LanItems.rb:1489
msgid "No hwinfo"
msgstr "無硬體資訊"

-#: src/modules/LanItems.rb:1508
+#: src/modules/LanItems.rb:1506
msgid "Unable to configure the network card because the kernel device (eth0,
wlan0) is not present. This is mostly caused by missing firmware (for wlan
devices). See dmesg output for details."
msgstr "由於核心裝置 (eth0、wlan0) 不存在,無法設定網路卡。這主要是因為缺少韌體 (對於 WLAN 裝置) 而導致。如需詳細資料,請參閱
dmesg 輸出。"

-#: src/modules/LanItems.rb:1514
+#: src/modules/LanItems.rb:1512
msgid ""
"The device is not configured. Press <b>Edit</b>\n"
"to configure.\n"
@@ -4482,11 +4488,11 @@
"未設定該裝置。請按<b>「編輯」</b>\n"
"進行設定。\n"

-#: src/modules/LanItems.rb:1521
+#: src/modules/LanItems.rb:1519
msgid "Needed firmware"
msgstr "必需韌體"

-#: src/modules/LanItems.rb:1521
+#: src/modules/LanItems.rb:1519
msgid "unknown"
msgstr "未知"

@@ -4496,11 +4502,11 @@
#. @param [String] ifcfg_type
#. @param [String] ifcfg_name
#. @return [String] formated string with the interface type and the interfaces
enslaved
-#: src/modules/LanItems.rb:2547
+#: src/modules/LanItems.rb:2545
msgid "Bonding slaves"
msgstr "結合從屬"

-#: src/modules/LanItems.rb:2550
+#: src/modules/LanItems.rb:2548
msgid "Bridge Ports"
msgstr "橋接器連接埠"

@@ -4566,21 +4572,21 @@
msgstr "已停用遠端管理。"

#. Progress stage 1
-#: src/modules/Routing.rb:264
+#: src/modules/Routing.rb:312
msgid "Write IP forwarding settings"
msgstr "寫入 IP 轉遞設定"

#. Progress stage 2
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:314
msgid "Write routing settings"
msgstr "寫入路由設定"

-#: src/modules/Routing.rb:269
+#: src/modules/Routing.rb:317
msgid "Saving Routing Configuration"
msgstr "儲存路由組態"

#. Progress stage 1/2
-#: src/modules/Routing.rb:274
+#: src/modules/Routing.rb:322
msgid "Writing IP forwarding settings..."
msgstr "正在寫入 IP 轉遞設定..."

@@ -4589,22 +4595,22 @@
#. sysconfig does not support restarting routes only,
#. so we let our caller do it together with other things
#. Progress stage 2/2
-#: src/modules/Routing.rb:284
+#: src/modules/Routing.rb:332
msgid "Writing routing settings..."
msgstr "正在寫入路由設定..."

#. Summary text
-#: src/modules/Routing.rb:454
+#: src/modules/Routing.rb:502
msgid "Gateway: %s"
msgstr "閘道:%s"

#. Summary text
-#: src/modules/Routing.rb:458
+#: src/modules/Routing.rb:506
msgid "IP Forwarding for IPv4: %s"
msgstr "IPv4 的 IP 轉遞:%s"

#. Summary text
-#: src/modules/Routing.rb:462
+#: src/modules/Routing.rb:510
msgid "IP Forwarding for IPv6: %s"
msgstr "IPv6 的 IP 轉遞:%s"

@@ -4622,3 +4628,9 @@
#: src/modules/SuSEFirewall4Network.rb:139
msgid "(Unprotected)"
msgstr "(未受保護)"
+
+#~ msgid "Genmask"
+#~ msgstr "網路遮罩"
+
+#~ msgid "Ge&nmask"
+#~ msgstr "網路遮罩(&N)"

Modified: branches/SLE12-SP3/yast/zh_TW/po/packager.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/packager.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/packager.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: packager\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-29 02:28+0000\n"
+"POT-Creation-Date: 2017-04-29 02:28+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -957,7 +957,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
#: src/include/packager/repositories_include.rb:287
-#: src/modules/Packages.rb:1206 src/modules/SourceManager.rb:306
+#: src/modules/Packages.rb:1209 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
"from URL '%1'."
@@ -1299,7 +1299,7 @@

#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1211
+#: src/lib/packager/clients/repositories.rb:1056 src/modules/Packages.rb:1214
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "詳細資訊:"
@@ -1307,7 +1307,7 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1219
+#: src/lib/packager/clients/repositories.rb:1058 src/modules/Packages.rb:1222
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "再試一次?"
@@ -1467,7 +1467,7 @@
#. adding the product to the list of products (BNC #269625)
#. no such products
#: src/modules/AddOnProduct.rb:1154 src/modules/AddOnProduct.rb:1748
-#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:461
+#: src/modules/AddOnProduct.rb:1754 src/modules/Packages.rb:464
msgid "Unknown Product"
msgstr "未知的產品"

@@ -1659,23 +1659,23 @@
msgstr "套用 delta RPM:%1"

#. warning text
-#: src/modules/Packages.rb:301
+#: src/modules/Packages.rb:304
msgid "Your computer is a 64-bit x86-64 system, but you are trying to install
a 32-bit distribution."
msgstr "您的電腦為 64 位元 x86-64 系統,但您正在嘗試安裝 32 位元的發行版本。"

#. help text for software proposal
-#: src/modules/Packages.rb:317
+#: src/modules/Packages.rb:320
msgid "<P>The pattern list states which functionality will be available after
installing the system.</P>"
msgstr "<P>模式清單指明在安裝系統後,將有哪些功能可以使用。</P>"

#. (see bnc#178357 why these numbers)
#. translators: help text for software proposal
-#: src/modules/Packages.rb:329
+#: src/modules/Packages.rb:332
msgid "<P>The proposal reports the total size of files which will be installed
to the system. However, the system will contain some other files (temporary and
working files) so the used space will be slightly larger than the proposed
value. Therefore it is a good idea to have at least 25% (or about 300MB) free
space before starting the installation.</P>"
msgstr
"<P>此建議會報告將安裝到系統上的檔案大小。然而系統會包含一些其他檔案(暫存檔案和工作檔案),所以使用的空間將會稍微比建議的數值稍多一些。因此在您開始安裝之前最好多預留一些可用空間(最少
25% 或大約 300MB)。</P>"

#. help text for software proposal
-#: src/modules/Packages.rb:334
+#: src/modules/Packages.rb:337
msgid ""
"<P>The total 'size to download' is the size of the packages which will be\n"
"downloaded from remote (network) repositories. This value is important if the
connection is slow or if there is a data limit for downloading.</P>\n"
@@ -1684,112 +1684,112 @@
"在網路連接緩慢或下載資料大小受限的情況下,此數值非常重要。</P>\n"

#. help text for software proposal - header
-#: src/modules/Packages.rb:343
+#: src/modules/Packages.rb:346
msgid "<P><B>Software Proposal</B></P>"
msgstr "<P><B>軟體建議</B></P>"

#. installation proposal - SW summary, %1 is name of the installed product
#. (e.g. openSUSE 10.3, SUSE Linux Enterprise ...)
-#: src/modules/Packages.rb:360
+#: src/modules/Packages.rb:363
msgid "Product: %1"
msgstr "產品:%1"

#. installation proposal - SW summary, %1 is name of the selected desktop or
system type (e.g. KDE)
-#: src/modules/Packages.rb:374
+#: src/modules/Packages.rb:377
msgid "System Type: %1"
msgstr "系統類型:%1"

-#: src/modules/Packages.rb:385
+#: src/modules/Packages.rb:388
msgid "Patterns:<br>"
msgstr "模式:<br>"

#. installation proposal - SW summary, %1 is size of the selected packages (in
MB or GB)
-#: src/modules/Packages.rb:395
+#: src/modules/Packages.rb:398
msgid "Size of Packages to Install: %1"
msgstr "要安裝套件的大小:%1"

#. installation proposal - SW summary, %1 is download size of the selected
packages
#. which will be installed from an ftp or http repository (in MB or GB)
-#: src/modules/Packages.rb:408
+#: src/modules/Packages.rb:411
msgid "Downloading from Remote Repositories: %1"
msgstr "正在從遠端儲存庫下載:%1"

-#: src/modules/Packages.rb:470
+#: src/modules/Packages.rb:473
msgid "These add-on products have been marked for auto-removal: %1"
msgstr "這些附加產品已被標示為自動移除:%1"

#. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:494
+#: src/modules/Packages.rb:497
msgid "Contact the vendors of these add-ons to provide you with new
installation media."
msgstr "請連繫這些附加產品的供應商提供新的安裝媒體。"

#. Warning message when some add-ons are marked to be removed automatically
-#: src/modules/Packages.rb:498
+#: src/modules/Packages.rb:501
msgid "Contact the vendor of the add-on to provide you with a new installation
media."
msgstr "連繫附加產品供應商以提供新的安裝媒體。"

#. error message: %1: e.g. "/usr", %2: "/dev/sda2"
-#: src/modules/Packages.rb:539
+#: src/modules/Packages.rb:542
msgid "Error: Cannot check free space in basic directory %1 (device %2),
cannot start installation."
msgstr "錯誤:無法檢查基礎目錄 %1 (裝置 %2) 的可用空間,無法開始安裝。"

#. error message: %1: e.g. "/local", %2: "/dev/sda2"
-#: src/modules/Packages.rb:559
+#: src/modules/Packages.rb:562
msgid "Warning: Cannot check free space in directory %1 (device %2)."
msgstr "警告:無法檢查目錄 %1 的可用空間 (裝置 %2)。"

#. summary warning
-#: src/modules/Packages.rb:602
+#: src/modules/Packages.rb:605
msgid "Not enough disk space."
msgstr "磁碟空間不足。"

#. summary warning
-#: src/modules/Packages.rb:604
+#: src/modules/Packages.rb:607
msgid "Not enough disk space. Remove some packages in the single selection."
msgstr "磁碟空間不足。請移除單一選擇中的某些套件。"

#. add a backslash if it's missing
-#: src/modules/Packages.rb:625
+#: src/modules/Packages.rb:628
msgid "Only %1 (%2%%) free space available on partition %3.<BR>"
msgstr "分割區 %3 上僅有 %1 (%2%%) 可用空間。<BR>"

#. Check the YaST required packages.
-#: src/modules/Packages.rb:645
+#: src/modules/Packages.rb:648
msgid "Please manually select the needed items to install."
msgstr "請手動選取需要安裝的的項目。"

#. newly installed products
-#: src/modules/Packages.rb:707
+#: src/modules/Packages.rb:710
msgid "New product <b>%s</b> will be installed"
msgstr "將安裝新產品 <b>%s</b>"

#. product update: %s is a product name
-#: src/modules/Packages.rb:717
+#: src/modules/Packages.rb:720
msgid "Product <b>%s</b> will be updated"
msgstr "將更新產品 <b>%s</b>"

#. product update: %{old_product} is an old product, %{new_product} is the new
one
-#: src/modules/Packages.rb:719
+#: src/modules/Packages.rb:722
msgid "Product <b>%{old_product}</b> will be updated to <b>%{new_product}</b>"
msgstr "產品 <b>%{old_product}</b> 將更新為 <b>%{new_product}</b>"

-#: src/modules/Packages.rb:726
+#: src/modules/Packages.rb:729
msgid "Product <b>%s</b> will stay installed"
msgstr "仍將安裝產品 <b>%s</b>"

#. Removing another product might be an issue
#. (just warn if removed by user or by YaST)
-#: src/modules/Packages.rb:736
+#: src/modules/Packages.rb:739
msgid "<b>Warning:</b> Product <b>%s</b> will be removed."
msgstr "<b>警告︰</b>將移除產品 <b>%s</b>。"

-#: src/modules/Packages.rb:737
+#: src/modules/Packages.rb:740
msgid "<b>Error:</b> Product <b>%s</b> will be automatically removed."
msgstr "<b>錯誤︰</b>將自動移除產品 <b>%s</b>。"

#. TRANSLATORS: update proposal warning, do NOT translate "-release",
#. it is part of a package name (like "sles-release")
-#: src/modules/Packages.rb:763
+#: src/modules/Packages.rb:766
msgid ""
"<ul><li><b>Some products are marked for automatic removal.</b></li>\n"
"<ul><li>Contact the vendor of the removed add-on to provide you with a new\n"
@@ -1806,12 +1806,12 @@
"</li></ul></li></ul>"

#. error in proposal, %1 is URL
-#: src/modules/Packages.rb:1227
+#: src/modules/Packages.rb:1230
msgid "No repository found at '%1'."
msgstr "在 %1 中找不到儲存庫。"

#. TRANSLATORS: beginning of the rich text with the release notes
-#: src/modules/Packages.rb:1500
+#: src/modules/Packages.rb:1503
msgid ""
"<p><b>The release notes for the initial release are part of the
installation\n"
"media. If an Internet connection is available during configuration, you can\n"
@@ -1822,31 +1822,31 @@
"伺服器下載更新的發行摘要。</b></p>\n"

#. popup - information label
-#: src/modules/Packages.rb:1527
+#: src/modules/Packages.rb:1530
msgid "Integrating booted media..."
msgstr "正在整合已開機的媒體..."

#. close the popup in order to be able to ask about the license
-#: src/modules/Packages.rb:1549
+#: src/modules/Packages.rb:1552
msgid "Failed to integrate the service pack repository."
msgstr "無法整合 Service Pack 儲存庫。"

#. popup - information label
-#: src/modules/Packages.rb:1582
+#: src/modules/Packages.rb:1585
msgid "Initializing repositories..."
msgstr "正在啟始化儲存庫..."

#. message popup, %1 is product name
-#: src/modules/Packages.rb:1814
+#: src/modules/Packages.rb:1825
msgid "Insert %1 CD 1"
msgstr "插入 %1 CD 1"

-#: src/modules/Packages.rb:1816
+#: src/modules/Packages.rb:1827
msgid "%1 CD 1 not found"
msgstr "找不到 %1 CD 1"

#. an error message
-#: src/modules/Packages.rb:1926
+#: src/modules/Packages.rb:1937
msgid ""
"Error while initializing package descriptions.\n"
"Check the log file %1 for more details."
@@ -1855,7 +1855,7 @@
"請檢查記錄檔案 %1,以取得詳細資訊。"

#. bnc #436925
-#: src/modules/Packages.rb:2198
+#: src/modules/Packages.rb:2209
msgid ""
"The software selection has been changed externally.\n"
"Software proposal will be called again."
@@ -1864,12 +1864,12 @@
"系統將會再次呼叫軟體建議。"

#. popup label
-#: src/modules/Packages.rb:2216
+#: src/modules/Packages.rb:2227
msgid "Evaluating package selection..."
msgstr "正在評估套件選項..."

#. Error message, %{pattern_name} is replaced with the missing pattern name in
runtime
-#: src/modules/Packages.rb:2559
+#: src/modules/Packages.rb:2570
msgid ""
"Failed to select default product pattern %{pattern_name}.\n"
"Pattern has not been found."
@@ -1878,18 +1878,18 @@
"未找到模式。"

#. TRANSLATORS: %s is a package list
-#: src/modules/Packages.rb:2732
+#: src/modules/Packages.rb:2743
msgid "These packages need to be selected to install: %s"
msgstr "需要選取以下套件加以安裝︰%s"

#. TRANSLATORS: %s is a pattern list
-#: src/modules/Packages.rb:2735
+#: src/modules/Packages.rb:2746
msgid "These patterns need to be selected to install: %s"
msgstr "需要選取以下模式加以安裝︰%s"

#. TRANSLATORS: %{type} is a resolvable type, %{list} is a list of names
#. This is a fallback message for unknown types, normally it should not be
displayed
-#: src/modules/Packages.rb:2739
+#: src/modules/Packages.rb:2750
msgid "These items (%{type}) need to be selected to install: %{list}"
msgstr "需要選取以下項目 (%{type}) 加以安裝︰%{list}"


Modified: branches/SLE12-SP3/yast/zh_TW/po/registration.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/registration.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/registration.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-20 17:12+0200\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -18,7 +18,7 @@
#. popup message
#. popup message
#. popup message
-#: src/clients/inst_scc.rb:54 src/clients/scc_auto.rb:49
+#: src/clients/inst_scc.rb:53 src/clients/scc_auto.rb:49
#: src/lib/registration/registration_ui.rb:40
msgid "Contacting the Registration Server"
msgstr "正在連接註冊伺服器"
@@ -31,10 +31,10 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:189
+#: src/clients/inst_scc.rb:183
#: src/lib/registration/ui/autoyast_config_dialog.rb:104
#: src/lib/registration/ui/base_system_registration_dialog.rb:61
-#: src/lib/registration/ui/migration_repos_workflow.rb:287
+#: src/lib/registration/ui/migration_repos_workflow.rb:317
#: src/lib/registration/ui/registered_system_dialog.rb:37
#: src/lib/registration/ui/registration_update_dialog.rb:41
msgid "Registration"
@@ -75,8 +75,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:286
-#: src/lib/registration/registration_ui.rb:319
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:317
+#: src/lib/registration/registration_ui.rb:350
msgid "Registering %s ..."
msgstr "正在註冊 %s..."

@@ -336,7 +336,7 @@
#. FIXME: use a better message, this one has been reused after the text freeze
#. error message, the entered URL is not valid.
#: src/lib/registration/connect_helpers.rb:295
-#: src/lib/registration/ui/base_system_registration_dialog.rb:544
+#: src/lib/registration/ui/base_system_registration_dialog.rb:537
msgid "Invalid URL."
msgstr "URL 無效。"

@@ -387,7 +387,7 @@
#. FIXME: reused an existing message due to text freeze
#. (later use a better text, it's system update actually...)
#: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:272
+#: src/lib/registration/registration_ui.rb:303
msgid "Registering the System..."
msgstr "正在註冊系統..."

@@ -397,8 +397,8 @@
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
#: src/lib/registration/registration_ui.rb:149
-#: src/lib/registration/registration_ui.rb:357
-#: src/lib/registration/ui/migration_repos_workflow.rb:304
+#: src/lib/registration/registration_ui.rb:388
+#: src/lib/registration/ui/migration_repos_workflow.rb:334
msgid "Updating to %s ..."
msgstr "正在更新至 %s ..."

@@ -460,6 +460,20 @@
"您是否要在升級期間啟用這些儲存庫\n"
"以接收最新更新?"

+#. TRANSLATORS: Popup question, add registered but not installed addons to
+#. the list of products that will be downgraded.
+#. %s are all the product names splited by '\n' e.g
+#. "SUSE Linux Enterprise Server 12\nSUSE Enterprise Storage 1 x86_64"
+#: src/lib/registration/registration_ui.rb:284
+msgid ""
+"The addons listed below are registered but not installed: \n"
+"\n"
+"%s\n"
+"\n"
+"Would you like to downgrade also them in the registration server? \n"
+"If not they will be deactivated. "
+msgstr ""
+
#. indent size used in summary text
#: src/lib/registration/ssl_certificate_details.rb:34
msgid "Certificate:"
@@ -589,38 +603,40 @@

#. create the main dialog definition
#. @return [Yast::Term] the main UI dialog term
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:97
-msgid "&Filter Out Beta Versions"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:105
+#, fuzzy
+#| msgid "&Filter Out Beta Versions"
+msgid "&Hide Beta Versions"
msgstr "濾除 Beta 版本(&F)"

-#: src/lib/registration/ui/addon_selection_base_dialog.rb:99
-msgid "Details"
-msgstr "詳細資料"
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:108
+msgid "Details (English only)"
+msgstr ""

#. addon description widget
#. @return [Yast::Term] the addon details widget
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:109
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:117
msgid "Select an extension or a module to show details here"
msgstr "在此處選取延伸或模組以顯示詳細資料"

#. checkbox label for an unavailable extension
#. (%s is an extension name)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:122
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:130
msgid "%s (not available)"
msgstr "%s (不可用)"

#. check if the count of addons requiring a reg. code fits two columns
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:261
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:269
msgid "YaST allows to select at most %s extensions or modules."
msgstr "YaST 最多允許選取 %s 個延伸或模組。"

#. help text (2/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:272
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:280
msgid "<p>Please note, that some extensions or modules might need specific
registration code.</p>"
msgstr "<p>請注意,部分延伸或模組可能需要特定的註冊代碼。</p>"

#. help text (3/3)
-#: src/lib/registration/ui/addon_selection_base_dialog.rb:275
+#: src/lib/registration/ui/addon_selection_base_dialog.rb:283
msgid "<p>If you want to remove any extension or module you need to loginto
the SUSE Customer Center and remove them manually there.</p>"
msgstr "<p>若要移除任何延伸或模組,您需要登入 SUSE Customer Center,然後在該位置手動將其移除。</p>"

@@ -639,21 +655,6 @@
msgid "Available Extensions and Modules"
msgstr "可用延伸和模組"

-#. dialog title
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:37
-msgid "Extension and Module Re-registration"
-msgstr "延伸與模組重新註冊"
-
-#. help text (1/3)
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:40
-msgid "<p>Here you can select extensions and modules which will be registered
again.</p>"
-msgstr "<p>您可以在這裡選取要重新註冊的延伸與模組。</p>"
-
-#. @return [String] the main dialog label
-#: src/lib/registration/ui/addon_selection_reregistration_dialog.rb:54
-msgid "Registered Extensions and Modules"
-msgstr "已註冊延伸與模組"
-
#. help text
#: src/lib/registration/ui/autoyast_addon_dialog.rb:38
msgid "<p>Here you can select which extensions or moduleswill be registered
together with the base product.</p>"
@@ -716,7 +717,7 @@
#. handle nil specifically, it cannot be stored in XML profile
#: src/lib/registration/ui/autoyast_addon_dialog.rb:190
#: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:266
+#: src/lib/registration/ui/base_system_registration_dialog.rb:269
msgid "Registration &Code"
msgstr "註冊代碼(&C)"

@@ -747,7 +748,7 @@
msgstr "註冊產品"

#: src/lib/registration/ui/autoyast_config_dialog.rb:106
-#: src/lib/registration/ui/base_system_registration_dialog.rb:263
+#: src/lib/registration/ui/base_system_registration_dialog.rb:266
msgid "&E-mail Address"
msgstr "電子郵件地址(&E)"

@@ -794,49 +795,54 @@
msgid "Register Extensions or Modules..."
msgstr "註冊延伸或模組..."

+#. TRANSLATORS: Wrong url for registration provided, %s is an URL.
+#: src/lib/registration/ui/base_system_registration_dialog.rb:232
+msgid ""
+"The registration URL provided by the command line is not valid.\n"
+"\n"
+"URL: %s\n"
+"\n"
+"The default one will be used instead."
+msgstr ""
+
#. TRANSLATORS: radio button; %s is a host name.
-#: src/lib/registration/ui/base_system_registration_dialog.rb:254
+#: src/lib/registration/ui/base_system_registration_dialog.rb:257
msgid "Register System via %s"
msgstr "透過 %s 註冊系統"

#. TRANSLATORS: radio button
-#: src/lib/registration/ui/base_system_registration_dialog.rb:297
+#: src/lib/registration/ui/base_system_registration_dialog.rb:300
msgid "Register System via local SMT Server"
msgstr "透過本地 SMT 伺服器註冊系統"

-#: src/lib/registration/ui/base_system_registration_dialog.rb:308
+#: src/lib/registration/ui/base_system_registration_dialog.rb:311
msgid "&Local Registration Server URL"
msgstr "本地註冊伺服器 URL(&L)"

-#: src/lib/registration/ui/base_system_registration_dialog.rb:322
+#: src/lib/registration/ui/base_system_registration_dialog.rb:325
msgid "&Skip Registration"
msgstr "跳過註冊(&S)"

-#. display the addon re-registration button only in registered installed system
-#: src/lib/registration/ui/base_system_registration_dialog.rb:334
-msgid "&Register Extensions or Modules Again"
-msgstr "重新註冊延伸或模組(&R)"
-
#. part of the main dialog definition - the base product details
#. @return [Yast::Term] UI term
#. the main dialog content
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:342
+#: src/lib/registration/ui/base_system_registration_dialog.rb:335
#: src/lib/registration/ui/registered_system_dialog.rb:67
msgid "The system is already registered."
msgstr "系統已註冊。"

-#: src/lib/registration/ui/base_system_registration_dialog.rb:344
+#: src/lib/registration/ui/base_system_registration_dialog.rb:337
msgid "Please select your preferred method of registration."
msgstr "請選取您偏好的註冊方法。"

#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:360
+#: src/lib/registration/ui/base_system_registration_dialog.rb:353
msgid "Enter SUSE Customer Center credentials here to register the system to
get updates and extensions."
msgstr "在此處輸入 SUSE Customer Center 的身分證明註冊系統,以取得更新與延伸。"

#. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:369
+#: src/lib/registration/ui/base_system_registration_dialog.rb:362
msgid ""
"If you do not register your system we will not be able\n"
"to grant you access to the update repositories.\n"
@@ -852,7 +858,7 @@

#. UI term for the network configuration button (or empty if not needed)
#. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:381
+#: src/lib/registration/ui/base_system_registration_dialog.rb:374
msgid "Net&work Configuration..."
msgstr "網路組態(&W)..."

@@ -950,7 +956,7 @@
#. 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
+#: src/lib/registration/ui/migration_repos_workflow.rb:154
msgid ""
"The system is not registered,\n"
"to run the online migration you need\n"
@@ -961,17 +967,28 @@
"先註冊系統。"

#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:183
+#: src/lib/registration/ui/migration_repos_workflow.rb:198
msgid "No installed product found."
msgstr "找不到已安裝的產品。"

+#. TRANSLATORS: Popup question, merge this addon that are registered but not
+#. installed to the current migration products list.
+#. %s is an addon friendly name, e.g 'SUSE Enterprise Storage 2 x86_64'
+#: src/lib/registration/ui/migration_repos_workflow.rb:219
+msgid ""
+"The '%s' extension is registered but not installed.\n"
+"If you accept it will be added for be installed, in other case it will be
unregistered at the end of the migration.\n"
+"\n"
+"Do you want to add it?"
+msgstr ""
+
#. TRANSLATORS: Error message
-#: src/lib/registration/ui/migration_repos_workflow.rb:212
+#: src/lib/registration/ui/migration_repos_workflow.rb:242
msgid "No migration product found."
msgstr "找不到移轉產品。"

#. TRANSLATORS: progress message
-#: src/lib/registration/ui/migration_repos_workflow.rb:289
+#: src/lib/registration/ui/migration_repos_workflow.rb:319
msgid "Preparing Migration Repositories..."
msgstr "正在準備移轉儲存庫..."

@@ -1015,48 +1032,54 @@
msgstr "可能的移轉目標"

#. 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:199
msgid "Migration Summary"
msgstr "移轉摘要"

+#. TRANSLATORS: Summary message in 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:211
+msgid "The registration server does not offer migrations for Product <b>%s</b>
so it will <b>stay unchanged</b>. We recommend you to check if it's correct and
to configure the repositories manually in case of needed."
+msgstr ""
+
#. TRANSLATORS: An error message displayed in the migration details.
#. The product has not been mirrored to the SMT server and cannot be used
#. for migration. The SMT admin has to mirror the product to allow
#. 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:234
msgid "ERROR: Product <b>%{product}</b> is not available at the registration
server (%{url}). Make the product available to allow using this migration."
msgstr "錯誤︰註冊伺服器 (%{url}) 上沒有產品 <b>%{product}</b>。請提供該產品以允許使用此移轉。"

#. 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:224
+#: src/lib/registration/ui/migration_selection_dialog.rb:246
msgid "%s <b>will be installed.</b>"
msgstr "%s <b>將會安裝。</b>"

#. 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:241
+#: src/lib/registration/ui/migration_selection_dialog.rb:263
msgid "%s <b>stays unchanged.</b>"
msgstr "%s <b>將保持不變。</b>"

#. 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:251
+#: src/lib/registration/ui/migration_selection_dialog.rb:273
msgid "%{old_product} <b>will be upgraded to</b> %{new_product}."
msgstr "%{old_product} <b>將升級到</b> %{new_product}。"

#. TRANSLATORS: Summary message, rich text format
#. %{old_product} and %{new_product} are product names
-#: src/lib/registration/ui/migration_selection_dialog.rb:256
+#: src/lib/registration/ui/migration_selection_dialog.rb:278
msgid "%{old_product} <b>will be downgraded to</b> %{new_product}."
msgstr "%{old_product} <b>將降級到</b> %{new_product}。"

#. TRANSLATORS: an error popup message
-#: src/lib/registration/ui/migration_selection_dialog.rb:289
+#: src/lib/registration/ui/migration_selection_dialog.rb:311
msgid ""
"The selected migration contains a product\n"
"which is not available at the registration server.\n"
@@ -1070,6 +1093,57 @@
"請選取其他移轉目標或在\n"
"註冊伺服器上提供缺少的產品。"

+#. this class displays and runs the dialog which check all the installed
+#. but not registered products warning the user about it and allowing him
+#. to take some actions over them.
+#: src/lib/registration/ui/not_installed_products_dialog.rb:45
+#, fuzzy
+#| msgid "Checking status..."
+msgid "Checking registration status"
+msgstr "正在檢查狀態..."
+
+#. FIXME: Maybe we could remove this option and just warn the user
+#: src/lib/registration/ui/not_installed_products_dialog.rb:85
+#, fuzzy
+#| msgid "Installed Add-on Products"
+msgid "Ins&tall products"
+msgstr "已安裝的附加產品"
+
+#: src/lib/registration/ui/not_installed_products_dialog.rb:86
+msgid "&Deactivate"
+msgstr "停用(&D)"
+
+#: src/lib/registration/ui/not_installed_products_dialog.rb:87
+msgid "Continue"
+msgstr "繼續"
+
+#. TRANSLATORS: Popup error showing all the addons that weren't
+#. installed, %s is the addons identifiers.
+#: src/lib/registration/ui/not_installed_products_dialog.rb:102
+#, fuzzy
+#| msgid ""
+#| "These sources were not found:\n"
+#| "%1"
+msgid ""
+"These addons were not installed:\n"
+"\n"
+"%s"
+msgstr ""
+"未找到下列來源︰\n"
+"%1"
+
+#. TRANSLATORS: A RichText warning about all the products registered but
+#. not installed. (1/2)
+#: src/lib/registration/ui/not_installed_products_dialog.rb:153
+msgid "<p>The addons listed below are registered but not installed: </p>"
+msgstr ""
+
+#. TRANSLATORS: A RichText warning about all the products registered but
+#. not installed. (2/2)
+#: src/lib/registration/ui/not_installed_products_dialog.rb:159
+msgid "<p>It's preferable to <b>deactivate</b> your products at your
registration server if you don't plan to use them anymore.</p>"
+msgstr ""
+
#. help text
#: src/lib/registration/ui/registered_system_dialog.rb:40
msgid "<p>The system is already registered.</p>"
@@ -1149,25 +1223,66 @@
msgid "Looking up local registration servers..."
msgstr "正在查詢本地註冊伺服器..."

-#. Constructor
+#. encoding: utf-8
+#.
------------------------------------------------------------------------------
+#. Copyright (c) 2017 SUSE LLC
#.
-#. @param services [Array<SlpServiceClass::Service>] list of services
to show
-#. @param heading [String] Dialog's heading. If nil (or not
specified), a default
-#. heading will be used).
-#. @param description [String] Dialog's description (to be shown on top of
the list).
-#. If nil (or not specified) a default description will be used.
-#. @param no_selected_msg [String] Message to be shown when no service was
selected
-#. If nil (or not specified) a default description will be used.
-#. @param initial [SlpServiceClass::Service] initially selected
service. If nil
-#. (or not specified) the first service will be used.
-#: src/lib/slp/dialogs/service_selection.rb:78
-msgid "Service selection"
-msgstr "服務選擇"
+#.
+#. This program is free software; you can redistribute it and/or modify it
under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS
+#. FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact SUSE.
+#.
+#. To contact SUSE about this file by physical or electronic mail, you may find
+#. current contact information at www.suse.com.
+#.
------------------------------------------------------------------------------
+#: src/lib/registration/widgets/registration_code.rb:38
+#, fuzzy
+#| msgid "&Local Registration Server URL"
+msgid "Registration Code or SMT Server URL"
+msgstr "本地註冊伺服器 URL(&L)"

-#: src/lib/slp/dialogs/service_selection.rb:79
-msgid "Select a detected service from the list."
-msgstr "從清單中選取偵測到的服務。"
+#. Error reports and logs about the registration are mostly handled
+#. by ConnectHelpers.catch_registration_errors and used by instances
+#. of RegistrationUI.
+#: src/lib/registration/widgets/registration_code.rb:92
+#, fuzzy
+#| msgid "Not a valid umask."
+msgid "Not valid url."
+msgstr "沒有有效的 umask。"

-#: src/lib/slp/dialogs/service_selection.rb:80
-msgid "No service was selected."
-msgstr "尚未選取服務。"
+#: src/lib/registration/widgets/registration_code.rb:96
+msgid ""
+"<p>\n"
+"The SMT Server URL must use http or https protocol, other schemes are not
supported.</p>\n"
+msgstr ""
+
+#~ msgid "Details"
+#~ msgstr "詳細資料"
+
+#~ msgid "Extension and Module Re-registration"
+#~ msgstr "延伸與模組重新註冊"
+
+#~ msgid "<p>Here you can select extensions and modules which will be
registered again.</p>"
+#~ msgstr "<p>您可以在這裡選取要重新註冊的延伸與模組。</p>"
+
+#~ msgid "Registered Extensions and Modules"
+#~ msgstr "已註冊延伸與模組"
+
+#~ msgid "&Register Extensions or Modules Again"
+#~ msgstr "重新註冊延伸或模組(&R)"
+
+#~ msgid "Service selection"
+#~ msgstr "服務選擇"
+
+#~ msgid "Select a detected service from the list."
+#~ msgstr "從清單中選取偵測到的服務。"
+
+#~ msgid "No service was selected."
+#~ msgstr "尚未選取服務。"

Modified: branches/SLE12-SP3/yast/zh_TW/po/reipl.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/reipl.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/reipl.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: reipl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-07 01:29+0000\n"
+"POT-Creation-Date: 2017-04-11 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -15,63 +15,10 @@
"Content-Transfer-Encoding: 8bit\n"

#. Command line help text for the Xreipl module
-#: src/clients/reipl.rb:53
+#: src/clients/reipl.rb:52
msgid "Configuration of reipl"
msgstr "Reipl 組態"

-#. TRANSLATORS: part of a shutdown message
-#. %1 is replaced with a device name
-#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:69
-msgid ""
-"\n"
-"After shutdown, reload the system\n"
-"with an IPL from device '%1'.\n"
-msgstr ""
-"\n"
-"關閉後,透過 IPL 從裝置「%1」\n"
-"重新載入系統。\n"
-
-#. TRANSLATORS: part of a shutdown message
-#. %1 is replaced with a FCP name
-#. %2 is replaced with a WWPN name
-#. %3 is replaced with a LUN name
-#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:88
-msgid ""
-"\n"
-"After shutdown, reload the system\n"
-"with an IPL from FCP '%1'\n"
-"with WWPN '%2'\n"
-"and LUN '%3'.\n"
-msgstr ""
-"\n"
-"關閉後,透過 IPL 從含有 WWPN「%2」\n"
-"與 LUN「%3」的 FCP「%1」\n"
-"重新載入系統。\n"
-
-#: src/clients/reipl_bootloader_finish.rb:102
-msgid ""
-"\n"
-"After shutdown, reload the system \n"
-"with an IPL from the device \n"
-"that contains /boot"
-msgstr ""
-"\n"
-"關閉後,透過 IPL 從\n"
-"包含 /boot 的裝置\n"
-"重新載入系統"
-
-#. Rich text title for Reipl in proposals
-#: src/clients/reipl_proposal.rb:81
-msgid "Reipl"
-msgstr "Reipl"
-
-#. Menu title for Reipl in proposals
-#: src/clients/reipl_proposal.rb:85
-msgid "&Reipl"
-msgstr "Reipl(&R)"
-
#. Reipl configure dialog caption
#. Initialization dialog caption
#: src/include/reipl/dialogs.rb:59 src/include/reipl/wizards.rb:100
@@ -279,32 +226,61 @@
msgid "Initializing..."
msgstr "正在啟始化..."

-#. Create a textual summary and a list of unconfigured cards
-#. @return summary of the current configuration
-#: src/modules/Reipl.rb:323
-msgid "Configured reipl methods"
-msgstr "已設定 Reipl 方法"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system\n"
+#~ "with an IPL from device '%1'.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "關閉後,透過 IPL 從裝置「%1」\n"
+#~ "重新載入系統。\n"

-#: src/modules/Reipl.rb:330
-msgid "The method ccw is configured and being used."
-msgstr "已設定方法 ccw,現正在使用。"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system\n"
+#~ "with an IPL from FCP '%1'\n"
+#~ "with WWPN '%2'\n"
+#~ "and LUN '%3'.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "關閉後,透過 IPL 從含有 WWPN「%2」\n"
+#~ "與 LUN「%3」的 FCP「%1」\n"
+#~ "重新載入系統。\n"

-#: src/modules/Reipl.rb:332
-msgid "The method ccw is configured."
-msgstr "已設定方法 ccw。"
+#~ msgid ""
+#~ "\n"
+#~ "After shutdown, reload the system \n"
+#~ "with an IPL from the device \n"
+#~ "that contains /boot"
+#~ msgstr ""
+#~ "\n"
+#~ "關閉後,透過 IPL 從\n"
+#~ "包含 /boot 的裝置\n"
+#~ "重新載入系統"

-#: src/modules/Reipl.rb:335
-msgid "The method ccw is not supported."
-msgstr "不支援方法 ccw。"
+#~ msgid "Reipl"
+#~ msgstr "Reipl"

-#: src/modules/Reipl.rb:343
-msgid "The method fcp is configured and being used."
-msgstr "已設定方法 fcp,現正在使用。"
+#~ msgid "&Reipl"
+#~ msgstr "Reipl(&R)"

-#: src/modules/Reipl.rb:345
-msgid "The method fcp is configured."
-msgstr "已設定方法 fcp。"
+#~ msgid "Configured reipl methods"
+#~ msgstr "已設定 Reipl 方法"

-#: src/modules/Reipl.rb:348
-msgid "The method fcp is not supported."
-msgstr "不支援方法 fcp。"
+#~ msgid "The method ccw is configured and being used."
+#~ msgstr "已設定方法 ccw,現正在使用。"
+
+#~ msgid "The method ccw is configured."
+#~ msgstr "已設定方法 ccw。"
+
+#~ msgid "The method ccw is not supported."
+#~ msgstr "不支援方法 ccw。"
+
+#~ msgid "The method fcp is configured and being used."
+#~ msgstr "已設定方法 fcp,現正在使用。"
+
+#~ msgid "The method fcp is configured."
+#~ msgstr "已設定方法 fcp。"
+
+#~ msgid "The method fcp is not supported."
+#~ msgstr "不支援方法 fcp。"

Modified: branches/SLE12-SP3/yast/zh_TW/po/rpm-groups.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/rpm-groups.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/rpm-groups.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: rpm-groups\n"
"Report-Msgid-Bugs-To: bugzilla.opensuse.org\n"
-"POT-Creation-Date: 2016-10-09 12:27+0300\n"
+"POT-Creation-Date: 2017-05-15 17:26+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -71,6 +71,9 @@
msgid "Building"
msgstr "建立"

+msgid "C++"
+msgstr ""
+
msgid "CAD"
msgstr "CAD"

@@ -116,9 +119,6 @@
msgid "Convertors"
msgstr "轉換器"

-msgid "Daemon"
-msgstr "精靈"
-
msgid "Daemons"
msgstr "精靈"

@@ -320,9 +320,6 @@
msgid "LXDE"
msgstr "LXDE"

-msgid "LXDE-Qt"
-msgstr "LXDE-Qt"
-
msgid "LXQt"
msgstr "LXQt"

@@ -356,6 +353,11 @@
msgid "Modem"
msgstr "數據機"

+#, fuzzy
+#| msgid "Monitoring"
+msgid "monitoring"
+msgstr "監視"
+
msgid "Monitoring"
msgstr "監視"

@@ -569,9 +571,6 @@
msgid "Terminals"
msgstr "終端機"

-msgid "Tests"
-msgstr "測試"
-
msgid "TeX"
msgstr "TeX"

@@ -655,3 +654,12 @@

msgid "YaST"
msgstr "YaST"
+
+#~ msgid "Daemon"
+#~ msgstr "精靈"
+
+#~ msgid "LXDE-Qt"
+#~ msgstr "LXDE-Qt"
+
+#~ msgid "Tests"
+#~ msgstr "測試"

Modified: branches/SLE12-SP3/yast/zh_TW/po/s390.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/s390.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/s390.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: s390\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:53+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -30,7 +30,7 @@
msgstr "DASD"

#. section name in proposal - menu item
-#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:110
+#: src/clients/dasd_proposal.rb:73 src/include/s390/dump/ui.rb:111
msgid "&DASD"
msgstr "DASD(&D)"

@@ -60,24 +60,24 @@
msgstr "正在偵測可用的控制器"

#. Initialization dialog caption
-#: src/clients/s390-disk-controller.rb:72
+#: src/clients/s390-disk-controller.rb:71
msgid "S/390 Disk Controller Configuration"
msgstr "S/390 磁碟控制卡組態"

#. push button
-#: src/clients/s390-disk-controller.rb:84
+#: src/clients/s390-disk-controller.rb:83
msgid "Configure &DASD Disks"
msgstr "設定 DASD 磁碟組態(&D)"

#. push button
-#: src/clients/s390-disk-controller.rb:94
+#: src/clients/s390-disk-controller.rb:93
msgid "Configure &ZFCP Disks"
msgstr "設定 ZFCP 磁碟組態(&Z)"

#. Initialization dialog contents
#. Initialization dialog contents
-#: src/clients/s390-disk-controller.rb:103
-#: src/include/s390/dasd/wizards.rb:102 src/include/s390/zfcp/wizards.rb:98
+#: src/clients/s390-disk-controller.rb:101 src/include/s390/dasd/wizards.rb:97
+#: src/include/s390/zfcp/wizards.rb:96
msgid "Initializing..."
msgstr "正在啟始化..."

@@ -102,82 +102,82 @@
msgstr "zFCP(&Z)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:170
+#: src/include/s390/dasd/dialogs.rb:165
msgid "&Activate"
msgstr "啟用(&A)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:172
+#: src/include/s390/dasd/dialogs.rb:167
msgid "&Deactivate"
msgstr "停用(&D)"

#. menu button id
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:174 src/include/s390/dasd/dialogs.rb:183
+#: src/include/s390/dasd/dialogs.rb:169 src/include/s390/dasd/dialogs.rb:178
msgid "Set DIAG O&n"
msgstr "設定 DIAG 為開啟(&N)"

#. menu button id
#. menu button id
-#: src/include/s390/dasd/dialogs.rb:176 src/include/s390/dasd/dialogs.rb:185
+#: src/include/s390/dasd/dialogs.rb:171 src/include/s390/dasd/dialogs.rb:180
msgid "Set DIAG O&ff"
msgstr "設定 DIAG 為關閉(&F)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:178
+#: src/include/s390/dasd/dialogs.rb:173
msgid "&Format"
msgstr "格式化(&F)"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:187
+#: src/include/s390/dasd/dialogs.rb:182
msgid "Set Format On"
msgstr "將格式化設為開啟"

#. menu button id
-#: src/include/s390/dasd/dialogs.rb:189
+#: src/include/s390/dasd/dialogs.rb:184
msgid "Set Format Off"
msgstr "將格式化設為關閉"

#. integer field (count of disks formatted parallel)
-#: src/include/s390/dasd/dialogs.rb:201
+#: src/include/s390/dasd/dialogs.rb:194
msgid "&Parallel Formatted Disks"
msgstr "並列格式化的磁碟(&P)"

#. error popup message
#. error popup message
#. error popup message
-#: src/include/s390/dasd/dialogs.rb:225 src/include/s390/dasd/dialogs.rb:687
-#: src/include/s390/zfcp/dialogs.rb:477
+#: src/include/s390/dasd/dialogs.rb:216 src/include/s390/dasd/dialogs.rb:673
+#: src/include/s390/zfcp/dialogs.rb:465
msgid "No disk selected."
msgstr "沒有選取磁碟。"

#. 8 means disk is not formatted
#. unformtted disk, manual (not AutoYaST)
-#: src/include/s390/dasd/dialogs.rb:254 src/modules/DASDController.rb:160
+#: src/include/s390/dasd/dialogs.rb:243 src/modules/DASDController.rb:149
msgid "Device %1 is not formatted. Format device now?"
msgstr "未格式化裝置 %1。是否立即格式化裝置?"

-#: src/include/s390/dasd/dialogs.rb:256 src/modules/DASDController.rb:162
+#: src/include/s390/dasd/dialogs.rb:246 src/modules/DASDController.rb:152
msgid "There are %1 unformatted devices. Format them now?"
msgstr "有 %1 個裝置未格式化。是否立即格式化?"

#. for autoinst, format unformatted disks later
-#: src/include/s390/dasd/dialogs.rb:267
+#: src/include/s390/dasd/dialogs.rb:258
msgid "Couldn't find device for channel %1."
msgstr "找不到通道 %1 的裝置。"

#. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:321
+#: src/include/s390/dasd/dialogs.rb:312
msgid "Disk %1 is not active."
msgstr "磁碟 %1 未啟動。"

#. error report, %1 is device identification
-#: src/include/s390/dasd/dialogs.rb:327
+#: src/include/s390/dasd/dialogs.rb:318
msgid "Disk %1 is not accessible for writing."
msgstr "沒有磁碟 %1 的寫入存取權。"

#. popup question
-#: src/include/s390/dasd/dialogs.rb:353
+#: src/include/s390/dasd/dialogs.rb:342
msgid ""
"Formatting these disks destroys all data on them.<br>\n"
"Really format the following disks?<br>\n"
@@ -188,7 +188,7 @@
" %1"

#. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:416
+#: src/include/s390/dasd/dialogs.rb:404
msgid "DASD Disk Management"
msgstr "DASD 磁碟管理"

@@ -196,111 +196,111 @@
#. table header
#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:423 src/include/s390/dasd/dialogs.rb:432
-#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
+#: src/include/s390/dasd/dialogs.rb:411 src/include/s390/dasd/dialogs.rb:420
+#: src/include/s390/zfcp/dialogs.rb:116 src/include/s390/zfcp/dialogs.rb:125
msgid "Channel ID"
msgstr "通道 ID"

#. table header
-#: src/include/s390/dasd/dialogs.rb:425
+#: src/include/s390/dasd/dialogs.rb:413
msgid "Format"
msgstr "格式"

#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:427 src/include/s390/dasd/dialogs.rb:440
+#: src/include/s390/dasd/dialogs.rb:415 src/include/s390/dasd/dialogs.rb:428
msgid "Use DIAG"
msgstr "使用 DIAG"

#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:434 src/include/s390/zfcp/dialogs.rb:135
+#: src/include/s390/dasd/dialogs.rb:422 src/include/s390/zfcp/dialogs.rb:131
msgid "Device"
msgstr "裝置"

#. table header
#. table header
-#: src/include/s390/dasd/dialogs.rb:436
+#: src/include/s390/dasd/dialogs.rb:424
#: src/include/s390/iucvterminal-server/ui.rb:242
msgid "Type"
msgstr "類型"

#. table header
-#: src/include/s390/dasd/dialogs.rb:438
+#: src/include/s390/dasd/dialogs.rb:426
msgid "Access Type"
msgstr "存取類型"

#. table header
-#: src/include/s390/dasd/dialogs.rb:442
+#: src/include/s390/dasd/dialogs.rb:430
msgid "Formatted"
msgstr "已格式化"

#. table header
-#: src/include/s390/dasd/dialogs.rb:444
+#: src/include/s390/dasd/dialogs.rb:432
msgid "Partition Information"
msgstr "分割區資訊"

#. text entry
#. text entry
-#: src/include/s390/dasd/dialogs.rb:455 src/include/s390/zfcp/dialogs.rb:146
+#: src/include/s390/dasd/dialogs.rb:443 src/include/s390/zfcp/dialogs.rb:142
msgid "Mi&nimum Channel ID"
msgstr "最小通道 ID(&N)"

#. text entry
#. text entry
-#: src/include/s390/dasd/dialogs.rb:462 src/include/s390/zfcp/dialogs.rb:153
+#: src/include/s390/dasd/dialogs.rb:450 src/include/s390/zfcp/dialogs.rb:149
msgid "Ma&ximum Channel ID"
msgstr "最大通道 ID(&X)"

#. push button
#. push button
-#: src/include/s390/dasd/dialogs.rb:468 src/include/s390/zfcp/dialogs.rb:159
+#: src/include/s390/dasd/dialogs.rb:456 src/include/s390/zfcp/dialogs.rb:155
msgid "&Filter"
msgstr "過濾器(&F)"

#. menu button
#. menu button
-#: src/include/s390/dasd/dialogs.rb:478 src/include/s390/dasd/dialogs.rb:485
+#: src/include/s390/dasd/dialogs.rb:466 src/include/s390/dasd/dialogs.rb:474
msgid "Perform &Action"
msgstr "執行動作(&A)"

-#: src/include/s390/dasd/dialogs.rb:481
+#: src/include/s390/dasd/dialogs.rb:470
msgid "&Select All"
msgstr "全選(&S)"

-#: src/include/s390/dasd/dialogs.rb:482
+#: src/include/s390/dasd/dialogs.rb:471
msgid "&Deselect All"
msgstr "全部不選(&D)"

#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:553 src/include/s390/zfcp/dialogs.rb:221
+#: src/include/s390/dasd/dialogs.rb:541 src/include/s390/zfcp/dialogs.rb:215
msgid "Invalid filter channel IDs."
msgstr "過濾器通道 ID 無效。"

#. Dialog caption
-#: src/include/s390/dasd/dialogs.rb:597
+#: src/include/s390/dasd/dialogs.rb:584
msgid "Add New DASD Disk"
msgstr "新增 DASD 磁碟"

#. text entry
#. combo box
-#: src/include/s390/dasd/dialogs.rb:608 src/include/s390/zfcp/dialogs.rb:301
+#: src/include/s390/dasd/dialogs.rb:595 src/include/s390/zfcp/dialogs.rb:294
msgid "&Channel ID"
msgstr "通道 ID(&C)"

#. check box
-#: src/include/s390/dasd/dialogs.rb:612
+#: src/include/s390/dasd/dialogs.rb:599
msgid "Format the Disk"
msgstr "格式化磁碟"

#. check box
-#: src/include/s390/dasd/dialogs.rb:615
+#: src/include/s390/dasd/dialogs.rb:602
msgid "Use &DIAG"
msgstr "使用 DIAG(&D)"

#. yes-no popup
-#: src/include/s390/dasd/dialogs.rb:637
+#: src/include/s390/dasd/dialogs.rb:624
msgid ""
"Really leave the DASD disk configuration without saving?\n"
"All changes will be lost."
@@ -312,14 +312,14 @@
#. error popup
#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:648 src/include/s390/zfcp/dialogs.rb:351
-#: src/include/s390/zfcp/dialogs.rb:368 src/include/s390/zfcp/dialogs.rb:404
+#: src/include/s390/dasd/dialogs.rb:635 src/include/s390/zfcp/dialogs.rb:340
+#: src/include/s390/zfcp/dialogs.rb:357 src/include/s390/zfcp/dialogs.rb:393
msgid "Not a valid channel ID."
msgstr "通道 ID 無效。"

#. error popup
#. error popup
-#: src/include/s390/dasd/dialogs.rb:658 src/include/s390/zfcp/dialogs.rb:434
+#: src/include/s390/dasd/dialogs.rb:645 src/include/s390/zfcp/dialogs.rb:423
msgid "Device already exists."
msgstr "裝置已存在。"

@@ -343,7 +343,7 @@
"要安全地中止組態公用程式,請按<b>「中止」</b>。</p>"

#. Write dialog help 1/2
-#: src/include/s390/dasd/helps.rb:44
+#: src/include/s390/dasd/helps.rb:45
msgid ""
"<p><b><big>Saving Controller Configuration</big></b><br>\n"
"</p>\n"
@@ -353,7 +353,7 @@

#. Write dialog help 2/2
#. Write dialog help 2/2
-#: src/include/s390/dasd/helps.rb:48 src/include/s390/zfcp/helps.rb:48
+#: src/include/s390/dasd/helps.rb:49 src/include/s390/zfcp/helps.rb:49
msgid ""
"<p><b><big>Aborting Saving:</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.\n"
@@ -365,7 +365,7 @@

#. Disk selection dialog help 1/4
#. Disk selection dialog help 1/4
-#: src/include/s390/dasd/helps.rb:54 src/include/s390/dasd/helps.rb:68
+#: src/include/s390/dasd/helps.rb:55 src/include/s390/dasd/helps.rb:71
msgid ""
"<p><b><big>Configured DASD Disks</big></b><br>\n"
"In this dialog, manage DASD disks on your system.</p>"
@@ -375,7 +375,7 @@

#. Disk selection dialog help 2/4
#. Disk selection dialog help 2/4
-#: src/include/s390/dasd/helps.rb:58 src/include/s390/dasd/helps.rb:72
+#: src/include/s390/dasd/helps.rb:60 src/include/s390/dasd/helps.rb:76
msgid ""
"<p>To filter the displayed disks, set the <b>Minimum Channel ID</b> and \n"
"the <b>Maximum Channel ID</b> and click <b>Filter</b>.</p>\n"
@@ -384,12 +384,12 @@
"<b>「最大通道 ID」</b>,然後按一下<b>「過濾」</b>。</p>\n"

#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:62
+#: src/include/s390/dasd/helps.rb:65
msgid "<p>To configure a new DASD disk, click <b>Add</b>.</p>"
msgstr "<p>若要設定新的 DASD 磁碟,請按一下<b>「新增」</b>。</p>"

#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:64
+#: src/include/s390/dasd/helps.rb:67
msgid ""
"<p>To remove a configured DASD disk, select it and click\n"
"<b>Delete</b>.</p>"
@@ -398,7 +398,7 @@
"<b>「刪除」</b>。</p>"

#. Disk selection dialog help 3/4
-#: src/include/s390/dasd/helps.rb:76
+#: src/include/s390/dasd/helps.rb:81
msgid ""
"<p>To perform actions on multiple disks at once, mark these disks. To select
all displayed disk (possibly after applying a filter), click\n"
"<b>Select All</b> or <b>Deselect All</b>.</p>\n"
@@ -407,7 +407,7 @@
"<b>「全選」</b>或<b>「全部不選」</b>。</p>\n"

#. Disk selection dialog help 4/4
-#: src/include/s390/dasd/helps.rb:80
+#: src/include/s390/dasd/helps.rb:87
msgid ""
"<p>To perform an action on the selected disks, use <b>Perform Action</b>.\n"
"The action will be performed immediately!</p>"
@@ -416,7 +416,7 @@
"該動作就會立即執行!</p>"

#. Disk add help 1/3
-#: src/include/s390/dasd/helps.rb:84
+#: src/include/s390/dasd/helps.rb:92
msgid ""
"<p><b><big>Add New DASD Disk</big></b><br>\n"
"To add a disk, enter the <b>Channel ID</b> of the DASD disk as\n"
@@ -427,7 +427,7 @@
"識別碼。</p>"

#. Disk add help 1/3
-#: src/include/s390/dasd/helps.rb:90
+#: src/include/s390/dasd/helps.rb:98
msgid ""
"<p>If the disk should be formatted,\n"
"use <b>Format the Disk</b>.</p>\n"
@@ -436,13 +436,13 @@
"請使用<b>「格式化磁碟」</b>。</p>\n"

#. Disk add help 3/3
-#: src/include/s390/dasd/helps.rb:94
+#: src/include/s390/dasd/helps.rb:102
msgid "<p>To use DIAG mode, select <b>Use DIAG</b>.</p>\n"
msgstr "<p>若要使用 DIAG 模式,請選取<b>「使用 DIAG」</b>。</p>\n"

#. Initialization dialog caption
#. Initialization dialog caption
-#: src/include/s390/dasd/wizards.rb:100 src/include/s390/zfcp/wizards.rb:96
+#: src/include/s390/dasd/wizards.rb:95 src/include/s390/zfcp/wizards.rb:94
msgid "Controller Configuration"
msgstr "控制器組態"

@@ -473,17 +473,17 @@
"格式化或分割,請啟用核取方塊<b>「強制覆寫磁碟」</b>。</p>"

#. Dump dialog help 4/8
-#: src/include/s390/dump/ui.rb:62
+#: src/include/s390/dump/ui.rb:63
msgid "<p>To use DASD and ZFCP devices activate them in the respective YaST
DASD or ZFCP dialog.<br>"
msgstr "<p>若要使用 DASD 和 ZFCP 裝置,請在相應的 YaST DASD 或 ZFCP 對話方塊中將其啟用。<br>"

#. Dump dialog help 5/8
-#: src/include/s390/dump/ui.rb:66
+#: src/include/s390/dump/ui.rb:67
msgid "Devices which are in use or have mounted partitions will not be
shown.</p>"
msgstr "使用中或已掛載分割區的裝置不會顯示。</p>"

#. Dump dialog help 6/8
-#: src/include/s390/dump/ui.rb:70
+#: src/include/s390/dump/ui.rb:71
msgid ""
"<p><b>dumpdevice</b> after a disk indicates that it is a usable dump\n"
"device. Multi-volume dump devices are indicated by a list of DASD IDs.</p>"
@@ -492,31 +492,31 @@
"裝置。多磁碟區傾印裝置則透過 DASD ID 清單來指示。</p>"

#. Dump dialog help 7/8
-#: src/include/s390/dump/ui.rb:74
+#: src/include/s390/dump/ui.rb:76
msgid "<p>ZFCP columns: Device, Size, ID, WWPN, LUN, Dump<br>"
msgstr "<p>ZFCP 欄︰裝置,大小,ID,WWPN,LUN,傾印<br>"

#. Dump dialog help 8/8
-#: src/include/s390/dump/ui.rb:76
+#: src/include/s390/dump/ui.rb:78
msgid "DASD columns: Device, Size, ID, Dump</p>"
msgstr "DASD 欄︰裝置,大小,ID,傾印</p>"

#. Dialog content
-#: src/include/s390/dump/ui.rb:95
+#: src/include/s390/dump/ui.rb:96
msgid "&ZFCP"
msgstr "ZFCP(&Z)"

-#: src/include/s390/dump/ui.rb:121
+#: src/include/s390/dump/ui.rb:122
msgid "&Force overwrite of disk"
msgstr "強制覆寫磁碟(&F)"

#. prevent leading space
-#: src/include/s390/dump/ui.rb:185
+#: src/include/s390/dump/ui.rb:186
msgid "You haven't selected any device."
msgstr "您未選取任何裝置。"

#. warn only in case of force
-#: src/include/s390/dump/ui.rb:193
+#: src/include/s390/dump/ui.rb:191
msgid "The disk %1 will be formatted as a dump device. All data on this device
will be lost! Continue?"
msgstr "磁碟 %1 將格式化為傾印裝置。此裝置上的所有資料都將遺失!要繼續嗎?"

@@ -539,21 +539,21 @@
"<br>各 z/VM ID 之間以分行符號分隔。</p>\n"

#. TS-Shell dialog help 1/5
-#: src/include/s390/iucvterminal-server/helps.rb:43
+#: src/include/s390/iucvterminal-server/helps.rb:44
msgid "<p><b><big>TS-Shell</big></b></p>"
msgstr "<p><b><big>TS-Shell</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:46
+#: src/include/s390/iucvterminal-server/helps.rb:47
msgid "<p>TS-Shell allows to specify <b>Authorization</b> for every TS-Shell
user and group. The rights of a group are inherited by its members.</p>"
msgstr "<p>TS-Shell 可用於為每個 TS-Shell 使用者和群組指定<b>「授權」</b>。群組的成員會繼承群組權限。</p>"

#. TS-Shell dialog help 2/5
-#: src/include/s390/iucvterminal-server/helps.rb:50
+#: src/include/s390/iucvterminal-server/helps.rb:52
msgid "<p>Each allowed z/VM ID can be selected manually under
<b>Selection</b>, defined by a <b>Regex</b> or loaded from a <b>File</b> which
contains all allowed z/VM IDs separated by line breaks.</p>"
msgstr "<p>您可在<b>「選擇」</b>下手動選取<b>「規則運算式」</b>定義之每個允許的 z/VM ID,也可以從包含所有允許之 z/VM
ID (以分行符號分隔) 的<b>「檔案」</b>中載入 z/VM ID。</p>"

#. TS-Shell dialog help 3/5
-#: src/include/s390/iucvterminal-server/helps.rb:54
+#: src/include/s390/iucvterminal-server/helps.rb:58
msgid ""
"<p>Click on <b>New User</b> to create new TS-Shell users or <b>Delete\n"
"User</b> to remove users.</p>"
@@ -562,7 +562,7 @@
"可移除使用者。</p>"

#. TS-Shell dialog help 4/5
-#: src/include/s390/iucvterminal-server/helps.rb:58
+#: src/include/s390/iucvterminal-server/helps.rb:63
msgid ""
"<p>To add or remove groups from the TS-Shell authorization table or to
change\n"
"the membership of users, go to <b>Manage Groups</b>.</p>"
@@ -571,16 +571,16 @@
"要變更使用者的成員資格,請移至<b>「管理群組」</b>。</p>"

#. TS-Shell dialog help 5/5
-#: src/include/s390/iucvterminal-server/helps.rb:62
+#: src/include/s390/iucvterminal-server/helps.rb:68
msgid "<p>With <b>Audited IDs</b> specify the z/VM IDs from which transcripts
should be gathered.</p>"
msgstr "<p>使用<b>「稽核的 ID」</b>可以指定應根據其收集文字記錄的 z/VM ID。</p>"

#. TS-Shell User creation dialog help 1/3
-#: src/include/s390/iucvterminal-server/helps.rb:66
+#: src/include/s390/iucvterminal-server/helps.rb:72
msgid "<p><b><big>New TS-Shell User</big></b></p>"
msgstr "<p><b><big>新增 TS-Shell 使用者</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:69
+#: src/include/s390/iucvterminal-server/helps.rb:75
msgid ""
"<p>To create new TS-Shell user the <b>Username</b>, <b>Home Directory</b> and
<b>Password</b> has to be provided.\n"
"\t<br>It is also possible to specify <b>Additional Groups</b> by selecting
them on the right.</p>"
@@ -589,12 +589,12 @@
"\t<br>也可以透過在右側選取群組來指定<b>附加群組</b>。</p>"

#. TS-Shell User creation dialog help 2/3
-#: src/include/s390/iucvterminal-server/helps.rb:73
+#: src/include/s390/iucvterminal-server/helps.rb:81
msgid "<p>To ensure that the user changes his password after the first login,
activate <b>Force Password Change</b>.</p>"
msgstr "<p>若要確保使用者在第一次登入後變更其密碼,請啟用<b>「強制密碼變更」</b>。</p>"

#. TS-Shell User creation dialog help 3/3
-#: src/include/s390/iucvterminal-server/helps.rb:77
+#: src/include/s390/iucvterminal-server/helps.rb:86
msgid ""
"<p>You can specify the same home directory for every TS-Shell user since no\n"
"data will be stored there.</p>"
@@ -603,11 +603,11 @@
"該處不會儲存任何資料。</p>"

#. TS-Shell Managing Groups dialog help 1/5
-#: src/include/s390/iucvterminal-server/helps.rb:81
+#: src/include/s390/iucvterminal-server/helps.rb:91
msgid "<p><b><big>Manage Groups for TS-Authorization</big></b></p>"
msgstr "<p><b><big>為 TS-授權管理群組</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:84
+#: src/include/s390/iucvterminal-server/helps.rb:94
msgid ""
"<p>Define TS-Shell authorizations per group if you want every TS-Shell \n"
"member of this groups to inherit the same rights.</p>"
@@ -616,7 +616,7 @@
"都繼承相同的權限,請按群組定義 TS-Shell 授權。</p>"

#. TS-Shell Managing Groups dialog help 2/5
-#: src/include/s390/iucvterminal-server/helps.rb:88
+#: src/include/s390/iucvterminal-server/helps.rb:99
msgid ""
"<p>Existing groups can be added to or removed from the TS-Shell\n"
"authorization. Select the groups in the table and click on <b>Select or
Deselect</b>. The current status is shown in the column <b>TS-Auth</b>.</p>"
@@ -625,7 +625,7 @@
"現有群組。在表中選取所需群組,然後按一下<b>「選取或取消選取」</b>。<b>「TS-授權」</b>欄中會顯示目前狀態。</p>"

#. TS-Shell Managing Groups dialog help 3/5
-#: src/include/s390/iucvterminal-server/helps.rb:92
+#: src/include/s390/iucvterminal-server/helps.rb:105
msgid ""
"<p>Change TS-Shell members of a selected group in the <b>TS-Members</b>\n"
"selection.</p>"
@@ -634,7 +634,7 @@
"成員。</p>"

#. TS-Shell Managing Groups dialog help 4/5
-#: src/include/s390/iucvterminal-server/helps.rb:96
+#: src/include/s390/iucvterminal-server/helps.rb:109
msgid ""
"<p>New groups could be created by entering the name in the <b>New Group</b>
input field and confirming with <b>Create</b>.\n"
"\t<br>To delete previously created groups the <b>YaST users</b> dialog has to
be used.</p>"
@@ -643,21 +643,21 @@
"\t<br>若要刪除之前建立的群組,必須使用 <b>YaST 使用者</b>對話方塊。</p>"

#. TS-Shell Managing Groups dialog help 5/5
-#: src/include/s390/iucvterminal-server/helps.rb:100
+#: src/include/s390/iucvterminal-server/helps.rb:115
msgid "<p>Undo changes in this dialog by clicking the <b>Back</b> button.</p>"
msgstr "<p>在此對話方塊中按一下<b>「上一步」</b>按鈕可以復原變更。<p>"

#. IUCVConn on Login dialog help 1/2
-#: src/include/s390/iucvterminal-server/helps.rb:104
+#: src/include/s390/iucvterminal-server/helps.rb:119
msgid "<p><b><big>IUCVConn on Login</big></b></p>"
msgstr "<p><b><big>登入時執行 IUCVConn</big></b></p>"

-#: src/include/s390/iucvterminal-server/helps.rb:107
+#: src/include/s390/iucvterminal-server/helps.rb:122
msgid "<p>IUCVConn on Login needs one user for every z/VM ID. To create these
users a <b>password</b> and <b>home directory</b> has to be provided."
msgstr "<p>「登入時執行 IUCVConn」要求每個 z/VM ID
都有一個使用者。若要建立這些使用者,必須提供<b>密碼</b>和<b>主目錄</b>。"

#. IUCVConn on Login dialog help 2/2
-#: src/include/s390/iucvterminal-server/helps.rb:111
+#: src/include/s390/iucvterminal-server/helps.rb:127
msgid "<p>It is possible to sync the users manually by clicking on <b>Sync</b>
or just confirming the changes with <b>Ok</b> while <b>IUCVConn on Login</b> is
enabled. </p>"
msgstr "<p>按一下<b>同步</b>可以手動同步使用者,如果啟用了<b>登入時執行
IUCVConn</b>,則在按一下<b>確定</b>確認變更時也會同步使用者。</p>"

@@ -846,87 +846,87 @@
msgstr "TS-成員(&M)"

#. draw active tab
-#: src/include/s390/iucvterminal-server/ui.rb:595
+#: src/include/s390/iucvterminal-server/ui.rb:594
msgid "&z/VM IDs"
msgstr "z/VM ID(&Z)"

-#: src/include/s390/iucvterminal-server/ui.rb:596
+#: src/include/s390/iucvterminal-server/ui.rb:595
msgid "&TS-Shell"
msgstr "TS-Shell(&T)"

-#: src/include/s390/iucvterminal-server/ui.rb:597
+#: src/include/s390/iucvterminal-server/ui.rb:596
msgid "&IUCVConn"
msgstr "IUCVConn(&I)"

#. check and commit password
-#: src/include/s390/iucvterminal-server/ui.rb:711
+#: src/include/s390/iucvterminal-server/ui.rb:708
msgid "The passwords do not match or are invalid."
msgstr "密碼不相符或無效。"

#. check if the user specifcation is valid and if the name does already exist
-#: src/include/s390/iucvterminal-server/ui.rb:717
+#: src/include/s390/iucvterminal-server/ui.rb:714
msgid "The username is not valid!"
msgstr "該使用者名稱無效!"

-#: src/include/s390/iucvterminal-server/ui.rb:721
+#: src/include/s390/iucvterminal-server/ui.rb:718
msgid "A home directory has to be specified!"
msgstr "必須指定主目錄!"

-#: src/include/s390/iucvterminal-server/ui.rb:757
+#: src/include/s390/iucvterminal-server/ui.rb:751
msgid "Adding the user has failed."
msgstr "新增使用者失敗。"

#. delete group entry if disabled
-#: src/include/s390/iucvterminal-server/ui.rb:861
+#: src/include/s390/iucvterminal-server/ui.rb:843
msgid "Configure IUCV Terminal Server Settings"
msgstr "設定 IUCV 終端機伺服器設定"

#. update screen
-#: src/include/s390/iucvterminal-server/ui.rb:881
+#: src/include/s390/iucvterminal-server/ui.rb:863
msgid "New TS-Shell User"
msgstr "新增 TS-Shell 使用者"

-#: src/include/s390/iucvterminal-server/ui.rb:894
+#: src/include/s390/iucvterminal-server/ui.rb:876
msgid "Manage Groups for TS-Authorization"
msgstr "為 TS-授權管理群組"

#. since alnum allows umlauts too the id is checked against the user name
specification
-#: src/include/s390/iucvterminal-server/ui.rb:1020
+#: src/include/s390/iucvterminal-server/ui.rb:1000
msgid "Wrong z/VM ID \"%1\" in line %2, only letters and numbers are allowed."
msgstr "第 %2 行中的 z/VM ID「%1」錯誤,只允許使用字母和數字。"

-#: src/include/s390/iucvterminal-server/ui.rb:1032
+#: src/include/s390/iucvterminal-server/ui.rb:1012
msgid "Wrong z/VM ID \"%1\" in line %2, numbers at the beginning are not
allowed."
msgstr "第 %2 行中的 z/VM ID「%1」錯誤,開頭不允許使用數字。"

-#: src/include/s390/iucvterminal-server/ui.rb:1044
+#: src/include/s390/iucvterminal-server/ui.rb:1024
msgid "Wrong z/VM ID \"%1\" in line %2, more than eight characters are not
allowed."
msgstr "第 %2 行中的 z/VM ID「%1」錯誤,不允許超過 8 個字元。"

#. only the last entry is allowed to be empty
-#: src/include/s390/iucvterminal-server/ui.rb:1057
+#: src/include/s390/iucvterminal-server/ui.rb:1037
msgid "Wrong z/VM ID \"%1\" in line %2, at least one letter is required."
msgstr "第 %2 行中的 z/VM ID「%1」錯誤,至少需包含一個字母。"

#. check password
-#: src/include/s390/iucvterminal-server/ui.rb:1081
+#: src/include/s390/iucvterminal-server/ui.rb:1061
msgid "A correctly entered password to sync IUCVConn users is required."
msgstr "需要輸入正確的密碼才能同步 IUCVConn 使用者。"

#. check home directory
-#: src/include/s390/iucvterminal-server/ui.rb:1087
+#: src/include/s390/iucvterminal-server/ui.rb:1067
msgid "The specified IUCVConn home directory is invalid."
msgstr "指定的 IUCVConn 主目錄無效。"

#. update ts member selection
-#: src/include/s390/iucvterminal-server/ui.rb:1437
+#: src/include/s390/iucvterminal-server/ui.rb:1415
msgid "The group name is not valid!"
msgstr "該群組名稱無效!"

#. change tab selection back
#. check for z/VM ID entries
-#: src/include/s390/iucvterminal-server/ui.rb:1497
-#: src/include/s390/iucvterminal-server/ui.rb:1598
+#: src/include/s390/iucvterminal-server/ui.rb:1474
+#: src/include/s390/iucvterminal-server/ui.rb:1575
msgid "Cannot configure the terminal server without valid z/VM IDs."
msgstr "沒有有效的 z/VM ID,將無法設定終端機伺服器。"

@@ -969,32 +969,32 @@
msgstr "<p>可以執行多個 <b>IUCVtty 例項</b>來提供多個終端機裝置。這些例項透過由<b>「終端機 ID
字首」</b>和例項編號組成的終端機 ID 來識別。<br>"

#. IUCVTerminal dialog help 4/11
-#: src/include/s390/iucvterminal/ui.rb:129
+#: src/include/s390/iucvterminal/ui.rb:131
msgid "For example, if you define ten instances with the prefix
&quot;<i>lxterm</i>&quot;, the terminal IDs from <i>lxterm0</i> to
<i>lxterm9</i> are available.</p>"
msgstr "例如,如果定義了 10 個字首為「<i>lxterm</i>」的例項,則提供的終端機 ID 為從 <i>lxterm0</i> 到
<i>lxterm9</i>。</p>"

#. IUCVTerminal dialog help 5/11
-#: src/include/s390/iucvterminal/ui.rb:133
+#: src/include/s390/iucvterminal/ui.rb:136
msgid "<p><b>HVC</b></p>"
msgstr "<p><b>HVC</b></p>"

#. IUCVTerminal dialog help 6/11
-#: src/include/s390/iucvterminal/ui.rb:135
+#: src/include/s390/iucvterminal/ui.rb:138
msgid "<p>The z/VM IUCV HVC device driver is a kernel module and uses device
nodes to enable up to eight HVC terminal devices to communicate with getty and
login programs.</p>"
msgstr "<p>z/VM IUCV HVC 裝置驅動程式是一個核心模組,它使用裝置節點來啟用 HVC 終端機裝置 (最多 8 個),以與 Getty
和登入程式進行通訊。</p>"

#. IUCVTerminal dialog help 7/11
-#: src/include/s390/iucvterminal/ui.rb:139
+#: src/include/s390/iucvterminal/ui.rb:143
msgid "<p>With <b>restrict access</b>, allow only connections from certain
<b>terminal servers</b>.</p>"
msgstr "<p>使用<b>「限制存取」</b>,可以只允許來自特定<b>終端機伺服器</b>的連接。</p>"

#. IUCVTerminal dialog help 8/11
-#: src/include/s390/iucvterminal/ui.rb:143
+#: src/include/s390/iucvterminal/ui.rb:147
msgid "<p>Define the emulation for all instances at once or for each one
separately.</p>"
msgstr "<p>一次性為所有例項定義模擬,或者分別為每個例項定義模擬。</p>"

#. IUCVTerminal dialog help 9/11
-#: src/include/s390/iucvterminal/ui.rb:147
+#: src/include/s390/iucvterminal/ui.rb:151
msgid ""
"<p>Activate <b>route kernel messages to hvc0</b> to route kernel messages
to\n"
"the hvc0 device instead of ttyS0.<br>"
@@ -1003,85 +1003,85 @@
"而非 ttyS0。<br>"

#. IUCVTerminal dialog help 10/11
-#: src/include/s390/iucvterminal/ui.rb:151
+#: src/include/s390/iucvterminal/ui.rb:156
msgid "Should kernel messages still be shown on ttyS0, manually add
<b>console=ttyS0</b> to the current boot selection kernel parameter in the
<b>YaST bootloader module</b>.</p>"
msgstr "如果仍要在 ttyS0 上顯示核心訊息,請在<b>「YaST 開機載入程式模組」</b>中手動將 <b>console=ttyS0</b>
新增到目前的開機選項核心參數中。</p>"

#. IUCVTerminal dialog help 11/11
-#: src/include/s390/iucvterminal/ui.rb:155
+#: src/include/s390/iucvterminal/ui.rb:161
msgid "<h3>Warning: HVC Terminals stay logged on without a manual logout
through the shortcut: ctrl _ d</h3>"
msgstr "<h3>警告︰HVC 終端機會保持登入狀態,除非使用者透過捷徑鍵 ctrl _ d 手動登出</h3>"

#. Dialog content
-#: src/include/s390/iucvterminal/ui.rb:168
+#: src/include/s390/iucvterminal/ui.rb:174
msgid "&IUCVtty"
msgstr "IUCVtty(&I)"

-#: src/include/s390/iucvterminal/ui.rb:176
+#: src/include/s390/iucvterminal/ui.rb:182
msgid "Terminal ID &Prefix"
msgstr "終端機 ID 字首(&P)"

-#: src/include/s390/iucvterminal/ui.rb:182
+#: src/include/s390/iucvterminal/ui.rb:188
msgid "I&UCVtty instances"
msgstr "IUCVtty 例項(&U)"

-#: src/include/s390/iucvterminal/ui.rb:196
+#: src/include/s390/iucvterminal/ui.rb:202
msgid "HVC"
msgstr "HVC"

-#: src/include/s390/iucvterminal/ui.rb:206
+#: src/include/s390/iucvterminal/ui.rb:212
msgid "H&VC instances"
msgstr "HVC 例項(&V)"

-#: src/include/s390/iucvterminal/ui.rb:217
+#: src/include/s390/iucvterminal/ui.rb:223
msgid "Restrict &access to"
msgstr "限制存取為(&A)"

-#: src/include/s390/iucvterminal/ui.rb:223
+#: src/include/s390/iucvterminal/ui.rb:229
msgid "Allowed Terminal &Servers"
msgstr "允許的終端機伺服器(&S)"

-#: src/include/s390/iucvterminal/ui.rb:231
+#: src/include/s390/iucvterminal/ui.rb:237
msgid "route &kernel messages to hvc0"
msgstr "將核心訊息路由至 hvc0(&K)"

#. if settings were changed don't exit without asking
-#: src/include/s390/iucvterminal/ui.rb:324
+#: src/include/s390/iucvterminal/ui.rb:330
msgid "Really leave without saving?"
msgstr "確定不儲存直接離開嗎?"

#. check iucv id
-#: src/include/s390/iucvterminal/ui.rb:333
+#: src/include/s390/iucvterminal/ui.rb:339
msgid "The IUCV ID is not valid."
msgstr "該 IUCV ID 無效。"

#. check restrict_hvc_to_srvs and make sure they doesn't end with a comma
-#: src/include/s390/iucvterminal/ui.rb:343
+#: src/include/s390/iucvterminal/ui.rb:349
msgid "The Terminal Servers are not valid."
msgstr "該終端機伺服器無效。"

#. check if the bootloader settings need to be adjusted
-#: src/include/s390/iucvterminal/ui.rb:366
+#: src/include/s390/iucvterminal/ui.rb:380
msgid "The system has to be rebooted for some changes to take effect."
msgstr "系統必須重新開機,某些變更才會生效。"

#. only five lines are allowed, remove every additional line
-#: src/include/s390/onpanic/ui.rb:63
+#: src/include/s390/onpanic/ui.rb:62
msgid "Only %1 lines are allowed for VMCMD."
msgstr "VMCMD 只允許輸入 %1 行。"

#. For translators: Caption of the dialog
-#: src/include/s390/onpanic/ui.rb:109
+#: src/include/s390/onpanic/ui.rb:108
msgid "On Panic Configuration"
msgstr "OnPanic 的組態"

#. OnPanic dialog help 1/11
-#: src/include/s390/onpanic/ui.rb:112
+#: src/include/s390/onpanic/ui.rb:111
msgid "<p><b>Configure the actions to be taken if a kernel panic
occurs</b></p>"
msgstr "<p><b>設定發生核心異常時要執行的動作</b></p>"

#. OnPanic dialog help 2/11
-#: src/include/s390/onpanic/ui.rb:116
+#: src/include/s390/onpanic/ui.rb:115
msgid "<p>The <b>Dumpconf</b> daemon needs to be enabled to influence the
behavior during kernel panics.</p>"
msgstr "<p>需要啟用 <b>dumpconf</b> 精靈才能影響發生核心異常時的行為。</p>"

@@ -1115,83 +1115,83 @@
"機器的 LPAR 上,以及 z/VM 5.3 和更高版本上可用。<br>"

#. OnPanic dialog help 8/11
-#: src/include/s390/onpanic/ui.rb:132
+#: src/include/s390/onpanic/ui.rb:133
msgid "<b>vmcmd</b> Execute specified CP commands and stop system.</p>"
msgstr "<b>vmcmd</b> 執行指定的 CP 指令並停止系統。</p>"

#. OnPanic dialog help 9/11
-#: src/include/s390/onpanic/ui.rb:134
+#: src/include/s390/onpanic/ui.rb:135
msgid "<p>The time defined in <b>Delay Minutes</b> defers activating the
specified panic action for a newly started system to prevent loops. If the
system crashes before the time has elapsed the default action (stop) is
performed.</p>"
msgstr
"<p><b>延遲分鐘數</b>中定義的時間會對新啟動的系統延遲啟動指定的異常時動作,以免發生迴路。如果系統在這個定義的時間之前當機,預設的動作 (stop)
將會執行。</p>"

#. OnPanic dialog help 10/11
-#: src/include/s390/onpanic/ui.rb:138
+#: src/include/s390/onpanic/ui.rb:141
msgid "<p>The device for dumping the memory can be set with <b>Dump
Device</b>. If no device is shown you have to create one with the <b>YaST Dump
Devices</b> dialog.</p>"
msgstr "<p>可以使用<b>傾印裝置</b>設定用於傾印記憶體的裝置。如果未顯示任何裝置,則您必須使用 <b>YaST
傾印裝置</b>對話方塊建立一個。</p>"

#. OnPanic dialog help 11/11
-#: src/include/s390/onpanic/ui.rb:143
+#: src/include/s390/onpanic/ui.rb:147
msgid "<p>With <b>VMCMD</b> specify CP commands to be executed before the
Linux system is stopped. Only %1 lines and a total of %2 chars are allowed.</p>"
msgstr "<p>使用 <b>VMCMD</b> 可以指定要在 Linux 系統停止之前執行的 CP 指令。只允許輸入 %1 行,並且總共只允許包含
%2 個字元。</p>"

#. radio button label
-#: src/include/s390/onpanic/ui.rb:166
+#: src/include/s390/onpanic/ui.rb:171
msgid "Do No&t Start Dumpconf"
msgstr "不啟動 Dumpconf(&T)"

#. radio button label
-#: src/include/s390/onpanic/ui.rb:175
+#: src/include/s390/onpanic/ui.rb:180
msgid "&Start Dumpconf"
msgstr "啟動 Dumpconf(&S)"

#. combobox label
-#: src/include/s390/onpanic/ui.rb:189
+#: src/include/s390/onpanic/ui.rb:194
msgid "&Panic Action"
msgstr "異常時動作(&P)"

-#: src/include/s390/onpanic/ui.rb:192
+#: src/include/s390/onpanic/ui.rb:197
msgid "Delay &Minutes"
msgstr "延遲分鐘數(&M)"

#. combobox label
-#: src/include/s390/onpanic/ui.rb:202
+#: src/include/s390/onpanic/ui.rb:207
msgid "&Dump Device"
msgstr "傾印裝置(&D)"

-#: src/include/s390/onpanic/ui.rb:206
+#: src/include/s390/onpanic/ui.rb:211
msgid "&VMCMD"
msgstr "VMCMD(&V)"

#. don't allow dumps if no device is available
-#: src/include/s390/onpanic/ui.rb:267
+#: src/include/s390/onpanic/ui.rb:271
msgid "It is not possible to enable the dump process without a dump device."
msgstr "沒有傾印裝置,無法啟用傾印程序。"

#. don't allow vmcmd without at least one command
-#: src/include/s390/onpanic/ui.rb:281
+#: src/include/s390/onpanic/ui.rb:285
msgid "It is not possible to use vmcmd without defining at least one command."
msgstr "若要使用 vmcmd,至少須定義一個指令。"

#. Dialog caption
-#: src/include/s390/zfcp/dialogs.rb:113
+#: src/include/s390/zfcp/dialogs.rb:109
msgid "Configured ZFCP Devices"
msgstr "設定的 ZFCP 裝置"

#. table header
#. table header
-#: src/include/s390/zfcp/dialogs.rb:122 src/include/s390/zfcp/dialogs.rb:131
+#: src/include/s390/zfcp/dialogs.rb:118 src/include/s390/zfcp/dialogs.rb:127
msgid "WWPN"
msgstr "WWPN"

#. table header
#. table header
-#: src/include/s390/zfcp/dialogs.rb:124 src/include/s390/zfcp/dialogs.rb:133
+#: src/include/s390/zfcp/dialogs.rb:120 src/include/s390/zfcp/dialogs.rb:129
msgid "LUN"
msgstr "LUN"

#. yes-no popup
#. yes-no popup
-#: src/include/s390/zfcp/dialogs.rb:238 src/include/s390/zfcp/dialogs.rb:391
+#: src/include/s390/zfcp/dialogs.rb:232 src/include/s390/zfcp/dialogs.rb:380
msgid ""
"Really leave the ZFCP device configuration without saving?\n"
"All changes will be lost."
@@ -1200,42 +1200,42 @@
"這樣會遺失所有的變更。"

#. dialog caption
-#: src/include/s390/zfcp/dialogs.rb:259
+#: src/include/s390/zfcp/dialogs.rb:252
msgid "Add New ZFCP Device"
msgstr "新增新的 ZFCP 裝置"

#. push button
-#: src/include/s390/zfcp/dialogs.rb:309
+#: src/include/s390/zfcp/dialogs.rb:300
msgid "Get WWPNs"
msgstr "取得 WWPN"

#. combo box
-#: src/include/s390/zfcp/dialogs.rb:312
+#: src/include/s390/zfcp/dialogs.rb:303
msgid "&WWPN"
msgstr "WWPN(&W)"

#. push button
-#: src/include/s390/zfcp/dialogs.rb:319
+#: src/include/s390/zfcp/dialogs.rb:308
msgid "Get LUNs"
msgstr "取得 LUN"

#. combobox
-#: src/include/s390/zfcp/dialogs.rb:322
+#: src/include/s390/zfcp/dialogs.rb:311
msgid "&LUN"
msgstr "LUN(&L)"

-#: src/include/s390/zfcp/dialogs.rb:325
+#: src/include/s390/zfcp/dialogs.rb:314
msgid "If no WWPN and no LUN have been defined the system is trying to use
allow_lun_scan."
msgstr "如果尚未定義 WWPN 和 LUN,系統將嘗試使用 allow_lun_scan。"

#. error popup
#. error popup
-#: src/include/s390/zfcp/dialogs.rb:376 src/include/s390/zfcp/dialogs.rb:413
+#: src/include/s390/zfcp/dialogs.rb:365 src/include/s390/zfcp/dialogs.rb:402
msgid "The entered WWPN is invalid."
msgstr "輸入的 WWPN 無效。"

#. error popup
-#: src/include/s390/zfcp/dialogs.rb:421
+#: src/include/s390/zfcp/dialogs.rb:410
msgid "The entered LUN is invalid."
msgstr "輸入的 LUN 無效。"

@@ -1249,7 +1249,7 @@
"</p>\n"

#. Write dialog help 1/2
-#: src/include/s390/zfcp/helps.rb:44
+#: src/include/s390/zfcp/helps.rb:45
msgid ""
"<p><b><big>Saving ZFCP Device Configuration</big></b><br>\n"
"</p>\n"
@@ -1258,7 +1258,7 @@
"</p>\n"

#. Disk selection dialog help 1/3
-#: src/include/s390/zfcp/helps.rb:54
+#: src/include/s390/zfcp/helps.rb:55
msgid ""
"<p><b><big>Configured ZFCP Devices</big></b><br>\n"
"Manage ZFCP devices on your system.</p>\n"
@@ -1267,12 +1267,12 @@
"管理您系統上的 ZFCP 裝置。</p>\n"

#. Disk selection dialog help 2/3
-#: src/include/s390/zfcp/helps.rb:58
+#: src/include/s390/zfcp/helps.rb:59
msgid "<p>To configure a new ZFCP device, click <b>Add</b>.</p>"
msgstr "<p>若要設定新的 ZFCP 裝置,請按一下<b>「新增」</b>。</p>"

#. Disk selection dialog help 3/3
-#: src/include/s390/zfcp/helps.rb:60
+#: src/include/s390/zfcp/helps.rb:61
msgid ""
"<p>To remove a configured ZFCP device, select it and click\n"
"<b>Delete</b>.</p>"
@@ -1282,11 +1282,11 @@

#. Disk selection dialog Warning
#. Disk selection dialog Warning
-#: src/include/s390/zfcp/helps.rb:64 src/include/s390/zfcp/helps.rb:88
+#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:90
msgid "<h1>Warning</h1>"
msgstr "<h1>警告</h1>"

-#: src/include/s390/zfcp/helps.rb:65 src/include/s390/zfcp/helps.rb:89
+#: src/include/s390/zfcp/helps.rb:66 src/include/s390/zfcp/helps.rb:91
msgid ""
"<p>When accessing a ZFCP device\n"
"<b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive.\n"
@@ -1297,7 +1297,7 @@
" 否則就有損毀資料的風險。</p>"

#. Disk add help 1/2
-#: src/include/s390/zfcp/helps.rb:71
+#: src/include/s390/zfcp/helps.rb:72
msgid ""
"<p><b><big>Add New ZFCP Device</big></b><br>\n"
"Enter the identifier of the device to add, the\n"
@@ -1310,7 +1310,7 @@
"(<b>WWPN</b>),以及 <b>LUN</b> 號碼。</p>\n"

#. Disk add help 2/2, This is HTML, so finally "&lt;devno&gt;" is displayed as
"<devno>"
-#: src/include/s390/zfcp/helps.rb:78
+#: src/include/s390/zfcp/helps.rb:79
msgid ""
"<p>The <b>Channel ID</b> must be entered with lowercase letters in a sysfs
conforming\n"
"format 0.0.&lt;devno&gt;, such as <tt>0.0.5c51</tt>.</p>\n"
@@ -1328,95 +1328,95 @@

#. popup label
#. popup label
-#: src/modules/DASDController.rb:187 src/modules/ZFCPController.rb:163
+#: src/modules/DASDController.rb:178 src/modules/ZFCPController.rb:153
msgid "Running mkinitrd."
msgstr "正在執行 mkinitrd。"

#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/DASDController.rb:333
+#: src/modules/DASDController.rb:311
msgid "Channel ID: %1, Format: %2, DIAG: %3"
msgstr "通道 ID:%1,格式:%2,DIAG:%3"

-#: src/modules/DASDController.rb:346
+#: src/modules/DASDController.rb:324
msgid "Channel ID: %1, Device: %2, DIAG: %3"
msgstr "通道 ID:%1,裝置:%2,DIAG:%3"

#. popup label
-#: src/modules/DASDController.rb:381
+#: src/modules/DASDController.rb:356
msgid "Reading Configured DASD Disks"
msgstr "正在讀取已設定的 DASD 磁碟"

#. error report, %1 is device identification
#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:472 src/modules/ZFCPController.rb:446
-#: src/modules/ZFCPController.rb:540
+#: src/modules/DASDController.rb:446 src/modules/ZFCPController.rb:422
+#: src/modules/ZFCPController.rb:515
msgid "%1: sysfs not mounted."
msgstr "%1:sysfs 未裝置。"

#. error report, %1 is device identification
#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:480 src/modules/ZFCPController.rb:454
-#: src/modules/ZFCPController.rb:548
+#: src/modules/DASDController.rb:454 src/modules/ZFCPController.rb:430
+#: src/modules/ZFCPController.rb:523
msgid "%1: Invalid status for <online>."
msgstr "%1:<online> 的狀態無效。"

#. error report, %1 is device identification
#. error report, %1 is device identification
-#: src/modules/DASDController.rb:488 src/modules/ZFCPController.rb:462
+#: src/modules/DASDController.rb:462 src/modules/ZFCPController.rb:438
msgid "%1: No device found for <ccwid>."
msgstr "%1:沒有找到 <ccwid> 的裝置。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:496
+#: src/modules/DASDController.rb:470
msgid "%1: Could not change state of the device."
msgstr "%1:無法變更裝置的狀態。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:505
+#: src/modules/DASDController.rb:479
msgid "%1: Device is not a DASD."
msgstr "%1:裝置不是 DASD。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:514
+#: src/modules/DASDController.rb:488
msgid "%1: Could not load module."
msgstr "%1:無法載入模組。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:523
+#: src/modules/DASDController.rb:497
msgid "%1: Failed to activate DASD."
msgstr "%1:無法啟用 DASD。"

#. error report, %1 is device identification
-#: src/modules/DASDController.rb:532
+#: src/modules/DASDController.rb:506
msgid "%1: DASD is not formatted."
msgstr "%1:DASD 未格式化。"

#. error report, %1 is device identification, %2 is integer code
#. error report, %1 is device identification, %2 is integer code
#. error report, %1 is device identification, %2 is integer code
-#: src/modules/DASDController.rb:540 src/modules/ZFCPController.rb:518
-#: src/modules/ZFCPController.rb:596
+#: src/modules/DASDController.rb:514 src/modules/ZFCPController.rb:494
+#: src/modules/ZFCPController.rb:571
msgid "%1: Unknown error %2."
msgstr "%1:未知錯誤 %2。"

#. progress bar
-#: src/modules/DASDController.rb:653
+#: src/modules/DASDController.rb:622
msgid "Formatting %1:"
msgstr "正在格式化 %1:"

#. error report, %1 is exit code of the command (integer)
#. error report, %1 is exit code of the command (integer)
-#: src/modules/DASDController.rb:682 src/modules/DASDController.rb:779
+#: src/modules/DASDController.rb:651 src/modules/DASDController.rb:747
msgid "Disks formatting failed. Exit code: %1."
msgstr "磁碟格式化失敗。退出碼:%1。"

#. progress bar, %1 is device name, %2 and %3
#. integers,
#. eg. Formatting /dev/dasda: cylinder 123 of 12334 done
-#: src/modules/DASDController.rb:750
+#: src/modules/DASDController.rb:718
msgid "Formatting %1: cylinder %2 of %3 done"
msgstr "正在格式化 %1:磁柱 %2 (共 %3) 完成"

@@ -1455,9 +1455,9 @@
#. Progress finished
#. Progress finished
#: src/modules/Dump.rb:86 src/modules/Dump.rb:121
-#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:246
-#: src/modules/IUCVTerminalServer.rb:334 src/modules/IUCVTerminalServer.rb:478
-#: src/modules/OnPanic.rb:234 src/modules/OnPanic.rb:276
+#: src/modules/IUCVTerminal.rb:165 src/modules/IUCVTerminal.rb:244
+#: src/modules/IUCVTerminalServer.rb:335 src/modules/IUCVTerminalServer.rb:478
+#: src/modules/OnPanic.rb:233 src/modules/OnPanic.rb:275
msgid "Finished"
msgstr "已完成"

@@ -1480,37 +1480,37 @@
msgstr "正在建立傾印裝置。這個過程可能需要幾分鐘時間。"

#. error description
-#: src/modules/Dump.rb:148
+#: src/modules/Dump.rb:147
msgid "Invalid or unusable disk (fatal)."
msgstr "無效或無法使用的磁碟 (嚴重)。"

#. error description
-#: src/modules/Dump.rb:151
+#: src/modules/Dump.rb:150
msgid "Incompatible formatting or partitioning, correct with Force."
msgstr "進行了不相容的格式化或分割,請使用「強制」功能進行修正。"

#. error description
-#: src/modules/Dump.rb:156
+#: src/modules/Dump.rb:155
msgid "Missing support programs."
msgstr "缺少支援程式。"

#. error description
-#: src/modules/Dump.rb:159
+#: src/modules/Dump.rb:158
msgid "Missing or wrong parameters."
msgstr "缺少參數或參數錯誤。"

#. error description
-#: src/modules/Dump.rb:162
+#: src/modules/Dump.rb:161
msgid "Access problem."
msgstr "存取問題。"

#. error description, %1 is error code (integer)
-#: src/modules/Dump.rb:165
+#: src/modules/Dump.rb:164
msgid "Error code from support program: %1."
msgstr "來自支援程式的錯誤代碼:%1。"

#. error report, %1 is device name, %2 error description
-#: src/modules/Dump.rb:169
+#: src/modules/Dump.rb:168
msgid ""
"Cannot create dump device %1:\n"
"%2"
@@ -1555,37 +1555,37 @@
msgstr "正在讀取核心參數..."

#. Inittab write dialog caption
-#: src/modules/IUCVTerminal.rb:223
+#: src/modules/IUCVTerminal.rb:221
msgid "Saving IUCV Terminal Configuration"
msgstr "正在儲存 IUCV 終端機組態"

#. Progress stage 1/4
-#: src/modules/IUCVTerminal.rb:232
+#: src/modules/IUCVTerminal.rb:230
msgid "Write IUCVtty settings"
msgstr "寫入 IUCVtty 設定"

#. Progress stage 2/4
-#: src/modules/IUCVTerminal.rb:234
+#: src/modules/IUCVTerminal.rb:232
msgid "Write HVC settings"
msgstr "寫入 HVC 設定"

#. Progress stage 3/4
-#: src/modules/IUCVTerminal.rb:236
+#: src/modules/IUCVTerminal.rb:234
msgid "Write kernel parameters"
msgstr "寫入核心參數"

#. Progress step 1/4
-#: src/modules/IUCVTerminal.rb:240
+#: src/modules/IUCVTerminal.rb:238
msgid "Writing IUCVtty settings..."
msgstr "正在寫入 IUCVtty 設定..."

#. Progress step 2/4
-#: src/modules/IUCVTerminal.rb:242
+#: src/modules/IUCVTerminal.rb:240
msgid "Writing HVC settings..."
msgstr "正在寫入 HVC 設定..."

#. Progress step 3/4
-#: src/modules/IUCVTerminal.rb:244
+#: src/modules/IUCVTerminal.rb:242
msgid "Writing kernel parameters..."
msgstr "正在寫入核心參數..."

@@ -1596,27 +1596,27 @@

#. Read all settings
#. @return true on success
-#: src/modules/IUCVTerminalServer.rb:315
+#: src/modules/IUCVTerminalServer.rb:316
msgid "Loading IUCV Terminal Server Configuration"
msgstr "正在載入 IUCV 終端機伺服器組態"

#. Progress stage 1/2
-#: src/modules/IUCVTerminalServer.rb:324
+#: src/modules/IUCVTerminalServer.rb:325
msgid "Read configuration files"
msgstr "讀取組態檔案"

#. Progress stage 2/2
-#: src/modules/IUCVTerminalServer.rb:326
+#: src/modules/IUCVTerminalServer.rb:327
msgid "Load user/group settings"
msgstr "載入使用者/群組設定"

#. Progress step 1/2
-#: src/modules/IUCVTerminalServer.rb:330
+#: src/modules/IUCVTerminalServer.rb:331
msgid "Reading configuration files..."
msgstr "正在讀取組態檔案..."

#. Progress step 2/2
-#: src/modules/IUCVTerminalServer.rb:332
+#: src/modules/IUCVTerminalServer.rb:333
msgid "Loading user/group settings..."
msgstr "正在載入使用者/群組設定..."

@@ -1646,67 +1646,67 @@
msgstr "正在更新使用者設定..."

#. Dumpconf read dialog caption
-#: src/modules/OnPanic.rb:215
+#: src/modules/OnPanic.rb:214
msgid "Reading Dumpconf Configuration"
msgstr "正在讀取 Dumpconf 組態"

#. Progress stage 1/2
-#: src/modules/OnPanic.rb:224
+#: src/modules/OnPanic.rb:223
msgid "Checking dump devices"
msgstr "正在檢查傾印裝置"

#. Progress stage 2/2
-#: src/modules/OnPanic.rb:226
+#: src/modules/OnPanic.rb:225
msgid "Reading settings"
msgstr "正在讀取設定"

#. Progress step 1/2
-#: src/modules/OnPanic.rb:230
+#: src/modules/OnPanic.rb:229
msgid "Checking dump devices..."
msgstr "正在檢查傾印裝置..."

#. Progress step 2/2
-#: src/modules/OnPanic.rb:232
+#: src/modules/OnPanic.rb:231
msgid "Reading the settings..."
msgstr "正在讀取設定..."

#. Dumpconf write dialog caption
-#: src/modules/OnPanic.rb:257
+#: src/modules/OnPanic.rb:256
msgid "Saving Dumpconf Configuration"
msgstr "正在儲存 Dumpconf 組態"

#. Progress stage 1/2
-#: src/modules/OnPanic.rb:266
+#: src/modules/OnPanic.rb:265
msgid "Write the settings"
msgstr "寫入設定"

#. Progress stage 2/2
-#: src/modules/OnPanic.rb:268
+#: src/modules/OnPanic.rb:267
msgid "Restart the service"
msgstr "重新啟動服務"

#. Progress step 1/2
-#: src/modules/OnPanic.rb:272
+#: src/modules/OnPanic.rb:271
msgid "Writing the settings..."
msgstr "正在寫入設定..."

#. Progress step 2/2
-#: src/modules/OnPanic.rb:274
+#: src/modules/OnPanic.rb:273
msgid "Restarting service..."
msgstr "正在重新啟動服務..."

#. Create a textual summary and a list of configured devices
#. @return summary of the current configuration
-#: src/modules/ZFCPController.rb:304
+#: src/modules/ZFCPController.rb:279
msgid "Channel ID: %1, WWPN: %2, LUN: %3"
msgstr "通道 ID:%1,WWPN:%2,LUN:%3"

-#: src/modules/ZFCPController.rb:313
+#: src/modules/ZFCPController.rb:288
msgid "Channel ID: %1, WWPN: %2, LUN: %3, Device: %4"
msgstr "通道 ID:%1,WWPN:%2,LUN:%3,裝置:%4"

#. TRANSLATORS: warning message
-#: src/modules/ZFCPController.rb:372
+#: src/modules/ZFCPController.rb:348
msgid ""
"Cannot evaluate ZFCP controllers (e.g. in LPAR).\n"
"You will have to set it manually."
@@ -1715,61 +1715,61 @@
"您必須手動設定它。"

#. popup label
-#: src/modules/ZFCPController.rb:391
+#: src/modules/ZFCPController.rb:366
msgid "Reading Configured ZFCP Devices"
msgstr "正在讀取已設定的 ZFCP 裝置"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:470
+#: src/modules/ZFCPController.rb:446
msgid "%1: WWPN invalid."
msgstr "%1:WWPN 無效。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:478
+#: src/modules/ZFCPController.rb:454
msgid "%1: Could not activate WWPN for adapter %1."
msgstr "%1:無法啟動介面卡 %1 的 WWPN。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:486
+#: src/modules/ZFCPController.rb:462
msgid "%1: Could not activate ZFCP device."
msgstr "%1:無法啟動 ZFCP 裝置。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:494
+#: src/modules/ZFCPController.rb:470
msgid "%1: SCSI disk could not be deactivated."
msgstr "%1:SCSI 磁碟無法停止。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:502
+#: src/modules/ZFCPController.rb:478
msgid "%1: LUN could not be unregistered."
msgstr "%1:無法取消註冊 LUN。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:510
+#: src/modules/ZFCPController.rb:486
msgid "%1: WWPN could not be unregistered."
msgstr "%1:無法取消註冊 WWPN。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:556
+#: src/modules/ZFCPController.rb:531
msgid "%1: Device <ccwid> does not exist."
msgstr "%1:裝置 <ccwid> 不存在。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:564
+#: src/modules/ZFCPController.rb:539
msgid "%1: Module zfcp could not be loaded."
msgstr "%1:無法載入模組 zfcp。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:572
+#: src/modules/ZFCPController.rb:547
msgid "%1: Adapter status could not be changed."
msgstr "%1:配接器狀態無法變更。"

#. error report, %1 is device identification
-#: src/modules/ZFCPController.rb:580
+#: src/modules/ZFCPController.rb:555
msgid "%1: WWPN ports still active."
msgstr "%1:WWPN 埠仍然作用中。"

#. message, %1 is device identification
-#: src/modules/ZFCPController.rb:588
+#: src/modules/ZFCPController.rb:563
msgid "%1: This host adapter supports allow_lun_scan."
msgstr "%1︰此主機介面卡支援 allow_lun_scan。"

Modified: branches/SLE12-SP3/yast/zh_TW/po/samba-server.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/samba-server.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/samba-server.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2017-04-05 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -1707,107 +1707,115 @@

#. translators: progress finished
#. translators: write progress step
-#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:285
+#: src/modules/SambaServer.pm:172 src/modules/SambaServer.pm:293
msgid "Finished"
msgstr "已完成"

+#: src/modules/SambaServer.pm:186
+msgid ""
+"Cups is required by samba for printing to \n"
+"work correctly. Do you wish to disable printing?\n"
+"Note: To reenable printing you will need to \n"
+"manually enable the \"printers\" share and install cups."
+msgstr ""
+
#. Samba-server read dialog caption
-#: src/modules/SambaServer.pm:255
+#: src/modules/SambaServer.pm:263
msgid "Saving Samba Server Configuration"
msgstr "正在儲存 Samba 伺服器組態"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:260
+#: src/modules/SambaServer.pm:268
msgid "Write global settings"
msgstr "寫入全域設定"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:262
+#: src/modules/SambaServer.pm:270
msgid "Disable Samba services"
msgstr "停用 Samba 服務"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:264
+#: src/modules/SambaServer.pm:272
msgid "Enable Samba services"
msgstr "啟用 Samba 服務"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:266
+#: src/modules/SambaServer.pm:274
msgid "Write back-end settings"
msgstr "寫入後端設定"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:268
+#: src/modules/SambaServer.pm:276
msgid "Write Samba accounts"
msgstr "寫入 Samba 帳號"

#. translators: write progress stage
-#: src/modules/SambaServer.pm:270
+#: src/modules/SambaServer.pm:278
msgid "Save firewall settings"
msgstr "儲存防火牆設定"

#. translators: write progress step
-#: src/modules/SambaServer.pm:273
+#: src/modules/SambaServer.pm:281
msgid "Writing global settings..."
msgstr "正在寫入全域設定..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:275
+#: src/modules/SambaServer.pm:283
msgid "Disabling Samba services..."
msgstr "正在停用 Samba 服務..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:277
+#: src/modules/SambaServer.pm:285
msgid "Enabling Samba services..."
msgstr "正在啟用 Samba 服務..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:279
+#: src/modules/SambaServer.pm:287
msgid "Writing back-end settings..."
msgstr "正在寫入後端設定..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:281
+#: src/modules/SambaServer.pm:289
msgid "Writing Samba accounts..."
msgstr "正在寫入 Samba 帳號..."

#. translators: write progress step
-#: src/modules/SambaServer.pm:283
+#: src/modules/SambaServer.pm:291
msgid "Saving firewall settings..."
msgstr "正在儲存防火牆設定..."

#. /etc/samba/smb.conf is filename
-#: src/modules/SambaServer.pm:309
+#: src/modules/SambaServer.pm:317
msgid "Cannot write settings to /etc/samba/smb.conf."
msgstr "無法將設定寫入 /etc/samba/smb.conf。"

#. summary item: configured workgroup/domain
-#: src/modules/SambaServer.pm:406
+#: src/modules/SambaServer.pm:414
msgid "Global Configuration:"
msgstr "全域組態:"

-#: src/modules/SambaServer.pm:408
+#: src/modules/SambaServer.pm:416
#, perl-format
msgid "Workgroup or Domain: %s"
msgstr "工作群組或網域:%s"

#. summary item: selected role for the samba server
-#: src/modules/SambaServer.pm:412
+#: src/modules/SambaServer.pm:420
#, perl-format
msgid "Role: %s"
msgstr "職能:%s"

#. summary item: status of the samba service
-#: src/modules/SambaServer.pm:415
+#: src/modules/SambaServer.pm:423
msgid "Samba server is disabled"
msgstr "關閉Samba 伺服器"

#. summary heading: configured shares
-#: src/modules/SambaServer.pm:419
+#: src/modules/SambaServer.pm:427
msgid "Share Configuration:"
msgstr "共用組態:"

#. summary item: no configured shares
-#: src/modules/SambaServer.pm:425
+#: src/modules/SambaServer.pm:433
msgid "None"
msgstr "無"

Modified: branches/SLE12-SP3/yast/zh_TW/po/scanner.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/scanner.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/scanner.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: scanner\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:29+0200\n"
+"POT-Creation-Date: 2017-04-04 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -157,7 +157,7 @@
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
#: src/include/scanner/dialogs.rb:438 src/include/scanner/dialogs.rb:971
-#: src/modules/Scanner.rb:2261
+#: src/modules/Scanner.rb:2235
msgid "Failed to deactivate %1."
msgstr "無法停用 %1。"

@@ -962,7 +962,7 @@
#. to add a preceding "The error message is:" comment
#. to display an error message where
#. %1 will be replaced by the actual error message:
-#: src/modules/Scanner.rb:355
+#: src/modules/Scanner.rb:353
msgid ""
"The error message is:\n"
"\n"
@@ -974,7 +974,7 @@

#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:377
+#: src/modules/Scanner.rb:375
msgid "Failed to determine the version of package %1."
msgstr "無法識別套件 %1版本。"

@@ -984,7 +984,7 @@
#. Do not change or translate "Image Scan", it is a driver software name.
#. Do not change or translate "Avasys", it is a manufacturer name.
#. Do not change or translate "Epson", it is a manufacturer name.
-#: src/modules/Scanner.rb:399
+#: src/modules/Scanner.rb:397
msgid ""
"The third-party Image Scan driver software from Epson/Avasys is required.\n"
"The Image Scan driver software is made and provided by Epson (formerly
Avasys)\n"
@@ -1018,12 +1018,12 @@

#. Is the package available to be installed?
#. Package::Available returns nil if no package source is available.
-#: src/modules/Scanner.rb:442
+#: src/modules/Scanner.rb:440
msgid "Required package %1 is not installed and there is no package repository
available."
msgstr "未安裝需要的套件 %1,也沒有可用的套件儲存庫。"

#. Message of a Popup::Error where %1 will be replaced by the package name:
-#: src/modules/Scanner.rb:457
+#: src/modules/Scanner.rb:455
msgid "Required package %1 is not installed and not available in the
repository."
msgstr "未安裝需要的套件 %1,儲存庫中也沒有該套件。"

@@ -1031,7 +1031,7 @@
#. Either the user has explicitly rejected to install the package,
#. or this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:476
+#: src/modules/Scanner.rb:474
msgid "Failed to install required package %1."
msgstr "安裝需要的套件 %1 失敗。"

@@ -1039,7 +1039,7 @@
#. Do not change or translate "net", it is a metadriver name.
#. Do not simply use "driver" because net is no normal driver but a metadriver.
#. Do not change or translate "scanimage -L", it is a fixed command.
-#: src/modules/Scanner.rb:497
+#: src/modules/Scanner.rb:495
msgid ""
"Failed to determine the active scanners.\n"
"If the net metadriver is activated while there is a problem\n"
@@ -1061,7 +1061,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no active scanner was
determined.
#. The latter results no error.
-#: src/modules/Scanner.rb:519
+#: src/modules/Scanner.rb:517
msgid "Failed to determine the active scanners."
msgstr "無法判斷使用中的掃描器。"

@@ -1073,8 +1073,8 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:533 src/modules/Scanner.rb:591
-#: src/modules/Scanner.rb:650 src/modules/Scanner.rb:2500
+#: src/modules/Scanner.rb:531 src/modules/Scanner.rb:589
+#: src/modules/Scanner.rb:648 src/modules/Scanner.rb:2474
msgid "File %1 does not exist."
msgstr "檔案 %1 不存在。"

@@ -1086,8 +1086,8 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:553 src/modules/Scanner.rb:611
-#: src/modules/Scanner.rb:670 src/modules/Scanner.rb:2520
+#: src/modules/Scanner.rb:551 src/modules/Scanner.rb:609
+#: src/modules/Scanner.rb:668 src/modules/Scanner.rb:2494
msgid "Failed to read %1."
msgstr "無法讀取 %1。"

@@ -1095,7 +1095,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no active driver was
determined.
#. The latter results no error.
-#: src/modules/Scanner.rb:577
+#: src/modules/Scanner.rb:575
msgid "Failed to determine the active drivers."
msgstr "無法判斷使用中的驅動程式。"

@@ -1103,7 +1103,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanner was autodetected.
#. The latter results no error.
-#: src/modules/Scanner.rb:636
+#: src/modules/Scanner.rb:634
msgid "Failed to detect scanners automatically."
msgstr "無法自動偵測掃描器。"

@@ -1115,53 +1115,53 @@
#. - Determine active backends
#. - Try to autodetect USB and SCSI scanners and HP all-in-one USB and NETWORK
scanners
#. @return true on success
-#: src/modules/Scanner.rb:766
+#: src/modules/Scanner.rb:764
msgid "Initializing Scanner Configuration"
msgstr "正在啟始化掃描器組態"

-#: src/modules/Scanner.rb:770
+#: src/modules/Scanner.rb:768
msgid "Check installed packages"
msgstr "檢查安裝的套件"

#. 2. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:772
+#: src/modules/Scanner.rb:770
msgid "Read or create the scanner database"
msgstr "讀取或建立掃描器資料庫"

#. 3. progress stage name of a Progress::New:
#. 5. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:774 src/modules/Scanner.rb:1988
+#: src/modules/Scanner.rb:772 src/modules/Scanner.rb:1986
msgid "Determine active scanners"
msgstr "判斷使用中的掃描器"

#. 4. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:776
+#: src/modules/Scanner.rb:774
msgid "Determine active drivers"
msgstr "判斷使用中的驅動程式"

#. 5. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:778
+#: src/modules/Scanner.rb:776
msgid "Detect scanners"
msgstr "偵測掃描器"

#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:781
+#: src/modules/Scanner.rb:779
msgid "Checking installed packages..."
msgstr "正在檢查安裝的套件..."

#. 2. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:783
+#: src/modules/Scanner.rb:781
msgid "Reading or creating the scanner database..."
msgstr "正在讀取或建立掃描器資料庫..."

#. 3. progress step progress bar title of a Progress::New:
#. 5. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:785 src/modules/Scanner.rb:2001
+#: src/modules/Scanner.rb:783 src/modules/Scanner.rb:1999
msgid "Determining active scanners..."
msgstr "正在判斷使用中的掃描器..."

#. 4. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:787
+#: src/modules/Scanner.rb:785
msgid "Determining active drivers..."
msgstr "正在判斷使用中的驅動程式..."

@@ -1170,49 +1170,49 @@
#. Body of a Popup::ShowFeedback:
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1001
-#: src/modules/Scanner.rb:1070
+#: src/modules/Scanner.rb:787 src/modules/Scanner.rb:999
+#: src/modules/Scanner.rb:1068
msgid "Detecting scanners..."
msgstr "正在偵測掃描器..."

#. Last progress step progress bar title of a Progress::New:
#. Last progress step progress bar title of a Progress::New:
#. Last progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:791 src/modules/Scanner.rb:1030
-#: src/modules/Scanner.rb:2003
+#: src/modules/Scanner.rb:789 src/modules/Scanner.rb:1028
+#: src/modules/Scanner.rb:2001
msgid "Finished"
msgstr "已完成"

#. Progress 2. stage (Read or create the scanner database):
-#: src/modules/Scanner.rb:859
+#: src/modules/Scanner.rb:857
msgid "Creating scanner database..."
msgstr "正在建立掃描器資料庫..."

#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:893
+#: src/modules/Scanner.rb:891
msgid "Aborting: Failed to create the scanner database."
msgstr "中止:無法建立掃描器資料庫。"

#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
-#: src/modules/Scanner.rb:933
+#: src/modules/Scanner.rb:931
msgid "Aborting: Failed to read %1."
msgstr "中止:無法讀取 %1。"

#. Write scanner settings:
#. - Save the actual environment
#. @return true on success
-#: src/modules/Scanner.rb:1023
+#: src/modules/Scanner.rb:1021
msgid "Writing Scanner Configuration"
msgstr "正在寫入掃描器組態"

-#: src/modules/Scanner.rb:1026
+#: src/modules/Scanner.rb:1024
msgid "Save the actual environment"
msgstr "儲存實際的環境"

#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1028
+#: src/modules/Scanner.rb:1026
msgid "Saving the actual environment..."
msgstr "正在儲存實際的環境..."

@@ -1220,7 +1220,7 @@
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "HPLIP", it is a subsystem name.
-#: src/modules/Scanner.rb:1088
+#: src/modules/Scanner.rb:1086
msgid ""
"There is at least one printer configuration that uses the ptal service.\n"
"It is possible to proceed but then the running ptal service could prevent\n"
@@ -1238,7 +1238,7 @@

#. Message of a Popup::Error when hp-setup should be run.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1099
+#: src/modules/Scanner.rb:1097
msgid ""
"Cannot run hp-setup because no graphical display can be opened. \n"
"This happens if YaST runs in text-only mode, or the user who runs YaST \n"
@@ -1257,7 +1257,7 @@
#. Message of a Popup::YesNo when hplip should be installed.
#. Do not change or translate "hp-setup", it is a program name.
#. Do not change or translate "hplip", it is a package name:
-#: src/modules/Scanner.rb:1111
+#: src/modules/Scanner.rb:1109
msgid ""
"It seems hplip is not installed, which is required to run hp-setup.\n"
"Should the hplip package be installed?\n"
@@ -1267,7 +1267,7 @@

#. Message of a Popup::Error when hp-setup should be run.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1117
+#: src/modules/Scanner.rb:1115
msgid ""
"Cannot run hp-setup because\n"
"/usr/bin/hp-setup is not executable\n"
@@ -1279,7 +1279,7 @@

#. Body of a Popup::ShowFeedback.
#. Do not change or translate "hp-setup", it is a program name:
-#: src/modules/Scanner.rb:1125
+#: src/modules/Scanner.rb:1123
msgid ""
"Launched hp-setup.\n"
"You must finish hp-setup before you can proceed with the scanner
configuration.\n"
@@ -1289,25 +1289,25 @@

#. where autodetected scanners are listed in the second column
#. to denote those scanners which are not configured yet:
-#: src/modules/Scanner.rb:1296
+#: src/modules/Scanner.rb:1294
msgid "Not Configured:"
msgstr "未設定:"

#. Fallback device name if the real device name is missing:
#. Fallback device name if the real device name is missing:
-#: src/modules/Scanner.rb:1326 src/modules/Scanner.rb:2242
+#: src/modules/Scanner.rb:1324 src/modules/Scanner.rb:2216
msgid "Unknown device"
msgstr "未知裝置"

#. Fallback manufacturer name if the real manufacturer name is missing:
#. Fallback manufacturer name if the real manufacturer name is missing:
-#: src/modules/Scanner.rb:1332 src/modules/Scanner.rb:2230
+#: src/modules/Scanner.rb:1330 src/modules/Scanner.rb:2204
msgid "Unknown manufacturer"
msgstr "未知的廠商"

#. Fallback model name if the real model name is missing:
#. Fallback model name if the real model name is missing:
-#: src/modules/Scanner.rb:1335 src/modules/Scanner.rb:2236
+#: src/modules/Scanner.rb:1333 src/modules/Scanner.rb:2210
msgid "Unknown model"
msgstr "未知型號"

@@ -1318,14 +1318,14 @@
#. %1 will be replaced by the manufacturer name
#. %2 will be replaced by the model name
#. %3 will be replaced by the device name where the scanner is connected to:
-#: src/modules/Scanner.rb:1360 src/modules/Scanner.rb:2225
+#: src/modules/Scanner.rb:1358 src/modules/Scanner.rb:2199
msgid "%1 %2 at %3"
msgstr "%1 %2 於 %3"

#. A suffix for the second column of a table
#. where active scanner drivers are listed in the first column
#. to denote those drivers for which there is no matching active scanner:
-#: src/modules/Scanner.rb:1402
+#: src/modules/Scanner.rb:1400
msgid "No scanner recognized by this driver"
msgstr "此驅動程式無法識別任何掃描器"

@@ -1333,12 +1333,12 @@
#. when neither a scanner was autodetected
#. nor an active scanner was found
#. nor an active driver was found:
-#: src/modules/Scanner.rb:1426
+#: src/modules/Scanner.rb:1424
msgid "No scanner was detected and no active scanner or driver exists."
msgstr "未偵測到掃描器且沒有作用中的掃描器或驅動程式存在。"

#. Scanner model list firmware entry for models which require a firmware
upload:
-#: src/modules/Scanner.rb:1455
+#: src/modules/Scanner.rb:1453
msgid "Firmware upload required."
msgstr "需要韌體上載。"

@@ -1347,79 +1347,79 @@
#. Do not change or translate "Image Scan", it is a driver software name.
#. Do not change or translate "Avasys", it is a manufacturer name.
#. Do not change or translate "Epson", it is a manufacturer name.
-#: src/modules/Scanner.rb:1461
+#: src/modules/Scanner.rb:1459
msgid "Third-party Image Scan driver software from Epson/Avasys required."
msgstr "需要使用 Epson/Avasys 提供的協力廠商影像掃描驅動程式軟體。"

#. %1 will be replaced by the RPM package name
#. which provides the driver for the particular model:
-#: src/modules/Scanner.rb:1527
+#: src/modules/Scanner.rb:1525
msgid "Package %1"
msgstr "套件 %1"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1548
+#: src/modules/Scanner.rb:1546
msgid "Unmaintained driver %1 may provide good functionality."
msgstr "不再維護的驅動程式 %1 可能提供良好的功能。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1554
+#: src/modules/Scanner.rb:1552
msgid "Driver %1 should provide good functionality."
msgstr "驅動程式 %1 應該能提供良好的功能。"

#. Scanner model list status entry for "good" supported models:
-#: src/modules/Scanner.rb:1561
+#: src/modules/Scanner.rb:1559
msgid "This scanner is not supported."
msgstr "未支援此掃描器。"

#. which are listed as "unsupported" for a particular driver:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1566
+#: src/modules/Scanner.rb:1564
msgid "This scanner is not supported by the driver %1."
msgstr "驅動程式 %1 不支援此掃描器。"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1576
+#: src/modules/Scanner.rb:1574
msgid "Unmaintained driver %1 may provide complete functionality."
msgstr "不再維護的驅動程式 %1 可能提供完整的功能。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1584
+#: src/modules/Scanner.rb:1582
msgid "Driver %1 should provide complete functionality."
msgstr "驅動程式 %1 應該能提供完整的功能。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1592
+#: src/modules/Scanner.rb:1590
msgid "Driver %1 may work, but was not tested."
msgstr "驅動程式 %1 可能可以運作,但沒有經過測試。"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1601
+#: src/modules/Scanner.rb:1599
msgid "Unmaintained driver %1 may provide basic functionality."
msgstr "不再維護的驅動程式 %1 可能提供基本的功能。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1609
+#: src/modules/Scanner.rb:1607
msgid "Driver %1 should provide basic functionality."
msgstr "驅動程式 %1 應該可以提供基本的功能。"

#. but where the backend (scanner driver) is unmaintained:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1619
+#: src/modules/Scanner.rb:1617
msgid "Unmaintained driver %1 may provide minimal functionality."
msgstr "不再維護的驅動程式 %1 可能可提供最少的功能。"

#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1627
+#: src/modules/Scanner.rb:1625
msgid "Driver %1 should provide minimal functionality."
msgstr "驅動程式 %1 應該可以提供最少的功能。"

#. which are listed but without a known support status:
#. %1 will be replaced by the backend (scanner driver) name
-#: src/modules/Scanner.rb:1635
+#: src/modules/Scanner.rb:1633
msgid "Driver %1 may work, but the functionality is unknown."
msgstr "驅動程式 %1 可能可以運作,但功能不明。"

@@ -1429,7 +1429,7 @@
#. stored on the manufacturer's CD but often it is buried in a weird
Windows-only
#. driver archive format. The text must indicate this.
#. Do not change or translate "SANE", it is a project name.
-#: src/modules/Scanner.rb:1886
+#: src/modules/Scanner.rb:1884
msgid ""
"A firmware file contains software that must be uploaded to the scanner's
memory.\n"
"Without firmware, the scanner cannot work.\n"
@@ -1462,7 +1462,7 @@
#. Message of a Popup::ContinueCancel for scanners which should be set up with
the hpaio driver.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "HPLIP", it is a subsystem name.
-#: src/modules/Scanner.rb:1905
+#: src/modules/Scanner.rb:1903
msgid ""
"There is at least one printer configuration that uses the ptal service.\n"
"It is possible to proceed but then the ptal service would be stopped\n"
@@ -1479,7 +1479,7 @@
#. Do not change or translate "PTAL", it is a subsystem name.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "hplip", it is a service name.
-#: src/modules/Scanner.rb:1917
+#: src/modules/Scanner.rb:1915
msgid ""
"The hpoj driver requires the PTAL system to be set up and running.\n"
"In particular, the ptal service must be up and running.\n"
@@ -1519,7 +1519,7 @@
#. Do not change or translate "hplip", it is a service name.
#. Do not change or translate "hpaio", it is a driver name.
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:1940
+#: src/modules/Scanner.rb:1938
msgid ""
"There is at least one printer configuration that uses the hplip service.\n"
"It is possible to proceed but then the hplip service would be stopped\n"
@@ -1536,51 +1536,51 @@
"或者,繼續進行並變更印表機組態已使用 ptal 服務。\n"

#. %1 will be replaced by the backend name
-#: src/modules/Scanner.rb:1976
+#: src/modules/Scanner.rb:1974
msgid "Setting Up Driver %1"
msgstr "設定驅動程式 %1"

-#: src/modules/Scanner.rb:1980
+#: src/modules/Scanner.rb:1978
msgid "Check whether additional packages must be installed"
msgstr "檢查是否必須安裝其他套件"

#. 2. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1982
+#: src/modules/Scanner.rb:1980
msgid "Check whether firmware upload is required"
msgstr "檢查是否需要韌體上載"

#. 3. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1984
+#: src/modules/Scanner.rb:1982
msgid "Test and set up special requirements for particular drivers"
msgstr "測試和設定特定驅動程式的特殊需求"

#. 4. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1986
+#: src/modules/Scanner.rb:1984
msgid "Activate the driver"
msgstr "啟用驅動程式 "

#. 1. progress stage name of a Progress::New:
-#: src/modules/Scanner.rb:1991
+#: src/modules/Scanner.rb:1989
msgid "Checking whether additional packages must be installed..."
msgstr "正在檢查是否必須安裝其他套件..."

#. 2. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1993
+#: src/modules/Scanner.rb:1991
msgid "Checking whether firmware upload is required..."
msgstr "正在檢查是否需要韌體上載..."

#. 3. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1995
+#: src/modules/Scanner.rb:1993
msgid "Testing and setting up special requirements for particular drivers..."
msgstr "正在測試和設定特定驅動程式的特殊需求..."

#. 4. progress step progress bar title of a Progress::New:
-#: src/modules/Scanner.rb:1999
+#: src/modules/Scanner.rb:1997
msgid "Activating the driver..."
msgstr "正在啟用驅動程式 ..."

#. the third-party Image Scan driver software from Epson/Avasys:
-#: src/modules/Scanner.rb:2020
+#: src/modules/Scanner.rb:2018
msgid "Required Package Not Installed"
msgstr "未安裝需要的套件"

@@ -1590,7 +1590,7 @@
#. Only a simple message because before there was a dialog
#. which let the user install the package so that this message is shown
#. if the user has explicitly rejected to install it.
-#: src/modules/Scanner.rb:2028
+#: src/modules/Scanner.rb:2026
msgid "The driver %1 requires the package %2."
msgstr "%1 驅動程式需要 %2 套件。"

@@ -1598,9 +1598,8 @@
#. It may happen that the conflicting service hplip is in use by the printing
system.
#. The hplip service is associated with the hpaoi backend.
#. Activate the backend via bash script:
-#: src/modules/Scanner.rb:2034 src/modules/Scanner.rb:2075
-#: src/modules/Scanner.rb:2119 src/modules/Scanner.rb:2133
-#: src/modules/Scanner.rb:2143
+#: src/modules/Scanner.rb:2032 src/modules/Scanner.rb:2073
+#: src/modules/Scanner.rb:2106 src/modules/Scanner.rb:2117
msgid "Aborted"
msgstr "已中止"

@@ -1612,7 +1611,7 @@
#. because which scanner requires firmware upload is stored in the database
#. and additionally user confirmation must be requested.
#. Otherwise skip this section.
-#: src/modules/Scanner.rb:2054
+#: src/modules/Scanner.rb:2052
msgid "Firmware Upload Required"
msgstr "需要韌體上載"

@@ -1621,19 +1620,12 @@
#. which asked the user whether he wants to let YaST activate the ptal service
#. so that this message is shown if the user has explicitly rejected to do it.
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2109
+#: src/modules/Scanner.rb:2096
msgid "If the ptal service is not running, the scanner cannot work."
msgstr "若 ptal 服務未執行,則掃描器將無法運作。"

-#. Only a simple message because this error does not happen on a normal system
-#. (i.e. a system which is not totally broken or totally messed up).
-#. Do not change or translate "PTAL", it is a subsystem name.
-#: src/modules/Scanner.rb:2130
-msgid "Failed to set up the PTAL system."
-msgstr "無法設定 PTAL 系統。"
-
#. Header message for a list of scanners which will be deactivated:
-#: src/modules/Scanner.rb:2217
+#: src/modules/Scanner.rb:2191
msgid ""
"The following scanners use the same driver.\n"
"Therefore all those scanners will be deactivated:"
@@ -1648,49 +1640,49 @@
#. Do not change or translate "hpoj", it is a driver name.
#. Do not change or translate "ptal", it is a service name.
#. Do not change or translate "CUPS", it is a subsystem name.
-#: src/modules/Scanner.rb:2285
+#: src/modules/Scanner.rb:2259
msgid "The driver hpoj is deactivated but the associated service ptal is not
deactivated because it is needed by the CUPS printing system."
msgstr "驅動程式 hpoj 已被停用,但是相關的服務 ptal 並未被停用,因為 CUPS 列印系統需要使用該服務。"

#. (i.e. a system which is not totally broken or totally messed up).
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2300
+#: src/modules/Scanner.rb:2274
msgid "Failed to stop the ptal service."
msgstr "無法停止 ptal 服務。"

#. (i.e. a system which is not totally broken or totally messed up).
#. Do not change or translate "ptal", it is a service name.
-#: src/modules/Scanner.rb:2311
+#: src/modules/Scanner.rb:2285
msgid "Failed to disable the ptal service."
msgstr "無法停止 ptal 服務。"

#. If there is no active scanner for the backend
#. then show a message but exit successfully because
#. it is no error when there is no active scanner for the backend:
-#: src/modules/Scanner.rb:2370
+#: src/modules/Scanner.rb:2344
msgid "No Scanner for %1"
msgstr "沒有 %1 的掃描器"

#. Header of a Popup::AnyMessage where %1 will be replaced by the driver name:
#. Body of a Popup::AnyMessage:
-#: src/modules/Scanner.rb:2372
+#: src/modules/Scanner.rb:2346
msgid "It is not possible to test without a matching active scanner."
msgstr "沒有符合的使用中掃描器,無法測試驅動程式。"

#. Header of a SelectionBox with a list of scanners:
-#: src/modules/Scanner.rb:2387
+#: src/modules/Scanner.rb:2361
msgid "&Scanner to Test"
msgstr "要測試的掃描器(&S)"

#. Test the device:
-#: src/modules/Scanner.rb:2409
+#: src/modules/Scanner.rb:2383
msgid "Testing %1"
msgstr "正在測試 %1"

#. Header of a Popup::ShowFeedback where %1 will be replaced by the driver
name:
#. Body of a Popup::ShowFeedback where %1 will be replaced by the SANE device
identifier.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2412
+#: src/modules/Scanner.rb:2386
msgid "Testing with 'scanimage -d %1 -v'..."
msgstr "正在使用「scanimage -d %1 -v」進行測試..."

@@ -1698,7 +1690,7 @@
#. %2 will be replaced by the actual test results
#. which are usually only available in English.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2424
+#: src/modules/Scanner.rb:2398
msgid ""
"Test with 'scanimage -d %1 -v' failed.\n"
"The results are:\n"
@@ -1712,7 +1704,7 @@

#. Fallback message if the real results are missing:
#. Fallback message if the real results are missing:
-#: src/modules/Scanner.rb:2435 src/modules/Scanner.rb:2467
+#: src/modules/Scanner.rb:2409 src/modules/Scanner.rb:2441
msgid "(no results available)"
msgstr "(沒有可用的結果)"

@@ -1722,7 +1714,7 @@
#. the scanner had fallen into coma or the USB or SCSI system had crashed
#. and then the scanner would be no longer an active scanner nor could it be
autodetected.
#. To simulate such an event, simply unplug an USB scanner while it is being
tested.
-#: src/modules/Scanner.rb:2450
+#: src/modules/Scanner.rb:2424
msgid "Successfully Tested %1"
msgstr "成功地測試 %1"

@@ -1730,7 +1722,7 @@
#. %2 will be replaced by the actual test results
#. which are usually only available in English.
#. Do not change or translate "scanimage -d %1 -v", it is a fixed command.
-#: src/modules/Scanner.rb:2456
+#: src/modules/Scanner.rb:2430
msgid ""
"Test with 'scanimage -d %1 -v' succeeded.\n"
"The results are:\n"
@@ -1746,7 +1738,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanning via network was
configured.
#. The latter results no error.
-#: src/modules/Scanner.rb:2486
+#: src/modules/Scanner.rb:2460
msgid "Failed to determine the configuration for scanning via network."
msgstr "無法判斷經由網路掃描的組態。"

@@ -1754,7 +1746,7 @@
#. (i.e. a system which is not totally broken or totally messed up).
#. Do not confuse this error with the case when no scanning via network is to
be set up.
#. The latter results no error.
-#: src/modules/Scanner.rb:2562
+#: src/modules/Scanner.rb:2536
msgid "Failed to set up scanning via network."
msgstr "無法設定經由網路掃描。"

@@ -1769,11 +1761,14 @@
#. If any kind of firewall seems to be active, show a popup message
#. regarding scanning via network and firewall.
#. @return true if any kind of firewall seems to be active
-#: src/modules/Scanner.rb:2590
+#: src/modules/Scanner.rb:2564
msgid "Check that your firewall allows scanning via network."
msgstr "檢查您的防火牆允許經由網路掃描。"

#. Popup::MessageDetails information regarding details:
-#: src/modules/Scanner.rb:2592
+#: src/modules/Scanner.rb:2566
msgid "For details regarding firewall see the help text of this dialog."
msgstr "關於防火牆細節,請參閱此對話方塊的說明文字。"
+
+#~ msgid "Failed to set up the PTAL system."
+#~ msgstr "無法設定 PTAL 系統。"

Modified: branches/SLE12-SP3/yast/zh_TW/po/smt.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/smt.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/smt.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: smt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-04 17:26+0000\n"
+"POT-Creation-Date: 2017-05-22 12:57+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -646,6 +646,19 @@
msgid "Writing patches..."
msgstr "正在寫入修補程式..."

+#. bnc #390085
+#: src/include/smt/dialogs.rb:1129
+#, fuzzy
+#| msgid "Database &Password"
+msgid "Database Password for %1 User"
+msgstr "資料庫密碼(&P)"
+
+#: src/include/smt/dialogs.rb:1137
+#, fuzzy
+#| msgid "P&assword for user (again)"
+msgid "Database Password for %1 User Once Again"
+msgstr "使用者密碼 (再輸一次)(&A)"
+
#. TRANSLATORS: error report
#: src/include/smt/dialogs.rb:1167 src/modules/SMTData.rb:1130
msgid "The first and the second password do not match."

Modified: branches/SLE12-SP3/yast/zh_TW/po/storage.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/storage.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/storage.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-03 01:29+0000\n"
+"POT-Creation-Date: 2017-05-17 17:46+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -71,7 +71,7 @@
msgid "List partitions"
msgstr "列出分割區"

-#. Title for dialogue
+#. Title for dialog
#: src/clients/inst_disk_proposal.rb:76
msgid "Suggested Partitioning"
msgstr "建議的分割方式"
@@ -88,7 +88,7 @@

#. popup text
#: src/clients/inst_disk_proposal.rb:123
-#: src/clients/partitions_proposal.rb:105
+#: src/clients/partitions_proposal.rb:115
msgid ""
"No automatic proposal possible.\n"
"Specify mount points manually in the 'Partitioner' dialog."
@@ -97,16 +97,14 @@
"請在「磁碟分割程式」對話方塊中手動指定掛接點。"

#. TRANSLATORS: button text
-#. this is the resize case
-#.
-#. this is the normal case
-#: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164
-#: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185
+#. Return a term for a PushButton("Edit Proposal Settings")
+#. or Empty() if that button is disabled in control.xml.
+#: src/clients/inst_disk_proposal.rb:136 src/clients/inst_target_part.rb:500
msgid "Edit Proposal Settings"
msgstr "編輯建議設定"

#. help on suggested partitioning
-#: src/clients/inst_disk_proposal.rb:165
+#: src/clients/inst_disk_proposal.rb:166
msgid ""
"<p>\n"
"Your hard disks have been checked. The partition setup\n"
@@ -118,7 +116,7 @@

#. help text continued
#. %1 is replaced by button text
-#: src/clients/inst_disk_proposal.rb:175
+#: src/clients/inst_disk_proposal.rb:176
msgid ""
"<p>\n"
"To make only small adjustments to the proposed\n"
@@ -133,7 +131,7 @@
"對話方塊中修改設定。</p>\n"

#. help text continued
-#: src/clients/inst_disk_proposal.rb:188
+#: src/clients/inst_disk_proposal.rb:189
msgid ""
"<p>\n"
"If the suggestion does not fit your needs, create\n"
@@ -153,25 +151,25 @@

#. Attention! besides the testsuite, AutoYaST is using this to turn off
#. the proposal screen too. See inst_autosetup.ycp
-#: src/clients/inst_disk_proposal.rb:232
+#: src/clients/inst_disk_proposal.rb:233
msgid "Impossible to create the requested proposal."
msgstr "無法建立要求的建議。"

#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:238
+#: src/clients/inst_disk_proposal.rb:239
msgid "Not enough space available to propose snapshots for root volume."
msgstr "沒有足夠用於為根磁碟區建議快照的空間。"

#. TRANSLATORS: popup error message
-#: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449
+#: src/clients/inst_disk_proposal.rb:245 src/clients/inst_target_part.rb:449
msgid "Not enough space available to propose separate /home."
msgstr "空間不足,無法建議其他 /home。"

-#: src/clients/inst_disk_proposal.rb:283
+#: src/clients/inst_disk_proposal.rb:284
msgid "Nothing assigned as root filesystem. Cannot continue."
msgstr "未指定根檔案系統。無法繼續。"

-#: src/clients/inst_disk_proposal.rb:304
+#: src/clients/inst_disk_proposal.rb:305
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -636,12 +634,12 @@
#. loop over targetMap and build radio buttons for selection
#. dont use foreach here since we need a counter (as a shortcut)
#. anyway
-#: src/clients/inst_target_selection.rb:115
+#: src/clients/inst_target_selection.rb:116
msgid "Available &Disks"
msgstr "可使用的磁碟(&D)"

#. label text
-#: src/clients/inst_target_selection.rb:149
+#: src/clients/inst_target_selection.rb:150
msgid "&Custom Partitioning (for experts)"
msgstr "自訂分割區 (進階)(&C)"

@@ -649,13 +647,13 @@
#. Below this label, all targets are listed that can be used as
#. installation target
#. heading text
-#: src/clients/inst_target_selection.rb:161
+#: src/clients/inst_target_selection.rb:162
msgid "Hard Disk"
msgstr "硬碟"

#. normally the target is located on hard disks. Here no hard disks
#. can be found. YaST2 cannot install. Update CD might have newer drivers.
-#: src/clients/inst_target_selection.rb:172
+#: src/clients/inst_target_selection.rb:173
msgid "No disks found. Try using the update CD, if available, for
installation."
msgstr "找不到磁碟。嘗試使用更新的CD,如果可能請安裝。"

@@ -664,7 +662,7 @@
#. "Preparing Hard Disk" is the description of the dialog what to
#. do while the following locale is the help description
#. help part 1 of 3
-#: src/clients/inst_target_selection.rb:184
+#: src/clients/inst_target_selection.rb:185
msgid ""
"<p>\n"
"All hard disks automatically detected on your system\n"
@@ -677,7 +675,7 @@
"</p>\n"

#. help part 2 of 3
-#: src/clients/inst_target_selection.rb:193
+#: src/clients/inst_target_selection.rb:194
msgid ""
"<p>\n"
"You may select later which part of the disk is used for &product;.\n"
@@ -688,7 +686,7 @@
"</p>\n"

#. help part 3 of 3
-#: src/clients/inst_target_selection.rb:202
+#: src/clients/inst_target_selection.rb:203
msgid ""
"\n"
"<p>\n"
@@ -707,7 +705,7 @@
#. first step of hd prepare, select a single disk or "expert" partitioning
#. Information what to do, background information
#. Information what to do, background information
-#: src/clients/inst_target_selection.rb:215
+#: src/clients/inst_target_selection.rb:216
#: src/include/partitioning/auto_part_ui.rb:244
#: src/include/partitioning/auto_part_ui.rb:302
msgid "Preparing Hard Disk"
@@ -715,14 +713,24 @@

#. there is a selection from which one option must be
#. chosen - at the moment no option is chosen
-#: src/clients/inst_target_selection.rb:271
+#: src/clients/inst_target_selection.rb:269
msgid "Select one of the options to continue."
msgstr "請選取其中一個選項以繼續。"

-#: src/clients/inst_target_selection.rb:297
+#: src/clients/inst_target_selection.rb:295
msgid "Disk %1 is in use by %2"
msgstr "磁碟 %1 已由 %2 使用"

+#. Warning popup about using the expert partitioner
+#: src/clients/inst_target_selection.rb:352
+msgid ""
+"This is for experts only.\n"
+"You might lose support if you use this!\n"
+"\n"
+"Please refer to the manual to make sure your custom\n"
+"partitioning meets the requirements of this product."
+msgstr ""
+
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -780,19 +788,35 @@
#. See also file proposal-API.txt for details.
#: src/clients/partitions_proposal.rb:93
msgid ""
+"No snapshots possible.\n"
+"Please use larger root partition."
+msgstr ""
+
+#: src/clients/partitions_proposal.rb:105
+msgid ""
"The /home partition will not be formatted. After installation,\n"
"ensure that ownerships of home directories are set properly."
msgstr ""
"系統不會格式化 /home 分割區。安裝後,\n"
"請確保正確設定主目錄的擁有權。"

+#. A custom configuration
+#: src/clients/partitions_proposal.rb:123
+msgid "Custom"
+msgstr "自定"
+
+#. A standard configuration
+#: src/clients/partitions_proposal.rb:126
+msgid "Standard"
+msgstr "標準"
+
#. label text
-#: src/clients/partitions_proposal.rb:218
+#: src/clients/partitions_proposal.rb:239
msgid "Partitioning"
msgstr "磁碟分割程式"

#. label text
-#: src/clients/partitions_proposal.rb:220
+#: src/clients/partitions_proposal.rb:241
msgid "&Partitioning"
msgstr "製作分割(&P)"

@@ -959,7 +983,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6272
+#: src/modules/StorageProposal.rb:6295
msgid "Propose Separate &Home Partition"
msgstr "建議個別主分割區(&H)"

@@ -977,7 +1001,7 @@
msgstr "建議類型"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:244
+#: src/include/partitioning/custom_part_check_generated.rb:248
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -992,7 +1016,7 @@
"確定要使用此設定?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:257
+#: src/include/partitioning/custom_part_check_generated.rb:261
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"
@@ -1007,7 +1031,7 @@
"確定要使用此設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:270
+#: src/include/partitioning/custom_part_check_generated.rb:274
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"
@@ -1022,7 +1046,7 @@
"確定要使用此設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:284
+#: src/include/partitioning/custom_part_check_generated.rb:288
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"
@@ -1038,7 +1062,7 @@

#. A PReP/CHRP partition is not supposed to be mounted. So if we find any
#. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:298
+#: src/include/partitioning/custom_part_check_generated.rb:302
msgid ""
"Warning:\n"
"Your system needs a boot partition, either with type 0x41 PReP/CHRP\n"
@@ -1055,7 +1079,7 @@
"確定要使用此設定嗎?\n"

#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:314
+#: src/include/partitioning/custom_part_check_generated.rb:318
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -1076,13 +1100,20 @@
"確定要使用此設定嗎?\n"

#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:334
+#: src/include/partitioning/custom_part_check_generated.rb:338
+#, fuzzy
+#| msgid ""
+#| "Warning:\n"
+#| "Your boot partition is smaller than %1.\n"
+#| "We recommend to increase the size of /boot.\n"
+#| "\n"
+#| "Really keep this size of boot partition?\n"
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
"We recommend to increase the size of /boot.\n"
"\n"
-"Really keep this size of boot partition?\n"
+"Really keep this size of the boot partition?\n"
msgstr ""
"警告:\n"
"您的開機分割區小於 %1。\n"
@@ -1091,7 +1122,7 @@
"確定要保留此開機分割區的大小嗎?\n"

#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:351
+#: src/include/partitioning/custom_part_check_generated.rb:355
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1108,7 +1139,7 @@
#. popup text
#. If the user chooses 'no' here, the system will not be able to
#. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:371
+#: src/include/partitioning/custom_part_check_generated.rb:375
msgid ""
"Warning: There is no partition mounted as /boot.\n"
"To boot from your hard disk, a small /boot partition\n"
@@ -1127,7 +1158,7 @@
"確定要使用不帶 /boot 分割區的設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:391
+#: src/include/partitioning/custom_part_check_generated.rb:395
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1147,7 +1178,7 @@
"\n"
"確定要使用此設定嗎?\n"

-#: src/include/partitioning/custom_part_check_generated.rb:417
+#: src/include/partitioning/custom_part_check_generated.rb:421
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
@@ -1160,7 +1191,7 @@
"確定要使用此設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:435
+#: src/include/partitioning/custom_part_check_generated.rb:441
msgid ""
"Warning: With your current setup, your %1\n"
"installation might not be directly bootable, because\n"
@@ -1177,7 +1208,7 @@
"確定要使用此設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:453
+#: src/include/partitioning/custom_part_check_generated.rb:459
msgid ""
"Warning: With your current setup, your %2 installation\n"
"will encounter problems when booting, because you have no\n"
@@ -1202,7 +1233,7 @@
"確定要使用此設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:475
+#: src/include/partitioning/custom_part_check_generated.rb:481
msgid ""
"Warning: With your current setup, your %2 installation will\n"
"encounter problems when booting, because you have no \n"
@@ -1227,12 +1258,12 @@
"確定要使用此設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:498
+#: src/include/partitioning/custom_part_check_generated.rb:504
msgid "Really use this setup?"
msgstr "確定要使用此設定嗎?"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:506
+#: src/include/partitioning/custom_part_check_generated.rb:512
msgid ""
"\n"
"You have not assigned a swap partition. In most cases, we highly recommend \n"
@@ -1253,7 +1284,7 @@
"確定要使用不帶交換分割區的設定嗎?\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:522
+#: src/include/partitioning/custom_part_check_generated.rb:528
msgid ""
"\n"
"You chose to install onto an existing partition that will not be\n"
@@ -1266,7 +1297,7 @@
"尤其遇到下列情況之一時:\n"

#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:529
+#: src/include/partitioning/custom_part_check_generated.rb:535
msgid ""
"- if this is an existing ReiserFS partition\n"
"- if this partition already contains a Linux distribution that will be\n"
@@ -1279,7 +1310,7 @@
"- 若此分割區尚未包含檔案系統\n"

#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:536
+#: src/include/partitioning/custom_part_check_generated.rb:542
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"
@@ -1290,7 +1321,7 @@
"例如 /、/boot、/opt 或 /var。\n"

#. continued popup text
-#: src/include/partitioning/custom_part_check_generated.rb:542
+#: src/include/partitioning/custom_part_check_generated.rb:548
msgid ""
"If you decide to format the partition, all data on it will be lost.\n"
"\n"
@@ -1301,7 +1332,7 @@
"確定要保留分割區不格式化?\n"

#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:603
+#: src/include/partitioning/custom_part_check_generated.rb:609
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1310,7 +1341,7 @@
"編輯裝置前,請先從 RAID 移除該裝置。\n"

#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:614
+#: src/include/partitioning/custom_part_check_generated.rb:620
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1319,7 +1350,7 @@
"編輯裝置前,請先從磁碟區群組移除該裝置。\n"

#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:624
+#: src/include/partitioning/custom_part_check_generated.rb:630
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1328,7 +1359,7 @@
"編輯裝置前,請先移除該磁碟區。\n"

#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:657
+#: src/include/partitioning/custom_part_check_generated.rb:663
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1337,7 +1368,7 @@
"刪除裝置前,請先從 RAID 移除該裝置。\n"

#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:668
+#: src/include/partitioning/custom_part_check_generated.rb:674
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1345,12 +1376,12 @@
"裝置 (%2) 為 %1 使用。\n"
"刪除裝置前,請先移除 %1。\n"

-#: src/include/partitioning/custom_part_check_generated.rb:680
+#: src/include/partitioning/custom_part_check_generated.rb:686
msgid "It cannot be deleted while mounted."
msgstr "掛接後將無法刪除。"

#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:716
+#: src/include/partitioning/custom_part_check_generated.rb:722
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"
@@ -1359,7 +1390,7 @@
"而另一個擁有較高編號的邏輯分割區正在使用中。\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:792
+#: src/include/partitioning/custom_part_check_generated.rb:798
msgid ""
"The selected extended partition contains partitions which are currently
mounted:\n"
"%1\n"
@@ -1372,7 +1403,7 @@
"除非您有執行的把握,否則請選擇「取消」。\n"

#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:810
+#: src/include/partitioning/custom_part_check_generated.rb:816
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1387,7 +1418,7 @@
"再刪除延伸分割區。\n"

#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:821
+#: src/include/partitioning/custom_part_check_generated.rb:827
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1402,7 +1433,7 @@
"再刪除延伸分割區。\n"

#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:832
+#: src/include/partitioning/custom_part_check_generated.rb:838
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1414,6 +1445,30 @@
"使用中的分割區。刪除延伸分割區前,\n"
"請先移除已使用的磁碟區。\n"

+#. popup text, %1 is a size
+#: src/include/partitioning/custom_part_check_generated.rb:905
+#, fuzzy
+#| msgid ""
+#| "Warning:\n"
+#| "Your boot partition is smaller than %1.\n"
+#| "We recommend to increase the size of /boot.\n"
+#| "\n"
+#| "Really keep this size of boot partition?\n"
+msgid ""
+"Warning:\n"
+"\n"
+"Your root partition is very small for snapshots.\n"
+"We recommend to increase the size of the root partition\n"
+"to %1 or more or to disable snapshots.\n"
+"\n"
+"Really keep the current setup?\n"
+msgstr ""
+"警告:\n"
+"您的開機分割區小於 %1。\n"
+"建議您增加 /boot 的大小。\n"
+"\n"
+"確定要保留此開機分割區的大小嗎?\n"
+
#. heading text
#: src/include/partitioning/custom_part_dialogs.rb:70
msgid "Enter your Password for the Encrypted File System."
@@ -1421,13 +1476,13 @@

#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6400
+#: src/include/partitioning/ep-dialogs.rb:805
+#: src/modules/StorageProposal.rb:6423
msgid "Do not forget what you enter here!"
msgstr "請不要忘記您在此處輸入的內容!"

#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:809
+#: src/include/partitioning/ep-dialogs.rb:808
msgid "Empty password allowed."
msgstr "允許空密碼。"

@@ -1456,7 +1511,7 @@
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:834
+#: src/include/partitioning/ep-dialogs.rb:833
msgid "&Enter a Password for your File System:"
msgstr "為您的檔案系統輸入密碼(&E):"

@@ -1467,7 +1522,7 @@
#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
#: src/include/partitioning/custom_part_dialogs.rb:147
-#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4007
+#: src/include/partitioning/ep-dialogs.rb:817 src/modules/Storage.rb:4002
msgid "Reenter the Password for &Verification:"
msgstr "重新輸入密碼以進行確認(&V):"

@@ -1490,7 +1545,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3963
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1501,7 +1556,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3971
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1621,47 +1676,54 @@
msgstr "檔案系統(&S)"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1053
+#: src/include/partitioning/custom_part_dialogs.rb:1059
msgid "O&ptions..."
msgstr "選項(&P)..."

+#. Translators: checkbox text
+#. TRANSLATORS: checkbox text
+#: src/include/partitioning/custom_part_dialogs.rb:1069
+#: src/modules/StorageProposal.rb:6276
+msgid "Enable Snapshots"
+msgstr "啟用快照"
+
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1069
+#: src/include/partitioning/custom_part_dialogs.rb:1084
msgid "&Encrypt Device"
msgstr "加密裝置(&E)"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1144
+#: src/include/partitioning/custom_part_dialogs.rb:1159
msgid "File system &ID:"
msgstr "檔案系統 ID(&I):"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1176
+#: src/include/partitioning/custom_part_dialogs.rb:1191
msgid "Format"
msgstr "格式化"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1186
+#: src/include/partitioning/custom_part_dialogs.rb:1201
msgid "Do &not format"
msgstr "不要格式化(&N)"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1196
+#: src/include/partitioning/custom_part_dialogs.rb:1211
msgid "&Format"
msgstr "格式化(&F)"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1249
+#: src/include/partitioning/custom_part_dialogs.rb:1264
msgid "Fs&tab Options"
msgstr "Fstab 選項(&T)"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1256
+#: src/include/partitioning/custom_part_dialogs.rb:1271
msgid "&Mount Point"
msgstr "掛接點(&M)"

#. popup text %1 is a partition name, %2 a dirctory
-#: src/include/partitioning/custom_part_dialogs.rb:1268
+#: src/include/partitioning/custom_part_dialogs.rb:1283
msgid ""
"\n"
"The selected partition (%1) is currently mounted on %2.\n"
@@ -1686,7 +1748,7 @@
"要繼續嗎?\n"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1297
+#: src/include/partitioning/custom_part_dialogs.rb:1312
msgid ""
"\n"
"The file system on the partition cannot be shrunk by YaST2.\n"
@@ -1697,7 +1759,7 @@
"只有 fat、ext2、ext3 以及 reiser 允許壓縮檔案系統。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1304
+#: src/include/partitioning/custom_part_dialogs.rb:1319
msgid ""
"\n"
"The file system on the logical volume cannot be shrunk by YaST2.\n"
@@ -1708,21 +1770,21 @@
"只有 fat、ext2、ext3、ext4 以及 reiser 允許壓縮檔案系統。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1316
+#: src/include/partitioning/custom_part_dialogs.rb:1331
msgid "You risk losing data if you shrink this partition."
msgstr "如果您縮減此分割區,會有遺失資料的風險。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1322
+#: src/include/partitioning/custom_part_dialogs.rb:1337
msgid "You risk losing data if you shrink this logical volume."
msgstr "如果您縮減此邏輯磁碟區,會有遺失資料的風險。"

-#: src/include/partitioning/custom_part_dialogs.rb:1326
+#: src/include/partitioning/custom_part_dialogs.rb:1341
msgid "Continue?"
msgstr "要繼續嗎?"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1342
+#: src/include/partitioning/custom_part_dialogs.rb:1357
msgid ""
"\n"
"The file system on the selected partition cannot be extended by YaST2.\n"
@@ -1733,7 +1795,7 @@
"只有 fat、ext2、ext3、ext4、xfs 以及 reiser 允許延伸檔案系統。"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1349
+#: src/include/partitioning/custom_part_dialogs.rb:1364
msgid ""
"\n"
"The file system on the selected logical volume cannot be extended by YaST2.\n"
@@ -1743,20 +1805,20 @@
"YaST2 無法延伸選定邏輯磁碟區上的檔案系統。\n"
"只有 fat、ext2、ext3、ext4、xfs 以及 reiser 允許延伸檔案系統。"

-#: src/include/partitioning/custom_part_dialogs.rb:1357
+#: src/include/partitioning/custom_part_dialogs.rb:1372
msgid "Continue resizing?"
msgstr "要繼續調整大小嗎?"

#. Popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1374
+#: src/include/partitioning/custom_part_dialogs.rb:1389
msgid "You decreased a partition with a reiser file system on it."
msgstr "您減去了一個含有 reiser 檔案系統的分割區。"

-#: src/include/partitioning/custom_part_dialogs.rb:1376
+#: src/include/partitioning/custom_part_dialogs.rb:1391
msgid "You decreased a logical volume with a reiser file system on it."
msgstr "您減去了一個含有 reiser 檔案系統的邏輯磁碟區。"

-#: src/include/partitioning/custom_part_dialogs.rb:1383
+#: src/include/partitioning/custom_part_dialogs.rb:1398
msgid ""
"\n"
"It is possible to shrink a reiser file system, but this feature is not\n"
@@ -1771,7 +1833,7 @@
"要立即縮減檔案系統嗎?"

#. popup text, %1 is replaced by device name
-#: src/include/partitioning/custom_part_dialogs.rb:1437
+#: src/include/partitioning/custom_part_dialogs.rb:1452
msgid ""
"The selected device contains partitions that are currently mounted:\n"
"%1\n"
@@ -1784,7 +1846,7 @@
"除非您有執行的把握,否則請選擇「取消」。\n"

#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_dialogs.rb:1460
+#: src/include/partitioning/custom_part_dialogs.rb:1475
msgid ""
"\n"
"The selected device contains at least one LVM partition\n"
@@ -1799,7 +1861,7 @@
"分割區。\n"

#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_dialogs.rb:1471
+#: src/include/partitioning/custom_part_dialogs.rb:1486
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1814,7 +1876,7 @@
"分割區。\n"

#. popup text
-#: src/include/partitioning/custom_part_dialogs.rb:1482
+#: src/include/partitioning/custom_part_dialogs.rb:1497
msgid ""
"\n"
"The selected device contains at least one partition\n"
@@ -1827,47 +1889,40 @@
"之前使用它來刪除磁碟區。\n"

#. help text, richtext format
-#: src/include/partitioning/custom_part_dialogs.rb:1543
+#: src/include/partitioning/custom_part_dialogs.rb:1558
msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
msgstr "<p>在 Btrfs 檔案系統中建立和移除子磁碟區。</p>\n"

-#: src/include/partitioning/custom_part_dialogs.rb:1548
+#: src/include/partitioning/custom_part_dialogs.rb:1563
msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>"
msgstr "<p>使用 snapper 為 Btrfs 檔案系統啟用自動快照。</p>"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1562
+#: src/include/partitioning/custom_part_dialogs.rb:1577
msgid "Existing Subvolumes:"
msgstr "現有的子磁碟區︰"

#. label text
-#: src/include/partitioning/custom_part_dialogs.rb:1568
+#: src/include/partitioning/custom_part_dialogs.rb:1583
msgid "New Subvolume"
msgstr "新子磁碟區"

#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1574
+#: src/include/partitioning/custom_part_dialogs.rb:1589
msgid "Add new"
msgstr "新增"

#. button text
#. push button text
-#: src/include/partitioning/custom_part_dialogs.rb:1580
+#: src/include/partitioning/custom_part_dialogs.rb:1595
#: src/modules/DualMultiSelectionBox.rb:147
msgid "Remove"
msgstr "移除"

-#. TRANSLATOR: checkbox text
-#. TRANSLATORS: checkbox text
-#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6253
-msgid "Enable Snapshots"
-msgstr "啟用快照"
-
#. heading text
#. button text
-#: src/include/partitioning/custom_part_dialogs.rb:1603
-#: src/include/partitioning/custom_part_lib.rb:409
+#: src/include/partitioning/custom_part_dialogs.rb:1605
+#: src/include/partitioning/custom_part_lib.rb:386
msgid "Subvolume Handling"
msgstr "子磁碟區處理"

@@ -1887,7 +1942,7 @@
msgid "Subvolume name %1 already exists."
msgstr "子磁碟區名稱 %1 已經存在。"

-#: src/include/partitioning/custom_part_dialogs.rb:1711
+#: src/include/partitioning/custom_part_dialogs.rb:1702
msgid "Modifications done so far in this dialog will be lost."
msgstr "此對話方塊中目前所做的修改都將遺失。"

@@ -1930,7 +1985,7 @@

#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:746
+#: src/include/partitioning/ep-dialogs.rb:745
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or
/var/tmp.\n"
@@ -1949,7 +2004,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:761
+#: src/include/partitioning/ep-dialogs.rb:760
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file
system.\n"
@@ -1968,7 +2023,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:775
+#: src/include/partitioning/ep-dialogs.rb:774
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have
at\n"
@@ -2000,7 +2055,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:787
+#: src/include/partitioning/ep-dialogs.rb:786
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2071,17 +2126,17 @@
"您需要標示此磁碟上要移除的所有分割區。\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:51
+#: src/include/partitioning/custom_part_lib.rb:50
msgid "You cannot use the mount point \"%1\" for LVM.\n"
msgstr "您無法將掛接點 \"%1\" 用於 LVM。\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:78
+#: src/include/partitioning/custom_part_lib.rb:77
msgid "You cannot use the mount point %1 for RAID."
msgstr "您無法將掛接點 %1 用於 RAID。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:97
+#: src/include/partitioning/custom_part_lib.rb:96
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"
@@ -2098,21 +2153,8 @@
"確定要執行嗎?\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:120
+#: src/include/partitioning/custom_part_lib.rb:138
msgid ""
-"You have assigned an encrypted file system to a partition\n"
-"with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
-"/var\". This is not possible. Change the mount point or use a\n"
-"nonloopbacked file system.\n"
-msgstr ""
-"您已使用以下其中一個掛接點,\n"
-"將加密的檔案系統指派到分割區: 「/」、「/usr」、「/boot」、\n"
-"「/var」。 而這是無法使用的。 請變更掛接點或使用\n"
-"非回送的檔案系統。\n"
-
-#. error popup text
-#: 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"
"\n"
@@ -2131,28 +2173,28 @@
#. @param [Hash{String => map}] targetMap the TargetMap
#. @param mount mount point
#. @return [Boolean]
-#: src/include/partitioning/custom_part_lib.rb:205
+#: src/include/partitioning/custom_part_lib.rb:185
msgid "Mount point must not be empty."
msgstr "掛接點不得為空白。"

#. error popup
-#: src/include/partitioning/custom_part_lib.rb:210
+#: src/include/partitioning/custom_part_lib.rb:190
msgid "Swap devices must have swap as mount point."
msgstr "交換裝置必須使用交換做為掛接點。"

#. error popup
-#: src/include/partitioning/custom_part_lib.rb:214
+#: src/include/partitioning/custom_part_lib.rb:194
msgid "Only swap devices may have swap as mount point."
msgstr "只有交換裝置可以使用交換做為掛接點。"

#. && mount!="swap" )
#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:229
+#: src/include/partitioning/custom_part_lib.rb:209
msgid "This mount point is already in use. Select a different one."
msgstr "此掛接點已使用。請選取其他名稱。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:239
+#: src/include/partitioning/custom_part_lib.rb:219
msgid ""
"FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n"
"This is not possible."
@@ -2161,12 +2203,12 @@
"這是無法使用的。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:248
+#: src/include/partitioning/custom_part_lib.rb:228
msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount
point."
msgstr "掛接點中有無效字元。請不要在掛接點中使用「`'!\"%#」。"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:257
+#: src/include/partitioning/custom_part_lib.rb:237
msgid ""
"You cannot use any of the following mount points:\n"
"/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n"
@@ -2177,12 +2219,12 @@
"/var/adm/mnt\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:266
+#: src/include/partitioning/custom_part_lib.rb:246
msgid "Your mount point must start with a \"/\" "
msgstr "您的掛接點必須以 \"/\" 開始"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:272
+#: src/include/partitioning/custom_part_lib.rb:252
msgid ""
"It is not allowed to assign the mount point swap\n"
"to a device without a swap file system."
@@ -2191,17 +2233,23 @@
"不具有交換檔案系統的裝置。"

#. 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:299
+#. %2 is replaced by the user entered size (e.g. 20GB)
+#. %3 is replaced by a size (e.g. 10 MB)
+#: src/include/partitioning/custom_part_lib.rb:280
+#, fuzzy
+#| msgid ""
+#| "Your partition is too small to use %1.\n"
+#| "The minimum size for this file system is %2.\n"
msgid ""
"Your partition is too small to use %1.\n"
-"The minimum size for this file system is %2.\n"
+"The size you entered (after rounding up) is %2.\n"
+"The minimum size for this file system is %3.\n"
msgstr ""
"您的分割區太小以致於無法使用 %1。\n"
"此檔案系統最小的大小為 %2。\n"

#. error popup text
-#: src/include/partitioning/custom_part_lib.rb:369
+#: src/include/partitioning/custom_part_lib.rb:346
msgid ""
"It is not allowed to assign a mount point\n"
"to a device with nonexistent or unknown file system."
@@ -2210,7 +2258,7 @@
"包含不存在或未知檔案系統的裝置。"

#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:482
+#: src/include/partitioning/custom_part_lib.rb:545
msgid ""
"\n"
"WARNING:\n"
@@ -2234,12 +2282,12 @@

#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:924
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:980
+#: src/include/partitioning/custom_part_lib.rb:1007
msgid "The file system is currently mounted on %1."
msgstr "檔案系統目前掛接於 %1 上。"

-#: src/include/partitioning/custom_part_lib.rb:929
+#: src/include/partitioning/custom_part_lib.rb:985
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2249,12 +2297,12 @@

#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:940
-#: src/include/partitioning/custom_part_lib.rb:965
+#: src/include/partitioning/custom_part_lib.rb:996
+#: src/include/partitioning/custom_part_lib.rb:1021
msgid "Unmount"
msgstr "卸載"

-#: src/include/partitioning/custom_part_lib.rb:956
+#: src/include/partitioning/custom_part_lib.rb:1012
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2262,15 +2310,15 @@
"您現在可以將它卸載,或者取消操作。\n"
"除非您完全清楚自己要做什麼,否則請按「取消」。"

-#: src/include/partitioning/custom_part_lib.rb:1002
+#: src/include/partitioning/custom_part_lib.rb:1058
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "無法壓縮處於掛接狀態的檔案系統。"

-#: src/include/partitioning/custom_part_lib.rb:1015
+#: src/include/partitioning/custom_part_lib.rb:1071
msgid "It is not possible to extend the file system while it is mounted."
msgstr "無法延伸處於掛接狀態的檔案系統。"

-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:1082
msgid "It is not possible to resize the file system while it is mounted."
msgstr "無法調整處於掛接狀態之檔案系統的大小。"

@@ -2752,47 +2800,47 @@
"分割區並輸入掛接點 (/、/boot、/home、/var 等)。</p>"

#. set globals
-#: src/include/partitioning/ep-dialogs.rb:337
+#: src/include/partitioning/ep-dialogs.rb:336
msgid "Formatting Options"
msgstr "格式化選項"

-#: src/include/partitioning/ep-dialogs.rb:345
+#: src/include/partitioning/ep-dialogs.rb:344
msgid "Format partition"
msgstr "格式化分割區"

-#: src/include/partitioning/ep-dialogs.rb:356
+#: src/include/partitioning/ep-dialogs.rb:355
msgid "Do not format partition"
msgstr "不格式化分割區"

-#: src/include/partitioning/ep-dialogs.rb:372
+#: src/include/partitioning/ep-dialogs.rb:371
msgid "Do not mount partition"
msgstr "不掛接分割區"

-#: src/include/partitioning/ep-dialogs.rb:391
+#: src/include/partitioning/ep-dialogs.rb:390
msgid "Mounting Options"
msgstr "掛接選項"

-#: src/include/partitioning/ep-dialogs.rb:399
+#: src/include/partitioning/ep-dialogs.rb:398
msgid "Mount partition"
msgstr "掛接分割區"

#. Column header
-#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:404 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "掛接點"

#. button text
-#: src/include/partitioning/ep-dialogs.rb:412
+#: src/include/partitioning/ep-dialogs.rb:411
msgid "Fs&tab Options..."
msgstr "Fstab 選項(&T)..."

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:596
+#: src/include/partitioning/ep-dialogs.rb:595
msgid "Crypt files must be encrypted."
msgstr "必須加密 crypt 檔案。"

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:607
+#: src/include/partitioning/ep-dialogs.rb:606
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2805,17 +2853,17 @@
"請同時檢查格式化選項。\n"

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:623
+#: src/include/partitioning/ep-dialogs.rb:622
msgid "Crypt files require a mount point."
msgstr "Crypt 檔案需要掛接點。"

#. error popup
-#: src/include/partitioning/ep-dialogs.rb:637
+#: src/include/partitioning/ep-dialogs.rb:636
msgid "Tmpfs requires a mount point."
msgstr "Tmpfs 需要掛接點。"

#. helptext
-#: src/include/partitioning/ep-dialogs.rb:721
+#: src/include/partitioning/ep-dialogs.rb:720
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2830,7 +2878,7 @@
" </p>"

#. helptext
-#: src/include/partitioning/ep-dialogs.rb:734
+#: src/include/partitioning/ep-dialogs.rb:733
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2844,21 +2892,21 @@
"用於休眠 (暫停寫入到磁碟)。\n"
"</p>\n"

-#: src/include/partitioning/ep-dialogs.rb:804
+#: src/include/partitioning/ep-dialogs.rb:803
msgid "All data stored on the volume will be lost!"
msgstr "磁碟區上儲存的所有資料都將遺失!"

-#: src/include/partitioning/ep-dialogs.rb:827
+#: src/include/partitioning/ep-dialogs.rb:826
msgid "Password"
msgstr "密碼"

#. popup text
-#: src/include/partitioning/ep-dialogs.rb:924
+#: src/include/partitioning/ep-dialogs.rb:923
msgid "Resize not supported by underlying device."
msgstr "基礎裝置不支援大小調整。"

#. popup text
-#: src/include/partitioning/ep-dialogs.rb:929
+#: src/include/partitioning/ep-dialogs.rb:928
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -2868,7 +2916,7 @@
"您無法重新調整選取分割區的大小,因為該分割區的檔案系統\n"
"不支援調整大小。\n"

-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:952
msgid ""
"It is not possible to check whether a NTFS\n"
"can be resized while it is mounted."
@@ -2877,7 +2925,7 @@
"無法檢查是否可調整其大小。"

#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:971
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
@@ -2886,21 +2934,21 @@
"因此無法調整分割區 %1 的大小。\n"

#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:999
+#: src/include/partitioning/ep-dialogs.rb:998
msgid "Resize Partition %1"
msgstr "調整分割區 %1 的大小"

#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:1020
+#: src/include/partitioning/ep-dialogs.rb:1019
msgid "Resize Logical Volume %1"
msgstr "調整邏輯磁碟區 %1 的大小"

#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1052
+#: src/include/partitioning/ep-dialogs.rb:1051
msgid "Current size: %1"
msgstr "目前大小︰%1"

-#: src/include/partitioning/ep-dialogs.rb:1064
+#: src/include/partitioning/ep-dialogs.rb:1063
msgid "Currently used: %1"
msgstr "目前已用︰%1"

@@ -2908,8 +2956,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1077
-#: src/include/partitioning/ep-dialogs.rb:1114
+#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1113
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2921,33 +2969,33 @@

#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1087
+#: src/include/partitioning/ep-dialogs.rb:1086
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
msgid "Maximum Size (%1)"
msgstr "最大大小 (%1)"

#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1097
+#: src/include/partitioning/ep-dialogs.rb:1096
msgid "Minimum Size (%1)"
msgstr "最小大小 (%1)"

#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1106
+#: src/include/partitioning/ep-dialogs.rb:1105
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
msgid "Custom Size"
msgstr "自訂大小"

#. help text
-#: src/include/partitioning/ep-dialogs.rb:1140
+#: src/include/partitioning/ep-dialogs.rb:1139
msgid "<p>Choose new size.</p>"
msgstr "<p>選擇新大小。</p>"

#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1191
+#: src/include/partitioning/ep-dialogs.rb:1190
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -2957,7 +3005,7 @@
#. after user tries to do that is stupid - in some cases
#. we can tell beforehand, thus user should never get to this
#. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1234
+#: src/include/partitioning/ep-dialogs.rb:1233
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -2970,12 +3018,12 @@
"大小調整任務的速度。"

#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1310
+#: src/include/partitioning/ep-dialogs.rb:1309
msgid "Output of %1"
msgstr "%1 的輸出"

#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1337
+#: src/include/partitioning/ep-dialogs.rb:1336
msgid "Rescanning disks..."
msgstr "正在重新掃描磁碟..."

@@ -3236,7 +3284,7 @@

#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5226
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5221
msgid "The disk is in use and cannot be modified."
msgstr "磁碟正在使用中,無法對其進行修改。"

@@ -5274,12 +5322,12 @@
msgstr "模式檔案"

#. label text
-#: src/modules/FileSystems.rb:278
+#: src/modules/FileSystems.rb:289
msgid "Tmpfs &Size"
msgstr "Tmpfs 大小(&S)"

#. popup text
-#: src/modules/FileSystems.rb:287
+#: src/modules/FileSystems.rb:298
msgid ""
"Invalid Size specified. Use number followed by K, M, G or %.\n"
"Value must be above 100k or between 1% and 200%. Try again."
@@ -5287,12 +5335,12 @@
"指定的大小無效。請使用以 K、M、G 或 % 結束的數字。\n"
"該值必須大於 100k,或介於 1% 與 200% 之間。請再試一次。"

-#: src/modules/FileSystems.rb:290
+#: src/modules/FileSystems.rb:301
msgid "Value must be between 1% and 200%. Try again."
msgstr "值必須介於 1% 到 200% 之間。請再試一次。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:297
+#: src/modules/FileSystems.rb:308
msgid ""
"<p><b>Tmpfs Size:</b>\n"
"Size may be either entered as a number followed by K,M,G for Kilo-, Mega- or
Gigabyte or\n"
@@ -5303,17 +5351,17 @@
"數字後跟表示記憶體百分比的百分號。</p>"

#. label text
-#: src/modules/FileSystems.rb:311
+#: src/modules/FileSystems.rb:322
msgid "Swap &Priority"
msgstr "交換優先程度(&P)"

#. popup text
-#: src/modules/FileSystems.rb:319
+#: src/modules/FileSystems.rb:330
msgid "Value must be between 0 and 32767. Try again."
msgstr "必須是 0 至 32767 之間的值。請再試一次。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:326
+#: src/modules/FileSystems.rb:337
msgid ""
"<p><b>Swap Priority:</b>\n"
"Enter the swap priority. Higher numbers mean higher priority.</p>\n"
@@ -5322,12 +5370,12 @@
"請輸入交換優先程度。數字愈大,優先程度愈高。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:481
+#: src/modules/FileSystems.rb:494
msgid "Mount &Read-Only"
msgstr "掛接唯讀(&R)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:485
+#: src/modules/FileSystems.rb:498
msgid ""
"<p><b>Mount Read-Only:</b>\n"
"Writing to the file system is not possible. Default is false. During
installation\n"
@@ -5338,12 +5386,12 @@
"將始終以讀寫模式掛接檔案系統。</p>"

#. button text
-#: src/modules/FileSystems.rb:497
+#: src/modules/FileSystems.rb:510
msgid "No &Access Time"
msgstr "無存取時間(&A)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:501
+#: src/modules/FileSystems.rb:514
msgid ""
"<p><b>No Access Time:</b>\n"
"Access times are not updated when a file is read. Default is false.</p>\n"
@@ -5352,12 +5400,12 @@
"讀取檔案時不更新存取時間。預設為 False。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:511
+#: src/modules/FileSystems.rb:524
msgid "Mountable by User"
msgstr "可由使用者掛接"

#. help text, richtext format
-#: src/modules/FileSystems.rb:515
+#: src/modules/FileSystems.rb:528
msgid ""
"<p><b>Mountable by User:</b>\n"
"The file system may be mounted by an ordinary user. Default is false.</p>\n"
@@ -5366,12 +5414,12 @@
"檔案系統可由一般使用者掛接。預設為 False。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:528
+#: src/modules/FileSystems.rb:541
msgid "Do Not Mount at System &Start-up"
msgstr "不要在系統啟動時掛接(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:534
+#: src/modules/FileSystems.rb:547
msgid ""
"<p><b>Do Not Mount at System Start-up:</b>\n"
"The file system is not automatically mounted when the system starts.\n"
@@ -5386,12 +5434,12 @@
"並以適當的選項掛接檔案系統。預設為 False。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:551
+#: src/modules/FileSystems.rb:564
msgid "Enable &Quota Support"
msgstr "啟用配額支援(&Q)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:557
+#: src/modules/FileSystems.rb:570
msgid ""
"<p><b>Enable Quota Support:</b>\n"
"The file system is mounted with user quotas enabled.\n"
@@ -5402,12 +5450,12 @@
"預設為不啟用。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:576
+#: src/modules/FileSystems.rb:589
msgid "Data &Journaling Mode"
msgstr "資料日誌式模式(&J)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:585
+#: src/modules/FileSystems.rb:598
msgid ""
"<p><b>Data Journaling Mode:</b>\n"
"Specifies the journaling mode for file data.\n"
@@ -5426,12 +5474,12 @@
"<tt>寫回</tt> -- 不會保留資料排列的順序。對效能無影響。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:606
+#: src/modules/FileSystems.rb:619
msgid "&Access Control Lists (ACL)"
msgstr "存取控制清單 (ACL)(&A)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:610
+#: src/modules/FileSystems.rb:623
msgid ""
"<p><b>Access Control Lists (ACL):</b>\n"
"Enable access control lists on the file system.</p>\n"
@@ -5440,12 +5488,12 @@
"啟用檔案系統上的存取控制清單。</p>\n"

#. button text
-#: src/modules/FileSystems.rb:621
+#: src/modules/FileSystems.rb:634
msgid "&Extended User Attributes"
msgstr "延伸的使用者屬性(&E)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:625
+#: src/modules/FileSystems.rb:638
msgid ""
"<p><b>Extended User Attributes:</b>\n"
"Allow extended user attributes on the file system.</p>\n"
@@ -5454,16 +5502,16 @@
"允許在檔案系統中使用延伸的使用者屬性。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:642
+#: src/modules/FileSystems.rb:655
msgid "Arbitrary Option &Value"
msgstr "任意的選項值(&V)"

-#: src/modules/FileSystems.rb:647
+#: src/modules/FileSystems.rb:660
msgid "Invalid characters in arbitrary option value. Do not use spaces or
tabs. Try again."
msgstr "任意的選項值中包含無效字元。請勿使用空格或 Tab 定位字元。請再試一次。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:651
+#: src/modules/FileSystems.rb:664
msgid ""
"<p><b>Arbitrary Option Value:</b>\n"
"In this field, type any legal mount option allowed in the fourth field of
/etc/fstab.\n"
@@ -5474,12 +5522,12 @@
"以逗號分隔多個選項。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:668
+#: src/modules/FileSystems.rb:681
msgid "Char&set for file names"
msgstr "檔案名稱的字元集(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:689
+#: src/modules/FileSystems.rb:702
msgid ""
"<p><b>Charset for File Names:</b>\n"
"Set the charset used for display of file names in Windows partitions.</p>\n"
@@ -5488,12 +5536,12 @@
"設定在 Windows 分割區顯示檔案名稱時所使用的字元集。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:700
+#: src/modules/FileSystems.rb:713
msgid "Code&page for short FAT names"
msgstr "短 FAT 名稱的內碼頁(&P)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:706
+#: src/modules/FileSystems.rb:719
msgid ""
"<p><b>Codepage for Short FAT Names:</b>\n"
"This codepage is used for converting to shortname characters on FAT file
systems.</p>\n"
@@ -5502,12 +5550,12 @@
"此內碼頁會用於轉換 FAT 檔案系統上的短名稱字元。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:720
+#: src/modules/FileSystems.rb:733
msgid "Number of &FATs"
msgstr "FAT 數量(&F)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:726
+#: src/modules/FileSystems.rb:739
msgid ""
"<p><b>Number of FATs:</b>\n"
"Specify the number of file allocation tables in the file system. The default
is 2.</p>"
@@ -5516,12 +5564,12 @@
"指定檔案系統中的檔案配置表數。預設為 2。</p>"

#. label text
-#: src/modules/FileSystems.rb:735
+#: src/modules/FileSystems.rb:748
msgid "FAT &Size"
msgstr "FAT 大小(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:746
+#: src/modules/FileSystems.rb:759
msgid ""
"<p><b>FAT Size:</b>\n"
"Specifies the type of file allocation tables used (12, 16, or 32-bit). If
auto is specified, YaST will automatically select the value most suitable for
the file system size.</p>\n"
@@ -5530,17 +5578,17 @@
"指定所使用的檔案配置表類型 (12、16 或 32 位元)。若指定自動,YaST 便會自動選取最適合於檔案系統大小的值。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:755
+#: src/modules/FileSystems.rb:768
msgid "Root &Dir Entries"
msgstr "根目錄項目(&D)"

#. popup text
-#: src/modules/FileSystems.rb:763
+#: src/modules/FileSystems.rb:776
msgid "The minimum size for \"Root Dir Entries\" is 112. Try again."
msgstr "「根目錄項目」的最小值為 112。請再試一次。"

#. help text, richtext format
-#: src/modules/FileSystems.rb:767
+#: src/modules/FileSystems.rb:780
msgid ""
"<p><b>Root Dir Entries:</b>\n"
"Select the number of entries available in the root directory.</p>\n"
@@ -5549,12 +5597,12 @@
"選取根目錄中可使用的項目數。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:780
+#: src/modules/FileSystems.rb:793
msgid "Hash &Function"
msgstr "雜湊函數(&F)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:787
+#: src/modules/FileSystems.rb:800
msgid ""
"<p><b>Hash Function:</b>\n"
"This specifies the name of the hash function to use to sort the file names in
directories.</p>\n"
@@ -5563,12 +5611,12 @@
"這會指定雜湊函數的名稱,用於對目錄中的檔案名稱進行排序。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:796
+#: src/modules/FileSystems.rb:809
msgid "FS &Revision"
msgstr "FS 版本(&R)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:803
+#: src/modules/FileSystems.rb:816
msgid ""
"<p><b>FS Revision:</b>\n"
"This option defines the reiserfs format revision to use. '3.5' is for
backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent,
but can only be used with kernel versions greater than or equal to 2.4.</p>\n"
@@ -5578,12 +5626,12 @@

#. label text
#. label text
-#: src/modules/FileSystems.rb:816 src/modules/FileSystems.rb:980
+#: src/modules/FileSystems.rb:829 src/modules/FileSystems.rb:993
msgid "Block &Size in Bytes"
msgstr "區塊大小 (以位元組為單位)(&S)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:823
+#: src/modules/FileSystems.rb:836
msgid ""
"<p><b>Block Size:</b>\n"
"Specify the size of blocks in bytes. Valid block size values are 512, 1024,
2048 and 4096 bytes per block. If auto is selected, the standard block size of
4096 is used.</p>\n"
@@ -5593,13 +5641,13 @@

#. label text
#. label text
-#: src/modules/FileSystems.rb:832 src/modules/FileSystems.rb:1062
+#: src/modules/FileSystems.rb:845 src/modules/FileSystems.rb:1075
msgid "&Inode Size"
msgstr "Inode 大小(&I)"

#. help text, richtext format
#. help text, richtext format
-#: src/modules/FileSystems.rb:838 src/modules/FileSystems.rb:1068
+#: src/modules/FileSystems.rb:851 src/modules/FileSystems.rb:1081
msgid ""
"<p><b>Inode Size:</b>\n"
"This option specifies the inode size of the file system.</p>\n"
@@ -5608,12 +5656,12 @@
"此選項會指定檔案系統的 inode 大小。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:847
+#: src/modules/FileSystems.rb:860
msgid "&Percentage of Inode Space"
msgstr "Inode 空間的百分比(&P)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:875
+#: src/modules/FileSystems.rb:888
msgid ""
"<p><b>Percentage of Inode Space:</b>\n"
"The option \"Percentage of Inode Space\" specifies the maximum percentage of
space in the file system that can be allocated to inodes.</p>\n"
@@ -5622,12 +5670,12 @@
"「Inode 空間的百分比」選項會指定檔案系統上可以配置給 Inode 之空間的最大百分比。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:884
+#: src/modules/FileSystems.rb:897
msgid "Inode &Aligned"
msgstr "Inode 對齊(&A)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:890
+#: src/modules/FileSystems.rb:903
msgid ""
"<p><b>Inode Aligned:</b>\n"
"The option \"Inode Aligned\" is used to specify whether inode allocation is
or\n"
@@ -5640,12 +5688,12 @@
"的效率通常較高。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:920
+#: src/modules/FileSystems.rb:933
msgid "&Log Size in Megabytes"
msgstr "日誌大小 (以 MB 為單位)(&L)"

#. popup text
-#: src/modules/FileSystems.rb:929
+#: src/modules/FileSystems.rb:942
msgid ""
"The \"Log Size\" value is incorrect.\n"
"Enter a value greater than zero.\n"
@@ -5655,7 +5703,7 @@

#. xgettext: no-c-format
#. help text, richtext format
-#: src/modules/FileSystems.rb:934
+#: src/modules/FileSystems.rb:947
msgid ""
"<p><b>Log Size</b>\n"
"Set the log size (in megabytes). If auto, the default is 40% of the aggregate
size.</p>\n"
@@ -5664,17 +5712,17 @@
"設定日誌大小 (以 MB 為單位)。若設為自動,則預設值為結集大小的 40%。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:942
+#: src/modules/FileSystems.rb:955
msgid "Invoke Bad Blocks List &Utility"
msgstr "呼叫不良區塊清單公用程式(&U)"

#. label text
-#: src/modules/FileSystems.rb:956
+#: src/modules/FileSystems.rb:969
msgid "Stride &Length in Blocks"
msgstr "區塊中的步幅長度(&L)"

#. popup text
-#: src/modules/FileSystems.rb:964
+#: src/modules/FileSystems.rb:977
msgid ""
"The \"Stride Length in Blocks\" value is invalid.\n"
"Select a value greater than 1.\n"
@@ -5683,7 +5731,7 @@
"請選取大於 1 的值。\n"

#. help text, richtext format
-#: src/modules/FileSystems.rb:968
+#: src/modules/FileSystems.rb:981
msgid ""
"<p><b>Stride Length in Blocks:</b>\n"
"Set RAID-related options for the file system. Currently, the only supported\n"
@@ -5696,7 +5744,7 @@
"作為其引數。</p>\n"

#. help text, richtext format
-#: src/modules/FileSystems.rb:987
+#: src/modules/FileSystems.rb:1000
msgid ""
"<p><b>Block Size:</b>\n"
"Specify the size of blocks in bytes. Valid block size values are 1024, 2048,
and 4096 bytes per block. If auto is selected, the block size is determined by
the file system size and the expected use of the file system.</p>\n"
@@ -5705,12 +5753,12 @@
"以位元組為單位指定區塊大小。有效的區塊大小值是每區塊 1024、2048 與 4096
位元組。若選取自動,便會依據檔案系統大小與檔案系統的預期使用量來決定區塊大小。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:996
+#: src/modules/FileSystems.rb:1009
msgid "Bytes per &Inode"
msgstr "每 Inode 的位元組數(&I)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1002
+#: src/modules/FileSystems.rb:1015
msgid ""
"<p><b>Bytes per Inode:</b> \n"
"Specify the bytes to inode ratio. YaST creates an inode for every\n"
@@ -5731,12 +5779,12 @@
"因此在輸入此參數值時,請注意其合理性。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:1018
+#: src/modules/FileSystems.rb:1031
msgid "Percentage of Blocks &Reserved for root"
msgstr "保留給根目錄的區塊百分比(&R)"

#. popup text
-#: src/modules/FileSystems.rb:1028
+#: src/modules/FileSystems.rb:1041
msgid ""
"The \"Percentage of Blocks Reserved for root\" value is incorrect.\n"
"Allowed are float numbers no larger than 99 (e.g. 0.5).\n"
@@ -5746,17 +5794,17 @@

#. xgettext: no-c-format
#. help text, richtext format
-#: src/modules/FileSystems.rb:1033
+#: src/modules/FileSystems.rb:1046
msgid "<p><b>Percentage of Blocks Reserved for root:</b> Specify the
percentage of blocks reserved for the super user. The default is computed so
that normally 1 Gig is reserved. Upper limit for reserved default is 5.0,
lowest reserved default is 0.1.</p>"
msgstr "<p><b>保留給根目錄的區塊百分比︰</b>指定保留給進階使用者的區塊百分比。系統會計算預設值,通常會保留 1 GB。預設保留的上限值為
5.0,下限值為 0.1。</p>"

#. checkbox text
-#: src/modules/FileSystems.rb:1042
+#: src/modules/FileSystems.rb:1055
msgid "Disable Regular Checks"
msgstr "停用標準檢查"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1050
+#: src/modules/FileSystems.rb:1063
msgid ""
"<p><b>Disable Regular Checks:</b>\n"
"Disable regular file system check at booting.</p>\n"
@@ -5765,12 +5813,12 @@
"停用在開機時執行標準檔案系統檢查的功能。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:1077
+#: src/modules/FileSystems.rb:1090
msgid "&Directory Index Feature"
msgstr "目錄索引功能(&D)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1084
+#: src/modules/FileSystems.rb:1097
msgid ""
"<p><b>Directory Index:</b>\n"
"Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
@@ -5779,12 +5827,12 @@
"啟用透過雜湊的 b-trees 加速在大型目錄中的查詢功能。</p>\n"

#. label text
-#: src/modules/FileSystems.rb:1096
+#: src/modules/FileSystems.rb:1109
msgid "&No Journal"
msgstr "無日誌(&N)"

#. help text, richtext format
-#: src/modules/FileSystems.rb:1103
+#: src/modules/FileSystems.rb:1116
msgid ""
"<p><b>No Journal:</b>\n"
"Suppressed use of journaling on filesystem. Only activate this when you
really\n"
@@ -5896,7 +5944,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:994
+#: src/modules/Storage.rb:989
msgid "Resize Not Possible:"
msgstr "無法調整大小:"

@@ -5909,7 +5957,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:2697 src/modules/Storage.rb:3920
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -5922,7 +5970,7 @@
"提供的加密密碼可能不正確。\n"

#. popup text
-#: src/modules/Storage.rb:3951
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -5933,7 +5981,7 @@
"請再試一次。"

#. popup text
-#: src/modules/Storage.rb:3982
+#: 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"
@@ -5945,24 +5993,24 @@

#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4036
+#: src/modules/Storage.rb:4031
msgid "&Enter Encryption Password:"
msgstr "輸入加密密碼(&E)︰"

#. Clear password fields on every round.
-#: src/modules/Storage.rb:4095
+#: src/modules/Storage.rb:4090
msgid "Provide Password"
msgstr "提供密碼"

-#: src/modules/Storage.rb:4114
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr "下列加密的磁碟區可供使用。"

-#: src/modules/Storage.rb:4129
+#: src/modules/Storage.rb:4124
msgid "Encrypted Volume Activation"
msgstr "啟動加密的磁碟區"

-#: src/modules/Storage.rb:4133
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -5974,12 +6022,12 @@
"如果更新期間需要磁碟區,\n"
"或者磁碟區包含加密的 LVM 實體磁碟區,則需要知道密碼。"

-#: src/modules/Storage.rb:4145
+#: src/modules/Storage.rb:4140
msgid "Do you want to provide encryption passwords?"
msgstr "您是否要提供加密密碼?"

#. text in help field
-#: src/modules/Storage.rb:4202
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -5990,69 +6038,69 @@
"系統將對所有裝置嘗試該密碼。"

#. header text
-#: src/modules/Storage.rb:4208
+#: src/modules/Storage.rb:4203
msgid "Enter Encryption Password"
msgstr "輸入加密密碼"

-#: src/modules/Storage.rb:4211
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr "沒有要解除鎖定的加密磁碟區。"

#. label text, multiple device names follow
-#: src/modules/Storage.rb:4224
+#: src/modules/Storage.rb:4219
msgid "Provide password for any of the following devices:"
msgstr "請提供下列任一裝置的密碼︰"

#. label text, one device name follows
-#: src/modules/Storage.rb:4227
+#: src/modules/Storage.rb:4222
msgid "Provide password for the following device:"
msgstr "請提供以下裝置的密碼︰"

-#: src/modules/Storage.rb:4240
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr "正在嘗試解除鎖定加密的磁碟區..."

-#: src/modules/Storage.rb:4264
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr "密碼不能解除鎖定任何磁碟區。"

-#: src/modules/Storage.rb:4350
+#: src/modules/Storage.rb:4345
msgid "IDE Disk"
msgstr "IDE 磁碟"

-#: src/modules/Storage.rb:4356
+#: src/modules/Storage.rb:4351
msgid "SCSI Disk"
msgstr "SCSI 磁碟"

-#: src/modules/Storage.rb:4362
+#: src/modules/Storage.rb:4357
msgid "Disk"
msgstr "磁碟"

-#: src/modules/Storage.rb:4390
+#: src/modules/Storage.rb:4385
msgid "DM RAID"
msgstr "DM RAID"

-#: src/modules/Storage.rb:4403
+#: src/modules/Storage.rb:4398
msgid "MD RAID"
msgstr "MD RAID"

#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4898
+#: src/modules/Storage.rb:4893
msgid "Installing required packages failed."
msgstr "安裝所需的套件時失敗。"

-#: src/modules/Storage.rb:4899 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
msgid "Continue despite the error?"
msgstr "忽略此錯誤並繼續?"

#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5238
+#: src/modules/Storage.rb:5233
msgid "Partitions cannot be created since other partitions on the disk are
used."
msgstr "無法建立分割區,因為磁碟上有其他分割區處於使用狀態。"

-#: src/modules/Storage.rb:5264
+#: src/modules/Storage.rb:5259
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
@@ -6062,7 +6110,7 @@
"無法修改裝置 %1,\n"
"因其包含執行安裝所需的已啟動交換。\n"

-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5273
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
@@ -6072,7 +6120,7 @@
"無法修改裝置 %1,\n"
"因其包含執行安裝所需的安裝資料。\n"

-#: src/modules/Storage.rb:5307
+#: src/modules/Storage.rb:5302
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
@@ -6082,7 +6130,7 @@
"無法移除裝置 %1,\n"
"因其包含執行安裝所需的已啟動交換。\n"

-#: src/modules/Storage.rb:5316
+#: src/modules/Storage.rb:5311
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
@@ -6092,7 +6140,7 @@
"無法移除裝置 %1,\n"
"因其包含執行安裝所需的安裝資料。\n"

-#: src/modules/Storage.rb:5345
+#: src/modules/Storage.rb:5340
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6104,7 +6152,7 @@
"裝置 %2,後者包含執行安裝所需的\n"
"已啟用交換。\n"

-#: src/modules/Storage.rb:5356
+#: src/modules/Storage.rb:5351
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6115,7 +6163,7 @@
"裝置 %2,後者包含執行安裝所需的資料。\n"

#. the check for verbose is needed for calls from StorageProposal (see
bnc#871779)
-#: src/modules/Storage.rb:5378
+#: src/modules/Storage.rb:5373
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6126,18 +6174,18 @@
"有其他分割區處於使用狀態。\n"

#. FIXME: please, add description of the list that is returned by this
function.
-#: src/modules/Storage.rb:5467
+#: src/modules/Storage.rb:5462
msgid "Nothing assigned as root filesystem!"
msgstr "未將任何項目指定為根檔案系統!"

-#: src/modules/Storage.rb:5468
+#: src/modules/Storage.rb:5463
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:6018
+#: src/modules/Storage.rb:6013
msgid "Adding the following resolvables failed: %1"
msgstr "新增下列可解析項目失敗︰%1"

@@ -6791,31 +6839,31 @@

#. bsc#983003
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4601 src/modules/StorageProposal.rb:5724
+#: src/modules/StorageProposal.rb:4624 src/modules/StorageProposal.rb:5747
msgid "Resize impossible due to inconsistent file system. Try checking file
system under Windows."
msgstr "由於不一致的檔案系統,無法調整大小。請在 Windows 下檢查檔案系統。"

#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6239
+#: src/modules/StorageProposal.rb:6262
msgid "File System for Root Partition"
msgstr "根分割區的檔案系統"

#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6286
+#: src/modules/StorageProposal.rb:6309
msgid "File System for Home Partition"
msgstr "主分割區的檔案系統"

#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6304
+#: src/modules/StorageProposal.rb:6327
msgid "Enlarge &Swap for Suspend"
msgstr "放大用於暫停的交換空間(&S)"

-#: src/modules/StorageProposal.rb:6314
+#: src/modules/StorageProposal.rb:6337
msgid "Proposal Settings"
msgstr "建議設定"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6329
+#: src/modules/StorageProposal.rb:6352
msgid ""
"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
@@ -6826,7 +6874,7 @@
"如果想加密系統,請選擇<b>基於加密 LVM 的建議</b>。</p>"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6337
+#: src/modules/StorageProposal.rb:6360
msgid ""
"<p>The filesystem for the root partition can be selected with the\n"
"corresponding combo box. With the filesystem BtrFS the proposal can\n"
@@ -6839,7 +6887,7 @@
"根分割區的大小。</p>"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6346
+#: src/modules/StorageProposal.rb:6369
msgid ""
"<p>The proposal can create a separate home partition. The filesystem for\n"
"the home partition can be selected with the corresponding combo box.</p>"
@@ -6848,7 +6896,7 @@
"相應的清單方塊選取主分割區的檔案系統。</p>"

#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6353
+#: src/modules/StorageProposal.rb:6376
msgid ""
"<p>The swap partition can be made large enough to be used to suspend\n"
"the system to disk in most cases.</p>"
@@ -6856,32 +6904,32 @@
"<p>可將交換分割區設定得足夠大,以便在大多數情況下\n"
"都能滿足暫停系統所要使用的磁碟要求。</p>"

-#: src/modules/StorageProposal.rb:6378
+#: src/modules/StorageProposal.rb:6401
msgid "Enter your password for the proposal encryption."
msgstr "輸入用於計畫加密的密碼。"

#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6385
+#: src/modules/StorageProposal.rb:6408
msgid "Password:"
msgstr "密碼:"

#. Label: get same password again for verification
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6396
+#: src/modules/StorageProposal.rb:6419
msgid "Reenter the password for verification:"
msgstr "重新輸入密碼以進行確認:"

#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6594
+#: src/modules/StorageProposal.rb:6617
msgid "&Partition-based Proposal"
msgstr "基於分割區的建議(&P)"

-#: src/modules/StorageProposal.rb:6596
+#: src/modules/StorageProposal.rb:6619
msgid "&LVM-based Proposal"
msgstr "基於 LVM 的建議(&L)"

-#: src/modules/StorageProposal.rb:6598
+#: src/modules/StorageProposal.rb:6621
msgid "&Encrypted LVM-based Proposal"
msgstr "基於加密 LVM 的建議(&E)"

@@ -6927,3 +6975,14 @@
#: src/modules/StorageSettings.rb:183
msgid "Visible Information on Storage Devices:"
msgstr "儲存裝置上的可見資訊:"
+
+#~ msgid ""
+#~ "You have assigned an encrypted file system to a partition\n"
+#~ "with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n"
+#~ "/var\". This is not possible. Change the mount point or use a\n"
+#~ "nonloopbacked file system.\n"
+#~ msgstr ""
+#~ "您已使用以下其中一個掛接點,\n"
+#~ "將加密的檔案系統指派到分割區: 「/」、「/usr」、「/boot」、\n"
+#~ "「/var」。 而這是無法使用的。 請變更掛接點或使用\n"
+#~ "非回送的檔案系統。\n"

Modified: branches/SLE12-SP3/yast/zh_TW/po/update.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/update.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/update.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-31 02:31+0000\n"
+"POT-Creation-Date: 2017-04-20 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -167,8 +167,8 @@
#: src/clients/inst_update.rb:69 src/clients/inst_update.rb:74
#: src/include/update/rootpart.rb:100 src/include/update/rootpart.rb:106
#: src/include/update/rootpart.rb:126 src/modules/RootPart.rb:157
-#: src/modules/RootPart.rb:1442 src/modules/RootPart.rb:1448
-#: src/modules/RootPart.rb:2006
+#: src/modules/RootPart.rb:1445 src/modules/RootPart.rb:1451
+#: src/modules/RootPart.rb:2009
msgid "Unknown"
msgstr "未知"

@@ -658,19 +658,19 @@
msgstr "跳過掛接(&S)"

#. yes-no popup
-#: src/modules/RootPart.rb:1066
+#: src/modules/RootPart.rb:1069
msgid "Incorrect password. Try again?"
msgstr "不正確的密碼。再試一次?"

#. TRANSLATORS: a popup headline
-#: src/modules/RootPart.rb:1169
+#: src/modules/RootPart.rb:1172
msgid "Warning"
msgstr "警告"

#. TRANSLATORS: error message,
#. %1 is replaced with the current /boot partition size
#. %2 with the recommended size
-#: src/modules/RootPart.rb:1174
+#: src/modules/RootPart.rb:1177
msgid ""
"Your /boot partition is too small (%1 MB).\n"
"We recommend a size of no less than %2 MB or else the new Kernel may not
fit.\n"
@@ -687,7 +687,7 @@
"您要繼續更新目前的系統嗎?\n"

#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount'
command
-#: src/modules/RootPart.rb:1266
+#: src/modules/RootPart.rb:1269
msgid ""
"The partition %1 could not be mounted.\n"
"\n"
@@ -708,27 +708,27 @@
"若要中止更新,請按一下「取消」。\n"

#. push button
-#: src/modules/RootPart.rb:1284
+#: src/modules/RootPart.rb:1287
msgid "&Specify Mount Options"
msgstr "指定掛接選項(&S)"

#. popup heading
-#: src/modules/RootPart.rb:1300
+#: src/modules/RootPart.rb:1303
msgid "Mount Options"
msgstr "掛接選項"

#. text entry label
-#: src/modules/RootPart.rb:1303
+#: src/modules/RootPart.rb:1306
msgid "&Mount Point"
msgstr "掛接點(&M)"

#. tex entry label
-#: src/modules/RootPart.rb:1306
+#: src/modules/RootPart.rb:1309
msgid "&Device"
msgstr "裝置(&D)"

#. text entry label
-#: src/modules/RootPart.rb:1311
+#: src/modules/RootPart.rb:1314
msgid ""
"&File System\n"
"(empty for autodetection)"
@@ -737,12 +737,12 @@
"(空白代表自動偵測)"

#. error message
-#: src/modules/RootPart.rb:1388
+#: src/modules/RootPart.rb:1391
msgid "The /var partition %1 could not be mounted.\n"
msgstr "無法掛接 /var 分割區 %1。\n"

#. Informational text about selected partition, %x are replaced with values
later
-#: src/modules/RootPart.rb:1429
+#: src/modules/RootPart.rb:1432
msgid ""
"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
@@ -754,17 +754,17 @@
"<b>udev ID:</b>%5,<br>\n"
"<b>udev 路經:</b>%6"

-#: src/modules/RootPart.rb:1443
+#: src/modules/RootPart.rb:1446
msgid "None"
msgstr "無"

#. a popup caption
-#: src/modules/RootPart.rb:1466
+#: src/modules/RootPart.rb:1469
msgid "Unable to find the /var partition automatically"
msgstr "無法自動找到 /var 分割區"

#. a popup message
-#: src/modules/RootPart.rb:1471
+#: src/modules/RootPart.rb:1474
msgid ""
"Your system uses a separate /var partition which is required for the
upgrade\n"
"process to detect the disk-naming changes. Select the /var partition
manually\n"
@@ -775,22 +775,22 @@
"以繼續執行升級程序。"

#. a combo-box label
-#: src/modules/RootPart.rb:1484
+#: src/modules/RootPart.rb:1487
msgid "&Select /var Partition Device"
msgstr "選取 /var 分割區裝置(&S)"

#. an informational rich-text widget label
-#: src/modules/RootPart.rb:1490
+#: src/modules/RootPart.rb:1493
msgid "Device Info"
msgstr "裝置資訊"

#. error message
-#: src/modules/RootPart.rb:1631
+#: src/modules/RootPart.rb:1634
msgid "Unable to mount /var partition with this disk configuration.\n"
msgstr "以此磁碟組態,無法掛接 /var 分割區。\n"

#. popup message, %1 will be replace with the name of the logfile
-#: src/modules/RootPart.rb:1662
+#: src/modules/RootPart.rb:1665
msgid ""
"Partitions could not be mounted.\n"
"\n"
@@ -803,7 +803,7 @@
#. read the keyboard settings now, so that it used when
#. typing passwords for encrypted partitions
#. Calling a script because otherwise this module would depend on yast2-country
-#: src/modules/RootPart.rb:1706
+#: src/modules/RootPart.rb:1709
msgid ""
"Some partitions in the system on %1 are mounted by kernel-device name. This
is\n"
"not reliable for the update since kernel-device names are unfortunately not\n"
@@ -816,37 +816,37 @@
"掛接方法變更為任何其他方法。"

#. error message
-#: src/modules/RootPart.rb:1724
+#: src/modules/RootPart.rb:1727
msgid "No fstab found."
msgstr "找不到 fstab。"

#. message part 1
-#: src/modules/RootPart.rb:1749
+#: src/modules/RootPart.rb:1752
msgid "The root partition in /etc/fstab has an invalid root device.\n"
msgstr "在 /etc/fstab 中的根分割區有無效的根裝置。\n"

#. message part 2
-#: src/modules/RootPart.rb:1754
+#: src/modules/RootPart.rb:1757
msgid "It is currently mounted as %1 but listed as %2.\n"
msgstr "目前掛接為 %1 卻顯示為 %2。\n"

#. TRANSLATORS: label for filesystem snapshot taken before system update
-#: src/modules/RootPart.rb:1810
+#: src/modules/RootPart.rb:1813
msgid "before update"
msgstr "在更新之前"

#. prepare progress-bar
-#: src/modules/RootPart.rb:2131
+#: src/modules/RootPart.rb:2134
msgid "Evaluating root partition. One moment please..."
msgstr "正在評估根分割區。請稍候..."

#. intermediate popup while mounting partitions
-#: src/modules/RootPart.rb:2214
+#: src/modules/RootPart.rb:2217
msgid "Mounting partitions. One moment please..."
msgstr "正在掛接分割區。請稍候..."

#. TRANSLATORS: dialog caption
-#: src/modules/RootPart.rb:2229
+#: src/modules/RootPart.rb:2232
msgid "Searching for Available Systems"
msgstr "搜尋可用系統"


Modified: branches/SLE12-SP3/yast/zh_TW/po/vm.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/vm.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/vm.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: vm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-01 02:29+0000\n"
+"POT-Creation-Date: 2017-03-31 02:29+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -21,7 +21,7 @@
msgstr "安裝 Hypervisor 和工具"

#. progress step title
-#: src/clients/vm_finish.rb:69
+#: src/clients/vm_finish.rb:70
msgid "Configuring the virtual machine..."
msgstr "正在設定虛擬機器..."


Modified: branches/SLE12-SP3/yast/zh_TW/po/xpram.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/xpram.zh_TW.po 2017-05-23 07:01:52 UTC
(rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/xpram.zh_TW.po 2017-05-23 07:02:49 UTC
(rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: xpram\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-31 17:53+0200\n"
+"POT-Creation-Date: 2017-05-16 19:52+0200\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -55,46 +55,46 @@
msgstr "<p>這項工具目前僅支援將整個 XPRAM 指定到單一磁碟區中。若要使用多個磁碟區,請參閱 Linux 核心 2.6 - 2004 年 4
月出版的 Device Drivers, Features and Commands November 30,
2004。</p><p>在目前情況下,請停用本模組的 XPRAM。</p>"

#. help text for XPRAM 3/4
-#: src/include/s390/xpram/ui.rb:57
+#: src/include/s390/xpram/ui.rb:60
msgid "<p>Choose the correct mount point for <b>Mount Point</b>.</p>"
msgstr "<p>選擇「<b>掛接點</b>」的正確掛接點。</p>"

#. help text for XPRAM 4/4
-#: src/include/s390/xpram/ui.rb:59
+#: src/include/s390/xpram/ui.rb:62
msgid "<p>Next, choose the file system to use on the device.</p>"
msgstr "<p>接下來,選擇要在該裝置上使用的檔案系統。</p>"

#. radio button label for to not start xpram
-#: src/include/s390/xpram/ui.rb:83
+#: src/include/s390/xpram/ui.rb:86
msgid "Do No&t Start XPRAM"
msgstr "不要啟動 XPRAM(&T)"

#. radio button label for to start xpram
-#: src/include/s390/xpram/ui.rb:92
+#: src/include/s390/xpram/ui.rb:95
msgid "&Start XPRAM"
msgstr "啟動 XPRAM(&S)"

-#: src/include/s390/xpram/ui.rb:104
+#: src/include/s390/xpram/ui.rb:107
msgid "Install File System or Swap Although &XPRAM Contains Valid Data"
msgstr "即使 XPRAM 包含有效資料仍要安裝檔案系統或交換分割區(&X)"

#. frame label
-#: src/include/s390/xpram/ui.rb:113
+#: src/include/s390/xpram/ui.rb:116
msgid "Mount Point"
msgstr "掛接點"

#. combobox label
-#: src/include/s390/xpram/ui.rb:122
+#: src/include/s390/xpram/ui.rb:125
msgid "&Mount Point"
msgstr "掛接點(&M)"

#. frame label
-#: src/include/s390/xpram/ui.rb:137
+#: src/include/s390/xpram/ui.rb:140
msgid "File System Type"
msgstr "檔案系統類型"

#. combobox label
-#: src/include/s390/xpram/ui.rb:146
+#: src/include/s390/xpram/ui.rb:149
msgid "F&ile System to Use:"
msgstr "要使用的檔案系統(&I):"

@@ -104,36 +104,34 @@
msgstr "正在儲存 XPRAM 組態"

#. Progress stage 1/2
-#: src/modules/Xpram.rb:109
+#: src/modules/Xpram.rb:108
msgid "Write the settings"
msgstr "寫入設定"

#. Progress stage 2/2
-#: src/modules/Xpram.rb:111
+#: src/modules/Xpram.rb:110
msgid "Restart the service"
msgstr "重新啟動服務"

#. Progress step 1/2
-#: src/modules/Xpram.rb:115
+#: src/modules/Xpram.rb:114
msgid "Writing the settings..."
msgstr "正在寫入設定..."

#. Progress step 2/2
-#: src/modules/Xpram.rb:117
+#: src/modules/Xpram.rb:116
msgid "Restarting service..."
msgstr "正在重新啟動服務..."

#. Progress finished
-#: src/modules/Xpram.rb:119
+#: src/modules/Xpram.rb:118
msgid "Finished"
msgstr "已完成"

-#: src/modules/Xpram.rb:136
+#: src/modules/Xpram.rb:135
msgid "Error stopping xpram. Try \"rcxpram stop\" manually."
msgstr "停止 xpram 時發生錯誤。請嘗試手動執行「rcxpram stop」。"

-#. map out = (map) SCR::Execute(.target.bash_output,"bash -x /etc/init.d/xpram
start", $["TERM":"raw"]);
-#. y2milestone("got %1", out);
-#: src/modules/Xpram.rb:154
+#: src/modules/Xpram.rb:151
msgid "Error starting xpram. Try \"rcxpram start\" manually."
msgstr "啟動 xpram 時發生錯誤。請嘗試手動執行「rcxpram start」。"

Modified: branches/SLE12-SP3/yast/zh_TW/po/yast2-apparmor.zh_TW.po
===================================================================
--- branches/SLE12-SP3/yast/zh_TW/po/yast2-apparmor.zh_TW.po 2017-05-23
07:01:52 UTC (rev 97354)
+++ branches/SLE12-SP3/yast/zh_TW/po/yast2-apparmor.zh_TW.po 2017-05-23
07:02:49 UTC (rev 97355)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: yast2-apparmor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:26+0200\n"
+"POT-Creation-Date: 2017-04-05 02:27+0000\n"
"PO-Revision-Date: 2017-04-18 14:03\n"
"Last-Translator: Novell language <language@xxxxxxxxxx>\n"
"Language-Team: Novell language <language@xxxxxxxxxx>\n"
@@ -78,7 +78,7 @@

#. AppArmor dialog caption
#. Network dialog caption
-#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:440
+#: src/clients/apparmor.rb:51 src/include/apparmor/aa-config.rb:60
msgid "AppArmor Configuration"
msgstr "AppArmor 組態"

@@ -136,119 +136,11 @@
#. you may find current contact information at www.novell.com
#.
#. ***************************************************************************
-#: src/include/apparmor/aa-config.rb:52
-msgid "This operation generated the following error. Check your installation
and AppArmor profile settings."
-msgstr "此操作產生下列錯誤。請檢查您的安裝與 AppArmor 設定檔設定。"
+#: src/include/apparmor/aa-config.rb:48
+msgid "Failed to change apparmor service. Please use journal (journalctl -n -u
apparmor) to diagnose"
+msgstr ""

-#: src/include/apparmor/aa-config.rb:91 src/include/apparmor/aa-config.rb:103
-#: src/include/apparmor/aa-config.rb:115
-msgid "Disabled"
-msgstr "已停用"
-
-#: src/include/apparmor/aa-config.rb:92 src/include/apparmor/aa-config.rb:104
-#: src/include/apparmor/aa-config.rb:116
-msgid "1 minute"
-msgstr "1 分鐘"
-
-#: src/include/apparmor/aa-config.rb:93 src/include/apparmor/aa-config.rb:105
-#: src/include/apparmor/aa-config.rb:117
-msgid "5 minutes"
-msgstr "5 分鐘"
-
-#: src/include/apparmor/aa-config.rb:94 src/include/apparmor/aa-config.rb:106
-#: src/include/apparmor/aa-config.rb:118
-msgid "10 minutes"
-msgstr "10 分鐘"
-
-#: src/include/apparmor/aa-config.rb:95 src/include/apparmor/aa-config.rb:107
-#: src/include/apparmor/aa-config.rb:119
-msgid "15 minutes"
-msgstr "15 分鐘"
-
-#: src/include/apparmor/aa-config.rb:96 src/include/apparmor/aa-config.rb:108
-#: src/include/apparmor/aa-config.rb:120
-msgid "30 minutes"
-msgstr "30 分鐘"
-
-#: src/include/apparmor/aa-config.rb:97 src/include/apparmor/aa-config.rb:109
-#: src/include/apparmor/aa-config.rb:121
-msgid "1 hour"
-msgstr "1 小時"
-
-#: src/include/apparmor/aa-config.rb:98 src/include/apparmor/aa-config.rb:110
-#: src/include/apparmor/aa-config.rb:122
-msgid "1 day"
-msgstr "1 天"
-
-#: src/include/apparmor/aa-config.rb:99 src/include/apparmor/aa-config.rb:111
-#: src/include/apparmor/aa-config.rb:123
-msgid "1 week"
-msgstr "1 週"
-
-#: src/include/apparmor/aa-config.rb:131 src/include/apparmor/aa-config.rb:233
-msgid "Security Event Notification"
-msgstr "安全事件通知功能"
-
-#: src/include/apparmor/aa-config.rb:138
-msgid "Terse Notification"
-msgstr "精簡通知"
-
-#: src/include/apparmor/aa-config.rb:142 src/include/apparmor/aa-config.rb:171
-#: src/include/apparmor/aa-config.rb:200
-msgid "Frequency"
-msgstr "頻率"
-
-#: src/include/apparmor/aa-config.rb:145 src/include/apparmor/aa-config.rb:174
-#: src/include/apparmor/aa-config.rb:203
-msgid "Email Address"
-msgstr "電子郵件位址"
-
-#: src/include/apparmor/aa-config.rb:150 src/include/apparmor/aa-config.rb:179
-#: src/include/apparmor/aa-config.rb:208
-msgid "Severity"
-msgstr "嚴重性"
-
-#: src/include/apparmor/aa-config.rb:159 src/include/apparmor/aa-config.rb:188
-#: src/include/apparmor/aa-config.rb:217
-msgid "Include Unknown Severity Events"
-msgstr "包含未知嚴重性的事件"
-
-#: src/include/apparmor/aa-config.rb:167
-msgid "Summary Notification"
-msgstr "摘要通知"
-
-#: src/include/apparmor/aa-config.rb:196
-msgid "Verbose Notification"
-msgstr "詳細通知"
-
-#: src/include/apparmor/aa-config.rb:270 src/include/apparmor/aa-config.rb:310
-#: src/include/apparmor/aa-config.rb:350
-msgid "An email address is required for each selected notification method."
-msgstr "每種選取的通知方式都需要電子郵件地址。"
-
-#: src/include/apparmor/aa-config.rb:394
-msgid "Configuration failed for the following operations: "
-msgstr "下列操作的組態失敗:"
-
-#: src/include/apparmor/aa-config.rb:401 src/include/apparmor/aa-config.rb:434
-msgid "Notification is enabled"
-msgstr "通知功能已啟用"
-
-#. Notification Status
-#: src/include/apparmor/aa-config.rb:403 src/include/apparmor/aa-config.rb:431
-msgid "Notification is disabled"
-msgstr "通知功能已停用"
-
-#. AppArmor Status
-#: src/include/apparmor/aa-config.rb:422
-msgid "AppArmor is disabled"
-msgstr "AppArmor 已停用"
-
-#: src/include/apparmor/aa-config.rb:426
-msgid "AppArmor is enabled"
-msgstr "AppArmor 已啟用"
-
-#: src/include/apparmor/aa-config.rb:441
+#: src/include/apparmor/aa-config.rb:61
msgid ""
"<p><b>AppArmor Status</b><br>This reports whether the AppArmor policy
enforcement \n"
"module is loaded and functioning.</p>"
@@ -256,7 +148,7 @@
"<p><b>AppArmor 狀態</b><br>報告 AppArmor 政策執行\n"
"模組是否已載入並在執行中。</p>"

-#: src/include/apparmor/aa-config.rb:444
+#: src/include/apparmor/aa-config.rb:64
msgid ""
"<p><b>Security Event Notification</b><br>Configure this tool if you want \n"
"to be notified by email when access violations have occurred.</p>"
@@ -264,7 +156,7 @@
"<p><b>安全事件通知</b><br>如果您希望在發生存取違規時\n"
"收到電子郵件通知,請設定此工具。</p>"

-#: src/include/apparmor/aa-config.rb:447
+#: src/include/apparmor/aa-config.rb:67
msgid ""
"<p><b>Profile Modes</b><br>Use this tool to change the way that AppArmor \n"
"uses individual profiles.</p>"
@@ -272,38 +164,28 @@
"<p><b>設定檔模式</b><br>使用此工具可以變更 AppArmor 對\n"
"個別設定檔的使用方式。</p>"

-#: src/include/apparmor/aa-config.rb:462
+#: src/include/apparmor/aa-config.rb:82
msgid "&Enable AppArmor"
msgstr "啟用 AppArmor(&E)"

-#: src/include/apparmor/aa-config.rb:469
+#: src/include/apparmor/aa-config.rb:89
msgid "Configure AppArmor"
msgstr "設定 AppArmor"

-#. event notification disabled due to changes in AppArmor
-#. `Frame ( _("Security Event Notification"),
-#. `HBox(
-#. `VSpacing(1), `HSpacing(1),
-#. `HVCenter( `Label( `id(`notifyLabel), evEnStr )),
-#. `PushButton( `id(`ntconf), _("C&onfigure")),
-#. `VSpacing(1), `HSpacing(1)
-#. )
-#. ),
-#. `VSpacing(1), `HSpacing(20),
-#: src/include/apparmor/aa-config.rb:485
+#: src/include/apparmor/aa-config.rb:95
msgid "Configure Profile Modes"
msgstr "設定設定檔模式"

-#: src/include/apparmor/aa-config.rb:491
+#: src/include/apparmor/aa-config.rb:101
msgid "Set profile modes"
msgstr "設定設定檔模式"

-#: src/include/apparmor/aa-config.rb:494
+#: src/include/apparmor/aa-config.rb:104
msgid "Co&nfigure"
msgstr "設定(&N)"

#. May want to replace Wizard() with UI()
-#: src/include/apparmor/aa-config.rb:518
+#: src/include/apparmor/aa-config.rb:128
#: src/include/apparmor/config_complain.rb:187
#: src/include/apparmor/config_complain.rb:235
#: src/include/apparmor/config_complain.rb:245
@@ -1994,7 +1876,77 @@
msgid "You must select a profile to edit."
msgstr "必須選取要編輯的設定檔。"

-#: perl-lib/Notify.pm:51
-#, perl-format
-msgid "Failed copying %s."
-msgstr "複製 %s 失敗。"
+#~ msgid "This operation generated the following error. Check your
installation and AppArmor profile settings."
+#~ msgstr "此操作產生下列錯誤。請檢查您的安裝與 AppArmor 設定檔設定。"
+
+#~ msgid "Disabled"
+#~ msgstr "已停用"
+
+#~ msgid "1 minute"
+#~ msgstr "1 分鐘"
+
+#~ msgid "5 minutes"
+#~ msgstr "5 分鐘"
+
+#~ msgid "10 minutes"
+#~ msgstr "10 分鐘"
+
+#~ msgid "15 minutes"
+#~ msgstr "15 分鐘"
+
+#~ msgid "30 minutes"
+#~ msgstr "30 分鐘"
+
+#~ msgid "1 hour"
+#~ msgstr "1 小時"
+
+#~ msgid "1 day"
+#~ msgstr "1 天"
+
+#~ msgid "1 week"
+#~ msgstr "1 週"
+
+#~ msgid "Security Event Notification"
+#~ msgstr "安全事件通知功能"
+
+#~ msgid "Terse Notification"
+#~ msgstr "精簡通知"
+
+#~ msgid "Frequency"
+#~ msgstr "頻率"
+
+#~ msgid "Email Address"
+#~ msgstr "電子郵件位址"
+
+#~ msgid "Severity"
+#~ msgstr "嚴重性"
+
+#~ msgid "Include Unknown Severity Events"
+#~ msgstr "包含未知嚴重性的事件"
+
+#~ msgid "Summary Notification"
+#~ msgstr "摘要通知"
+
+#~ msgid "Verbose Notification"
+#~ msgstr "詳細通知"
+
+#~ msgid "An email address is required for each selected notification method."
+#~ msgstr "每種選取的通知方式都需要電子郵件地址。"
+
+#~ msgid "Configuration failed for the following operations: "
+#~ msgstr "下列操作的組態失敗:"
+
+#~ msgid "Notification is enabled"
+#~ msgstr "通知功能已啟用"
+
+#~ msgid "Notification is disabled"
+#~ msgstr "通知功能已停用"
+
+#~ msgid "AppArmor is disabled"
+#~ msgstr "AppArmor 已停用"
+
+#~ msgid "AppArmor is enabled"
+#~ msgstr "AppArmor 已啟用"
+
+#~ msgid "Failed copying %s."
+#~ msgstr "複製 %s 失敗。"


< Previous Next >
This Thread
  • No further messages