diff --git a/res/loc/po/zh-TW.po b/res/loc/po/zh-TW.po index 13d26736..33444837 100644 --- a/res/loc/po/zh-TW.po +++ b/res/loc/po/zh-TW.po @@ -1,10 +1,10 @@ msgid "" msgstr "" -"Project-Id-Version: 3.22\n" +"Project-Id-Version: 3.14\n" "Report-Msgid-Bugs-To: pete@akeo.ie\n" -"POT-Creation-Date: 2023-03-09 10:01+0000\n" -"PO-Revision-Date: 2023-03-09 10:01+0000\n" -"Last-Translator: \n" +"POT-Creation-Date: 2022-01-10 19:23+0800\n" +"PO-Revision-Date: 2022-01-10 20:13+0800\n" +"Last-Translator: SiderealArt \n" "Language-Team: \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ msgstr "" "X-Poedit-SourceCharset: UTF-8\n" "X-Rufus-LanguageName: Chinese Traditional (正體中文)\n" "X-Rufus-LCID: 0x0404, 0x0c04, 0x1404, 0x7c04\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.0.1\n" #. • IDD_DIALOG → IDS_DRIVE_PROPERTIES_TXT msgid "Drive Properties" @@ -946,8 +946,8 @@ msgid "Download using a browser" msgstr "使用瀏覽器下載" #. • MSG_144 -msgid "Download of Windows ISOs is unavailable due to Microsoft having altered their website to prevent it." -msgstr "由於 Microsoft 已更改其網站以阻止下載 Windows ISO，因此無法下載。" +msgid "Temporarily banned by Microsoft for requesting too many downloads - Please try again later..." +msgstr "下載要求過多，已被微軟暫時列入黑名單 - 請稍後再嘗試..." #. • MSG_145 msgid "PowerShell 3.0 or later is required to run this script." @@ -1092,7 +1092,7 @@ msgstr "版本 %d.%d (Build %d)" #. • MSG_176 msgid "English translation: Pete Batard " -msgstr "正體中文譯者: 佚 \\line Chocobo1 \\line SiderealArt \\line Ocha " +msgstr "正體中文譯者: 佚 \\line Chocobo1 \\line SiderealArt " #. • MSG_177 msgid "Report bugs or request enhancements at:" @@ -1198,10 +1198,6 @@ msgstr "偵測到非標準磁區大小" msgid "'Windows To Go' can only be installed on a GPT partitioned drive if it has the FIXED attribute set. The current drive was not detected as FIXED." msgstr "'Windows To Go' 只能安裝於有 '固定' 屬性的 GPT 分割裝置。目前裝置屬性不是 '固定'。" -#. • MSG_199 -msgid "This feature is not available on this platform." -msgstr "此功能在此平台上不可用。" - #. • MSG_201 msgid "Cancelling - Please wait..." msgstr "取消中，請稍候..." @@ -1646,12 +1642,8 @@ msgid "Unsupported Windows version" msgstr "不支援的 Windows 版本" #. • MSG_294 -msgid "" -"This version of Windows is no longer supported by Rufus.\n" -"The last version of Rufus compatible with this platform is v%d.%d." -msgstr "" -"Rufus 已不再支援此 Windows 版本。\n" -"此平台Rufus所支援的最新版本為v%d.%d。" +msgid "This version of Windows is no longer supported by Rufus." +msgstr "Rufus 已不再支援此 Windows 版本。" #. • MSG_295 msgid "Warning: Unofficial version" @@ -1716,8 +1708,12 @@ msgid "Create a disk image of the selected device" msgstr "建立選擇的裝置的磁碟映像" #. • MSG_305 -msgid "Use this option to indicate if you plan to install Windows to a different disk, or if you want to run Windows directly from this drive (Windows To Go)." -msgstr "是否要使用此裝置來安裝 Windows 在另一個磁碟上，或是要直接在此磁碟上執行 Windows (Windows To Go)。" +msgid "" +"Use this option to indicate if you plan to install Windows to a different disk, or if you want to run Windows directly from this drive (Windows To Go).\r\n" +"In 'Extended Windows 11 Installation' mode, Rufus will patch the media so that Windows 11 can be installed on platforms that don't meet the TPM 2.0 or Secure Boot requirements." +msgstr "" +"是否要使用此裝置來安裝 Windows 在另一個磁碟上，或是要直接在此磁碟上執行 Windows (Windows To Go)。\r\n" +"在「擴充 Windows 11 安裝」模式中，Rufus 將修補裝置，以使 Windows 11 能夠安裝在不符合 TPM 2.0 或安全開機要求的系統上。" #. • MSG_306 #. @@ -1797,142 +1793,17 @@ msgstr "" "因此強制使用 DD 映像寫入模式。" #. • MSG_322 -msgid "Unable to open or read '%s'" -msgstr "無法開啟或讀取 '%s'" +msgid "Standard Windows 11 Installation (TPM 2.0 + Secure Boot)" +msgstr "標準 Windows 11 安裝 (TPM 2.0 + 安全開機)" + +#. • MSG_323 +msgid "Extended Windows 11 Installation (no TPM / no Secure Boot)" +msgstr "擴充 Windows 11 安裝 (無 TPM 和安全開機)" + +#. • MSG_324 +msgid "Removing Windows 11 installation restrictions: %s" +msgstr "正在移除 Windows 11 安裝限制: %s" #. • MSG_325 -msgid "Applying Windows customization: %s" -msgstr "正在應用 Windows 自定義設置：%s" - -#. • MSG_326 -msgid "Applying user options..." -msgstr "正在應用用戶設置..." - -#. • MSG_327 -msgid "Windows User Experience" -msgstr "Windows 用戶體驗" - -#. • MSG_328 -msgid "Customize Windows installation?" -msgstr "自定義 Windows 安裝？" - -#. • MSG_329 -msgid "Remove requirement for 4GB+ RAM, Secure Boot and TPM 2.0" -msgstr "移除對 4GB+ 內存、安全引導和 TPM 2.0 的要求" - -#. • MSG_330 -msgid "Remove requirement for an online Microsoft account" -msgstr "移除對登錄微軟賬戶的要求" - -#. • MSG_331 -msgid "Disable data collection (Skip privacy questions)" -msgstr "關閉數據收集 (跳過隱私設置)" - -#. • MSG_332 -msgid "Prevent Windows To Go from accessing internal disks" -msgstr "阻止 Windows To Go 訪問內部磁盤" - -#. • MSG_333 -msgid "Create a local account with username:" -msgstr "創建一個使用此用戶名的本地賬號:" - -#. • MSG_334 -msgid "Set regional options to the same values as this user's" -msgstr "使用當前用戶的區域設置" - -#. • MSG_335 -msgid "Disable BitLocker automatic device encryption" -msgstr "關閉 BitLocker 自動設備加密" - -#. • MSG_336 -msgid "Persistent log" -msgstr "持久化日誌" - -#. • MSG_900 -#. -#. The following messages are for the Windows Store listing only and are not used by the application -msgid "Rufus is a utility that helps format and create bootable USB flash drives, such as USB keys/pendrives, memory sticks, etc." -msgstr "Rufus 是個能格式化並製作可開機 USB 快閃磁碟機（USB 隨身碟、Memory Stick 等等）的工具。" - -#. • MSG_901 -msgid "Official site: %s" -msgstr "官方網站: %s" - -#. • MSG_902 -msgid "Source Code: %s" -msgstr "源代碼: %s" - -#. • MSG_903 -msgid "ChangeLog: %s" -msgstr "更新日誌: %s" - -#. • MSG_904 -#. -#. The gnu.org website has many translations of the GPL (such as https://www.gnu.org/licenses/gpl-3.0.zh-cn.html, https://www.gnu.org/licenses/gpl-3.0.fr.html) -#. Please make sure you try to locate the relevant https://www.gnu.org/licenses/gpl-3.0..html for your language and use it here. -msgid "" -"This application is licensed under the terms of the GNU Public License (GPL) version 3.\n" -"See https://www.gnu.org/licenses/gpl-3.0.en.html for details." -msgstr "" -"本應用採用 GNU 通用公共許可證 (GPL) 第三版。\n" -"具體許可證見 https://www.gnu.org/licenses/gpl-3.0.zh-tw.html。" - -#. • MSG_905 -#. -#. Keyword for "boot" will be used for search in the Windows Store -msgid "Boot" -msgstr "啟動" - -#. • MSG_910 -#. -#. This and subsequent messages will be listed in the 'Features' section of the Windows Store page -msgid "Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3" -msgstr "將 U 盤、存儲卡或虛擬驅動器格式化為 FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 格式" - -#. • MSG_911 -msgid "Create FreeDOS bootable USB drives" -msgstr "創建 FreeDOS 可啟動驅動器" - -#. • MSG_912 -msgid "Create bootable drives from bootable ISOs (Windows, Linux, etc.)" -msgstr "從可啟動 ISO 文件 (Windows 和 Linux 等) 創建可啟動驅動器" - -#. • MSG_913 -msgid "Create bootable drives from bootable disk images, including compressed ones" -msgstr "從可啟動硬盤鏡像 (包括壓縮鏡像) 創建可啟動驅動器" - -#. • MSG_914 -msgid "Create BIOS or UEFI bootable drives, including UEFI bootable NTFS" -msgstr "創建 BIOS 或 UEFI 可啟動驅動器，包括 UEFI 可啟動的 NTFS 驅動器" - -#. • MSG_915 -msgid "Create 'Windows To Go' drives" -msgstr "創建 'Windows To Go' 驅動" - -#. • MSG_916 -msgid "Create Windows 11 installation drives for PCs that don't have TPM or Secure Boot" -msgstr "為沒有 TPM 或安全啟動功能的電腦創建 Windows 11 安裝驅動" - -#. • MSG_917 -msgid "Create persistent Linux partitions" -msgstr "創建持久 Linux 分區" - -#. • MSG_918 -msgid "Create VHD/DD images of the selected drive" -msgstr "為選中的驅動創建 VHD/DD 鏡像" - -#. • MSG_919 -msgid "Compute MD5, SHA-1, SHA-256 and SHA-512 checksums of the selected image" -msgstr "計算被選中鏡像的 MD5、SHA-1、SHA-256 和 SHA-512 校驗碼" - -#. • MSG_920 -msgid "Perform bad blocks checks, including detection of \"fake\" flash drives" -msgstr "執行壞塊檢查，包括對”假“USB 快閃磁碟機的檢測" - -#. • MSG_921 -msgid "Download official Microsoft Windows retail ISOs" -msgstr "下載微軟官方 Windows 鏡像" - -#. • MSG_922 -msgid "Download UEFI Shell ISOs" -msgstr "下載 UEFI Shell 鏡像" +msgid "Unable to open or read '%s'" +msgstr "無法開啟或讀取 '%s'" diff --git a/res/loc/rufus.loc b/res/loc/rufus.loc index ef9043ac..242fad26 100644 --- a/res/loc/rufus.loc +++ b/res/loc/rufus.loc @@ -7,7 +7,7 @@ # • v3.5 "ar-SA" "Arabic (العربية)" # • v3.5 "bg-BG" "Bulgarian (Български)" # • v3.22 "zh-CN" "Chinese Simplified (简体中文)" -# • v3.22 "zh-TW" "Chinese Traditional (正體中文)" +# • v3.14 "zh-TW" "Chinese Traditional (正體中文)" # • v3.14 "hr-HR" "Croatian (Hrvatski)" # • v3.22 "cs-CZ" "Czech (Čeština)" # • v3.14 "da-DK" "Danish (Dansk)" @@ -1769,7 +1769,7 @@ t MSG_922 "下载 UEFI Shell 镜像" ######################################################################### l "zh-TW" "Chinese Traditional (正體中文)" 0x0404, 0x0c04, 0x1404, 0x7c04 -v 3.22 +v 3.14 b "en-US" g IDD_ABOUTBOX @@ -1968,7 +1968,7 @@ t MSG_140 "繼續" t MSG_141 "返回" t MSG_142 "請稍候..." t MSG_143 "使用瀏覽器下載" -t MSG_144 "由於 Microsoft 已更改其網站以阻止下載 Windows ISO，因此無法下載。" +t MSG_144 "下載要求過多，已被微軟暫時列入黑名單 - 請稍後再嘗試..." t MSG_145 "需要 PowerShell 3.0 或更新版本才能執行。" t MSG_146 "您要連上網並下載?" t MSG_148 "執行下載程序中..." @@ -1999,7 +1999,7 @@ t MSG_172 "下載簽章無效" t MSG_173 "選取內容..." t MSG_174 "Rufus - 快速可靠的 USB 格式化工具" t MSG_175 "版本 %d.%d (Build %d)" -t MSG_176 "正體中文譯者: 佚 \\line Chocobo1 \\line SiderealArt \\line Ocha " +t MSG_176 "正體中文譯者: 佚 \\line Chocobo1 \\line SiderealArt " t MSG_177 "Bug 回報或請求新功能請至: (英文網頁)" t MSG_178 "其他著作權資訊:" t MSG_179 "線上更新規則:" @@ -2022,7 +2022,6 @@ t MSG_195 "使用內建 %s 檔案" t MSG_196 "重要: 此裝置使用非標準磁區大小!\n\n一般裝置使用 512-byte 磁區，但是此裝置使用 %d-byte。在多數情況下，這代表你無法使用此裝置開機。\nRufus 可嘗試建立開機磁碟，但不保證能正常使用。" t MSG_197 "偵測到非標準磁區大小" t MSG_198 "'Windows To Go' 只能安裝於有 '固定' 屬性的 GPT 分割裝置。目前裝置屬性不是 '固定'。" -t MSG_199 "此功能在此平台上不可用。" t MSG_201 "取消中，請稍候..." t MSG_202 "掃描映像檔中..." t MSG_203 "映像檔掃描失敗" @@ -2116,7 +2115,7 @@ t MSG_290 "檔案索引屬性" t MSG_291 "版本選擇" t MSG_292 "請選擇你要安裝的 Windows 版本:" t MSG_293 "不支援的 Windows 版本" -t MSG_294 "Rufus 已不再支援此 Windows 版本。\n此平台Rufus所支援的最新版本為v%d.%d。" +t MSG_294 "Rufus 已不再支援此 Windows 版本。" t MSG_295 "警告: 非官方版本" t MSG_296 "此 Rufus 版本不是由官方開發者發布的。\n\n你確定要執行嗎?" t MSG_297 "偵測到 ISO 映像檔不完整" @@ -2145,37 +2144,7 @@ t MSG_319 "忽略 Boot Marker" t MSG_320 "正在重新整理磁區分割 (%s)..." t MSG_321 "你選擇的映像檔是 ISOHybrid，但是檔案作者沒有使之與 ISO/檔案複製模式相容。\n因此強制使用 DD 映像寫入模式。" t MSG_322 "無法開啟或讀取 '%s'" -t MSG_325 "正在應用 Windows 自定義設置：%s" -t MSG_326 "正在應用用戶設置..." -t MSG_327 "Windows 用戶體驗" -t MSG_328 "自定義 Windows 安裝？" -t MSG_329 "移除對 4GB+ 內存、安全引導和 TPM 2.0 的要求" -t MSG_330 "移除對登錄微軟賬戶的要求" -t MSG_331 "關閉數據收集 (跳過隱私設置)" -t MSG_332 "阻止 Windows To Go 訪問內部磁盤" -t MSG_333 "創建一個使用此用戶名的本地賬號:" -t MSG_334 "使用當前用戶的區域設置" -t MSG_335 "關閉 BitLocker 自動設備加密" -t MSG_336 "持久化日誌" t MSG_900 "Rufus 是個能格式化並製作可開機 USB 快閃磁碟機（USB 隨身碟、Memory Stick 等等）的工具。" -t MSG_901 "官方網站: %s" -t MSG_902 "源代碼: %s" -t MSG_903 "更新日誌: %s" -t MSG_904 "本應用採用 GNU 通用公共許可證 (GPL) 第三版。\n具體許可證見 https://www.gnu.org/licenses/gpl-3.0.zh-tw.html。" -t MSG_905 "啟動" -t MSG_910 "將 U 盤、存儲卡或虛擬驅動器格式化為 FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 格式" -t MSG_911 "創建 FreeDOS 可啟動驅動器" -t MSG_912 "從可啟動 ISO 文件 (Windows 和 Linux 等) 創建可啟動驅動器" -t MSG_913 "從可啟動硬盤鏡像 (包括壓縮鏡像) 創建可啟動驅動器" -t MSG_914 "創建 BIOS 或 UEFI 可啟動驅動器，包括 UEFI 可啟動的 NTFS 驅動器" -t MSG_915 "創建 'Windows To Go' 驅動" -t MSG_916 "為沒有 TPM 或安全啟動功能的電腦創建 Windows 11 安裝驅動" -t MSG_917 "創建持久 Linux 分區" -t MSG_918 "為選中的驅動創建 VHD/DD 鏡像" -t MSG_919 "計算被選中鏡像的 MD5、SHA-1、SHA-256 和 SHA-512 校驗碼" -t MSG_920 "執行壞塊檢查，包括對”假“USB 快閃磁碟機的檢測" -t MSG_921 "下載微軟官方 Windows 鏡像" -t MSG_922 "下載 UEFI Shell 鏡像" ######################################################################### l "hr-HR" "Croatian (Hrvatski)" 0x041a, 0x081a, 0x101a diff --git a/src/drive.c b/src/drive.c index 90824c17..361fe82e 100644 --- a/src/drive.c +++ b/src/drive.c @@ -2607,12 +2607,14 @@ BOOL InitializeDisk(HANDLE hDrive) (BYTE*)&CreateDisk, size, NULL, 0, &size, NULL ); if (!r) { uprintf("Could not delete drive layout: %s", WindowsErrorString()); + safe_closehandle(hDrive); return FALSE; } r = DeviceIoControl(hDrive, IOCTL_DISK_UPDATE_PROPERTIES, NULL, 0, NULL, 0, &size, NULL ); if (!r) { uprintf("Could not refresh drive layout: %s", WindowsErrorString()); + safe_closehandle(hDrive); return FALSE; } diff --git a/src/format.c b/src/format.c index ac0905fc..b2bc1224 100644 --- a/src/format.c +++ b/src/format.c @@ -1428,6 +1428,7 @@ DWORD WINAPI FormatThread(void* param) HANDLE hPhysicalDrive = INVALID_HANDLE_VALUE; HANDLE hLogicalVolume = INVALID_HANDLE_VALUE; SYSTEMTIME lt; + FILE* log_fd; uint8_t *buffer = NULL, extra_partitions = 0; char *bb_msg, *volume_name = NULL; char drive_name[] = "?:\\"; @@ -1560,7 +1561,6 @@ DWORD WINAPI FormatThread(void* param) if (IsChecked(IDC_BAD_BLOCKS)) { do { - FILE* log_fd; int sel = ComboBox_GetCurSel(hNBPasses); // create a log file for bad blocks report. Since %USERPROFILE% may // have localized characters, we use the UTF-8 API. @@ -1573,8 +1573,7 @@ DWORD WINAPI FormatThread(void* param) lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond); log_fd = fopenU(logfile, "w+"); if (log_fd == NULL) { - uprintf("Error: Could not create log file for bad blocks check"); - goto out; + uprintf("Could not create log file for bad blocks check"); } else { fprintf(log_fd, APPLICATION_NAME " bad blocks check started on: %04d.%02d.%02d %02d:%02d:%02d", lt.wYear, lt.wMonth, lt.wDay, lt.wHour, lt.wMinute, lt.wSecond); diff --git a/src/rufus.rc b/src/rufus.rc index a273410f..a2fdbd97 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.22.1992" +CAPTION "Rufus 3.22.1990" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -392,8 +392,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,22,1992,0 - PRODUCTVERSION 3,22,1992,0 + FILEVERSION 3,22,1990,0 + PRODUCTVERSION 3,22,1990,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.22.1992" + VALUE "FileVersion", "3.22.1990" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.22.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.22.1992" + VALUE "ProductVersion", "3.22.1990" END END BLOCK "VarFileInfo"