From d4b663b222031786714534f1cafce468b81c293e Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sat, 2 May 2015 14:41:46 +0100 Subject: [PATCH] [ui] hint that UEFI/CSM is used when BIOS+UEFI is selected for target system * Also drop "Computer" from all languages (except Japanese as I think it would be incorrect) * Also rename the manifest --- res/localization/rufus.loc | 194 +++++++++--------- src/.msvc/rufus.vcxproj | 2 +- src/.msvc/rufus.vcxproj.filters | 2 +- src/.msvc/rufus_sources | 2 +- ..._and_elevation.manifest => rufus.manifest} | 0 src/rufus.rc | 20 +- src/stdfn.c | 4 +- 7 files changed, 111 insertions(+), 113 deletions(-) rename src/{common_controls_and_elevation.manifest => rufus.manifest} (100%) diff --git a/res/localization/rufus.loc b/res/localization/rufus.loc index f1cf3efc..cbbf5872 100644 --- a/res/localization/rufus.loc +++ b/res/localization/rufus.loc @@ -204,9 +204,9 @@ t MSG_028 "megabytes" t MSG_029 "Default" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Default)" -t MSG_031 "%s partition scheme for BIOS or BIOS-compatible computer" -t MSG_032 "%s partition scheme for BIOS computer" -t MSG_033 "%s partition scheme for UEFI computer" +t MSG_031 "%s partition scheme for BIOS or UEFI/CSM" +t MSG_032 "%s partition scheme for BIOS" +t MSG_033 "%s partition scheme for UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Pass" t MSG_035 "%d Passes" @@ -358,12 +358,12 @@ t MSG_116 "This image uses Grub %s but the application only includes the install "automatically if present. If no match can be found online, then the default version will be used." # Tooltips # Partition Scheme and Target Type -t MSG_150 "Usually the safest choice. If you have an UEFI computer and want to install " - "an OS in EFI mode however, you should select one of the other options" -t MSG_151 "Use this if you want to install an OS in EFI mode, but need to access " - "the USB content from Windows XP" -t MSG_152 "The preferred option to install an OS in EFI mode and when " - "USB access is not required for Windows XP" +t MSG_150 "Usually the safest choice. However, if you have an UEFI computer and want to install " + "an Operating System in native EFI mode, you should select one of the other options" +t MSG_151 "Use this if you want to install an Operating System in native EFI mode, but will need " + "to access the USB content from Windows XP" +t MSG_152 "The preferred option to install an Operating System in native EFI mode, when USB access " + "is not required from Windows XP" t MSG_153 "Test pattern: 0x%02X" t MSG_154 "Test pattern: 0x%02X, 0x%02X" t MSG_155 "Test pattern: 0x%02X, 0x%02X, 0x%02X" @@ -629,9 +629,9 @@ t MSG_028 "ميجا بايت" t MSG_029 "الإفتراضي" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (الإفتراضي)" -t MSG_031 "%s مخطط تقسيم لل BIOS أو أجهزة الكمبيوتر UEFI" -t MSG_032 "%s مخطط تقسيم لكمبيوتر BIOS" -t MSG_033 "%s مخطط تقسيم لكمبيوتر UEFI" +t MSG_031 "%s مخطط تقسيم لل BIOS أو أجهزة UEFI/CSM" +t MSG_032 "%s مخطط تقسيم BIOS" +t MSG_033 "%s مخطط تقسيم UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d تجاوز" t MSG_035 "%d تجاوزات" @@ -1049,9 +1049,9 @@ t MSG_028 "megabytes" t MSG_029 "Стандартно" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Стандартно)" -t MSG_031 "%s дялова схема за BIOS или UEFI компютри" -t MSG_032 "%s дялова схема за BIOS компютър" -t MSG_033 "%s дялова схема за UEFI компютър" +t MSG_031 "%s дялова схема за BIOS или UEFI/CSM" +t MSG_032 "%s дялова схема за BIOS" +t MSG_033 "%s дялова схема за UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Пробег" t MSG_035 "%d Пробега" @@ -1467,7 +1467,7 @@ t MSG_028 "M 字节" t MSG_029 "默认" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (默认)" -t MSG_031 "用于 BIOS 或 UEFI 计算机的 %s 分区方案，" +t MSG_031 "用于 BIOS 或 UEFI/CSM 计算机的 %s 分区方案，" t MSG_032 "用于 BIOS 计算机的 %s 分区方案" t MSG_033 "用于 UEFI 计算机的 %s 分区方案" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) @@ -1879,7 +1879,7 @@ t MSG_028 "megabytes" t MSG_029 "預設" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (預設)" -t MSG_031 "%s 可相容 BIOS 和 UEFI 之資料分割配置" +t MSG_031 "%s 可相容 BIOS 和 UEFI/CSM 之資料分割配置" t MSG_032 "%s BIOS 資料分割配置" t MSG_033 "%s UEFI 資料分割配置" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) @@ -2255,9 +2255,9 @@ t MSG_028 "megabajta" t MSG_029 "Zadano" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Zadano)" -t MSG_031 "%s shema particije za BIOS ili UEFI računalo" -t MSG_032 "%s shema particije za BIOS računalo" -t MSG_033 "%s shema particije za UEFI računalo" +t MSG_031 "%s shema particije za BIOS ili UEFI/CSM" +t MSG_032 "%s shema particije za BIOS" +t MSG_033 "%s shema particije za UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d prolaz" t MSG_035 "%d prolaza" @@ -2681,9 +2681,9 @@ t MSG_028 "megabajtů" t MSG_029 "Výchozí" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Výchozí)" -t MSG_031 "%s schéma oddílu pro BIOS nebo UEFI počítač" -t MSG_032 "%s schéma oddílu pro BIOS počítač" -t MSG_033 "%s schéma oddílu pro UEFI počítač" +t MSG_031 "%s schéma oddílu pro BIOS nebo UEFI/CSM" +t MSG_032 "%s schéma oddílu pro BIOS" +t MSG_033 "%s schéma oddílu pro UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d pokus" t MSG_035 "%d pokusy" @@ -3116,9 +3116,9 @@ t MSG_028 "megabytes" t MSG_029 "standard" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (standard)" -t MSG_031 "%s partition for BIOS eller UEFI computere" -t MSG_032 "%s partition for BIOS computere" -t MSG_033 "%s partition for UEFI computere" +t MSG_031 "%s partition for BIOS eller UEFI/CSM" +t MSG_032 "%s partition for BIOS" +t MSG_033 "%s partition for UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d gennemløb" t MSG_035 "%d gennemløb" @@ -3555,9 +3555,9 @@ t MSG_028 "megabytes" t MSG_029 "Standaard" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Standaard)" -t MSG_031 "%s partitie-indeling voor BIOS of UEFI computers" -t MSG_032 "%s partitie-indeling voor BIOS computer" -t MSG_033 "%s partitie-indeling voor UEFI computer" +t MSG_031 "%s partitie-indeling voor BIOS of UEFI/CSM" +t MSG_032 "%s partitie-indeling voor BIOS" +t MSG_033 "%s partitie-indeling voor UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Ronde" t MSG_035 "%d Rondes" @@ -3967,9 +3967,9 @@ t MSG_028 "megatavua" t MSG_029 "Oletus" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Oletus)" -t MSG_031 "%s-osiotyyppi BIOS- tai UEFI-tietokoneille" -t MSG_032 "%s-osiotyyppi BIOS-tietokoneelle" -t MSG_033 "%s-osiotyyppi UEFI-tietokoneelle" +t MSG_031 "%s-osiotyyppi BIOS- tai UEFI/CSM" +t MSG_032 "%s-osiotyyppi BIOS" +t MSG_033 "%s-osiotyyppi UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d testi" t MSG_035 "%d testiä" @@ -4386,9 +4386,9 @@ t MSG_027 "kilo-octets" t MSG_028 "méga-octets" t MSG_029 "Défaut" t MSG_030 "%s (Défaut)" -t MSG_031 "Type de partition %s pour ordinateur BIOS ou UEFI" -t MSG_032 "Type de partition %s pour ordinateur BIOS" -t MSG_033 "Type de partition %s pour ordinateur UEFI" +t MSG_031 "Type de partition %s pour BIOS ou UEFI/CSM" +t MSG_032 "Type de partition %s pour BIOS" +t MSG_033 "Type de partition %s pour UEFI" t MSG_034 "%d passe" t MSG_035 "%d passes" t MSG_036 "Image ISO" @@ -4807,9 +4807,9 @@ t MSG_028 "Megabyte" t MSG_029 "Standard" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Standard)" -t MSG_031 "%s Partitionierungsschema für BIOS oder UEFI Computer" -t MSG_032 "%s Partitionierungsschema für BIOS Computer" -t MSG_033 "%s Partitionierungsschema für UEFI Computer" +t MSG_031 "%s Partitionierungsschema für BIOS oder UEFI/CSM" +t MSG_032 "%s Partitionierungsschema für BIOS" +t MSG_033 "%s Partitionierungsschema für UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Durchgang" t MSG_035 "%d Durchgänge" @@ -5253,9 +5253,9 @@ t MSG_028 "megabytes" t MSG_029 "Προεπιλογή" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Προεπιλογή)" -t MSG_031 "%s Σύστημα διαμερισμού για υπολογιστές με BIOS ή UEFI" -t MSG_032 "%s Σύστημα διαμερισμού για υπολογιστές με BIOS" -t MSG_033 "%s Σύστημα διαμερισμού για υπολογιστές με UEFI" +t MSG_031 "%s Σύστημα διαμερισμού για BIOS ή UEFI/CSM" +t MSG_032 "%s Σύστημα διαμερισμού για BIOS" +t MSG_033 "%s Σύστημα διαμερισμού για UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Πέρασμα" t MSG_035 "%d Περάσματα" @@ -5668,7 +5668,7 @@ t MSG_028 "megabájt" t MSG_029 "Alapértelmezett" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Alap)" -t MSG_031 "%s partíciós séma BIOS-os vagy UEFI-s gép(ek)hez" +t MSG_031 "%s partíciós séma BIOS-os vagy UEFI/CSM-s gép(ek)hez" t MSG_032 "%s partíciós séma BIOS-os gép(ek)hez" t MSG_033 "%s partíciós séma UEFI-s gép(ek)hez" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) @@ -6113,9 +6113,9 @@ t MSG_028 "megabit" t MSG_029 "Standar" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Standar)" -t MSG_031 "%s skema partisi untuk BIOS atau UEFI komputer" -t MSG_032 "%s skema partisi untuk komputer BIOS" -t MSG_033 "%s skema partisi untuk komputer UEFI" +t MSG_031 "%s skema partisi untuk BIOS atau UEFI/CSM" +t MSG_032 "%s skema partisi untuk BIOS" +t MSG_033 "%s skema partisi untuk UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Pass" t MSG_035 "%d Passes" @@ -6478,9 +6478,9 @@ t MSG_027 "kilobyte" t MSG_028 "megabyte" t MSG_029 "Predefinito" t MSG_030 "%s (predefinito)" -t MSG_031 "Schema partizione %s per computer con BIOS o UEFI" -t MSG_032 "Schema partizione %s per computer con BIOS" -t MSG_033 "Schema partizione %s per computer con UEFI" +t MSG_031 "Schema partizione %s per BIOS o UEFI/CSM" +t MSG_032 "Schema partizione %s per BIOS" +t MSG_033 "Schema partizione %s per UEFI" t MSG_034 "%d test" t MSG_035 "%d test" t MSG_036 "Immagine ISO" @@ -7349,9 +7349,9 @@ t MSG_028 "MB" t MSG_029 "기본" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (기본)" -t MSG_031 "%s 파티션 형식의 BIOS 또는 UEFI 컴퓨터" -t MSG_032 "%s 파티션 형식의 BIOS 컴퓨터" -t MSG_033 "%s 파티션 형식의 UEFI 컴퓨터" +t MSG_031 "%s 파티션 형식의 BIOS 또는 UEFI/CSM (BIOS 호환)" +t MSG_032 "%s 파티션 형식의 BIOS" +t MSG_033 "%s 파티션 형식의 UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "한번만 검사" t MSG_035 "%d회 검사" @@ -7790,7 +7790,7 @@ t MSG_028 "megabaiti" t MSG_029 "Noklusējums" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Noklusējums)" -t MSG_031 "%s formāts datoriem ar BIOS vai UEFI" +t MSG_031 "%s formāts datoriem ar BIOS vai UEFI/CSM" t MSG_032 "%s formāts datoriem ar BIOS" t MSG_033 "%s formāts datoriem ar UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) @@ -8221,9 +8221,9 @@ t MSG_028 "megabaitai" t MSG_029 "Numatytas" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (numatytas)" -t MSG_031 "%s skaidinių schema BIOS ar UEFI kompiuteriui" -t MSG_032 "%s skaidinių schema BIOS kompiuteriui" -t MSG_033 "%s skaidinių schema UEFI kompiuteriui" +t MSG_031 "%s skaidinių schema BIOS ar UEFI/CSM" +t MSG_032 "%s skaidinių schema BIOS" +t MSG_033 "%s skaidinių schema UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d bandymas" t MSG_035 "%d bandymai" @@ -8669,9 +8669,9 @@ t MSG_028 "megabait" t MSG_029 "lalai" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Lalai)" -t MSG_031 "%s skema partition untuk komputer BIOS dan UEFI" -t MSG_032 "%s skema partition untuk komputer BIOS" -t MSG_033 "%s skema partition untuk komputer UEFI" +t MSG_031 "%s skema partition untuk BIOS dan UEFI/CSM" +t MSG_032 "%s skema partition untuk BIOS" +t MSG_033 "%s skema partition untuk UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d kali lulus" @@ -9076,9 +9076,9 @@ t MSG_028 "megabytes" t MSG_029 "Standard" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Standard)" -t MSG_031 "%s partisjon skjema for BIOS eller UEFI datamaskiner" -t MSG_032 "%s partisjon skjema for BIOS datamaskiner" -t MSG_033 "%s partisjon skjema for UEFI datamaskiner" +t MSG_031 "%s partisjon skjema for BIOS eller UEFI/CSM" +t MSG_032 "%s partisjon skjema for BIOS" +t MSG_033 "%s partisjon skjema for UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Passering" t MSG_035 "%d Passeringer" @@ -9535,9 +9535,9 @@ t MSG_028 "megabajtów" t MSG_029 "Domyślne" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Domyślne)" -t MSG_031 "Schemat partycjonowania %s dla komputerów z BIOS lub UEFI" -t MSG_032 "Schemat partycjonowania %s dla komputerów z BIOS" -t MSG_033 "Schemat partycjonowania %s dla komputerów z UEFI" +t MSG_031 "Schemat partycjonowania %s dla BIOS lub UEFI/CSM" +t MSG_032 "Schemat partycjonowania %s dla BIOS" +t MSG_033 "Schemat partycjonowania %s dla UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Przebieg" t MSG_035 "%d Przebiegi" @@ -9971,9 +9971,9 @@ t MSG_028 "megabytes" t MSG_029 "Default" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Default)" -t MSG_031 "Partição %s para BIOS ou computador UEFI" -t MSG_032 "Partição %s para computadores UEFI" -t MSG_033 "Partição %s para computadores UEFI" +t MSG_031 "Partição %s para BIOS ou UEFI/CSM" +t MSG_032 "Partição %s para UEFI" +t MSG_033 "Partição %s para UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d passo" t MSG_035 "%d passos" @@ -10382,9 +10382,9 @@ t MSG_028 "megabytes" t MSG_029 "Default" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Default)" -t MSG_031 "Partição %s para BIOS ou computador UEFI" -t MSG_032 "Partição %s para computadores UEFI" -t MSG_033 "Partição %s para computadores UEFI" +t MSG_031 "Partição %s para BIOS ou UEFI/CSM" +t MSG_032 "Partição %s para UEFI" +t MSG_033 "Partição %s para UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d passo" t MSG_035 "%d passos" @@ -10753,9 +10753,9 @@ t MSG_027 "kilo-octeţi" t MSG_028 "megaocteţi" t MSG_029 "Standart" t MSG_030 "%s (Standart)" -t MSG_031 "Schema de partiţie %s calculator cu BIOS sau UEFI" -t MSG_032 "Schema de partiţie %s calculator cu BIOS" -t MSG_033 "Schema de partiţie %s calculator cu UEFI" +t MSG_031 "Schema de partiţie %s cu BIOS sau UEFI/CSM" +t MSG_032 "Schema de partiţie %s cu BIOS" +t MSG_033 "Schema de partiţie %s cu UEFI" t MSG_034 "%d trecere" t MSG_035 "%d treceri" t MSG_036 "Imagine ISO" @@ -11158,9 +11158,9 @@ t MSG_028 "МБ" t MSG_029 "По умолчанию" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (по умолчанию)" -t MSG_031 "%s для компьютеров с BIOS или UEFI" -t MSG_032 "%s для компьютеров с интерфейсом BIOS" -t MSG_033 "%s для компьютеров с интерфейсом UEFI" +t MSG_031 "%s для компьютеров с BIOS или UEFI/CSM" +t MSG_032 "%s для компьютеров с BIOS" +t MSG_033 "%s для компьютеров с UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d проход" t MSG_035 "%d прохода" @@ -11563,9 +11563,9 @@ t MSG_028 "megabitov" t MSG_029 "Predvolené" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Predvolené)" -t MSG_031 "%s schéma oddielu pre BIOS alebo UEFI počítač" -t MSG_032 "%s schéma oddielu pre BIOS počítač" -t MSG_033 "%s schéma oddielu pre UEFI počítač" +t MSG_031 "%s schéma oddielu pre BIOS alebo UEFI/CSM" +t MSG_032 "%s schéma oddielu pre BIOS" +t MSG_033 "%s schéma oddielu pre UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d pokus" t MSG_035 "%d pokusy" @@ -11997,9 +11997,9 @@ t MSG_028 "megabajtov" t MSG_029 "Privzeto" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (privzeto)" -t MSG_031 "%s particijska shema za BIOS ali UEFI računalnike" -t MSG_032 "%s particijska shema za BIOS računalnike" -t MSG_033 "%s particijska shema za UEFI računalnike" +t MSG_031 "%s particijska shema za BIOS ali UEFI/CSM" +t MSG_032 "%s particijska shema za BIOS" +t MSG_033 "%s particijska shema za UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d prehod" t MSG_035 "%d prehoda/-i" @@ -12425,9 +12425,9 @@ t MSG_028 "megabytes" t MSG_029 "Por defecto" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Por defecto)" -t MSG_031 "Tipo de partición %s para computadora BIOS o UEFI" -t MSG_032 "Tipo de partición %s para computadora BIOS" -t MSG_033 "Tipo de partición %s para computadora UEFI" +t MSG_031 "Tipo de partición %s para BIOS o UEFI/CSM" +t MSG_032 "Tipo de partición %s para BIOS" +t MSG_033 "Tipo de partición %s para UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d paso" t MSG_035 "%d pasos" @@ -12874,9 +12874,9 @@ t MSG_028 "megabytes" t MSG_029 "Standard" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Standard)" -t MSG_031 "%s partitionsschema för BIOS- eller UEFI-datorer" -t MSG_032 "%s partitionsschema för datorer med BIOS" -t MSG_033 "%s partitionsschema för datorer med UEFI" +t MSG_031 "%s partitionsschema för BIOS eller UEFI/CSM" +t MSG_032 "%s partitionsschema för BIOS" +t MSG_033 "%s partitionsschema för UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d gång" t MSG_035 "%d gånger" @@ -13330,9 +13330,9 @@ t MSG_028 "megabyte" t MSG_029 "Varsayılan" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Varsayılan)" -t MSG_031 "BIOS yada UEFI Bilgisayarlar için %s Bölüm Düzeni" -t MSG_032 "BIOS Bilgisayarlar için %s Bölüm Düzeni" -t MSG_033 "UEFI Bilgisayarlar için %s Bölüm Düzeni" +t MSG_031 "BIOS yada UEFI/CSM için %s Bölüm Düzeni" +t MSG_032 "BIOS için %s Bölüm Düzeni" +t MSG_033 "UEFI için %s Bölüm Düzeni" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d Geçiş" t MSG_035 "%d Geçiş" @@ -13782,9 +13782,9 @@ t MSG_028 "мегабайтів" t MSG_029 "За замовчуванням" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (за замовч.)" -t MSG_031 "%s для комп'ютерів з BIOS чи UEFI" -t MSG_032 "%s для комп'ютерів з інтерфейсом BIOS" -t MSG_033 "%s для комп'ютерів з інтерфейсом UEFI" +t MSG_031 "%s для комп'ютерів з BIOS чи UEFI/CSM" +t MSG_032 "%s для комп'ютерів з BIOS" +t MSG_033 "%s для комп'ютерів з UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "%d прохід" t MSG_035 "%d проходи" @@ -14194,9 +14194,9 @@ t MSG_028 "megabyte" t MSG_029 "Mặc định" # The following gets appended to the file system, cluster size, etc. t MSG_030 "%s (Mặc định)" -t MSG_031 "Sắp xếp phân vùng %s cho máy tính BIOS hoặc UEFI" -t MSG_032 "Sắp xếp phân vùng %s cho máy tính BIOS" -t MSG_033 "Sắp xếp phân vùng %s cho máy tính UEFI" +t MSG_031 "Sắp xếp phân vùng %s cho BIOS hoặc UEFI/CSM" +t MSG_032 "Sắp xếp phân vùng %s cho BIOS" +t MSG_033 "Sắp xếp phân vùng %s cho UEFI" # Number of bad block check passes (singular for 1 pass, plural for 2 or more passes) t MSG_034 "Qua %d lần" t MSG_035 "Qua %d lần" diff --git a/src/.msvc/rufus.vcxproj b/src/.msvc/rufus.vcxproj index f4b4a400..9dcc30bf 100644 --- a/src/.msvc/rufus.vcxproj +++ b/src/.msvc/rufus.vcxproj @@ -220,7 +220,7 @@ - + diff --git a/src/.msvc/rufus.vcxproj.filters b/src/.msvc/rufus.vcxproj.filters index 04be5abb..f36a263d 100644 --- a/src/.msvc/rufus.vcxproj.filters +++ b/src/.msvc/rufus.vcxproj.filters @@ -144,7 +144,7 @@ - + Resource Files diff --git a/src/.msvc/rufus_sources b/src/.msvc/rufus_sources index 8d57cc9d..67ad702f 100644 --- a/src/.msvc/rufus_sources +++ b/src/.msvc/rufus_sources @@ -29,7 +29,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \ .\getopt\getopt.lib # http://jpassing.com/2008/02/01/how-to-use-manifests-with-buildexe/ -SXS_APPLICATION_MANIFEST=..\common_controls_and_elevation.manifest +SXS_APPLICATION_MANIFEST=..\rufus.manifest SOURCES=rufus.c \ format.c \ diff --git a/src/common_controls_and_elevation.manifest b/src/rufus.manifest similarity index 100% rename from src/common_controls_and_elevation.manifest rename to src/rufus.manifest diff --git a/src/rufus.rc b/src/rufus.rc index b9f59e2c..d5617d5c 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.2.655" +CAPTION "Rufus 2.2.656" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -156,7 +156,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.2.655" +CAPTION "Rufus 2.2.656" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -281,7 +281,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.2.655" +CAPTION "Rufus 2.2.656" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -412,7 +412,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.2.655" +CAPTION "Rufus 2.2.656" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -614,7 +614,7 @@ BEGIN "// Must reference a manifest for visual styles and elevation\r\n" "// Oh, and it must happen at the end, or MinGW will ignore it!\r\n" "#if defined(__GNUC__)\r\n" - "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""common_controls_and_elevation.manifest""\r\n" + "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""rufus.manifest""\r\n" "#endif\r\n" "\0" END @@ -667,8 +667,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,655,0 - PRODUCTVERSION 2,2,655,0 + FILEVERSION 2,2,656,0 + PRODUCTVERSION 2,2,656,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -685,13 +685,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.2.655" + VALUE "FileVersion", "2.2.656" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", " 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.2.655" + VALUE "ProductVersion", "2.2.656" END END BLOCK "VarFileInfo" @@ -769,7 +769,7 @@ IDR_TOGO_UNATTEND_XML RCDATA "../res/togo/unattend.xml" // Must reference a manifest for visual styles and elevation // Oh, and it must happen at the end, or MinGW will ignore it! #if defined(__GNUC__) -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "common_controls_and_elevation.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "rufus.manifest" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/src/stdfn.c b/src/stdfn.c index 19d1c03d..4b65c5a6 100644 --- a/src/stdfn.c +++ b/src/stdfn.c @@ -277,8 +277,6 @@ void GetWindowsVersion(void) ws = (vi.wProductType <= VER_NT_WORKSTATION); nWindowsVersion = vi.dwMajorVersion << 4 | vi.dwMinorVersion; switch (nWindowsVersion) { - case 0x50: w = "2000"; - break; case 0x51: w = "XP"; break; case 0x52: w = (!GetSystemMetrics(89)?"2003":"2003_R2"); @@ -297,7 +295,7 @@ void GetWindowsVersion(void) case 0xA0: w = (ws?"10":"Server 10"); break; default: - if (nWindowsVersion < 0x50) + if (nWindowsVersion < 0x51) nWindowsVersion = WINDOWS_UNSUPPORTED; else w = "11 or later";