various Mandrake -> Mandriva changes

1 files changed, 169 insertions, 162 deletions

diff --git a/perl-install/share/po/zh_TW.po b/perl-install/share/po/zh_TW.po
index c109f5e31..0d1d49134 100644
--- a/perl-install/share/po/zh_TW.po
+++ b/perl-install/share/po/zh_TW.po
@@ -1268,11 +1268,11 @@ msgstr "語言選擇"
 #: any.pm:733
 #, c-format
 msgid ""
-"Mandrivalinux can support multiple languages. Select\n"
+"Mandriva Linux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandrivalinux 能支援多種語言. 選擇您想安裝的語言.\n"
+"Mandriva Linux 能支援多種語言. 選擇您想安裝的語言.\n"
 "他們將可使用於您的安裝完成與您重新開始您的系統之後."
 
 #: any.pm:752 any.pm:773 help.pm:647
@@ -3580,12 +3580,12 @@ msgstr "啟用音效支援"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrivalinux distribution. If you agree with all the\n"
+"covers the entire Mandriva Linux distribution. If you agree with all the\n"
 "terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
 "button will reboot your computer."
 msgstr ""
 "在繼續之前，您應該仔細的閱讀下面相關版權條款。\n"
-"這包含整個 Mandrivalinux 發行版的版權內容。若是您同意裡面的所有條款，\n"
+"這包含整個 Mandriva Linux 發行版的版權內容。若是您同意裡面的所有條款，\n"
 "請點選 \"%s\" 按鈕，否則請點選 \"%s\" 按鈕並自動重新開機。"
 
 #: help.pm:14 install_steps_gtk.pm:556 install_steps_interactive.pm:92
@@ -3753,13 +3753,13 @@ msgstr ""
 #: help.pm:85
 #, c-format
 msgid ""
-"The Mandrivalinux installation is distributed on several CD-ROMs. If a\n"
+"The Mandriva Linux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the required one. If you do not have the requested\n"
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrivalinux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"
+"Mandriva Linux 安裝片包含數張光碟片. 若一所選擇的套件是位於另一張光碟,\n"
 "DrakeX 會彈出現在的光碟且要求您放入所要求的正確光碟片.\n"
 "若您沒有要求的光碟在手上的話, 就按下 \"%s\", 對應的套件不會被安裝."
 
@@ -3767,11 +3767,12 @@ msgstr ""
 #, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
-"There are thousands of packages available for Mandrivalinux, and to make it\n"
+"There are thousands of packages available for Mandriva Linux, and to make "
+"it\n"
 "simpler to manage, they have been placed into groups of similar\n"
 "applications.\n"
 "\n"
-"Mandrivalinux sorts package groups in four categories. You can mix and\n"
+"Mandriva Linux sorts package groups in four categories. You can mix and\n"
 "match applications from the various categories, so a ``Workstation''\n"
 "installation can still have applications from the ``Server'' category\n"
 "installed.\n"
@@ -3822,10 +3823,10 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"現在是指定那個程式您想要裝在您的系統上. Mandrivalinux 有上千個套件,\n"
+"現在是指定那個程式您想要裝在您的系統上. Mandriva Linux 有上千個套件,\n"
 "為了簡單管理, 相似性質的應用程式已經被分類到群組裡.\n"
 "\n"
-"Mandrivalinux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"
+"Mandriva Linux 分類套件群組於四個範疇. 你能由不同範疇混合與配對應用程式,\n"
 "所以一個 ``工作站''安裝也能安裝``伺服器''範疇安裝的應用程式.\n"
 "\n"
 " * \"%s\": 如果您計畫用您的機器當作一個工作站, 選擇一個或\n"
@@ -3920,10 +3921,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you'll be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrivalinux will automatically start any installed\n"
+"installed. By default Mandriva Linux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
-"security holes were discovered after this version of Mandrivalinux was\n"
+"security holes were discovered after this version of Mandriva Linux was\n"
 "finalized. If you do not know what a particular service is supposed to do "
 "or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
@@ -4050,7 +4051,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrivalinux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandriva Linux rely upon.\n"
 "\n"
 "You'll see a list of different parameters to change to get an optimal\n"
 "graphical display.\n"
@@ -4163,12 +4164,12 @@ msgstr ""
 #: help.pm:316
 #, c-format
 msgid ""
-"You now need to decide where you want to install the Mandrivalinux\n"
+"You now need to decide where you want to install the Mandriva Linux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
 "existing operating system is using all the available space you will have to\n"
 "partition the drive. Basically, partitioning a hard drive means to\n"
 "logically divide it to create the space needed to install your new\n"
-"Mandrivalinux system.\n"
+"Mandriva Linux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to data losses, partitioning can be intimidating and stressful\n"
@@ -4195,7 +4196,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you've previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended. Using this option is\n"
-"recommended if you want to use both Mandrivalinux and Microsoft Windows on\n"
+"recommended if you want to use both Mandriva Linux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4204,7 +4205,8 @@ msgid ""
 "to store your data or to install new software.\n"
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrivalinux system, choose\n"
+"your hard drive and replace them with your new Mandriva Linux system, "
+"choose\n"
 "this option. Be careful, because you will not be able to undo this "
 "operation\n"
 "after you confirm.\n"
@@ -4224,12 +4226,12 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"您需要決定那裡你想要安裝 Mandrivalinux\n"
+"您需要決定那裡你想要安裝 Mandriva Linux\n"
 "作業系統於那個硬碟. 如果您的硬碟是全新尚未使用或\n"
 "已經存在的作業系統正在使用全部可被利用的空間, 您將\n"
 "必須進行分割硬碟的動作. 基本上, 分割硬碟的動作包含\n"
 "邏輯上劃分它以建立需要的空間來安裝您的新\n"
-"Mandrivalinux 系統.\n"
+"Mandriva Linux 系統.\n"
 "\n"
 "因為分割硬碟的動作程序通常是無法回復的\n"
 "且能導致資料遺失, 若您是一位不熟練的使用者,\n"
@@ -4255,7 +4257,7 @@ msgstr ""
 "重新調整 Microsoft Windows FAT 或 NTFS 分割區大小.\n"
 "若您已經 defragment(不連續碎片重新整理) Windows 分割\n"
 "且它用 FAT 格式.重新調整分割可以被執行於不遺失任何資料\n"
-"資料備份是被強烈建議的. 若您想要使用 Mandrivalinux and Microsoft\n"
+"資料備份是被強烈建議的. 若您想要使用 Mandriva Linux and Microsoft\n"
 "Windows 於同一台電腦, 使用此選項是被建議的.\n"
 "\n"
 "   選擇此選項前, 請了解當使用這個過程項目後, Microsoft Windows\n"
@@ -4263,7 +4265,7 @@ msgstr ""
 " Microsoft Windows 來存您的資料與安裝新軟體.\n"
 "\n"
 " * \"%s\". 如果您想要刪除全部現存於您的硬碟上資料與\n"
-"分割且以您的新 Mandrivalinux 系統替換他們,\n"
+"分割且以您的新 Mandriva Linux 系統替換他們,\n"
 "選此選項. 但是小心使用, 你將無法於你確認之後\n"
 "逆反你的決定.\n"
 "\n"
@@ -4415,7 +4417,7 @@ msgid ""
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrivalinux operating system installation.\n"
+"Mandriva Linux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
@@ -4430,7 +4432,7 @@ msgstr ""
 "您將不行重新恢復它.\n"
 "當您準備好要格式化此分割, 點選 \"%s\".\n"
 "\n"
-"若您想選擇另一個分割給您的新的 Mandrivalinux 作業系統安裝, 點選了\"%s\".\n"
+"若您想選擇另一個分割給您的新的 Mandriva Linux 作業系統安裝, 點選了\"%s\".\n"
 "若您想選擇要被檢查磁碟上壞的區塊的分割, 點選.\"%s\"."
 
 #: help.pm:431 install_steps_gtk.pm:392 interactive.pm:434
@@ -4445,7 +4447,7 @@ msgstr "上一步"
 #: help.pm:434
 #, c-format
 msgid ""
-"By the time you install Mandrivalinux, it's likely that some packages will\n"
+"By the time you install Mandriva Linux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
 "security issues resolved. To allow you to benefit from these updates,\n"
 "you're now able to download them from the Internet. Check \"%s\" if you\n"
@@ -4457,7 +4459,7 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"此時您安裝 Mandrivalinux 時, 或許自從初始釋出的某些套件將有更新.\n"
+"此時您安裝 Mandriva Linux 時, 或許自從初始釋出的某些套件將有更新.\n"
 "臭蟲或許已經修正了, 安全性問題解決了. 為了允許您從這些更新中\n"
 "獲得利益, 您現在可以由網際網路下載他們. 如果您有可用的網際網路連線,\n"
 "選取 \"%s\", 或是, 如果您想稍後安裝更新套件, 選取 \"%s\".\n"
@@ -4482,7 +4484,7 @@ msgid ""
 "generally obtained at the expense of ease of use.\n"
 "\n"
 "If you do not know what to choose, keep the default option. You'll be able\n"
-"to change it later with the draksec tool, which is part of Mandrivalinux\n"
+"to change it later with the draksec tool, which is part of Mandriva Linux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
@@ -4493,8 +4495,8 @@ msgstr ""
 "安全性等級應該設定較高. 權衡之下, 較高的安全性等級換得不容易使用.\n"
 "\n"
 "如果您不知道選什麼, 保留預設選項. 您將能在稍後用 draksec 工具改變它,\n"
-"draksec 是 Mandrivalinux 控制中心的一部分.用負責安全性的人的 e-mail 地址填入 "
-"\"%s\" 欄位. 安全性訊息將被寄到\n"
+"draksec 是 Mandriva Linux 控制中心的一部分.用負責安全性的人的 e-mail 地址填"
+"入 \"%s\" 欄位. 安全性訊息將被寄到\n"
 "那個位址."
 
 #: help.pm:458
@@ -4506,7 +4508,7 @@ msgstr "安全性管理員:"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrivalinux system. If partitions have already been\n"
+"installation of your Mandriva Linux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4576,7 +4578,7 @@ msgid ""
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
-"在這個階段, 您需要選擇要用來安裝 Mandrivalinux 系統的分割區.\n"
+"在這個階段, 您需要選擇要用來安裝 Mandriva Linux 系統的分割區.\n"
 "如果分割區已經被定義了, 不管是從舊有的 GNU/Linux 安裝或是\n"
 "另一個處理分割區的工具, 您可以使用原本已經劃分好的分割區.\n"
 "否則硬碟分割必須要被定義.\n"
@@ -4651,7 +4653,7 @@ msgstr "切換一般/專家模式"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrivalinux operating system.\n"
+"Mandriva Linux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4680,7 +4682,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "多於一個 Microsoft 分割區已經在您的硬碟上被偵測到. 請選擇您希望要重新調整 大"
-"小的分割以便安裝您的新的 Mandrivalinux 作業系統.\n"
+"小的分割以便安裝您的新的 Mandriva Linux 作業系統.\n"
 "\n"
 "每個分割區都列出了像是: \"Linux 名稱\", \"Windows 名稱\", \"容量\".\n"
 "\n"
@@ -4722,7 +4724,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new installation or an\n"
-"upgrade of an existing Mandrivalinux system:\n"
+"upgrade of an existing Mandriva Linux system:\n"
 "\n"
 " * \"%s\". For the most part, this completely wipes out the old system.\n"
 "However, depending on your partitioning scheme, you can prevent some of\n"
@@ -4731,13 +4733,14 @@ msgid ""
 "the file system, you should use this option.\n"
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
-"currently installed on your Mandrivalinux system. Your current partitioning\n"
+"currently installed on your Mandriva Linux system. Your current "
+"partitioning\n"
 "scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrivalinux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandriva Linux systems\n"
 "running version \"8.1\" or later. Performing an upgrade on versions prior\n"
-"to Mandrivalinux version \"8.1\" is not recommended."
+"to Mandriva Linux version \"8.1\" is not recommended."
 msgstr ""
 
 #: help.pm:591
@@ -4790,7 +4793,8 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. However full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrivalinux's use of UTF-8 will\n"
+"still under development. For that reason, Mandriva Linux's use of UTF-8 "
+"will\n"
 "depend on the user's choices:\n"
 "\n"
 " * If you choose a language with a strong legacy encoding (latin1\n"
@@ -4827,7 +4831,8 @@ msgstr ""
 "選擇英文當預設語言且在進階部份選擇 \"%s\".\n"
 "\n"
 "關於 UTF-8 (unicode) 支援: Unicode 是一個新的字元編碼以含蓋全部存在的語言.\n"
-"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandrivalinux 的\n"
+"然而, 在 GNU/Linux 下完全的支援仍然在開發中. 因為那個原因, Mandriva Linux "
+"的\n"
 " UTF-8 使用將根據使用者的選擇:\n"
 "\n"
 " * 如果您選擇一個有強烈舊式編碼的語言 (latin1 語言, 俄羅斯, 日本, 中國,\n"
@@ -5032,7 +5037,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
-"operating systems may offer you one, but Mandrivalinux offers two. Each of\n"
+"operating systems may offer you one, but Mandriva Linux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
@@ -5053,11 +5058,11 @@ msgid ""
 "options and for managing the printer.\n"
 "\n"
 "If you make a choice now, and later find that you do not like your printing\n"
-"system you may change it by running PrinterDrake from the Mandrivalinux\n"
+"system you may change it by running PrinterDrake from the Mandriva Linux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
 "現在要選擇您的電腦要使用的列印系統. 其他作業系統或許只有提供您一種選擇,\n"
-"但是 Mandrivalinux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"
+"但是 Mandriva Linux 這邊提供了兩種選擇. 每一種列印系統是最適合於特別設定型"
 "態.\n"
 "\n"
 " * \"%s\" - 是 ``print, do not queue (列印, 不排隊)'' 之縮寫字, 是當您有一"
@@ -5075,7 +5080,7 @@ msgstr ""
 "\"%s\" 提供了圖形的介面前端給列印, 選擇列印的選項, 管理印表機.\n"
 "\n"
 "如果您現在做出決定, 且您之後發現不喜歡您的列印系統, 您可以藉由從\n"
-"Mandrivalinux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."
+"Mandriva Linux 控制中心執行 PrinterDrake 點選 \"%s\" 按鍵改變它."
 
 #: help.pm:765
 #, c-format
@@ -5185,7 +5190,8 @@ msgid ""
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
 "you can do so now. Refer to the printed documentation or use the\n"
-"Mandrivalinux Control Center after the installation has finished to benefit\n"
+"Mandriva Linux Control Center after the installation has finished to "
+"benefit\n"
 "from full in-line help.\n"
 "\n"
 " * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
@@ -5202,7 +5208,7 @@ msgid ""
 " * \"%s\": if you wish to change your bootloader configuration, click this\n"
 "button. This should be reserved to advanced users. Refer to the printed\n"
 "documentation or the in-line help about bootloader configuration in the\n"
-"Mandrivalinux Control Center.\n"
+"Mandriva Linux Control Center.\n"
 "\n"
 " * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
@@ -5264,10 +5270,10 @@ msgstr "服務"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrivalinux partition. Be careful, all data on this drive will be lost\n"
+"Mandriva Linux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"選擇您想要抹除的硬碟來安裝新的 Mandrivalinux 分割. 小心,\n"
+"選擇您想要抹除的硬碟來安裝新的 Mandriva Linux 分割. 小心,\n"
 "磁碟上全部資料將遺失且將無法挽回!"
 
 #: help.pm:863
@@ -5612,11 +5618,11 @@ msgstr "計算 Windows 分割區大小"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrivalinux "
+"Windows, run the ``defrag'' utility, then restart the Mandriva Linux "
 "installation."
 msgstr ""
 "您的 Windows 分割區太支離破碎。請先用 Windows 重新開機，執行  ``defrag'' 工具"
-"程式，然後重新開始安裝 Mandrivalinux 。"
+"程式，然後重新開始安裝 Mandriva Linux 。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5727,13 +5733,13 @@ msgstr "關閉網路"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the "
-"Mandrivalinux distribution \n"
+"The operating system and the different components available in the Mandriva "
+"Linux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrivalinux distribution.\n"
+"system and the different components of the Mandriva Linux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -5762,8 +5768,8 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"Mandriva S.A. will, in no circumstances and to the extent permitted by "
-"law, be liable for any special,\n"
+"Mandriva S.A. will, in no circumstances and to the extent permitted by law, "
+"be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
 "business, interruption of business, financial loss, legal fees and penalties "
@@ -5777,8 +5783,8 @@ msgid ""
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, Mandriva S.A. or its distributors will, "
-"in no circumstances, be \n"
+"To the extent permitted by law, Mandriva S.A. or its distributors will, in "
+"no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
 "limitation damages for loss of business, interruption of business, financial "
@@ -5787,7 +5793,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrivalinux sites  which are prohibited or restricted in some "
+"from one of Mandriva Linux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -5821,10 +5827,10 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"Mandriva S.A. reserves its rights to modify or adapt the Software "
-"Products, as a whole or in \n"
+"Mandriva S.A. reserves its rights to modify or adapt the Software Products, "
+"as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandriva\", \"Mandrivalinux\" and associated logos are trademarks of "
+"\"Mandriva\", \"Mandriva Linux\" and associated logos are trademarks of "
 "Mandriva S.A.  \n"
 "\n"
 "\n"
@@ -5925,8 +5931,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of "
-"Mandrivalinux,\n"
+"For information on fixes which are available for this release of Mandriva "
+"Linux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -5934,28 +5940,28 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrivalinux User's Guide."
+"install chapter of the Official Mandriva Linux User's Guide."
 msgstr ""
 "恭喜您！系統已經完成安裝。\n"
 "請取出開機媒介並按下 return 以重新開機。\n"
 "\n"
 "\n"
-"要獲得這個 Mandrivalinux 釋出版本可用的修正相關資訊，\n"
+"要獲得這個 Mandriva Linux 釋出版本可用的修正相關資訊，\n"
 "請諮詢可用的勘誤表：\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"關於如何設定您系統的資訊可以在官方 Mandrivalinux 使用者指南\n"
-"(Official Mandrivalinux User's Guide) 的安裝後章節 (post install chapter )\n"
+"關於如何設定您系統的資訊可以在官方 Mandriva Linux 使用者指南\n"
+"(Official Mandriva Linux User's Guide) 的安裝後章節 (post install chapter )\n"
 "裡面找到。"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/errata.php3"
-msgstr "http://www.mandrakelinux.com/en/errata.php3"
+msgid "http://www.mandrivalinux.com/en/errata.php3"
+msgstr "http://www.mandrivalinux.com/en/errata.php3"
 
 #: install_steps.pm:246
 #, c-format
@@ -5983,11 +5989,11 @@ msgstr "進入步驟 `%s'\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrivalinux. If that occurs, you can try a text install instead. For "
+"Mandriva Linux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"您的系統資源太少。您可能會在安裝 Mandrivalinux 過程中遇到問題。\n"
+"您的系統資源太少。您可能會在安裝 Mandriva Linux 過程中遇到問題。\n"
 "若是真的發生問題，您或許可以改用文字模式的安裝方式來取代。\n"
 "要如此作的話m，請在光碟開機時按下 `F1'，然後輸入 `text'。"
 
@@ -6518,7 +6524,7 @@ msgstr ""
 #: install_steps_interactive.pm:821
 #, c-format
 msgid ""
-"Contacting Mandrivalinux web site to get the list of available mirrors..."
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "連結到 Mirror Linux Web Site 查詢可用的映射站台"
 
 #: install_steps_interactive.pm:840
@@ -6735,8 +6741,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrivalinux Installation %s"
-msgstr "Mandrivalinux 安裝程式 %s"
+msgid "Mandriva Linux Installation %s"
+msgstr "Mandriva Linux 安裝程式 %s"
 
 #. -PO: This string must fit in a 80-char wide text screen
 #: install_steps_newt.pm:34
@@ -9315,13 +9321,13 @@ msgstr "BitTorrent"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrivalinux machine.\n"
+"This configures a personal firewall for this Mandriva Linux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "drakfirewall 設定程式\n"
 "\n"
-"這是用來設定個人防火牆給 Mandrivalinux 機器.\n"
+"這是用來設定個人防火牆給 Mandriva Linux 機器.\n"
 "若是您需要很致力強大的防火牆解決方案, 請您參閱\n"
 "專門的 MandrakeSecurity Firewall distribution 產品資訊."
 
@@ -13172,8 +13178,8 @@ msgstr ""
 #: printer/printerdrake.pm:3929
 #, c-format
 msgid ""
-"Run Scannerdrake (Hardware/Scanner in Mandrivalinux Control Center) to share "
-"your scanner on the network.\n"
+"Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to "
+"share your scanner on the network.\n"
 "\n"
 msgstr ""
 
@@ -13429,9 +13435,9 @@ msgid ""
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
 "在系統整個安裝過程中, 系統的網路服務並未啟動。建議您可以在\n"
-"整個安裝完成, 重新開機進入系統後, 透過 Mandrake 控制台程式\n"
+"整個安裝完成, 重新開機進入系統後, 透過 Mandriva 控制台程式\n"
 "選擇『網路』『連線』項目進行設定。此外, 後續像是印表機\n"
-"的設定, 您也可以透過 Mandrake 控制台程式, 在『硬體』內的\n"
+"的設定, 您也可以透過 Mandriva 控制台程式, 在『硬體』內的\n"
 "『印表機』項目來進行設定"
 
 #: printer/printerdrake.pm:4196
@@ -14950,18 +14956,18 @@ msgstr "停止"
 
 #: share/advertising/01.pl:13
 #, c-format
-msgid "<b>What is Mandrivalinux?</b>"
-msgstr "<b>Mandrivalinux 是什麼？</b>"
+msgid "<b>What is Mandriva Linux?</b>"
+msgstr "<b>Mandriva Linux 是什麼？</b>"
 
 #: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to <b>Mandrivalinux</b>!"
-msgstr "歡迎來到 <b>Mandrivalinux</b>!"
+msgid "Welcome to <b>Mandriva Linux</b>!"
+msgstr "歡迎來到 <b>Mandriva Linux</b>!"
 
 #: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is a <b>Linux distribution</b> that comprises the core of the "
+"Mandriva Linux is a <b>Linux distribution</b> that comprises the core of the "
 "system, called the <b>operating system</b> (based on the Linux kernel) "
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
@@ -14970,7 +14976,7 @@ msgstr ""
 #: share/advertising/01.pl:19
 #, c-format
 msgid ""
-"Mandrivalinux is the most <b>user-friendly</b> Linux distribution today. It "
+"Mandriva Linux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
 
@@ -14987,9 +14993,9 @@ msgstr "歡迎來到開放源碼的世界。"
 #: share/advertising/02.pl:17
 #, c-format
 msgid ""
-"Mandrivalinux is committed to the open source model. This means that this "
-"new release is the result of <b>collaboration</b> between <b>Mandriva's "
-"team of developers</b> and the <b>worldwide community</b> of Mandrivalinux "
+"Mandriva Linux is committed to the open source model. This means that this "
+"new release is the result of <b>collaboration</b> between <b>Mandriva's team "
+"of developers</b> and the <b>worldwide community</b> of Mandriva Linux "
 "contributors."
 msgstr ""
 
@@ -15008,8 +15014,8 @@ msgstr ""
 #: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Most of the software included in the distribution and all of the "
-"Mandrivalinux tools are licensed under the <b>General Public License</b>."
+"Most of the software included in the distribution and all of the Mandriva "
+"Linux tools are licensed under the <b>General Public License</b>."
 msgstr ""
 
 #: share/advertising/03.pl:17
@@ -15035,17 +15041,17 @@ msgstr ""
 #: share/advertising/04.pl:15
 #, c-format
 msgid ""
-"Mandrivalinux has one of the <b>biggest communities</b> of users and "
+"Mandriva Linux has one of the <b>biggest communities</b> of users and "
 "developers. The role of such a community is very wide, ranging from bug "
 "reporting to the development of new applications. The community plays a "
-"<b>key role</b> in the Mandrivalinux world."
+"<b>key role</b> in the Mandriva Linux world."
 msgstr ""
 
 #: share/advertising/04.pl:17
 #, c-format
 msgid ""
 "To <b>learn more</b> about our dynamic community, please visit <b>www."
-"mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
+"mandrivalinux.com</b> or directly <b>www.mandrivalinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
 
@@ -15057,7 +15063,7 @@ msgstr ""
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"You are now installing <b>Mandrivalinux Download</b>. This is the free "
+"You are now installing <b>Mandriva Linux Download</b>. This is the free "
 "version that Mandriva wants to keep <b>available to everyone</b>."
 msgstr ""
 
@@ -15095,7 +15101,7 @@ msgstr ""
 
 #: share/advertising/06.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux Discovery</b>."
+msgid "You are now installing <b>Mandriva Linux Discovery</b>."
 msgstr ""
 
 #: share/advertising/06.pl:17
@@ -15114,7 +15120,7 @@ msgstr ""
 
 #: share/advertising/07.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack</b>."
 msgstr ""
 
 #: share/advertising/07.pl:17
@@ -15132,7 +15138,7 @@ msgstr ""
 
 #: share/advertising/08.pl:15
 #, c-format
-msgid "You are now installing <b>Mandrivalinux PowerPack+</b>."
+msgid "You are now installing <b>Mandriva Linux PowerPack+</b>."
 msgstr ""
 
 #: share/advertising/08.pl:17
@@ -15147,18 +15153,17 @@ msgstr ""
 #: share/advertising/09.pl:13
 #, fuzzy, c-format
 msgid "<b>Mandriva Products</b>"
-msgstr "Mandrivalinux 控制中心"
+msgstr "Mandriva Linux 控制中心"
 
 #: share/advertising/09.pl:15
 #, c-format
 msgid ""
-"<b>Mandriva</b> has developed a wide range of <b>Mandrivalinux</b> "
-"products."
+"<b>Mandriva</b> has developed a wide range of <b>Mandriva Linux</b> products."
 msgstr ""
 
 #: share/advertising/09.pl:17
 #, c-format
-msgid "The Mandrivalinux products are:"
+msgid "The Mandriva Linux products are:"
 msgstr ""
 
 #: share/advertising/09.pl:18
@@ -15179,7 +15184,7 @@ msgstr ""
 #: share/advertising/09.pl:21
 #, c-format
 msgid ""
-"\t* <b>Mandrivalinux for x86-64</b>, The Mandrivalinux solution for making "
+"\t* <b>Mandriva Linux for x86-64</b>, The Mandriva Linux solution for making "
 "the most of your 64-bit processor."
 msgstr ""
 
@@ -15191,21 +15196,21 @@ msgstr ""
 #: share/advertising/10.pl:17
 #, c-format
 msgid ""
-"Mandriva has developed two products that allow you to use Mandrivalinux "
+"Mandriva has developed two products that allow you to use Mandriva Linux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 
 #: share/advertising/10.pl:18
 #, c-format
 msgid ""
-"\t* <b>Move</b>, a Mandrivalinux distribution that runs entirely from a "
+"\t* <b>Move</b>, a Mandriva Linux distribution that runs entirely from a "
 "bootable CD-ROM."
 msgstr ""
 
 #: share/advertising/10.pl:19
 #, c-format
 msgid ""
-"\t* <b>GlobeTrotter</b>, a Mandrivalinux distribution pre-installed on the "
+"\t* <b>GlobeTrotter</b>, a Mandriva Linux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 
@@ -15217,23 +15222,25 @@ msgstr ""
 #: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Below are the Mandriva products designed to meet the <b>professional "
-"needs</b>:"
+"Below are the Mandriva products designed to meet the <b>professional needs</"
+"b>:"
 msgstr ""
 
 #: share/advertising/11.pl:16
 #, c-format
-msgid "\t* <b>Corporate Desktop</b>, The Mandrivalinux Desktop for Businesses."
+msgid ""
+"\t* <b>Corporate Desktop</b>, The Mandriva Linux Desktop for Businesses."
 msgstr ""
 
 #: share/advertising/11.pl:17
 #, c-format
-msgid "\t* <b>Corporate Server</b>, The Mandrivalinux Server Solution."
+msgid "\t* <b>Corporate Server</b>, The Mandriva Linux Server Solution."
 msgstr ""
 
 #: share/advertising/11.pl:18
 #, c-format
-msgid "\t* <b>Multi-Network Firewall</b>, The Mandrivalinux Security Solution."
+msgid ""
+"\t* <b>Multi-Network Firewall</b>, The Mandriva Linux Security Solution."
 msgstr ""
 
 #: share/advertising/12.pl:13
@@ -15409,7 +15416,7 @@ msgstr ""
 #: share/advertising/18.pl:15
 #, c-format
 msgid ""
-"In the Mandrivalinux menu you will find <b>easy-to-use</b> applications for "
+"In the Mandriva Linux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
 
@@ -15644,14 +15651,14 @@ msgstr ""
 
 #: share/advertising/25.pl:13
 #, c-format
-msgid "<b>Mandrivalinux Control Center</b>"
-msgstr "<b>Mandrivalinux 控制中心</b>"
+msgid "<b>Mandriva Linux Control Center</b>"
+msgstr "<b>Mandriva Linux 控制中心</b>"
 
 #: share/advertising/25.pl:15
 #, c-format
 msgid ""
-"The <b>Mandrivalinux Control Center</b> is an essential collection of "
-"Mandrivalinux-specific utilities designed to simplify the configuration of "
+"The <b>Mandriva Linux Control Center</b> is an essential collection of "
+"Mandriva Linux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
 
@@ -15674,21 +15681,21 @@ msgid ""
 "Like all computer programming, open source software <b>requires time and "
 "people</b> for development. In order to respect the open source philosophy, "
 "Mandriva sells added value products and services to <b>keep improving "
-"Mandrivalinux</b>. If you want to <b>support the open source philosophy</b> "
-"and the development of Mandrivalinux, <b>please</b> consider buying one of "
+"Mandriva Linux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandriva Linux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
 
 #: share/advertising/27.pl:13
 #, fuzzy, c-format
 msgid "<b>Online Store</b>"
-msgstr "Mandrivalinux 控制中心"
+msgstr "Mandriva Linux 控制中心"
 
 #: share/advertising/27.pl:15
 #, c-format
 msgid ""
-"To learn more about Mandriva products and services, you can visit our "
-"<b>e-commerce platform</b>."
+"To learn more about Mandriva products and services, you can visit our <b>e-"
+"commerce platform</b>."
 msgstr ""
 
 #: share/advertising/27.pl:17
@@ -15705,7 +15712,7 @@ msgstr ""
 
 #: share/advertising/27.pl:21
 #, c-format
-msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
+msgid "Stop by today at <b>store.mandriva.com</b>!"
 msgstr ""
 
 #: share/advertising/28.pl:15
@@ -15716,7 +15723,7 @@ msgstr "<b>Mandriva Club</b>"
 #: share/advertising/28.pl:17
 #, c-format
 msgid ""
-"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandrivalinux "
+"<b>Mandriva Club</b> is the <b>perfect companion</b> to your Mandriva Linux "
 "product.."
 msgstr ""
 
@@ -15730,7 +15737,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
-"<b>store.mandrakesoft.com</b>."
+"<b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/advertising/28.pl:21
@@ -15742,14 +15749,14 @@ msgstr ""
 
 #: share/advertising/28.pl:22
 #, c-format
-msgid "\t* Participation in Mandrivalinux <b>user forums</b>."
+msgid "\t* Participation in Mandriva Linux <b>user forums</b>."
 msgstr ""
 
 #: share/advertising/28.pl:23
 #, c-format
 msgid ""
-"\t* <b>Early and privileged access</b>, before public release, to "
-"Mandrivalinux <b>ISO images</b>."
+"\t* <b>Early and privileged access</b>, before public release, to Mandriva "
+"Linux <b>ISO images</b>."
 msgstr ""
 
 #: share/advertising/29.pl:13
@@ -15768,7 +15775,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Mandriva Online provides a wide range of valuable services for <b>easily "
-"updating</b> your Mandrivalinux systems:"
+"updating</b> your Mandriva Linux systems:"
 msgstr ""
 
 #: share/advertising/29.pl:18
@@ -15791,7 +15798,7 @@ msgstr ""
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
-"\t* Management of <b>all your Mandrivalinux systems</b> with one account."
+"\t* Management of <b>all your Mandriva Linux systems</b> with one account."
 msgstr ""
 
 #: share/advertising/30.pl:13
@@ -15803,21 +15810,21 @@ msgstr "<b>Mandriva Expert</b>"
 #, c-format
 msgid ""
 "Do you require <b>assistance?</b> Meet Mandriva's technical experts on "
-"<b>our technical support platform</b> www.mandrakeexpert.com."
+"<b>our technical support platform</b> www.mandrivaexpert.com."
 msgstr ""
 
 #: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"Thanks to the help of <b>qualified Mandrivalinux experts</b>, you will save "
+"Thanks to the help of <b>qualified Mandriva Linux experts</b>, you will save "
 "a lot of time."
 msgstr ""
 
 #: share/advertising/30.pl:19
 #, c-format
 msgid ""
-"For any question related to Mandrivalinux, you have the possibility to "
-"purchase support incidents at <b>store.mandrakesoft.com</b>."
+"For any question related to Mandriva Linux, you have the possibility to "
+"purchase support incidents at <b>store.mandriva.com</b>."
 msgstr ""
 
 #: share/compssUsers.pl:25
@@ -16113,7 +16120,7 @@ msgstr ""
 #: share/compssUsers.pl:196
 #, c-format
 msgid "Mandriva Wizards"
-msgstr "Mandrivalinux 精靈"
+msgstr "Mandriva Linux 精靈"
 
 #: share/compssUsers.pl:197
 #, c-format
@@ -16171,8 +16178,8 @@ msgid ""
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrakelinux tools\n"
-"  --incident        - program should be one of mandrakelinux tools"
+"  --report          - program should be one of Mandriva Linux tools\n"
+"  --incident        - program should be one of Mandriva Linux tools"
 msgstr ""
 
 #: standalone.pm:63
@@ -16208,7 +16215,7 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrivalinux Terminal Server Configurator\n"
+"Mandriva Linux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16255,8 +16262,8 @@ msgstr ""
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      do not ask first confirmation question in "
-"Mandriva Update mode\n"
+"  --no-confirmation      do not ask first confirmation question in Mandriva "
+"Update mode\n"
 "  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
@@ -18821,13 +18828,13 @@ msgstr ""
 
 #: standalone/drakbug:41
 #, c-format
-msgid "Mandrivalinux Bug Report Tool"
-msgstr "Mandrivalinux 臭蟲回報工具"
+msgid "Mandriva Linux Bug Report Tool"
+msgstr "Mandriva Linux 臭蟲回報工具"
 
 #: standalone/drakbug:46
 #, c-format
-msgid "Mandrivalinux Control Center"
-msgstr "Mandrivalinux 控制中心"
+msgid "Mandriva Linux Control Center"
+msgstr "Mandriva Linux 控制中心"
 
 #: standalone/drakbug:48
 #, c-format
@@ -18853,7 +18860,7 @@ msgstr "Mandriva Online 線上服務"
 #: standalone/drakbug:52
 #, c-format
 msgid "Menudrake"
-msgstr "Mandrake 選單編輯器"
+msgstr "Mandriva 選單編輯器"
 
 #: standalone/drakbug:53
 #, c-format
@@ -19305,17 +19312,17 @@ msgstr "於開機時啟動"
 #, fuzzy, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrivalinux Control Center"
+"Run the \"Add an interface\" assistant from the Mandriva Linux Control Center"
 msgstr "網路介面尚未設定, 請執行設定巫師"
 
 #: standalone/drakconnect:1009 standalone/net_applet:61
 #, c-format
 msgid ""
 "You do not have any configured Internet connection.\n"
-"Run the \"%s\" assistant from the Mandrivalinux Control Center"
+"Run the \"%s\" assistant from the Mandriva Linux Control Center"
 msgstr ""
 "您沒有任何已設定好的網路連線。\n"
-"請由 Mandrivalinux 控制中心啟動 \"%s\" 設定精靈"
+"請由 Mandriva Linux 控制中心啟動 \"%s\" 設定精靈"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
 #: standalone/drakconnect:1010 standalone/net_applet:62
@@ -19365,8 +19372,8 @@ msgstr "KDM (KDE 登入管理員)"
 
 #: standalone/drakedm:36
 #, c-format
-msgid "MdkKDM (Mandrivalinux Display Manager)"
-msgstr "MdkKDM (Mandrivalinux 登入管理員)"
+msgid "MdkKDM (Mandriva Linux Display Manager)"
+msgstr "MdkKDM (Mandriva Linux 登入管理員)"
 
 #: standalone/drakedm:37
 #, c-format
@@ -19663,9 +19670,9 @@ msgid ""
 "\n"
 "       DUPONT Sebastien (original version)\n"
 "\n"
-"       CHAUMETTE Damien <dchaumette@mandrakesoft.com>\n"
+"       CHAUMETTE Damien <dchaumette@mandriva.com>\n"
 "\n"
-"       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
+"       VIGNAUD Thierry <tvignaud@mandriva.com>"
 msgstr ""
 
 #: standalone/drakfont:520
@@ -20186,8 +20193,8 @@ msgstr ""
 
 #: standalone/drakhelp:36
 #, fuzzy, c-format
-msgid "Mandrivalinux Help Center"
-msgstr "Mandrake 控制中心"
+msgid "Mandriva Linux Help Center"
+msgstr "Mandriva 控制中心"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -20777,7 +20784,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "目前您的系統偵測不到任何音效卡裝置, 請確認您的音效卡有安插正確。\n"
 "\n"
@@ -20785,7 +20792,7 @@ msgstr ""
 "另外請連上我們的官方網站查看資料庫, 檢視您的音效卡是否已經支援：\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/draksound:57
 #, fuzzy, c-format
@@ -22406,7 +22413,7 @@ msgid ""
 "You can visit our hardware database at:\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
 "目前您的系統偵測不到任何電視卡, 請確認您的電視卡有安插正確。\n"
 "\n"
@@ -22414,7 +22421,7 @@ msgstr ""
 "另外請連上我們的官方網站查看資料庫, 檢視您的電視卡是否已經支援：\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"http://www.mandrivalinux.com/en/hardware.php3"
 
 #: standalone/harddrake2:24
 #, c-format
@@ -23105,13 +23112,13 @@ msgid ""
 "This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 msgstr ""
-"這是 HardDrake 程式, Mandrivalinux 所發展的硬體檢視設定工具。\n"
+"這是 HardDrake 程式, Mandriva Linux 所發展的硬體檢視設定工具。\n"
 "<span foreground=\"royalblue3\">版本：</span> %s\n"
 "<span foreground=\"royalblue3\">作者:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"tvignaud@mandriva.com&gt;\n"
 "\n"
 
 #: standalone/harddrake2:243
@@ -23219,8 +23226,8 @@ msgstr "變更已經完成，不過您需要重新登入才能夠生效"
 
 #: standalone/logdrake:50
 #, c-format
-msgid "Mandrivalinux Tools Logs"
-msgstr "Mandrake 工具紀錄"
+msgid "Mandriva Linux Tools Logs"
+msgstr "Mandriva 工具紀錄"
 
 #: standalone/logdrake:51
 #, c-format
@@ -23732,10 +23739,10 @@ msgstr "連線完成。"
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrivalinux Control Center."
+"Verify your configuration in the Mandriva Linux Control Center."
 msgstr ""
 "連線失敗。\n"
-"請檢查您在 Mandrivalinux 控制中心的設定。"
+"請檢查您在 Mandriva Linux 控制中心的設定。"
 
 #: standalone/net_monitor:341
 #, c-format