--- a/messages/install/zh_TW/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot Fri Aug 26 10:51:14 2011 +0900
+++ b/messages/install/zh_TW/usr/share/locale/__LOCALE__/LC_MESSAGES/gui-install.pot Wed Aug 31 20:17:18 2011 +0900
@@ -20,31 +20,31 @@
#
# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
#
-#: ../src/user_screen.py:300
+#: ../src/user_screen.py:355
msgid ""
-msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-12 16:54+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+msgstr "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2011-08-26 12:39+0900\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <[email protected]>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
-#: ../src/__init__.py:269
+#: ../src/__init__.py:262
#, python-format
msgid "The %s installer must be run as root. Quitting."
msgstr "%s 安裝程式必須以超級使用者身份執行。正在結束。"
-#: ../src/__init__.py:274
+#: ../src/__init__.py:267
msgid "Installer Startup Terminated"
msgstr "安裝程式啟動已終止"
-#: ../src/__init__.py:275 ../src/__init__.py:277
+#: ../src/__init__.py:268 ../src/__init__.py:270
msgid ""
"Only one instance of this Installer is allowed. Another instance is already "
"running."
msgstr "只允許一個安裝程式實例。另一個實例已經在執行中。"
-#: ../src/__init__.py:285
+#: ../src/__init__.py:278
#, python-format
msgid "Set log location to FILE (default: %default)"
msgstr "將記錄位置設定到 FILE (預設：%default)"
-#: ../src/__init__.py:289
+#: ../src/__init__.py:282
#, python-format
msgid ""
"Set log verbosity to LEVEL. In order of increasing verbosity, valid values "
@@ -52,13 +52,13 @@
"[default: %default]"
msgstr "將記錄詳細度設定到 LEVEL。依照詳細度的遞增順序，有效值為 'error'、'warn'、'info'、'debug' 或 'input'\n[預設：%default]"
-#: ../src/__init__.py:296
+#: ../src/__init__.py:289
msgid ""
"Enable debug mode. Sets logging level to 'input' and enables CTRL-C for "
"killing the program\n"
msgstr "啟用除錯模式。將記錄層級設定成 'input' 並啟用 CTRL-C 終止程式\n"
-#: ../src/base_screen.py:69 ../src/welcome_screen.py:62
+#: ../src/base_screen.py:69 ../src/welcome_screen.py:63
msgid "Welcome"
msgstr "歡迎使用"
@@ -70,7 +70,7 @@
msgid "Time Zone"
msgstr "時區"
-#: ../src/base_screen.py:72 ../src/user_screen.py:109
+#: ../src/base_screen.py:72 ../src/user_screen.py:158
#: ../xml/users.xml.glade.h:9
msgid "Users"
msgstr "使用者"
@@ -87,10 +87,10 @@
#: ../src/base_screen.py:97 ../src/confirm_screen.py:82
#: ../src/disk_screen.py:141 ../src/failure_screen.py:62
#: ../src/fdisk_panel.py:152 ../src/finish_screen.py:65
-#: ../src/help_dialog.py:64 ../src/progress_screen.py:104
+#: ../src/help_dialog.py:64 ../src/progress_screen.py:111
#: ../src/screen_manager.py:217 ../src/textview_dialog.py:53
-#: ../src/timezone.py:210 ../src/timezone_screen.py:75
-#: ../src/user_screen.py:79 ../src/welcome_screen.py:52
+#: ../src/timezone.py:230 ../src/timezone_screen.py:75
+#: ../src/user_screen.py:86 ../src/welcome_screen.py:53
msgid "Internal error"
msgstr "內部錯誤"
@@ -100,43 +100,46 @@
"changes."
msgstr "請查閱下列設定，然後再進行安裝。按 [上一步] 按鈕進行變更。"
-#: ../src/confirm_screen.py:176
+#. There is no definitive way to detect whether "Use the whole
+#. disk" or "Partition the disk" was selected, so we will display
+#. a message about the Solaris2 partition details for each disk.
+#: ../src/confirm_screen.py:187
#, python-format
-msgid "%.1f GB disk (%s)"
-msgstr "%.1f GB 磁碟 (%s)"
+msgid "%(partsize).1f GB partition on %(disksize).1f GB disk (%(disk)s)"
+msgstr "%(disksize).1f GB 磁碟 (%(disk)s) 上的 %(partsize).1f GB 分割區"
-#: ../src/confirm_screen.py:179
-msgid "This disk will be erased"
-msgstr "將清除此磁碟。"
+#: ../src/confirm_screen.py:191
+msgid "This partition will be erased"
+msgstr "將清除此分割區。"
-#: ../src/confirm_screen.py:183
+#: ../src/confirm_screen.py:200
#, python-format
msgid "The whole installation will take up %.1fGB hard disk space."
msgstr "整個安裝將佔用 %.1fGB 的硬碟空間。"
-#: ../src/confirm_screen.py:202
+#: ../src/confirm_screen.py:219
#, python-format
msgid "Default Language: %s"
msgstr "預設語言：%s"
-#: ../src/confirm_screen.py:207
+#: ../src/confirm_screen.py:224
msgid "Language Support:"
msgstr "語言支援："
-#: ../src/confirm_screen.py:215 ../src/confirm_screen.py:217
+#: ../src/confirm_screen.py:232 ../src/confirm_screen.py:234
#, python-format
msgid "User Account: %s"
msgstr "使用者帳號：%s"
-#: ../src/confirm_screen.py:215
+#: ../src/confirm_screen.py:232
msgid "No user account."
msgstr "無使用者帳號。"
-#: ../src/confirm_screen.py:221
+#: ../src/confirm_screen.py:238
msgid "Root Password: Same as user account."
msgstr "管理者密碼：與使用者帳號的相同。"
-#: ../src/confirm_screen.py:224
+#: ../src/confirm_screen.py:241
#, python-format
msgid "Host name: %s"
msgstr "主機名稱：%s"
@@ -191,7 +194,7 @@
#: ../src/disk_screen.py:291 ../src/disk_screen.py:363
#: ../src/disk_screen.py:457 ../src/disk_screen.py:491
-#: ../src/disk_screen.py:521 ../src/disk_screen.py:757
+#: ../src/disk_screen.py:521 ../src/disk_screen.py:762
msgid "See log file for details."
msgstr "請參閱記錄檔以瞭解詳細資訊。"
@@ -218,8 +221,8 @@
msgstr "這個磁碟太小"
#: ../src/disk_screen.py:456 ../src/disk_screen.py:490
-#: ../src/disk_screen.py:520 ../src/disk_screen.py:756
-#: ../src/user_screen.py:299
+#: ../src/disk_screen.py:520 ../src/disk_screen.py:761
+#: ../src/user_screen.py:354
msgid "Internal Error"
msgstr "內部錯誤"
@@ -234,24 +237,24 @@
msgid "Where should Oracle Solaris be installed?"
msgstr "將 Oracle Solaris 安裝到何處?"
-#: ../src/disk_screen.py:749
+#: ../src/disk_screen.py:754
msgid "No disks were found."
msgstr "找不到任何磁碟"
#. If we cannot get the icon info from the theme, then
#. just fall back to making up a blank image
-#: ../src/disk_screen.py:852
+#: ../src/disk_screen.py:860
msgid ""
"Unable to display correct 'disk' graphics, but all other information is "
"available."
msgstr "無法顯示正確的「磁碟」圖形，但其他所有資訊都可使用。"
-#: ../src/failure_screen.py:70 ../xml/failure.xml.glade.h:4
+#: ../src/failure_screen.py:71 ../xml/failure.xml.glade.h:4
msgid "Failure"
msgstr "失敗"
-#: ../src/failure_screen.py:70 ../src/finish_screen.py:80
-#: ../src/progress_screen.py:137 ../src/user_screen.py:109
+#: ../src/failure_screen.py:71 ../src/finish_screen.py:81
+#: ../src/progress_screen.py:144 ../src/user_screen.py:158
msgid " "
msgstr " "
@@ -282,11 +285,11 @@
msgstr "<span size=\"smaller\"><span font_desc=\"Bold\">警告：</span>將會清除此分割區中的資料。</span>"
#: ../src/fdisk_panel.py:1388 ../src/install_profile.py:124
-#: ../src/user_screen.py:301
+#: ../src/user_screen.py:356
msgid "Unknown"
msgstr "不明的"
-#: ../src/finish_screen.py:80
+#: ../src/finish_screen.py:81
msgid "Finished"
msgstr "已完成"
@@ -312,7 +315,7 @@
"No help available"
msgstr "內部錯誤\n\n沒有可用的輔助說明"
-#: ../src/progress_screen.py:137
+#: ../src/progress_screen.py:144
msgid "Installing"
msgstr "正在安裝"
@@ -336,7 +339,7 @@
msgid "Error:No log file found"
msgstr "錯誤：找不到記錄檔"
-#: ../src/timezone.py:42
+#: ../src/timezone.py:48
msgid "- Select -"
msgstr "- 選取 -"
@@ -350,66 +353,66 @@
"date and time."
msgstr "在地圖上選取您附近的城市，或在下方設定您的時區，然後設定日期與時間。"
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
msgid "Time Zone Invalid"
msgstr "時區無效"
-#: ../src/timezone_screen.py:387
+#: ../src/timezone_screen.py:385
msgid "Please select a valid time zone"
msgstr "請選取有效的時區"
#. update the label message
-#: ../src/user_screen.py:155 ../src/user_screen.py:183
-#: ../src/user_screen.py:201 ../src/user_screen.py:346
+#: ../src/user_screen.py:206 ../src/user_screen.py:234
+#: ../src/user_screen.py:254 ../src/user_screen.py:401
#: ../xml/users.xml.glade.h:8
msgid "Re-enter to check for typing errors."
msgstr "請重新輸入以檢查打字錯誤。"
-#: ../src/user_screen.py:203 ../src/user_screen.py:348
+#: ../src/user_screen.py:256 ../src/user_screen.py:403
msgid "The two user passwords do not match."
msgstr "兩個使用者密碼不相符。"
-#: ../src/user_screen.py:277
+#: ../src/user_screen.py:332
msgid "<b>Error:</b> A computer name is required."
msgstr "<b>錯誤：</b>需要電腦名稱。"
-#: ../src/user_screen.py:279
+#: ../src/user_screen.py:334
msgid "<b>Error:</b> Computer name exceeds maximum length."
msgstr "<b>錯誤：</b>電腦名稱超過長度上限。"
-#: ../src/user_screen.py:281
+#: ../src/user_screen.py:336
msgid "<b>Error:</b> Computer name contains invalid characters."
msgstr "<b>錯誤：</b>電腦名稱包含無效字元。"
-#: ../src/user_screen.py:283
+#: ../src/user_screen.py:338
msgid "<b>Error:</b> Computer name ends with invalid character."
msgstr "<b>錯誤：</b>電腦名稱以無效字元結尾。"
-#: ../src/user_screen.py:293 ../src/user_screen.py:295
+#: ../src/user_screen.py:348 ../src/user_screen.py:350
msgid "Invalid User Account"
msgstr "無效的使用者帳號"
-#: ../src/user_screen.py:294
+#: ../src/user_screen.py:349
msgid "Enter a Log-in name."
msgstr "輸入登入名稱。"
-#: ../src/user_screen.py:296
+#: ../src/user_screen.py:351
msgid "Enter a user password."
msgstr "輸入使用者密碼。"
-#: ../src/user_screen.py:297
+#: ../src/user_screen.py:352
msgid "Invalid Computer Name"
msgstr "無效的電腦名稱"
-#: ../src/user_screen.py:298
+#: ../src/user_screen.py:353
msgid "Enter a computer name."
msgstr "輸入電腦名稱。"
-#: ../src/user_screen.py:302
+#: ../src/user_screen.py:357
msgid "Recheck entries."
msgstr "重新檢查輸入。"
-#: ../src/user_screen.py:380
+#: ../src/user_screen.py:435
msgid "Internal error occurred creating profile"
msgstr "建立設定檔時發生內部錯誤"