nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] fix issues with unpartitioned drives and bad blocks reports

Browse source 
* Listing an unpartitioned could result in all controls besides
  drive selection dropdown being blank
* The bad blocks report was not displaying the right values
* Also update version to Rufus next
This commit is contained in:
Pete Batard 2014-03-29 00:42:49 +00:00
parent 027d0d7c3a
commit b343d9b86d
8 changed files with 64 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

20
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for rufus 1.4.6. # Generated by GNU Autoconf 2.68 for rufus 1.4.7.
# #
# Report bugs to <https://github.com/pbatard/rufus/issues>. # Report bugs to <https://github.com/pbatard/rufus/issues>.
# #
@ -560,8 +560,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='rufus' PACKAGE_NAME='rufus'
PACKAGE_TARNAME='rufus' PACKAGE_TARNAME='rufus'
PACKAGE_VERSION='1.4.6' PACKAGE_VERSION='1.4.7'
PACKAGE_STRING='rufus 1.4.6' PACKAGE_STRING='rufus 1.4.7'
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
PACKAGE_URL='http://rufus.akeo.ie' PACKAGE_URL='http://rufus.akeo.ie'
@ -1203,7 +1203,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures rufus 1.4.6 to adapt to many kinds of systems. \`configure' configures rufus 1.4.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1269,7 +1269,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of rufus 1.4.6:";; short | recursive ) echo "Configuration of rufus 1.4.7:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1357,7 +1357,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
rufus configure 1.4.6 rufus configure 1.4.7
generated by GNU Autoconf 2.68 generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc. Copyright (C) 2010 Free Software Foundation, Inc.
@ -1412,7 +1412,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by rufus $as_me 1.4.6, which was It was created by rufus $as_me 1.4.7, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@ $ $0 $@
@ -2227,7 +2227,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='rufus' PACKAGE='rufus'
VERSION='1.4.6' VERSION='1.4.7'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -4140,7 +4140,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by rufus $as_me 1.4.6, which was This file was extended by rufus $as_me 1.4.7, which was
generated by GNU Autoconf 2.68. Invocation command line was generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -4194,7 +4194,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
rufus config.status 1.4.6 rufus config.status 1.4.7
configured by $0, generated by GNU Autoconf 2.68, configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

2
configure.ac
View file

@ -1,4 +1,4 @@
AC_INIT([rufus], [1.4.6], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AC_INIT([rufus], [1.4.7], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_SRCDIR([src/rufus.c])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

7
res/localization/ChangeLog.txt
View file

@ -3,6 +3,9 @@ rufus.loc since its original version. Translators are expected to keep their
translations up to date by monitoring this file on regular basis and applying translations up to date by monitoring this file on regular basis and applying
the same changes. the same changes.
When editing an existing translation, make sure you always follow:
https://github.com/pbatard/rufus/wiki/Localization#Editing_a_translation
Remember to also update the version number for your translation ('v x.y.z') Remember to also update the version number for your translation ('v x.y.z')
once you have matched all the changes that occurred for the en-US translation. once you have matched all the changes that occurred for the en-US translation.
@ -12,6 +15,10 @@ content. PLEASE, do not just look at this Changelog when updating your
translation, but always use the English section of rufus.loc as your base. translation, but always use the English section of rufus.loc as your base.
For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line! For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line!
o Version 1.0.11 (2014.03.29)
- Changed MSG_011 "%u bad block(s) found" -> "%d bad block(s) found"
Note: since this doesn't require translator involvement, I have applied the change to existing translations.
o Version 1.0.10 (2014.02.09) o Version 1.0.10 (2014.02.09)
- *NEW* MSG_095 "DD Image" - *NEW* MSG_095 "DD Image"
- *NEW* MSG_261 "Writing image: %0.1f%% completed" - *NEW* MSG_261 "Writing image: %0.1f%% completed"

74
res/localization/rufus.loc
View file

@ -53,7 +53,7 @@
# http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf # http://download.microsoft.com/download/9/5/E/95EF66AF-9026-4BB0-A41D-A4F81802D92C/%5BMS-LCID%5D.pdf
# for the LCID (0x####) codes you should use # for the LCID (0x####) codes you should use
l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809 l "en-US" "English (English)" 0x0409, 0x0809, 0x0c09, 0x1009, 0x1409, 0x1809, 0x1c09, 0x2009, 0x2409, 0x2809, 0x2c09, 0x3009, 0x3409, 0x3809, 0x3c09, 0x4009, 0x4409, 0x4809
v 1.0.10 v 1.0.11
# Main dialog # Main dialog
g IDD_DIALOG g IDD_DIALOG
@ -145,7 +145,7 @@ t MSG_007 "Cancel"
t MSG_008 "Yes" t MSG_008 "Yes"
t MSG_009 "No" t MSG_009 "No"
t MSG_010 "Bad blocks found" t MSG_010 "Bad blocks found"
t MSG_011 "Check completed: %u bad block(s) found\n" t MSG_011 "Check completed: %d bad block(s) found\n"
" %d read error(s)\n %d write error(s)\n %d corruption error(s)\n" " %d read error(s)\n %d write error(s)\n %d corruption error(s)\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nA more detailed report can be found in:\n%s" t MSG_012 "%s\nA more detailed report can be found in:\n%s"
@ -498,7 +498,7 @@ t MSG_212 "فشل"
###################################################################### ######################################################################
l "bg-BG" "Bulgarian (Български)" 0x0402 l "bg-BG" "Bulgarian (Български)" 0x0402
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -635,7 +635,7 @@ t MSG_007 "Прекрати"
t MSG_008 "Да" t MSG_008 "Да"
t MSG_009 "Не" t MSG_009 "Не"
t MSG_010 "Намерени са лоши блокове" t MSG_010 "Намерени са лоши блокове"
t MSG_011 "Проверката завършена: намерени са %u лоши блокове\n" t MSG_011 "Проверката завършена: намерени са %d лоши блокове\n"
" %d грешки при четене\n %d грешки при запис\n %d повредени\n" " %d грешки при четене\n %d грешки при запис\n %d повредени\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nA По подробен доклад може да намерите в:\n%s" t MSG_012 "%s\nA По подробен доклад може да намерите в:\n%s"
@ -926,7 +926,7 @@ t MSG_261 "Писане на образ: %0.1f%% завършено"
################################################################################ ################################################################################
l "zh-CN" "Chinese Simplified (简体中文)" 0x0804, 0x1004 l "zh-CN" "Chinese Simplified (简体中文)" 0x0804, 0x1004
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -1014,7 +1014,7 @@ t MSG_007 "取消"
t MSG_008 "是" t MSG_008 "是"
t MSG_009 "否" t MSG_009 "否"
t MSG_010 "检测到坏快" t MSG_010 "检测到坏快"
t MSG_011 "扫描结果：检测到 %u 个坏快\n" t MSG_011 "扫描结果：检测到 %d 个坏快\n"
" %d 读取错误\n %d 写入错误\n %d 损坏错误\n" " %d 读取错误\n %d 写入错误\n %d 损坏错误\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\n详细报告位于：\n%s" t MSG_012 "%s\n详细报告位于：\n%s"
@ -1282,7 +1282,7 @@ t MSG_261 "写入镜像：已完成 %0.1f%%"
################################################################################ ################################################################################
l "zh-TW" "Chinese Traditional (正體中文)" 0x0404, 0x0c04, 0x1404, 0x7c04 l "zh-TW" "Chinese Traditional (正體中文)" 0x0404, 0x0c04, 0x1404, 0x7c04
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -1386,7 +1386,7 @@ t MSG_007 "取消"
t MSG_008 "是" t MSG_008 "是"
t MSG_009 "否" t MSG_009 "否"
t MSG_010 "偵測到損毀磁區" t MSG_010 "偵測到損毀磁區"
t MSG_011 "掃描結果: %u 個異常\n" t MSG_011 "掃描結果: %d 個異常\n"
" %d 讀取錯誤\n %d 寫入錯誤\n %d 損毀錯誤\n" " %d 讀取錯誤\n %d 寫入錯誤\n %d 損毀錯誤\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\n詳細報告位於:\n%s" t MSG_012 "%s\n詳細報告位於:\n%s"
@ -1771,7 +1771,7 @@ t MSG_007 "Annuleren"
t MSG_008 "Ja" t MSG_008 "Ja"
t MSG_009 "Nee" t MSG_009 "Nee"
t MSG_010 "Slechte blokken gevonden" t MSG_010 "Slechte blokken gevonden"
t MSG_011 "Controle voltooid: %u slechte blok(ken) gevonden\n" t MSG_011 "Controle voltooid: %d slechte blok(ken) gevonden\n"
" %d leesfout(en)\n %d schrijffout(en)\n %d corruptiefout(en)\n" " %d leesfout(en)\n %d schrijffout(en)\n %d corruptiefout(en)\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nEen meer gedetailleerder rapport kan worden gevonden in:\n%s" t MSG_012 "%s\nEen meer gedetailleerder rapport kan worden gevonden in:\n%s"
@ -2031,7 +2031,7 @@ t MSG_259 "Forceer update"
################################################################################ ################################################################################
l "fi-FI" "Finnish (Suomi)" 0x040B l "fi-FI" "Finnish (Suomi)" 0x040B
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -2139,7 +2139,7 @@ t MSG_007 "Peruuta"
t MSG_008 "Kyllä" t MSG_008 "Kyllä"
t MSG_009 "Ei" t MSG_009 "Ei"
t MSG_010 "Viallisia lohkoja löydetty" t MSG_010 "Viallisia lohkoja löydetty"
t MSG_011 "Tarkistus valmis: %u viallista lohkoa löydetty\n" t MSG_011 "Tarkistus valmis: %d viallista lohkoa löydetty\n"
" %d lukuvirhe(ttä)\n %d kirjoitusvirhe(ttä)\n %d korruptiovirhe(ttä)\n" " %d lukuvirhe(ttä)\n %d kirjoitusvirhe(ttä)\n %d korruptiovirhe(ttä)\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nA voit tarkastella tarkempaa raporttia kohteessa:\n%s" t MSG_012 "%s\nA voit tarkastella tarkempaa raporttia kohteessa:\n%s"
@ -2429,7 +2429,7 @@ t MSG_261 "Kirjoitetaan levykuvaa: %0.1f%% valmiina"
################################################################################ ################################################################################
l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c l "fr-FR" "French (Français)" 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
g IDD_DIALOG g IDD_DIALOG
@ -2525,7 +2525,7 @@ t MSG_007 "Annuler"
t MSG_008 "Oui" t MSG_008 "Oui"
t MSG_009 "Non" t MSG_009 "Non"
t MSG_010 "Blocs défectueux détectés" t MSG_010 "Blocs défectueux détectés"
t MSG_011 "Vérification complète : %u bloc(s) défectueux détecté(s)\n" t MSG_011 "Vérification complète : %d bloc(s) défectueux détecté(s)\n"
" %d erreur(s) de lecture\n %d erreur(s) d'écriture\n %d erreur(s) de corruption\n" " %d erreur(s) de lecture\n %d erreur(s) d'écriture\n %d erreur(s) de corruption\n"
t MSG_012 "%s\nUn rapport plus détaillé peut être obtenu à :\n%s" t MSG_012 "%s\nUn rapport plus détaillé peut être obtenu à :\n%s"
t MSG_013 "Jamais" t MSG_013 "Jamais"
@ -2788,7 +2788,7 @@ t MSG_261 "Ecriture d'image : %0.1f%% complété"
################################################################################ ################################################################################
l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407 l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
g IDD_DIALOG g IDD_DIALOG
@ -2901,7 +2901,7 @@ t MSG_007 "Abbruch"
t MSG_008 "Ja" t MSG_008 "Ja"
t MSG_009 "Nein" t MSG_009 "Nein"
t MSG_010 "Fehlerhafte Blöcke gefunden" t MSG_010 "Fehlerhafte Blöcke gefunden"
t MSG_011 "Prüfung abgeschlossen: %u fehlerhafte Blöcke gefunden\n" t MSG_011 "Prüfung abgeschlossen: %d fehlerhafte Blöcke gefunden\n"
" %d Lesefehler\n %d Schreibfehler\n %d Defekt(e)\n" " %d Lesefehler\n %d Schreibfehler\n %d Defekt(e)\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nEin detaillierter Bericht ist hier zu finden:\n%s" t MSG_012 "%s\nEin detaillierter Bericht ist hier zu finden:\n%s"
@ -3175,7 +3175,7 @@ t MSG_261 "Schreibe Abbild-Datei: %0.1f%% fertiggestellt"
################################################################################ ################################################################################
l "el-GR" "Greek (Ελληνικά)" 0x0408 l "el-GR" "Greek (Ελληνικά)" 0x0408
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -3319,7 +3319,7 @@ t MSG_007 "Άκυρο"
t MSG_008 "Ναι" t MSG_008 "Ναι"
t MSG_009 "Όχι" t MSG_009 "Όχι"
t MSG_010 "Βρέθηκαν κατεστραμμένοι τομείς" t MSG_010 "Βρέθηκαν κατεστραμμένοι τομείς"
t MSG_011 "Ο έλεγχος ολοκληρώθηκε: βρέθηκαν %u κατεστραμμένοι τομείς \n" t MSG_011 "Ο έλεγχος ολοκληρώθηκε: βρέθηκαν %d κατεστραμμένοι τομείς \n"
" %d σφάλματα ανάγνωσης\n %d σφάλματα εγγραφής\n %d σφάλματα διαστρέβλωσης\n" " %d σφάλματα ανάγνωσης\n %d σφάλματα εγγραφής\n %d σφάλματα διαστρέβλωσης\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nΜια πιο λεπτομερής αναφορά μπορεί να βρεθεί στο:\n%s" t MSG_012 "%s\nΜια πιο λεπτομερής αναφορά μπορεί να βρεθεί στο:\n%s"
@ -3687,7 +3687,7 @@ t MSG_007 "Mégse"
t MSG_008 "Igen" t MSG_008 "Igen"
t MSG_009 "Nem" t MSG_009 "Nem"
t MSG_010 "Hibás blokkokat találtam" t MSG_010 "Hibás blokkokat találtam"
t MSG_011 "Ellenörzés befejezve: %u hibás blokk találva\n" t MSG_011 "Ellenörzés befejezve: %d hibás blokk találva\n"
" %d olvasási hiba,\n %d írási hiba\n %d összeomlásra hajlamos hiba\n" " %d olvasási hiba,\n %d írási hiba\n %d összeomlásra hajlamos hiba\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nEgy részletesebb jelentés itt található:\n%s" t MSG_012 "%s\nEgy részletesebb jelentés itt található:\n%s"
@ -4083,7 +4083,7 @@ t MSG_007 "Batal"
t MSG_008 "Ya" t MSG_008 "Ya"
t MSG_009 "Tidak" t MSG_009 "Tidak"
t MSG_010 "Blok buruk ditemukan" t MSG_010 "Blok buruk ditemukan"
t MSG_011 "Pemeriksaan selesai: %u blok buruk ditemukan\n" t MSG_011 "Pemeriksaan selesai: %d blok buruk ditemukan\n"
" %d read error(s)\n %d write error(s)\n %d corruption error(s)\n" " %d read error(s)\n %d write error(s)\n %d corruption error(s)\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nLaporan yang lebih rinci dapat ditemukan di:\n%s" t MSG_012 "%s\nLaporan yang lebih rinci dapat ditemukan di:\n%s"
@ -4355,7 +4355,7 @@ t MSG_259 "Pembaruan Paksa"
################################################################################ ################################################################################
l "it-IT" "Italian (Italiano)" 0x0410, 0x0810 l "it-IT" "Italian (Italiano)" 0x0410, 0x0810
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
g IDD_DIALOG g IDD_DIALOG
@ -4465,7 +4465,7 @@ t MSG_007 "Annulla"
t MSG_008 "Sì" t MSG_008 "Sì"
t MSG_009 "No" t MSG_009 "No"
t MSG_010 "Rilevato blocco difettoso" t MSG_010 "Rilevato blocco difettoso"
t MSG_011 "Controllo completato: trovati %u blocchi difettosi\n" t MSG_011 "Controllo completato: trovati %d blocchi difettosi\n"
" %d errori lettura\n %d errori scrittura\n %d errori corruzione\n" " %d errori lettura\n %d errori scrittura\n %d errori corruzione\n"
t MSG_012 "%s\nUn report più dettagliato è disponibile in:\n%s" t MSG_012 "%s\nUn report più dettagliato è disponibile in:\n%s"
t MSG_013 "Disabilitato" t MSG_013 "Disabilitato"
@ -4731,7 +4731,7 @@ t MSG_261 "Scrittura immagine: %0.1f%% completata"
################################################################################ ################################################################################
l "ko-KR" "Korean (한국어)" 0x0412 l "ko-KR" "Korean (한국어)" 0x0412
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -4835,7 +4835,7 @@ t MSG_007 "취소"
t MSG_008 "예" t MSG_008 "예"
t MSG_009 "아니오" t MSG_009 "아니오"
t MSG_010 "배드 섹터 발견 됨." t MSG_010 "배드 섹터 발견 됨."
t MSG_011 "검사 완료: %u 개의 배트섹터가 발견되었습니다.\n" t MSG_011 "검사 완료: %d 개의 배트섹터가 발견되었습니다.\n"
" %d 읽기 오류\n %d 쓰기 오류\n %d 손상 섹터\n" " %d 읽기 오류\n %d 쓰기 오류\n %d 손상 섹터\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\n보고에 대한 상세 정보:\n%s" t MSG_012 "%s\n보고에 대한 상세 정보:\n%s"
@ -5123,7 +5123,7 @@ t MSG_261 "이미지 만들기: %0.1f%% 완료"
################################################################################ ################################################################################
l "lt-LT" "Lithuanian (Lietuvių)" 0x0427 l "lt-LT" "Lithuanian (Lietuvių)" 0x0427
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -5249,7 +5249,7 @@ t MSG_007 "Atšaukti"
t MSG_008 "Taip" t MSG_008 "Taip"
t MSG_009 "Ne" t MSG_009 "Ne"
t MSG_010 "Rasta blogų blokų" t MSG_010 "Rasta blogų blokų"
t MSG_011 "Tikrinimas baigtas: rasta %u blogų blokų\n" t MSG_011 "Tikrinimas baigtas: rasta %d blogų blokų\n"
" %d skaitymo klaidų\n %d rašymo klaidų\n %d iškraipymo klaidų\n" " %d skaitymo klaidų\n %d rašymo klaidų\n %d iškraipymo klaidų\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nIšsamesnę ataskaitą rasite:\n%s" t MSG_012 "%s\nIšsamesnę ataskaitą rasite:\n%s"
@ -5539,7 +5539,7 @@ t MSG_261 "Rašomas atvaizdas: %0.1f%% baigta"
################################################################################ ################################################################################
l "ms-MY" "Malay (Bahasa Malaysia)" 0x043e, 0x083e l "ms-MY" "Malay (Bahasa Malaysia)" 0x043e, 0x083e
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -5668,7 +5668,7 @@ t MSG_007 "batal"
t MSG_008 "Ya" t MSG_008 "Ya"
t MSG_009 "Tidak" t MSG_009 "Tidak"
t MSG_010 "Blok rosak dijumpai" t MSG_010 "Blok rosak dijumpai"
t MSG_011 "Semak selsesai: %u blok rosak dijumpai\n" t MSG_011 "Semak selsesai: %d blok rosak dijumpai\n"
" %d error membaca\n %d error menulis\n %d error korupsi\n" " %d error membaca\n %d error menulis\n %d error korupsi\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nA more detailed report can be found in:\n%s" t MSG_012 "%s\nA more detailed report can be found in:\n%s"
@ -5959,7 +5959,7 @@ t MSG_261 "Menulis imej: %0.1f%% selesai"
################################################################################ ################################################################################
l "pl-PL" "Polish (Polski)" 0x0415 l "pl-PL" "Polish (Polski)" 0x0415
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# my info: 15.02.2014,16:14 # my info: 15.02.2014,16:14
@ -6087,7 +6087,7 @@ t MSG_007 "Anuluj"
t MSG_008 "Tak" t MSG_008 "Tak"
t MSG_009 "Nie" t MSG_009 "Nie"
t MSG_010 "Znaleziono uskodzone sektory" t MSG_010 "Znaleziono uskodzone sektory"
t MSG_011 "Sprawdzanie zakończone: znaleziono %u uskodzone sektory(ów)\n" t MSG_011 "Sprawdzanie zakończone: znaleziono %d uskodzone sektory(ów)\n"
" %d błędów odczytu\n %d błędów zapisu\n %d błędy(ów) uszkodzeń\n" " %d błędów odczytu\n %d błędów zapisu\n %d błędy(ów) uszkodzeń\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nRaport szczegółowy jest dostępny w:\n%s" t MSG_012 "%s\nRaport szczegółowy jest dostępny w:\n%s"
@ -6508,7 +6508,7 @@ t MSG_007 "Cancelar"
t MSG_008 "Sim" t MSG_008 "Sim"
t MSG_009 "Não" t MSG_009 "Não"
t MSG_010 "Foram encontrados erros no disco" t MSG_010 "Foram encontrados erros no disco"
t MSG_011 "Verificação completa: %u erros encontrados\n" t MSG_011 "Verificação completa: %d erros encontrados\n"
" %d erros de leitura\n %d erros de escrita\n %d erros de corrupção\n" " %d erros de leitura\n %d erros de escrita\n %d erros de corrupção\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nMais informações disponíveis em:\n%s" t MSG_012 "%s\nMais informações disponíveis em:\n%s"
@ -6898,7 +6898,7 @@ t MSG_007 "Anulează"
t MSG_008 "Da" t MSG_008 "Da"
t MSG_009 "Nu" t MSG_009 "Nu"
t MSG_010 "Bloc defect Detectat" t MSG_010 "Bloc defect Detectat"
t MSG_011 "Verificare completă: s-au găsit %u blocuri defecte\n" t MSG_011 "Verificare completă: s-au găsit %d blocuri defecte\n"
" %d erori de citire\n %d erori de scriere\n %d erori de corupţie\n" " %d erori de citire\n %d erori de scriere\n %d erori de corupţie\n"
t MSG_012 "%s\n Un raport mai detaliat este disponibil în:\n%s" t MSG_012 "%s\n Un raport mai detaliat este disponibil în:\n%s"
t MSG_013 "Invalid" t MSG_013 "Invalid"
@ -7152,7 +7152,7 @@ t MSG_260 "Compresie NTFS"
################################################################################ ################################################################################
l "ru-RU" "Russian (Русский)" 0x0419, 0x0819 l "ru-RU" "Russian (Русский)" 0x0419, 0x0819
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -7289,7 +7289,7 @@ t MSG_007 "Отмена"
t MSG_008 "Да" t MSG_008 "Да"
t MSG_009 "Нет" t MSG_009 "Нет"
t MSG_010 "Найдены плохие блоки" t MSG_010 "Найдены плохие блоки"
t MSG_011 "Проверка закончена: %u плохих блоков найдено\n" t MSG_011 "Проверка закончена: %d плохих блоков найдено\n"
" %d ошибок чтения\n %d ошибок записи\n %d поврежденных блоков\n" " %d ошибок чтения\n %d ошибок записи\n %d поврежденных блоков\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nБолее подробный отчет можно найти в:\n%s" t MSG_012 "%s\nБолее подробный отчет можно найти в:\n%s"
@ -7558,7 +7558,7 @@ t MSG_261 "Запись образа: %0.1f%% выполнено"
################################################################################ ################################################################################
l "sl-SI" "Slovene (Slovenščina)" 0x0424 l "sl-SI" "Slovene (Slovenščina)" 0x0424
v 1.0.10 v 1.0.11
b "en-US" b "en-US"
# Main dialog # Main dialog
@ -7673,7 +7673,7 @@ t MSG_007 "Prekliči"
t MSG_008 "Da" t MSG_008 "Da"
t MSG_009 "Ne" t MSG_009 "Ne"
t MSG_010 "Slabi bloki najdeni" t MSG_010 "Slabi bloki najdeni"
t MSG_011 "Preizkus končan: %u slabih blokov najdenih\n" t MSG_011 "Preizkus končan: %d slabih blokov najdenih\n"
" Napak pri branju: %d\n Napak pri pisanju: %d\n %d corruption error(s)\n" " Napak pri branju: %d\n Napak pri pisanju: %d\n %d corruption error(s)\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nPodrobnejše poročilo lahko najdete v datoteki\n%s" t MSG_012 "%s\nPodrobnejše poročilo lahko najdete v datoteki\n%s"
@ -8086,7 +8086,7 @@ t MSG_007 "Cancelar"
t MSG_008 "Sí" t MSG_008 "Sí"
t MSG_009 "No" t MSG_009 "No"
t MSG_010 "Se encontraron bloques defectuosos" t MSG_010 "Se encontraron bloques defectuosos"
t MSG_011 "Verificación completa: se encontraron %u bloques dañados\n" t MSG_011 "Verificación completa: se encontraron %d bloques dañados\n"
" %d errores de lectura\n %d errores de escritura\n %d errores de corrupción\n" " %d errores de lectura\n %d errores de escritura\n %d errores de corrupción\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nEl informe detallado se puede encontrar en:\n%s" t MSG_012 "%s\nEl informe detallado se puede encontrar en:\n%s"
@ -8487,7 +8487,7 @@ t MSG_007 "Vazgeç"
t MSG_008 "Evet" t MSG_008 "Evet"
t MSG_009 "Hayır" t MSG_009 "Hayır"
t MSG_010 "Hatalı bloklar bulundu" t MSG_010 "Hatalı bloklar bulundu"
t MSG_011 "Denetim Tamamlandı: %u hatalı blok bulundu\n" t MSG_011 "Denetim Tamamlandı: %d hatalı blok bulundu\n"
" %d okuma hatası\n %d yazma hatası\n %d hata oluşumu\n" " %d okuma hatası\n %d yazma hatası\n %d hata oluşumu\n"
# The following will contain the formatted message above as well as the name of the bad blocks logfile # The following will contain the formatted message above as well as the name of the bad blocks logfile
t MSG_012 "%s\nDaha ayrıntılı rapor burada:\n%s" t MSG_012 "%s\nDaha ayrıntılı rapor burada:\n%s"

4
src/format.c
View file

@ -1315,12 +1315,12 @@ DWORD WINAPI FormatThread(void* param)
_unlink(logfile); _unlink(logfile);
goto out; goto out;
} }
uprintf("Bad Blocks: Check completed, %u bad block%s found. (%d/%d/%d errors)\n", uprintf("Bad Blocks: Check completed, %d bad block%s found. (%d/%d/%d errors)\n",
report.bb_count, (report.bb_count==1)?"":"s", report.bb_count, (report.bb_count==1)?"":"s",
report.num_read_errors, report.num_write_errors, report.num_corruption_errors); report.num_read_errors, report.num_write_errors, report.num_corruption_errors);
r = IDOK; r = IDOK;
if (report.bb_count) { if (report.bb_count) {
bb_msg = lmprintf(MSG_011, report.num_read_errors, report.num_write_errors, bb_msg = lmprintf(MSG_011, report.bb_count, report.num_read_errors, report.num_write_errors,
report.num_corruption_errors); report.num_corruption_errors);
fprintf(log_fd, bb_msg); fprintf(log_fd, bb_msg);
GetLocalTime(&lt); GetLocalTime(&lt);

2
src/rufus.c
View file

@ -397,8 +397,6 @@ static BOOL SetDriveInfo(int ComboIndex)
SelectedDrive.DeviceNumber = (DWORD)ComboBox_GetItemData(hDeviceList, ComboIndex); SelectedDrive.DeviceNumber = (DWORD)ComboBox_GetItemData(hDeviceList, ComboIndex);
SelectedDrive.nPartitions = GetDrivePartitionData(SelectedDrive.DeviceNumber, fs_type, sizeof(fs_type)); SelectedDrive.nPartitions = GetDrivePartitionData(SelectedDrive.DeviceNumber, fs_type, sizeof(fs_type));
if (SelectedDrive.nPartitions == 0)
return FALSE;
if (!DefineClusterSizes()) { if (!DefineClusterSizes()) {
uprintf("No file system is selectable for this drive\n"); uprintf("No file system is selectable for this drive\n");

12
src/rufus.rc
View file

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 329 IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 1.4.6.444" CAPTION "Rufus 1.4.7.445"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -165,7 +165,7 @@ END
RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329 RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 1.4.6.444" CAPTION "Rufus 1.4.7.445"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
@ -427,8 +427,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,6,444 FILEVERSION 1,4,7,445
PRODUCTVERSION 1,4,6,444 PRODUCTVERSION 1,4,7,445
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -445,13 +445,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.4.6.444" VALUE "FileVersion", "1.4.7.445"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "1.4.6.444" VALUE "ProductVersion", "1.4.7.445"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

1
src/stdio.c
View file

@ -196,6 +196,7 @@ char* SizeToHumanReadable(uint64_t size, BOOL log, BOOL fake_units)
const char* _StrError(DWORD error_code) const char* _StrError(DWORD error_code)
{ {
if ( (!IS_ERROR(error_code)) || (SCODE_CODE(error_code) == ERROR_SUCCESS)) { if ( (!IS_ERROR(error_code)) || (SCODE_CODE(error_code) == ERROR_SUCCESS)) {
// TODO: this message is wrong!
return lmprintf(MSG_044); return lmprintf(MSG_044);
} }
if (SCODE_FACILITY(error_code) != FACILITY_STORAGE) { if (SCODE_FACILITY(error_code) != FACILITY_STORAGE) {