merge from branch to HEAD. turkish stays on HEAD, though

1 files changed, 24 insertions, 25 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c4348d1ff..6a9d3fd15 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: anaconda\n"
-"POT-Creation-Date: 2003-02-20 22:29-0500\n"
-"PO-Revision-Date: 2003-02-21 09:07+1000\n"
+"POT-Creation-Date: 2003-02-24 19:53-0500\n"
+"PO-Revision-Date: 2003-02-25 00:26+1000\n"
 "Last-Translator: Ben Wu <hpwu@redhat.com>\n"
 "Language-Team: Chinese (Traditional) <i18n-list@redhat.com>\n"
 "MIME-Version: 1.0\n"
@@ -236,7 +236,7 @@ msgstr ""
 
 #: ../autopart.py:1405 ../bootloader.py:123 ../image.py:386
 #: ../partedUtils.py:247 ../partedUtils.py:732 ../upgrade.py:303
-#: ../upgrade.py:438 ../upgrade.py:458 ../upgrade.py:500
+#: ../upgrade.py:439 ../upgrade.py:459 ../upgrade.py:500
 #: ../iw/blpasswidget.py:148 ../iw/bootloader_advanced_gui.py:42
 #: ../iw/bootloader_main_gui.py:88 ../iw/fdasd_gui.py:93
 #: ../iw/upgrade_swap_gui.py:200 ../iw/upgrade_swap_gui.py:208
@@ -415,8 +415,8 @@ msgstr "建立開機磁片(_M)"
 #: ../harddrive.py:217 ../image.py:76 ../image.py:113 ../image.py:249
 #: ../packages.py:140 ../packages.py:154 ../packages.py:341 ../packages.py:513
 #: ../packages.py:586 ../partedUtils.py:531 ../partIntfHelpers.py:147
-#: ../partIntfHelpers.py:332 ../upgrade.py:333 ../upgrade.py:358
-#: ../upgrade.py:384 ../iw/osbootwidget.py:222 ../iw/osbootwidget.py:231
+#: ../partIntfHelpers.py:332 ../upgrade.py:334 ../upgrade.py:359
+#: ../upgrade.py:385 ../iw/osbootwidget.py:222 ../iw/osbootwidget.py:231
 #: ../iw/raid_dialog_gui.py:616 ../iw/raid_dialog_gui.py:655
 #: ../textw/fdasd_text.py:73 ../textw/partition_text.py:1068
 #: ../textw/partition_text.py:1079 ../textw/upgrade_text.py:165
@@ -873,11 +873,11 @@ msgstr "這張光碟片無法被掛載"
 msgid "Install on System"
 msgstr "完整安裝"
 
-#: ../kickstart.py:1170
+#: ../kickstart.py:1168
 msgid "Missing Package"
 msgstr "套件遺失"
 
-#: ../kickstart.py:1171
+#: ../kickstart.py:1169
 #, python-format
 msgid ""
 "You have specified that the package '%s' should be installed.  This package "
@@ -885,19 +885,19 @@ msgid ""
 msgstr ""
 "您已經指定要安裝 '%s' 套件，這個套件並不存在。 您想要繼續或中斷您的安裝？"
 
-#: ../kickstart.py:1177 ../kickstart.py:1203
+#: ../kickstart.py:1175 ../kickstart.py:1201
 msgid "_Abort"
 msgstr "中斷(_A)"
 
-#: ../kickstart.py:1178 ../kickstart.py:1204 ../iw/partition_gui.py:997
+#: ../kickstart.py:1176 ../kickstart.py:1202 ../iw/partition_gui.py:997
 msgid "_Continue"
 msgstr "繼續(_C)"
 
-#: ../kickstart.py:1196
+#: ../kickstart.py:1194
 msgid "Missing Group"
 msgstr "群組遺失"
 
-#: ../kickstart.py:1197
+#: ../kickstart.py:1195
 #, python-format
 msgid ""
 "You have specified that the group '%s' should be installed.  This group does "
@@ -1007,7 +1007,7 @@ msgid ""
 "of %s."
 msgstr "您正試著要在這個 %s 發行沒有支援的機器上執行安裝。"
 
-#: ../packages.py:587 ../upgrade.py:334
+#: ../packages.py:587 ../upgrade.py:335
 msgid ""
 "Unable to merge header list.  This may be due to a missing file or bad "
 "media.  Press <return> to try again."
@@ -1947,15 +1947,15 @@ msgstr "無效的目錄"
 msgid "%s not found"
 msgstr "找不到 %s"
 
-#: ../upgrade.py:346
+#: ../upgrade.py:347
 msgid "Finding"
 msgstr "搜尋中"
 
-#: ../upgrade.py:347
+#: ../upgrade.py:348
 msgid "Finding packages to upgrade..."
 msgstr "尋找要升級的套件"
 
-#: ../upgrade.py:359
+#: ../upgrade.py:360
 msgid ""
 "The installation program is unable to upgrade systems with a pre-rpm 4.x "
 "database. Please install the errata rpm packages for your release as "
@@ -1964,11 +1964,11 @@ msgstr ""
 "安裝程式無法使用一個 pre-rpm 4.x 的資料庫來做升級，請依照發行公告中 所描述的"
 "事項來安裝適用於此發行的除錯 rpm 套件，然後再執行升級程序。"
 
-#: ../upgrade.py:385
+#: ../upgrade.py:386
 msgid "An error occurred when finding the packages to upgrade."
 msgstr "尋找要升級的套件時發生了一個錯誤。"
 
-#: ../upgrade.py:439
+#: ../upgrade.py:440
 msgid ""
 "This system appears to have third party packages installed that overlap with "
 "packages included in Red Hat Linux. Because these packages overlap, "
@@ -1979,7 +1979,7 @@ msgstr ""
 "這個系統有安裝其他廠商提供的套件，和 Red Hat 提供的套件重覆。 因為套件重覆，"
 "繼續升級可能會造成您的系統不穩定或功能不正常。 您想要繼續升級嗎?"
 
-#: ../upgrade.py:459
+#: ../upgrade.py:460
 msgid ""
 "This system does not have an /etc/redhat-release file.  It is possible that "
 "this is not a Red Hat Linux system. Continuing with the upgrade process may "
@@ -3715,7 +3715,7 @@ msgstr "建立一個 RAID 裝置 [預設為 /dev/md%s]。"
 #: ../iw/partition_gui.py:1254
 #, python-format
 msgid "Clone a _drive to create a RAID device [default=/dev/md%s]."
-msgstr "完整複製一個磁碟以建立一個 RAID 裝置 [預設為 /dev/md%s]。"
+msgstr "完整複製一個磁碟以建立一個 RAID 裝置 [預設為 /dev/md%s](_d)。"
 
 #: ../iw/partition_gui.py:1293
 msgid "Couldn't Create Drive Clone Editor"
@@ -3909,7 +3909,7 @@ msgstr "_RAID 成員:"
 
 #: ../iw/raid_dialog_gui.py:398
 msgid "Number of _spares:"
-msgstr "_spares 的數量:"
+msgstr "備援裝置的數量(_s):"
 
 #: ../iw/raid_dialog_gui.py:408
 msgid "_Format partition?"
@@ -6271,8 +6271,8 @@ msgid ""
 "Would you like to manually select your driver or use a driver disk?"
 msgstr ""
 "找不到這種安裝類型所需的任何裝置類型。\n"
-"您想要手動選取您的驅動程式或使用驅動程式\n"
-"磁片？"
+"您想要手動選取您的驅動程式或使用驅動\n"
+"程式磁片？"
 
 #: ../loader2/loader.c:818
 msgid "The following devices have been found on your system."
@@ -7339,9 +7339,8 @@ msgstr "西班牙語"
 msgid "Swedish"
 msgstr "瑞典語"
 
-#. generated from lang-table
-msgid "Turkish"
-msgstr "土耳其文"
+#~ msgid "Turkish"
+#~ msgstr "土耳其文"
 
 #~ msgid "Slovenian"
 #~ msgstr "斯洛維尼亞語"