mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[misc] right-to-left and version handling improvements
* Improve right-to-left consistency and handling * Drop 'v' from version indicators * Also update version to 1.4.4 * Also fix French translation typos
This commit is contained in:
Pete Batard
parent
8ae158ba22
commit
2577337dec
16 changed files with 109 additions and 100 deletions
|
|
@ -7,5 +7,5 @@ release: all
|
|||
@mv src/$(TARGET)$(EXEEXT) .
|
||||
@$(STRIP) $(TARGET)$(EXEEXT)
|
||||
@upx --lzma $(TARGET)$(EXEEXT)
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
@cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_$(VERSION)$(EXEEXT)
|
||||
@cmd.exe /k _sign.cmd $(TARGET)_$(VERSION)$(EXEEXT)
|
||||
|
|
|
|||
|
|
@ -449,8 +449,8 @@ release: all
|
|||
@mv src/$(TARGET)$(EXEEXT) .
|
||||
@$(STRIP) $(TARGET)$(EXEEXT)
|
||||
@upx --lzma $(TARGET)$(EXEEXT)
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
@cmd.exe /k _sign.cmd $(TARGET)_v$(VERSION)$(EXEEXT)
|
||||
@mv $(TARGET)$(EXEEXT) $(TARGET)_$(VERSION)$(EXEEXT)
|
||||
@cmd.exe /k _sign.cmd $(TARGET)_$(VERSION)$(EXEEXT)
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ s/^[ \t]*FILEVERSION[ \t]*.*,.*,.*,\(.*\)/ FILEVERSION @@MAJOR@@,@@MINOR@@,@@MIC
|
|||
s/^[ \t]*PRODUCTVERSION[ \t]*.*,.*,.*,\(.*\)/ PRODUCTVERSION @@MAJOR@@,@@MINOR@@,@@MICRO@@,\1/
|
||||
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*".*\..*\..*\.\(.*\)"/\1VALUE "FileVersion", "@@MAJOR@@.@@MINOR@@.@@MICRO@@.\2"/
|
||||
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*".*\..*\..*\.\(.*\)"/\1VALUE "ProductVersion", "@@MAJOR@@.@@MINOR@@.@@MICRO@@.\2"/
|
||||
s/^\(.*\)"Rufus v\(.*\)\.\(.*\)"\(.*\)/\1"Rufus v@@MAJOR@@.@@MINOR@@.@@MICRO@@.\3"\4/
|
||||
s/^\(.*\)"Rufus \(.*\)\.\(.*\)"\(.*\)/\1"Rufus @@MAJOR@@.@@MINOR@@.@@MICRO@@.\3"\4/
|
||||
s/^\(.*\)"Version \(.*\) (\(.*\)"\(.*\)/\1"Version @@MAJOR@@.@@MINOR@@.@@MICRO@@ (\3"\4/
|
||||
_EOF
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@TAGVER
|
|||
s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ PRODUCTVERSION \1,\2,\3,@@TAGVER@@/
|
||||
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@TAGVER@@"/
|
||||
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@TAGVER@@"/
|
||||
s/^\(.*\)"Rufus v\(.*\)\.\(.*\)"\(.*\)/\1"Rufus v\2.@@TAGVER@@"\4/
|
||||
s/^\(.*\)"Rufus \(.*\)\.\(.*\)"\(.*\)/\1"Rufus \2.@@TAGVER@@"\4/
|
||||
_EOF
|
||||
|
||||
# First run sed to substitute our variable in the sed command file
|
||||
|
|
|
|||
20
configure
vendored
20
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.68 for rufus 1.4.3.
|
||||
# Generated by GNU Autoconf 2.68 for rufus 1.4.4.
|
||||
#
|
||||
# Report bugs to <https://github.com/pbatard/rufus/issues>.
|
||||
#
|
||||
|
|
@ -560,8 +560,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='rufus'
|
||||
PACKAGE_TARNAME='rufus'
|
||||
PACKAGE_VERSION='1.4.3'
|
||||
PACKAGE_STRING='rufus 1.4.3'
|
||||
PACKAGE_VERSION='1.4.4'
|
||||
PACKAGE_STRING='rufus 1.4.4'
|
||||
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
|
||||
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.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures rufus 1.4.3 to adapt to many kinds of systems.
|
||||
\`configure' configures rufus 1.4.4 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1269,7 +1269,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of rufus 1.4.3:";;
|
||||
short | recursive ) echo "Configuration of rufus 1.4.4:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1357,7 +1357,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
rufus configure 1.4.3
|
||||
rufus configure 1.4.4
|
||||
generated by GNU Autoconf 2.68
|
||||
|
||||
Copyright (C) 2010 Free Software Foundation, Inc.
|
||||
|
|
@ -1412,7 +1412,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by rufus $as_me 1.4.3, which was
|
||||
It was created by rufus $as_me 1.4.4, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2227,7 +2227,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='rufus'
|
||||
VERSION='1.4.3'
|
||||
VERSION='1.4.4'
|
||||
|
||||
|
||||
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
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by rufus $as_me 1.4.3, which was
|
||||
This file was extended by rufus $as_me 1.4.4, which was
|
||||
generated by GNU Autoconf 2.68. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -4194,7 +4194,7 @@ _ACEOF
|
|||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
rufus config.status 1.4.3
|
||||
rufus config.status 1.4.4
|
||||
configured by $0, generated by GNU Autoconf 2.68,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
AC_INIT([rufus], [1.4.3], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
|
||||
AC_INIT([rufus], [1.4.4], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
|
||||
AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
|
||||
AC_CONFIG_SRCDIR([src/rufus.c])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ o Version 1.0.8 (2014.01.21)
|
|||
- Changed MSG_047 "%s (%c:)" -> "Multiple Volumes" (non-updated ones have been commented out)
|
||||
- *NEW* MSG_093 "IMPORTANT: THIS DRIVE CONTAINS MULTIPLE PARTITIONS OR VOLUMES!!"
|
||||
- *NEW* MSG_094 "Multiple partitions detected"
|
||||
- *NEW* MSG_114 "This image uses Syslinux %s but this application only includes Syslinux %s
|
||||
- *NEW* MSG_114 "This image uses Syslinux %s but this application only includes the installation files for Syslinux %s."
|
||||
- *NEW* MSG_115 "Download required"
|
||||
- Changed MSG_234: 'v%d' is replaced with '%s' (change already applied to existing translations)
|
||||
|
||||
|
|
|
|||
|
|
@ -291,13 +291,14 @@ t MSG_111 "Incompatible Cluster size"
|
|||
t MSG_112 "Formatting a large UDF volumes can take a lot of time. At USB 2.0 speeds, the estimated formatting "
|
||||
"duration is %d:%02d, during which the progress bar will appear frozen. Please be patient!"
|
||||
t MSG_113 "Large UDF volume"
|
||||
t MSG_114 "This image uses Syslinux %s but this application only includes Syslinux %s.\n\n"
|
||||
"As new versions of Syslinux are not compatible with one another, and it is not possible to "
|
||||
"include them all, Rufus needs to download two additional files ('ldlinux.sys' and 'ldlinux.bss'):\n"
|
||||
"- Select 'Yes' to connect to the internet and download these files\n"
|
||||
t MSG_114 "This image uses Syslinux %s but this application only includes the installation files for "
|
||||
"Syslinux %s.\n\nAs new versions of Syslinux are not compatible with one another, and it wouldn't "
|
||||
"be possible for Rufus to include them all, two additional files must be downloaded from the "
|
||||
"Internet ('ldlinux.sys' and 'ldlinux.bss'):\n"
|
||||
"- Select 'Yes' to connect to the Internet and download these files\n"
|
||||
"- Select 'No' to cancel the operation\n\n"
|
||||
"Note: The files will be downloaded in the current directory and once "
|
||||
"they exist there, they will be reused automatically.\n"
|
||||
"Note: The files will be downloaded in the current application directory and will be reused "
|
||||
"automatically if present.\n"
|
||||
t MSG_115 "Download required"
|
||||
# Tootips
|
||||
# Partition Scheme and Target Type
|
||||
|
|
@ -458,7 +459,7 @@ t IDC_RUFUS_MBR "استخدام روفوس MBR مع BIOS ID:"
|
|||
|
||||
# About dialog
|
||||
g IDD_ABOUTBOX
|
||||
t IDD_ABOUTBOX "حول Rufus"
|
||||
t IDD_ABOUTBOX "Rufus حول"
|
||||
t IDC_ABOUT_LICENSE "ترخيص"
|
||||
t IDC_ABOUT_UPDATES "تحديثات"
|
||||
t IDOK "حسنا"
|
||||
|
|
@ -473,10 +474,14 @@ t MSG_030 "%s (الافتراضي)"
|
|||
t MSG_034 "%d يمر"
|
||||
t MSG_035 "%d تمريرات"
|
||||
t MSG_109 "0x%02X (أسطوانة %d)"
|
||||
# The following will appear in the about dialog
|
||||
t MSG_174 "Rufus وموثوق USB تنسيق المساعدة"
|
||||
t MSG_175 "الإصدار %d.%d.%d (Build %d)"
|
||||
t MSG_176 "ترجمة: هارون الرشيد <mailto:pete@akeo.ie>"
|
||||
# NOTE: In the line below, there are (potentially) invisible Right-To-Left marks
|
||||
# (UTF-8: 0xE2 0x80 0x8f) After "USB" and after "Rufus".
|
||||
t MSG_174 "Rufus - وموثوق USB تنسيق المساعدة"
|
||||
# This one's a massive empirical fest of RTL marks and nonsensical parenthesis, to
|
||||
# make the output look about right... If you edit this, all I can say is: GOOD LUCK!!!
|
||||
t MSG_175 "الإصدار %d.%d.%d)بناء %d("
|
||||
# NOTE: RTL mark after the ':'
|
||||
t MSG_176 "ترجمة: هارون الرشيد <mailto:pete@akeo.ie>"
|
||||
t MSG_177 "البق تقرير أو طلب تعزيزات في:"
|
||||
t MSG_178 "حقوق الطبع والنشر إضافية:"
|
||||
|
||||
|
|
@ -1561,16 +1566,16 @@ v 1.0.8
|
|||
b "en-US"
|
||||
|
||||
g IDD_DIALOG
|
||||
t IDS_DEVICE_TXT "Periphérique"
|
||||
t IDS_DEVICE_TXT "Périphérique"
|
||||
t IDS_PARTITION_TYPE_TXT "Type de partition et système de destination"
|
||||
t IDS_FILESYSTEM_TXT "Système de fichiers"
|
||||
t IDS_CLUSTERSIZE_TXT "Taille de clusters"
|
||||
t IDS_LABEL_TXT "Nouveau label"
|
||||
t IDS_FORMAT_OPTIONS_GRP "Options de Formattage "
|
||||
t IDS_FORMAT_OPTIONS_GRP "Options de Formatage "
|
||||
t IDC_BADBLOCKS "Vérification de mauvais blocs:"
|
||||
s IDC_BADBLOCKS +10,0
|
||||
m IDC_NBPASSES +5,0
|
||||
t IDC_QUICKFORMAT "Formattage rapide"
|
||||
t IDC_QUICKFORMAT "Formatage rapide"
|
||||
t IDC_BOOT "Disque de démarrage utilisant:"
|
||||
s IDC_BOOT +5,0
|
||||
m IDC_BOOTTYPE +5,0
|
||||
|
|
@ -1641,13 +1646,13 @@ t IDC_ISO_FILENAME "Ouverture de l'image - veuillez patienter..."
|
|||
t IDC_ISO_ABORT "Annuler"
|
||||
|
||||
# Messages used throughout the application
|
||||
t MSG_001 "Autre instance detectée"
|
||||
t MSG_001 "Autre instance détectée"
|
||||
t MSG_002 "Une autre instance de Rufus est en cours d'exécution.\n"
|
||||
"Veuillez fermer la première instance avant d'en lancer une seconde."
|
||||
t MSG_003 "ATTENTION: TOUTES LES DONNEES DU VOLUME '%s' VONT ETRE EFFACEES.\n"
|
||||
"Pour continuer cette operation, cliquez sur OK.\nPour quitter cliquez sur ANNULER."
|
||||
"Pour continuer cette opération, cliquez sur OK.\nPour quitter cliquez sur ANNULER."
|
||||
t MSG_004 "Mises à jour"
|
||||
t MSG_005 "Voulez-vous authoriser Rufus à chercher des mises à jour en ligne?"
|
||||
t MSG_005 "Voulez-vous autoriser Rufus à chercher des mises à jour en ligne?"
|
||||
t MSG_006 "Fermer"
|
||||
t MSG_007 "Annuler"
|
||||
t MSG_008 "Oui"
|
||||
|
|
@ -1660,7 +1665,7 @@ t MSG_013 "Jamais"
|
|||
t MSG_014 "Quotidienne"
|
||||
t MSG_015 "Hebdomadaire"
|
||||
t MSG_016 "Mensuelle"
|
||||
t MSG_017 "Personalisée"
|
||||
t MSG_017 "Personnalisée"
|
||||
t MSG_018 "Votre version: %d.%d.%d (Build %d)"
|
||||
t MSG_019 "Dernière version: %d.%d.%d (Build %d)"
|
||||
t MSG_020 "octets"
|
||||
|
|
@ -1671,7 +1676,7 @@ t MSG_024 "To"
|
|||
t MSG_025 "Po"
|
||||
t MSG_026 "octets"
|
||||
t MSG_027 "kilo-octets"
|
||||
t MSG_028 "mega-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"
|
||||
|
|
@ -1684,7 +1689,7 @@ t MSG_037 "Application"
|
|||
t MSG_038 "Annuler"
|
||||
t MSG_039 "Lancer"
|
||||
t MSG_040 "Télécharger"
|
||||
t MSG_041 "Operation annulée par l'utilisateur"
|
||||
t MSG_041 "Opération annulée par l'utilisateur"
|
||||
t MSG_042 "Erreur"
|
||||
t MSG_043 "Erreur: %s"
|
||||
t MSG_044 "Téléchargement de fichier"
|
||||
|
|
@ -1696,16 +1701,16 @@ t MSG_049 "Rufus - Annulation"
|
|||
|
||||
# Error messages
|
||||
t MSG_050 "Opération réussie."
|
||||
t MSG_051 "Erreur indéterminéee lors du formatage."
|
||||
t MSG_051 "Erreur indéterminée lors du formatage."
|
||||
t MSG_052 "Ce système de fichiers ne peut pas être utilisé ici."
|
||||
t MSG_053 "L'accès au périphérique est refusé."
|
||||
t MSG_054 "Le périphérique est protegé en écriture."
|
||||
t MSG_054 "Le périphérique est protégé en écriture."
|
||||
t MSG_055 "Le périphérique est en cours d'utilisation par une autre application. "
|
||||
"Veuillez fermer toute autre application succeptible d'accéder au périphérique."
|
||||
"Veuillez fermer toute autre application susceptible d'accéder au périphérique."
|
||||
t MSG_056 "Le formatage rapide n'est pas disponible pour ce périphérique."
|
||||
t MSG_057 "Le nom de volume est invalide."
|
||||
t MSG_058 "Le handle de périphérique est invalide."
|
||||
t MSG_059 "Cette taille de cluster n'est pas appliquable ici."
|
||||
t MSG_059 "Cette taille de cluster n'est pas applicable ici."
|
||||
t MSG_060 "La taille du volume est invalide."
|
||||
t MSG_061 "Veuillez insérer un média dans le lecteur."
|
||||
t MSG_062 "Commande non supportée."
|
||||
|
|
@ -1715,8 +1720,8 @@ t MSG_065 "Erreur d'écriture."
|
|||
t MSG_066 "L'installation a échoué"
|
||||
t MSG_067 "Impossible d'accéder au média. Il peut être en cours d'utilisation par une autre application. "
|
||||
"Essayer de déconnecter le média et essayez à nouveau."
|
||||
t MSG_068 "Erreur de partitionement."
|
||||
t MSG_069 "Impossible de copier les fichiers sur le périphérique de detination."
|
||||
t MSG_068 "Erreur de partitionnement."
|
||||
t MSG_069 "Impossible de copier les fichiers sur le périphérique de destination."
|
||||
t MSG_070 "Opération annulée par l'utilisateur."
|
||||
t MSG_071 "Impossible de créer le thread."
|
||||
t MSG_072 "La vérification de blocs défectueux a été interrompue."
|
||||
|
|
@ -1727,7 +1732,7 @@ t MSG_076 "Echec de modification des fichiers de démarrage."
|
|||
t MSG_077 "Echec d'assignation d'une lettre de volume."
|
||||
t MSG_078 "Impossible de monter le volume GUID."
|
||||
|
||||
t MSG_080 "Rufus a detecté que Windows est en train de finir de vider la mémoire tampon.\n\n"
|
||||
t MSG_080 "Rufus a détecté que Windows est en train de finir de vider la mémoire tampon.\n\n"
|
||||
"En fonction de la vitesse de votre périphérique et de la taille du fichier, cette opération peut "
|
||||
"prendre beaucoup de temps.\n\nNous recommandons d'attendre que Windows complète cette opération "
|
||||
"pour éviter la corruption du périphérique. Mais si jamais vous en avez marre d'attendre, vous "
|
||||
|
|
@ -1742,7 +1747,7 @@ t MSG_084 "Cette image ISO utilise une version obsolète du fichier '%s'.\n"
|
|||
"- Choisissez 'Oui' pour télécharger le fichier depuis Internet\n"
|
||||
"- Choisissez 'Non' pour garder le fichier de l'image ISO\n"
|
||||
"Si vous ne savez pas quoi faire, sélectionnez 'Oui'.\n\n"
|
||||
"Note: Le nouveau fichier sera téléchargé dans le répertoire courrant. "
|
||||
"Note: Le nouveau fichier sera téléchargé dans le répertoire courant. "
|
||||
"Si un '%s' existe à cet endroit, il sera réutilisé automatiquement."
|
||||
t MSG_085 "Téléchargement de %s"
|
||||
t MSG_086 "Aucune image ISO sélectionnée"
|
||||
|
|
@ -1751,7 +1756,7 @@ t MSG_087 "Veuillez cliquer sur le bouton avec un disque pour choisir une image
|
|||
t MSG_088 "Image ISO trop large"
|
||||
t MSG_089 "Cette ISO image est trop large pour le périphérique sélectionné."
|
||||
t MSG_090 "Image ISO on supportée"
|
||||
t MSG_091 "Quand UEFI est séelectionné, seules les images ISO basées sur EFI sont supportées. "
|
||||
t MSG_091 "Quand UEFI est sélectionné, seules les images ISO basées sur EFI sont supportées. "
|
||||
"Veuillez sélectionner une image ISO démarrable avec EFI ou sélectionner BIOS pour le système de destination."
|
||||
t MSG_092 "Système de fichiers non supporté"
|
||||
t MSG_093 "IMPORTANT: CE PÉRIPHÉRIQUE CONTIENT PLUSIEURS PARTITIONS !!\n\n"
|
||||
|
|
@ -1766,7 +1771,7 @@ t MSG_100 "Cette image ISO contient un fichier de plus de 4 Go, ce qui est plus
|
|||
"supportée par le système de fichiers FAT ou FAT32."
|
||||
t MSG_101 "Support pour archives WIM non disponible"
|
||||
t MSG_102 "Votre plateforme ne peut pas extraire les fichiers depuis les archives WIM. L'extraction de données WIM "
|
||||
"est nécéssaire pour créer des médias USB démarrable avec EFI pour Windows 7/8 ou Windows Vista. Vous pouvez addresser "
|
||||
"est nécessaire pour créer des médias USB démarrable avec EFI pour Windows 7/8 ou Windows Vista. Vous pouvez adresser "
|
||||
"ce problème en téléchargeant une version récente de l'utilitaire 7-Zip.\nVoulez-vous visiter la page de téléchargements de 7-zip?"
|
||||
t MSG_103 "Télécharger %s?"
|
||||
t MSG_104 "Syslinux v5.0 ou plus récent requiert l'installation d'un fichier '%s'.\n"
|
||||
|
|
@ -1774,7 +1779,7 @@ t MSG_104 "Syslinux v5.0 ou plus récent requiert l'installation d'un fichier '%
|
|||
"il n'est pas inclus dans l'application.\n\nRufus peut télécharger ce fichier pour vous:\n"
|
||||
"- Choisissez 'Oui' pour télécharger le fichier depuis Internet\n"
|
||||
"- Choisissez 'Non' si vous compter copier ce fichier manuellement\n"
|
||||
"Note: Ce fichier est téléchargé dans le répertoire courrant. Une fois qu'un fichier"
|
||||
"Note: Ce fichier est téléchargé dans le répertoire courant. Une fois qu'un fichier"
|
||||
"'%s' existe à cet endroit, il sera réutilisé automatiquement."
|
||||
t MSG_105 "Annuler peut laisser le périphérique dans un état inutilisable.\n"
|
||||
"Si vous êtes sûr de vouloir annuler, sélectionnez OUI. Sinon, sélectionnez NON."
|
||||
|
|
@ -1785,16 +1790,15 @@ t MSG_109 "0x%02X (disque %d)"
|
|||
t MSG_110 "MS-DOS ne peut pas être utilisé sur un disque avec une Taille de clusters de 64 kilo-octets.\n"
|
||||
"Veuillez changer la Taille de clusters ou utilisez FreeDOS."
|
||||
t MSG_111 "Taille de clusters incompatible"
|
||||
t MSG_112 "Le formattage d'un volume UDF de grande taille peut prendre beaucoup de temps. Aux vitesses USB 2.0, "
|
||||
"la durée de formattage estimée est %d:%02d, pendant laquelle la barre de progrès semblera gelée. Veuillez être patient !"
|
||||
t MSG_112 "Le formatage d'un volume UDF de grande taille peut prendre beaucoup de temps. Aux vitesses USB 2.0, "
|
||||
"la durée de formatage estimée est %d:%02d, pendant laquelle la barre de progrès semblera gelée. Veuillez être patient !"
|
||||
t MSG_113 "Volume UDF de grand taille"
|
||||
t MSG_114 "Cette image utilise Syslinux %s mais l'application inclus seulement Syslinux %s.\n\n"
|
||||
"Comme les nouvelles versions de Syslinux sont incompatibles, et il n'est pas possible toutes "
|
||||
"les inclure, Rufus doit télécharger 2 fichiers supplémentaires ('ldlinux.sys' et 'ldlinux.bss'):\n"
|
||||
t MSG_114 "Cette image utilise Syslinux %s mais l'application inclus seulement les fichiers d'installation pour Syslinux %s.\n\n"
|
||||
"Comme les nouvelles versions de Syslinux sont incompatibles entre elles, et il n'est pas possible à Rufus de toutes "
|
||||
"les inclure, deux fichiers supplémentaires ('ldlinux.sys' et 'ldlinux.bss') doivent être téléchargés:\n"
|
||||
"- Choisissez 'Oui' pour télécharger ces fichier depuis Internet\n"
|
||||
"- Choisissez 'Non' pour annuler l'opération\n"
|
||||
"Note: Ces fichier seront téléchargés dans le répertoire courrant et une fois qu'ils"
|
||||
"existent à cet endroit, il seront réutilisés automatiquement."
|
||||
"Note: Ces fichier seront téléchargés dans le répertoire courant et réutilisés automatiquement une fois présents."
|
||||
t MSG_115 "Téléchargement nécessaire"
|
||||
|
||||
# Tootips
|
||||
|
|
@ -1853,7 +1857,7 @@ t MSG_186 "Aucun service ou tâche de fond n'est installé ou lancé par Rufus ;
|
|||
t MSG_201 "Annulation - Veuillez patienter..."
|
||||
t MSG_202 "Analyse de l'image ISO..."
|
||||
t MSG_203 "Echec d'analyse de l'image ISO"
|
||||
t MSG_204 "Fichier %s obsolète detecté"
|
||||
t MSG_204 "Fichier %s obsolète détecté"
|
||||
t MSG_205 "ISO utilisée: %s"
|
||||
t MSG_206 "Fichier %s manquant"
|
||||
t MSG_207 "Nouveau volume"
|
||||
|
|
@ -1888,10 +1892,10 @@ t MSG_235 "Défauts: PASSE %d/%d - %0.2f%% (%d/%d/%d erreurs)"
|
|||
t MSG_236 "Défauts: Test avec motif aléatoire"
|
||||
t MSG_237 "Défauts: Test avec motif 0x%02X"
|
||||
t MSG_238 "Partitionage (%s)..."
|
||||
t MSG_239 "Effaçement des partitions..."
|
||||
t MSG_240 "Télechargement de %s: Connection..."
|
||||
t MSG_241 "Télechargement: %0.1f%%"
|
||||
t MSG_242 "Echec de télechargement du fichier"
|
||||
t MSG_239 "Effacement des partitions..."
|
||||
t MSG_240 "Téléchargement de %s: Connexion..."
|
||||
t MSG_241 "Téléchargement: %0.1f%%"
|
||||
t MSG_242 "Echec de téléchargement du fichier"
|
||||
t MSG_243 "Recherche des mises à jour..."
|
||||
t MSG_244 "MAJ: Impossible de se connecter"
|
||||
t MSG_245 "MAJ: Pas d'accès aux données de mises à jour"
|
||||
|
|
|
|||
|
|
@ -609,7 +609,7 @@ out:
|
|||
iso_report.sl_version = sl_version;
|
||||
j = (int)i;
|
||||
} else if (iso_report.sl_version != sl_version) {
|
||||
uprintf("Found conflicting %s versions:\n '%s' (v%d.%02d) vs '%s' (v%d.%02d)\n", isolinux_bin,
|
||||
uprintf("Found conflicting %s versions:\n '%s' (%d.%02d) vs '%s' (%d.%02d)\n", isolinux_bin,
|
||||
isolinux_path.String[j], SL_MAJOR(iso_report.sl_version), SL_MINOR(iso_report.sl_version),
|
||||
isolinux_path.String[i], SL_MAJOR(sl_version), SL_MINOR(sl_version));
|
||||
}
|
||||
|
|
@ -621,7 +621,7 @@ out:
|
|||
}
|
||||
}
|
||||
if (iso_report.sl_version != 0) {
|
||||
static_sprintf(iso_report.sl_version_str, "v%d.%02d",
|
||||
static_sprintf(iso_report.sl_version_str, "%d.%02d",
|
||||
SL_MAJOR(iso_report.sl_version), SL_MINOR(iso_report.sl_version));
|
||||
uprintf("Detected Isolinux version: %s (from '%s')",
|
||||
iso_report.sl_version_str, isolinux_path.String[j]);
|
||||
|
|
@ -631,7 +631,7 @@ out:
|
|||
} else {
|
||||
// Couldn't find a version from isolinux.bin. Force set to the versions we embed
|
||||
iso_report.sl_version = embedded_sl_version[has_ldlinux_c32?1:0];
|
||||
static_sprintf(iso_report.sl_version_str, "v%d.%02d",
|
||||
static_sprintf(iso_report.sl_version_str, "%d.%02d",
|
||||
SL_MAJOR(iso_report.sl_version), SL_MINOR(iso_report.sl_version));
|
||||
uprintf("Warning: Could not detect Isolinux version - Forcing to %s (embedded)",
|
||||
iso_report.sl_version_str);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ const char* about_blurb_format =
|
|||
"{\\b\\fs20%s}\\line\n"
|
||||
"\\fs18%s\\line\n"
|
||||
"\\line\n"
|
||||
"Copyright © 2011-2014 Pete Batard / Akeo\\line\n"
|
||||
"%s\\line\n"
|
||||
RUFUS_URL "\\line\n"
|
||||
"\\fs3 \\line\n"
|
||||
"\\fs18%s\\line\n"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* Rufus: The Reliable USB Formatting Utility
|
||||
* Localization tables - autogenerated from resource.h
|
||||
* Copyright © 2013 Pete Batard <pete@akeo.ie>
|
||||
* Copyright © 2013-2014 Pete Batard <pete@akeo.ie>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
echo This file recreates localization_data.c according resource.h
|
||||
echo
|
||||
|
||||
# check that sed are available
|
||||
# check that sed is available
|
||||
type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; }
|
||||
|
||||
# Create the first sed command file
|
||||
|
|
@ -12,7 +12,7 @@ cat > cmd.sed <<\_EOF
|
|||
1i /*\
|
||||
* Rufus: The Reliable USB Formatting Utility\
|
||||
* Localization tables - autogenerated from resource.h\
|
||||
* Copyright © 2013 Pete Batard <pete@akeo.ie>\
|
||||
* Copyright © 2013-2014 Pete Batard <pete@akeo.ie>\
|
||||
*\
|
||||
* This program is free software: you can redistribute it and/or modify\
|
||||
* it under the terms of the GNU General Public License as published by\
|
||||
|
|
|
|||
42
src/rufus.c
42
src/rufus.c
|
|
@ -142,7 +142,7 @@ BOOL iso_op_in_progress = FALSE, format_op_in_progress = FALSE, right_to_left_mo
|
|||
BOOL enable_HDDs = FALSE, advanced_mode = TRUE, force_update = FALSE;
|
||||
int dialog_showing = 0;
|
||||
uint16_t rufus_version[4], embedded_sl_version[2];
|
||||
char embedded_sl_version_str[2][12] = { "v?.??", "v?.??" };
|
||||
char embedded_sl_version_str[2][12] = { "?.??", "?.??" };
|
||||
RUFUS_UPDATE update = { {0,0,0,0}, {0,0}, NULL, NULL};
|
||||
extern char szStatusMessage[256];
|
||||
|
||||
|
|
@ -1400,7 +1400,7 @@ static BOOL BootCheck(void)
|
|||
IGNORE_RETVAL(_chdir(FILES_DIR));
|
||||
for (i=0; i<2; i++) {
|
||||
// Check if we already have the relevant ldlinux_v#.##.sys & ldlinux_v#.##.bss files
|
||||
static_sprintf(tmp, "%s-%s/%s.%s", syslinux, &iso_report.sl_version_str[1], ldlinux, ldlinux_ext[i]);
|
||||
static_sprintf(tmp, "%s-%s/%s.%s", syslinux, iso_report.sl_version_str, ldlinux, ldlinux_ext[i]);
|
||||
fd = fopen(tmp, "rb");
|
||||
if (fd != NULL) {
|
||||
fseek(fd, 0, SEEK_END);
|
||||
|
|
@ -1410,18 +1410,18 @@ static BOOL BootCheck(void)
|
|||
}
|
||||
if ((syslinux_ldlinux_len[0] != 0) && (syslinux_ldlinux_len[1] != 0)) {
|
||||
uprintf("Will reuse '%s.%s' and '%s.%s' from './%s/%s-%s/' for Syslinux installation\n",
|
||||
ldlinux, ldlinux_ext[0], ldlinux, ldlinux_ext[1], FILES_DIR, syslinux, &iso_report.sl_version_str[1]);
|
||||
ldlinux, ldlinux_ext[0], ldlinux, ldlinux_ext[1], FILES_DIR, syslinux, iso_report.sl_version_str);
|
||||
} else {
|
||||
r = MessageBoxU(hMainDialog, lmprintf(MSG_114, iso_report.sl_version_str, embedded_sl_version_str[1]),
|
||||
lmprintf(MSG_115), MB_YESNO|MB_ICONWARNING|MB_IS_RTL);
|
||||
if (r != IDYES)
|
||||
return FALSE;
|
||||
for (i=0; i<2; i++) {
|
||||
static_sprintf(tmp, "%s-%s", syslinux, &iso_report.sl_version_str[1]);
|
||||
static_sprintf(tmp, "%s-%s", syslinux, iso_report.sl_version_str);
|
||||
IGNORE_RETVAL(_mkdir(tmp));
|
||||
static_sprintf(tmp, "%s.%s %s", ldlinux, ldlinux_ext[i], iso_report.sl_version_str);
|
||||
SetWindowTextU(hISOProgressDlg, lmprintf(MSG_085, tmp));
|
||||
static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, &iso_report.sl_version_str[1], ldlinux, ldlinux_ext[i]);
|
||||
static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, iso_report.sl_version_str, ldlinux, ldlinux_ext[i]);
|
||||
SetWindowTextU(hISOFileName, tmp);
|
||||
syslinux_ldlinux_len[i] = DownloadFile(tmp, &tmp[sizeof(FILES_URL)], hISOProgressDlg);
|
||||
if (syslinux_ldlinux_len[i] == 0) {
|
||||
|
|
@ -1435,7 +1435,7 @@ static BOOL BootCheck(void)
|
|||
IGNORE_RETVAL(_chdirU(app_dir));
|
||||
IGNORE_RETVAL(_mkdir(FILES_DIR));
|
||||
IGNORE_RETVAL(_chdir(FILES_DIR));
|
||||
static_sprintf(tmp, "%s-%s/%s.%s", syslinux, &embedded_sl_version_str[1][1], ldlinux, ldlinux_ext[2]);
|
||||
static_sprintf(tmp, "%s-%s/%s.%s", syslinux, embedded_sl_version_str[1], ldlinux, ldlinux_ext[2]);
|
||||
fd = fopenU(tmp, "rb");
|
||||
if (fd != NULL) {
|
||||
uprintf("Will reuse './%s/%s' for Syslinux installation\n", FILES_DIR, tmp);
|
||||
|
|
@ -1449,9 +1449,9 @@ static BOOL BootCheck(void)
|
|||
if (r == IDCANCEL)
|
||||
return FALSE;
|
||||
if (r == IDYES) {
|
||||
static_sprintf(tmp, "%s-%s", syslinux, &embedded_sl_version_str[1][1]);
|
||||
static_sprintf(tmp, "%s-%s", syslinux, embedded_sl_version_str[1]);
|
||||
IGNORE_RETVAL(_mkdir(tmp));
|
||||
static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, &embedded_sl_version_str[1][1], ldlinux, ldlinux_ext[2]);
|
||||
static_sprintf(tmp, "%s/%s-%s/%s.%s", FILES_URL, syslinux, embedded_sl_version_str[1], ldlinux, ldlinux_ext[2]);
|
||||
SetWindowTextU(hISOProgressDlg, lmprintf(MSG_085, tmp));
|
||||
SetWindowTextU(hISOFileName, tmp);
|
||||
DownloadFile(tmp, &tmp[sizeof(FILES_URL)], hISOProgressDlg);
|
||||
|
|
@ -1516,22 +1516,26 @@ void InitDialog(HWND hDlg)
|
|||
GetWindowTextA(hDlg, tmp, sizeof(tmp));
|
||||
// Count of Microsoft for making it more attractive to read a
|
||||
// version using strtok() than using GetFileVersionInfo()
|
||||
token = strtok(tmp, "v");
|
||||
token = strtok(tmp, " ");
|
||||
for (i=0; (i<4) && ((token = strtok(NULL, ".")) != NULL); i++)
|
||||
rufus_version[i] = (uint16_t)atoi(token);
|
||||
uprintf(APPLICATION_NAME " version %d.%d.%d.%d\n", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
|
||||
uprintf("Windows version: %s\n", WindowsVersionStr);
|
||||
if (right_to_left_mode) {
|
||||
static_sprintf(tmp, "%d.%d.%d.%d " APPLICATION_NAME, rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
|
||||
SetWindowTextU(hDlg, tmp);
|
||||
}
|
||||
uprintf(APPLICATION_NAME " version: %d.%d.%d.%d\n", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]);
|
||||
for (i=0; i<ARRAYSIZE(resource); i++) {
|
||||
buf = (char*)GetResource(hMainInstance, resource[i], _RT_RCDATA, "ldlinux_sys", &len, FALSE);
|
||||
if ((buf == NULL) || (len < 16)) {
|
||||
uprintf("Warning: could not read embedded Syslinux v%d version", i+4);
|
||||
} else {
|
||||
embedded_sl_version[i] = (((uint8_t)strtoul(&buf[0xb], &token, 10))<<8) + (uint8_t)strtoul(&token[1], NULL, 10);
|
||||
static_sprintf(embedded_sl_version_str[i], "v%d.%02d", SL_MAJOR(embedded_sl_version[i]), SL_MINOR(embedded_sl_version[i]));
|
||||
static_sprintf(embedded_sl_version_str[i], "%d.%02d", SL_MAJOR(embedded_sl_version[i]), SL_MINOR(embedded_sl_version[i]));
|
||||
}
|
||||
}
|
||||
uprintf("Syslinux version: %s, %s", embedded_sl_version_str[0], embedded_sl_version_str[1]);
|
||||
uprintf("LCID: 0x%04X\n", GetUserDefaultUILanguage());
|
||||
uprintf("Syslinux versions: %s, %s", embedded_sl_version_str[0], embedded_sl_version_str[1]);
|
||||
uprintf("Windows version: %s\n", WindowsVersionStr);
|
||||
uprintf("Locale ID: 0x%04X\n", GetUserDefaultUILanguage());
|
||||
|
||||
SetClusterSizeLabels();
|
||||
|
||||
|
|
@ -2394,13 +2398,13 @@ relaunch:
|
|||
* sets of dialog resources: one mirrored and one nonmirrored."
|
||||
* Unfortunately, this limitation is VERY REAL, so that's what we have to go through, and
|
||||
* furthermore, trying to switch part of the dialogs back to LTR is also a major exercise
|
||||
* in frustration, because it's next to impossible which combination of WS_EX_RTLREADING,
|
||||
* WS_EX_RIGHT, WS_EX_LAYOUTRTL, WS_EX_LEFTSCROLLBAR and ES_RIGHT will work, plus there's
|
||||
* no way to toggle ES_RIGHT at runtime anyway.
|
||||
* in frustration, because it's next to impossible to figure out which combination of
|
||||
* WS_EX_RTLREADING, WS_EX_RIGHT, WS_EX_LAYOUTRTL, WS_EX_LEFTSCROLLBAR and ES_RIGHT will
|
||||
* work... and there's no way to toggle ES_RIGHT at runtime anyway.
|
||||
* So, just like Microsoft advocates, we go through a massive duplication of all our RC
|
||||
* dialogs (our RTL dialogs having their IDD's offset by +100 - see IDD_IS_RTL), just to
|
||||
* add a handful of stupid flags. And of course, now we'll have to figure out a way to keep
|
||||
* the RTL and non RTL duplicated dialogs always in sync...
|
||||
* add a handful of stupid flags. And of course, we also have to go through a whole other
|
||||
* exercise just so that our RTL and non RTL duplicated dialogs are kept in sync...
|
||||
*/
|
||||
hDlg = CreateDialogW(hInstance, MAKEINTRESOURCEW(IDD_DIALOG + IDD_IS_RTL), NULL, MainCallback);
|
||||
if (hDlg == NULL) {
|
||||
|
|
|
|||
20
src/rufus.rc
20
src/rufus.rc
|
|
@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
|
||||
IDD_DIALOG DIALOGEX 12, 12, 206, 329
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Rufus v1.4.3.390"
|
||||
CAPTION "Rufus 1.4.4.391"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
|
||||
|
|
@ -75,7 +75,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
|
|||
CAPTION "About Rufus"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
BEGIN
|
||||
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,21,20
|
||||
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20
|
||||
DEFPUSHBUTTON "OK",IDOK,251,207,50,14,WS_GROUP
|
||||
PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,207,50,14,WS_GROUP
|
||||
CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,107,267,90,WS_EX_STATICEDGE
|
||||
|
|
@ -165,7 +165,7 @@ END
|
|||
RTL_IDD_DIALOG DIALOGEX 12, 12, 206, 329
|
||||
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
|
||||
CAPTION "Rufus v1.4.3.390"
|
||||
CAPTION "Rufus 1.4.4.391"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Start",IDC_START,94,291,50,14
|
||||
|
|
@ -212,8 +212,8 @@ BEGIN
|
|||
ICON IDI_ICON,IDC_ABOUT_ICON,11,8,20,20
|
||||
DEFPUSHBUTTON "OK",IDOK,251,207,50,14,WS_GROUP
|
||||
PUSHBUTTON "License",IDC_ABOUT_LICENSE,46,207,50,14,WS_GROUP
|
||||
CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",WS_VSCROLL | 0x806,46,107,267,90,WS_EX_RTLREADING | WS_EX_STATICEDGE
|
||||
CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",WS_TABSTOP | 0x884,45,7,268,99
|
||||
CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_RIGHT | ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,107,267,90,WS_EX_STATICEDGE | WS_EX_RTLREADING
|
||||
CONTROL "",IDC_ABOUT_BLURB,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_TABSTOP,45,7,268,99
|
||||
PUSHBUTTON "Updates",IDC_ABOUT_UPDATES,100,207,50,14,NOT WS_VISIBLE | WS_GROUP
|
||||
END
|
||||
|
||||
|
|
@ -290,7 +290,7 @@ CAPTION "Check For Updates - Rufus"
|
|||
FONT 8, "MS Shell Dlg", 400, 0, 0x0
|
||||
BEGIN
|
||||
PUSHBUTTON "Close",IDCANCEL,167,244,50,14,WS_GROUP
|
||||
CONTROL "",IDC_RELEASE_NOTES,"RichEdit20W",WS_VSCROLL | 0x804,15,77,352,88,WS_EX_STATICEDGE
|
||||
CONTROL "",IDC_RELEASE_NOTES,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,15,77,352,88,WS_EX_STATICEDGE
|
||||
DEFPUSHBUTTON "Download",IDC_DOWNLOAD,293,211,74,14,WS_GROUP
|
||||
CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,15,212,270,11
|
||||
GROUPBOX "Release Notes",IDS_NEW_VERSION_NOTES_GRP,8,63,367,111
|
||||
|
|
@ -427,8 +427,8 @@ END
|
|||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 1,4,3,390
|
||||
PRODUCTVERSION 1,4,3,390
|
||||
FILEVERSION 1,4,4,391
|
||||
PRODUCTVERSION 1,4,4,391
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
|
|
@ -445,13 +445,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||
VALUE "FileDescription", "Rufus"
|
||||
VALUE "FileVersion", "1.4.3.390"
|
||||
VALUE "FileVersion", "1.4.4.391"
|
||||
VALUE "InternalName", "Rufus"
|
||||
VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)"
|
||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||
VALUE "OriginalFilename", "rufus.exe"
|
||||
VALUE "ProductName", "Rufus"
|
||||
VALUE "ProductVersion", "1.4.3.390"
|
||||
VALUE "ProductVersion", "1.4.4.391"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
|
|
|||
|
|
@ -513,6 +513,7 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
|
|||
ShowWindow(GetDlgItem(hDlg, IDC_ABOUT_UPDATES), SW_SHOW);
|
||||
safe_sprintf(about_blurb, sizeof(about_blurb), about_blurb_format, lmprintf(MSG_174),
|
||||
lmprintf(MSG_175, rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]),
|
||||
right_to_left_mode?"Akeo \\\\ Pete Batard 2011-2014 © Copyright":"Copyright © 2011-2014 Pete Batard / Akeo",
|
||||
lmprintf(MSG_176), lmprintf(MSG_177), lmprintf(MSG_178));
|
||||
for (i=0; i<ARRAYSIZE(hEdit); i++) {
|
||||
hEdit[i] = GetDlgItem(hDlg, edit_id[i]);
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ BOOL InstallSyslinux(DWORD drive_index, char drive_letter)
|
|||
syslinux_ldlinux[i] = (unsigned char*) malloc(syslinux_ldlinux_len[i]);
|
||||
if (syslinux_ldlinux[i] == NULL)
|
||||
goto out;
|
||||
static_sprintf(path, "%s/%s-%s/%s.%s", FILES_DIR, syslinux, &iso_report.sl_version_str[1], ldlinux, i==0?"sys":"bss");
|
||||
static_sprintf(path, "%s/%s-%s/%s.%s", FILES_DIR, syslinux, iso_report.sl_version_str, ldlinux, i==0?"sys":"bss");
|
||||
fd = fopen(path, "rb");
|
||||
if (fd == NULL) {
|
||||
uprintf("Could not open %s\n", path);
|
||||
|
|
@ -238,7 +238,7 @@ BOOL InstallSyslinux(DWORD drive_index, char drive_letter)
|
|||
|
||||
if (dt == DT_SYSLINUX_V5) {
|
||||
IGNORE_RETVAL(_chdirU(app_dir));
|
||||
static_sprintf(path, "%s/%s-%s", FILES_DIR, syslinux, &embedded_sl_version_str[1][1]);
|
||||
static_sprintf(path, "%s/%s-%s", FILES_DIR, syslinux, embedded_sl_version_str[1]);
|
||||
IGNORE_RETVAL(_chdir(path));
|
||||
static_sprintf(path, "%C:\\%s.%s", drive_letter, ldlinux, ldlinux_ext[2]);
|
||||
fd = fopen(&path[3], "rb");
|
||||
|
|
@ -247,7 +247,7 @@ BOOL InstallSyslinux(DWORD drive_index, char drive_letter)
|
|||
} else {
|
||||
fclose(fd);
|
||||
if (CopyFileA(&path[3], path, TRUE)) {
|
||||
uprintf("Created '%s' (from '%s/%s-%s/%s')", path, FILES_DIR, syslinux, &embedded_sl_version_str[1][1], &path[3]);
|
||||
uprintf("Created '%s' (from '%s/%s-%s/%s')", path, FILES_DIR, syslinux, embedded_sl_version_str[1], &path[3]);
|
||||
} else {
|
||||
uprintf("Failed to create '%s': %s\n", path, WindowsErrorString());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue