nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[misc] drop the micro from the version 

* Closes #439
This commit is contained in:
Pete Batard 2015-02-08 22:36:57 +00:00
parent 61d2efc6b7
commit 1c322aba56
12 changed files with 154 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
_chver.sh
View File

@ -5,12 +5,11 @@
type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; } type -P sed &>/dev/null || { echo "sed command not found. Aborting." >&2; exit 1; }
if [ ! -n "$1" ]; then if [ ! -n "$1" ]; then
echo "you must provide a version number (eg. 1.0.2)" echo "you must provide a version number (eg. 2.1)"
exit 1 exit 1
else else
MAJOR=`echo $1 | sed "s/\(.*\)[.].*[.].*/\1/"` MAJOR=`echo $1 | sed "s/\(.*\)[.].*/\1/"`
MINOR=`echo $1 | sed "s/.*[.]\(.*\)[.].*/\1/"` MINOR=`echo $1 | sed "s/.*[.]\(.*\)/\1/"`
MICRO=`echo $1 | sed "s/.*[.].*[.]\(.*\)/\1/"`
fi fi
case $MAJOR in *[!0-9]*) case $MAJOR in *[!0-9]*)
echo "$MAJOR is not a number" echo "$MAJOR is not a number"
@ -20,22 +19,18 @@ case $MINOR in *[!0-9]*)
echo "$MINOR is not a number" echo "$MINOR is not a number"
exit 1 exit 1
esac esac
case $MICRO in *[!0-9]*) echo "changing version to $MAJOR.$MINOR"
echo "$MICRO is not a number" sed -i -e "s/^AC_INIT(\[\([^ ]*\)\], \[[^ ]*\]\(.*\)/AC_INIT([\1], [$MAJOR.$MINOR]\2/" configure.ac
exit 1
esac
echo "changing version to $MAJOR.$MINOR.$MICRO"
sed -i -e "s/^AC_INIT(\[\([^ ]*\)\], \[[^ ]*\]\(.*\)/AC_INIT([\1], [$MAJOR.$MINOR.$MICRO]\2/" configure.ac
cat > cmd.sed <<\_EOF cat > cmd.sed <<\_EOF
s/^[ \t]*FILEVERSION[ \t]*.*,.*,.*,\(.*\)/ FILEVERSION @@MAJOR@@,@@MINOR@@,@@MICRO@@,\1/ s/^[ \t]*FILEVERSION[ \t]*.*,.*,\(.*\),\(.*\)/ FILEVERSION @@MAJOR@@,@@MINOR@@,\1,\2/
s/^[ \t]*PRODUCTVERSION[ \t]*.*,.*,.*,\(.*\)/ PRODUCTVERSION @@MAJOR@@,@@MINOR@@,@@MICRO@@,\1/ s/^[ \t]*PRODUCTVERSION[ \t]*.*,.*,\(.*\),\(.*\)/ PRODUCTVERSION @@MAJOR@@,@@MINOR@@,\1,\2/
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*".*\..*\..*\.\(.*\)"/\1VALUE "FileVersion", "@@MAJOR@@.@@MINOR@@.@@MICRO@@.\2"/ s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*".*\..*\.\(.*\)"/\1VALUE "FileVersion", "@@MAJOR@@.@@MINOR@@.\2"/
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*".*\..*\..*\.\(.*\)"/\1VALUE "ProductVersion", "@@MAJOR@@.@@MINOR@@.@@MICRO@@.\2"/ s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*".*\..*\.\(.*\)"/\1VALUE "ProductVersion", "@@MAJOR@@.@@MINOR@@.\2"/
s/^\(.*\)"Rufus \(.*\)\.\(.*\)"\(.*\)/\1"Rufus @@MAJOR@@.@@MINOR@@.@@MICRO@@.\3"\4/ s/^\(.*\)"Rufus \.*\.\.*\.\(.*\)\.\(.*\)"\(.*\)/\1"Rufus @@MAJOR@@.@@MINOR@@.\2.\3"\4/
_EOF _EOF
# First run sed to substitute our variable in the sed command file # First run sed to substitute our variable in the sed command file
sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" -e "s/@@MICRO@@/$MICRO/g" cmd.sed sed -i -e "s/@@MAJOR@@/$MAJOR/g" -e "s/@@MINOR@@/$MINOR/g" cmd.sed
sed -i -f cmd.sed src/rufus.rc sed -i -f cmd.sed src/rufus.rc
sed -i 's/$/\r/' src/rufus.rc sed -i 's/$/\r/' src/rufus.rc
rm cmd.sed rm cmd.sed

12
_pre-commit.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Bumps the nano version according to the number of commits on this branch # Bumps the micro version according to the number of commits on this branch
# #
# To have git run this script on commit, create a "pre-commit" text file in # To have git run this script on commit, create a "pre-commit" text file in
# .git/hooks/ with the following content: # .git/hooks/ with the following content:
@ -15,22 +15,22 @@ type -P git &>/dev/null || { echo "git command not found. Aborting." >&2; exit 1
VER=`git log --oneline | wc -l` VER=`git log --oneline | wc -l`
# adjust so that we match the github commit count # adjust so that we match the github commit count
TAGVER=`expr $VER + 1` TAGVER=`expr $VER + 1`
# there may be a better way to prevent improper nano on amend. For now the detection # there may be a better way to prevent improper micro on amend. For now the detection
# of a .amend file in the current directory will do # of a .amend file in the current directory will do
if [ -f ./.amend ]; then if [ -f ./.amend ]; then
TAGVER=`expr $TAGVER - 1` TAGVER=`expr $TAGVER - 1`
git tag -d "b$TAGVER" git tag -d "b$TAGVER"
rm ./.amend; rm ./.amend;
fi fi
echo "setting nano to $TAGVER" echo "setting micro to $TAGVER"
echo $TAGVER > .tag echo $TAGVER > .tag
cat > cmd.sed <<\_EOF cat > cmd.sed <<\_EOF
s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ FILEVERSION \1,\2,\3,@@TAGVER@@/ s/^[ \t]*FILEVERSION[ \t]*\(.*\),\(.*\),.*,\(.*\)/ FILEVERSION \1,\2,@@TAGVER@@,\3/
s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),\(.*\),.*/ PRODUCTVERSION \1,\2,\3,@@TAGVER@@/ s/^[ \t]*PRODUCTVERSION[ \t]*\(.*\),\(.*\),.*,\(.*\)/ PRODUCTVERSION \1,\2,@@TAGVER@@,\3/
s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@TAGVER@@"/ s/^\([ \t]*\)VALUE[ \t]*"FileVersion",[ \t]*"\(.*\)\..*"/\1VALUE "FileVersion", "\2.@@TAGVER@@"/
s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@TAGVER@@"/ s/^\([ \t]*\)VALUE[ \t]*"ProductVersion",[ \t]*"\(.*\)\..*"/\1VALUE "ProductVersion", "\2.@@TAGVER@@"/
s/^\(.*\)"Rufus \(.*\)\.\(.*\)"\(.*\)/\1"Rufus \2.@@TAGVER@@"\4/ s/^\(.*\)"Rufus \(.*\)\..*"\(.*\)/\1"Rufus \2.@@TAGVER@@"\3/
_EOF _EOF
# First run sed to substitute our variable in the sed command file # First run sed to substitute our variable in the sed command file

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.69 for rufus 2.0.0. # Generated by GNU Autoconf 2.69 for rufus 2.0.
# #
# Report bugs to <https://github.com/pbatard/rufus/issues>. # Report bugs to <https://github.com/pbatard/rufus/issues>.
# #
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='rufus' PACKAGE_NAME='rufus'
PACKAGE_TARNAME='rufus' PACKAGE_TARNAME='rufus'
PACKAGE_VERSION='2.0.0' PACKAGE_VERSION='2.0'
PACKAGE_STRING='rufus 2.0.0' PACKAGE_STRING='rufus 2.0'
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'
@ -1226,7 +1226,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 2.0.0 to adapt to many kinds of systems. \`configure' configures rufus 2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1292,7 +1292,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 2.0.0:";; short | recursive ) echo "Configuration of rufus 2.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1382,7 +1382,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 2.0.0 rufus configure 2.0
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -1437,7 +1437,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 2.0.0, which was It was created by rufus $as_me 2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -2300,7 +2300,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='rufus' PACKAGE='rufus'
VERSION='2.0.0' VERSION='2.0'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -4371,7 +4371,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 2.0.0, which was This file was extended by rufus $as_me 2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -4425,7 +4425,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 2.0.0 rufus config.status 2.0
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"

4
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([rufus], [2.0.0], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AC_INIT([rufus], [2.0], [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])
@ -38,7 +38,7 @@ if test "x$alpha_enabled" != "xno" ; then
CFLAGS+=" -DALPHA" CFLAGS+=" -DALPHA"
SUFFIX=_ALPHA SUFFIX=_ALPHA
fi fi
AC_ARG_ENABLE([beta],[AS_HELP_STRING([--enable-beta], [build a BETA release (default=no)])], [beta_enabled=$enableval], [beta_enabled='no']) AC_ARG_ENABLE([beta],[AS_HELP_STRING([--enable-beta], [build a BETA release (default=no)])], [beta_enabled=$enableval], [beta_enabled='no'])
if test "x$beta_enabled" != "xno" ; then if test "x$beta_enabled" != "xno" ; then
CFLAGS+=" -DBETA" CFLAGS+=" -DBETA"
SUFFIX=_BETA SUFFIX=_BETA

194
res/localization/rufus.loc
View File

@ -187,8 +187,8 @@ t MSG_014 "Daily"
t MSG_015 "Weekly" t MSG_015 "Weekly"
t MSG_016 "Monthly" t MSG_016 "Monthly"
t MSG_017 "Custom" t MSG_017 "Custom"
t MSG_018 "Your version: %d.%d.%d (Build %d)" t MSG_018 "Your version: %d.%d (Build %d)"
t MSG_019 "Latest version: %d.%d.%d (Build %d)" t MSG_019 "Latest version: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -389,7 +389,7 @@ t MSG_172 "Licensing information and credits"
t MSG_173 "Click to select..." t MSG_173 "Click to select..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Version %d.%d.%d (Build %d)" t MSG_175 "Version %d.%d (Build %d)"
t MSG_176 "English translation: Pete Batard <mailto:pete@akeo.ie>" t MSG_176 "English translation: Pete Batard <mailto:pete@akeo.ie>"
t MSG_177 "Report bugs or request enhancements at:" t MSG_177 "Report bugs or request enhancements at:"
t MSG_178 "Additional Copyrights:" t MSG_178 "Additional Copyrights:"
@ -612,8 +612,8 @@ t MSG_014 "يومياً"
t MSG_015 "أسبوعاً" t MSG_015 "أسبوعاً"
t MSG_016 "شهرياً" t MSG_016 "شهرياً"
t MSG_017 "معدّل" t MSG_017 "معدّل"
t MSG_018 "نسختك: %d.%d.%d (Build %d)" t MSG_018 "نسختك: %d.%d (Build %d)"
t MSG_019 "آخر نسخة: %d.%d.%d (Build %d)" t MSG_019 "آخر نسخة: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "بايت" t MSG_020 "بايت"
t MSG_021 "KB" t MSG_021 "KB"
@ -795,7 +795,7 @@ t MSG_173 "إضغط لاختيار..."
t MSG_174 "Rufus‏ - أداة فرمتة الـ USB‏ جدية بالثقة" t MSG_174 "Rufus‏ - أداة فرمتة الـ USB‏ جدية بالثقة"
# This one's a massive empirical fest of RTL marks and nonsensical parenthesis, to # 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!!! # make the output look about right... If you edit this, all I can say is: GOOD LUCK!!!
t MSG_175 "إصدار ‏ %d.%d.%d‏)بناء‏ ‏%d‏(" t MSG_175 "إصدار ‏ %d.%d‏)بناء‏ ‏%d‏("
t MSG_176 "ترجمة العربي: عمر الصمد <mailto:omarkk@msn.com>" t MSG_176 "ترجمة العربي: عمر الصمد <mailto:omarkk@msn.com>"
t MSG_177 "إخبار عن مشكلة أو طلب تعديلات على:" t MSG_177 "إخبار عن مشكلة أو طلب تعديلات على:"
t MSG_178 "حقوق الطبع والنشر الإضافية:" t MSG_178 "حقوق الطبع والنشر الإضافية:"
@ -1030,8 +1030,8 @@ t MSG_014 "Ежедневно"
t MSG_015 "Седмично" t MSG_015 "Седмично"
t MSG_016 "Месечно" t MSG_016 "Месечно"
t MSG_017 "Персонално" t MSG_017 "Персонално"
t MSG_018 "Вашата версия е: %d.%d.%d (Build %d)" t MSG_018 "Вашата версия е: %d.%d (Build %d)"
t MSG_019 "Последната версия е: %d.%d.%d (Build %d)" t MSG_019 "Последната версия е: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -1209,7 +1209,7 @@ t MSG_172 "Лицензна информация и разработчици"
t MSG_173 "Натиснете тук за да изберете..." t MSG_173 "Натиснете тук за да изберете..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Надеждната USB Форматираща програма" t MSG_174 "Rufus - Надеждната USB Форматираща програма"
t MSG_175 "Версия %d.%d.%d (Build %d)" t MSG_175 "Версия %d.%d (Build %d)"
t MSG_176 "Български превод: Krasimir Nevenov <mailto:berzabel@yahoo.com>" t MSG_176 "Български превод: Krasimir Nevenov <mailto:berzabel@yahoo.com>"
t MSG_177 "Докладвайте за проблем или изискайте подобрения на:" t MSG_177 "Докладвайте за проблем или изискайте подобрения на:"
t MSG_178 "Допълнителни авторски права:" t MSG_178 "Допълнителни авторски права:"
@ -1406,8 +1406,8 @@ t MSG_014 "每日"
t MSG_015 "每周" t MSG_015 "每周"
t MSG_016 "每月" t MSG_016 "每月"
t MSG_017 "自定义" t MSG_017 "自定义"
t MSG_018 "目前版本：%d.%d.%d (Build %d)" t MSG_018 "目前版本：%d.%d (Build %d)"
t MSG_019 "最新版本：%d.%d.%d (Build %d)" t MSG_019 "最新版本：%d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "B" t MSG_020 "B"
t MSG_021 "KB" t MSG_021 "KB"
@ -1567,7 +1567,7 @@ t MSG_172 "许可证和开发者信息"
t MSG_173 "单击选择..." t MSG_173 "单击选择..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - 快速可靠的 USB 格式化工具" t MSG_174 "Rufus - 快速可靠的 USB 格式化工具"
t MSG_175 "版本 %d.%d.%d (Build %d)" t MSG_175 "版本 %d.%d (Build %d)"
t MSG_176 "简体中文翻译者：佚名 <mailto:acc_reg@aol.com>" t MSG_176 "简体中文翻译者：佚名 <mailto:acc_reg@aol.com>"
t MSG_177 "报告错误或请求新功能：" t MSG_177 "报告错误或请求新功能："
t MSG_178 "更多版权信息：" t MSG_178 "更多版权信息："
@ -1776,8 +1776,8 @@ t MSG_014 "每天"
t MSG_015 "每週" t MSG_015 "每週"
t MSG_016 "每月" t MSG_016 "每月"
t MSG_017 "自訂" t MSG_017 "自訂"
t MSG_018 "目前版本: %d.%d.%d (Build %d)" t MSG_018 "目前版本: %d.%d (Build %d)"
t MSG_019 "最新版本: %d.%d.%d (Build %d)" t MSG_019 "最新版本: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -1931,7 +1931,7 @@ t MSG_172 "授權合約、開發者資料等資訊"
t MSG_173 "選取內容..." t MSG_173 "選取內容..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - 快速可靠的 USB 格式化工具" t MSG_174 "Rufus - 快速可靠的 USB 格式化工具"
t MSG_175 "版本 %d.%d.%d (Build %d)" t MSG_175 "版本 %d.%d (Build %d)"
t MSG_176 "正體中文譯者: 佚 <mailto:mmmeow@gmail.com>" t MSG_176 "正體中文譯者: 佚 <mailto:mmmeow@gmail.com>"
t MSG_177 "Bug 回報或請求新功能請至: (英文網頁)" t MSG_177 "Bug 回報或請求新功能請至: (英文網頁)"
t MSG_178 "其他著作權資訊:" t MSG_178 "其他著作權資訊:"
@ -2127,8 +2127,8 @@ t MSG_014 "Dnevno"
t MSG_015 "Tjedno" t MSG_015 "Tjedno"
t MSG_016 "Mjesečno" t MSG_016 "Mjesečno"
t MSG_017 "Prilagođeno" t MSG_017 "Prilagođeno"
t MSG_018 "Verzija: %d.%d.%d (Build %d)" t MSG_018 "Verzija: %d.%d (Build %d)"
t MSG_019 "Zadnja verzija: %d.%d.%d (Build %d)" t MSG_019 "Zadnja verzija: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bajta" t MSG_020 "bajta"
t MSG_021 "KB" t MSG_021 "KB"
@ -2326,7 +2326,7 @@ t MSG_172 "Info licenciranja i zahvale"
t MSG_173 "Klikni za odabir..." t MSG_173 "Klikni za odabir..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Verzija %d.%d.%d (Build %d)" t MSG_175 "Verzija %d.%d (Build %d)"
t MSG_176 "Preveo: Dario Komar <mailto:acmefreak@hotmail.com>" t MSG_176 "Preveo: Dario Komar <mailto:acmefreak@hotmail.com>"
t MSG_177 "Prijavite greške u prijevodu na navedenu adresu" t MSG_177 "Prijavite greške u prijevodu na navedenu adresu"
t MSG_178 "Dodatna autorska prava:" t MSG_178 "Dodatna autorska prava:"
@ -2553,8 +2553,8 @@ t MSG_014 "Denně"
t MSG_015 "Týdně" t MSG_015 "Týdně"
t MSG_016 "Měsíčně" t MSG_016 "Měsíčně"
t MSG_017 "Vlastní" t MSG_017 "Vlastní"
t MSG_018 "Vaše verze: %d.%d.%d (Build %d)" t MSG_018 "Vaše verze: %d.%d (Build %d)"
t MSG_019 "Poslední verze: %d.%d.%d (Build %d)" t MSG_019 "Poslední verze: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "B" t MSG_020 "B"
t MSG_021 "KB" t MSG_021 "KB"
@ -2752,7 +2752,7 @@ t MSG_172 "Informace o licenci, aktualizaci a zásluhy"
t MSG_173 "Klepnutím zvolit..." t MSG_173 "Klepnutím zvolit..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Spolehlivý program pro formátování USB" t MSG_174 "Rufus - Spolehlivý program pro formátování USB"
t MSG_175 "Verze %d.%d.%d (Build %d)" t MSG_175 "Verze %d.%d (Build %d)"
t MSG_176 "Čeština: Richard Kahl <mailto:richard.kahl@seznam.cz>" t MSG_176 "Čeština: Richard Kahl <mailto:richard.kahl@seznam.cz>"
t MSG_177 "Nahlášení chyb nebo náměty na zlepšení programu:" t MSG_177 "Nahlášení chyb nebo náměty na zlepšení programu:"
t MSG_178 "Další licenční informace:" t MSG_178 "Další licenční informace:"
@ -2983,8 +2983,8 @@ t MSG_014 "Dagligt"
t MSG_015 "Ugentligt" t MSG_015 "Ugentligt"
t MSG_016 "Månedligt" t MSG_016 "Månedligt"
t MSG_017 "Tilpasset" t MSG_017 "Tilpasset"
t MSG_018 "Din version: %d.%d.%d (Build %d)" t MSG_018 "Din version: %d.%d (Build %d)"
t MSG_019 "Seneste version: %d.%d.%d (Build %d)" t MSG_019 "Seneste version: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -3160,7 +3160,7 @@ t MSG_171 "Start formateringen.\nDette vil SLETTE alle data på målet!"
t MSG_172 "Licens information og anerkendelse" t MSG_172 "Licens information og anerkendelse"
t MSG_173 "Klik for at vælge..." t MSG_173 "Klik for at vælge..."
t MSG_174 "Rufus - Det pålidelige USB formateringsværktøj" t MSG_174 "Rufus - Det pålidelige USB formateringsværktøj"
t MSG_175 "Version %d.%d.%d (Build %d)" t MSG_175 "Version %d.%d (Build %d)"
t MSG_176 "Danish translation: Jens Hansen <mailto:zenzay@gmail.com>" t MSG_176 "Danish translation: Jens Hansen <mailto:zenzay@gmail.com>"
t MSG_177 "Rapporter fejl eller anmod om forbedringer på:" t MSG_177 "Rapporter fejl eller anmod om forbedringer på:"
t MSG_178 "Yderligere rettigheder:" t MSG_178 "Yderligere rettigheder:"
@ -3375,8 +3375,8 @@ t MSG_014 "Dagelijks"
t MSG_015 "Wekelijks" t MSG_015 "Wekelijks"
t MSG_016 "Maandelijks" t MSG_016 "Maandelijks"
t MSG_017 "Aangepast" t MSG_017 "Aangepast"
t MSG_018 "Huidige versie: %d.%d.%d (Build %d)" t MSG_018 "Huidige versie: %d.%d (Build %d)"
t MSG_019 "Laatste versie: %d.%d.%d (Build %d)" t MSG_019 "Laatste versie: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -3544,7 +3544,7 @@ t MSG_172 "Licentie informatie en credits"
t MSG_173 "Klik om te selecteren..." t MSG_173 "Klik om te selecteren..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - De betrouwbare USB Formatteer Tool" t MSG_174 "Rufus - De betrouwbare USB Formatteer Tool"
t MSG_175 "Versie %d.%d.%d (Build %d)" t MSG_175 "Versie %d.%d (Build %d)"
t MSG_176 "Nederlandse vertaling: Roberto Pino <mailto:rcpac@ziggo.nl>" t MSG_176 "Nederlandse vertaling: Roberto Pino <mailto:rcpac@ziggo.nl>"
t MSG_177 "Meld fouten of verbeteringsverzoeken naar:" t MSG_177 "Meld fouten of verbeteringsverzoeken naar:"
t MSG_178 "Aanvullende Auteursrechten:" t MSG_178 "Aanvullende Auteursrechten:"
@ -3748,8 +3748,8 @@ t MSG_014 "Päivittäin"
t MSG_015 "Viikoittain" t MSG_015 "Viikoittain"
t MSG_016 "Kuukausittain" t MSG_016 "Kuukausittain"
t MSG_017 "Mukautettu" t MSG_017 "Mukautettu"
t MSG_018 "Tämä versio: %d.%d.%d (Build %d)" t MSG_018 "Tämä versio: %d.%d (Build %d)"
t MSG_019 "Viimeisin versio: %d.%d.%d (Build %d)" t MSG_019 "Viimeisin versio: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "tavua" t MSG_020 "tavua"
t MSG_021 "KB" t MSG_021 "KB"
@ -3927,7 +3927,7 @@ t MSG_172 "Lisenssitiedot ja tekijät"
t MSG_173 "Paina valitaksesi..." t MSG_173 "Paina valitaksesi..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Luotettava USB-alustusohjelma" t MSG_174 "Rufus - Luotettava USB-alustusohjelma"
t MSG_175 "Versio %d.%d.%d (Build %d)" t MSG_175 "Versio %d.%d (Build %d)"
t MSG_176 "Suomenkielinen käännös: Riku Brander" t MSG_176 "Suomenkielinen käännös: Riku Brander"
t MSG_177 "Raportoi virheitä tai pyydä parannuksia osoitteessa:" t MSG_177 "Raportoi virheitä tai pyydä parannuksia osoitteessa:"
t MSG_178 "Muut tekijänoikeudet:" t MSG_178 "Muut tekijänoikeudet:"
@ -4131,8 +4131,8 @@ t MSG_014 "Quotidienne"
t MSG_015 "Hebdomadaire" t MSG_015 "Hebdomadaire"
t MSG_016 "Mensuelle" t MSG_016 "Mensuelle"
t MSG_017 "Personnalisée" t MSG_017 "Personnalisée"
t MSG_018 "Votre version : %d.%d.%d (Build %d)" t MSG_018 "Votre version : %d.%d (Build %d)"
t MSG_019 "Dernière version : %d.%d.%d (Build %d)" t MSG_019 "Dernière version : %d.%d (Build %d)"
t MSG_020 "octets" t MSG_020 "octets"
t MSG_021 "Ko" t MSG_021 "Ko"
t MSG_022 "Mo" t MSG_022 "Mo"
@ -4317,7 +4317,7 @@ t MSG_171 "Lance le formatage. Cette opération DETRUIT toutes les données sur
t MSG_172 "Licence et remerciements" t MSG_172 "Licence et remerciements"
t MSG_173 "Cliquez pour sélectionner..." t MSG_173 "Cliquez pour sélectionner..."
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Version %d.%d.%d (Build %d)" t MSG_175 "Version %d.%d (Build %d)"
t MSG_176 "Traduction Française : Pete Batard <mailto:pete@akeo.ie>" t MSG_176 "Traduction Française : Pete Batard <mailto:pete@akeo.ie>"
t MSG_177 "Soumettre un bug ou une demande d'amélioration à :" t MSG_177 "Soumettre un bug ou une demande d'amélioration à :"
t MSG_178 "Copyrights supplémentaires :" t MSG_178 "Copyrights supplémentaires :"
@ -4549,8 +4549,8 @@ t MSG_014 "Täglich"
t MSG_015 "Wöchentlich" t MSG_015 "Wöchentlich"
t MSG_016 "Monatlich" t MSG_016 "Monatlich"
t MSG_017 "Speziell" t MSG_017 "Speziell"
t MSG_018 "Ihre Version: %d.%d.%d (Build %d)" t MSG_018 "Ihre Version: %d.%d (Build %d)"
t MSG_019 "Aktuelle Version: %d.%d.%d (Build %d)" t MSG_019 "Aktuelle Version: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "Byte" t MSG_020 "Byte"
t MSG_021 "KB" t MSG_021 "KB"
@ -4716,7 +4716,7 @@ t MSG_172 "Lizenzinformationen und Mitwirkende"
t MSG_173 "Klicken Sie, um auszuwählen..." t MSG_173 "Klicken Sie, um auszuwählen..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Das zuverlässige USB-Formatierungs Utility" t MSG_174 "Rufus - Das zuverlässige USB-Formatierungs Utility"
t MSG_175 "Version %d.%d.%d (Build %d)" t MSG_175 "Version %d.%d (Build %d)"
t MSG_176 "Deutsche Übersetzung: Thilo Langbein" t MSG_176 "Deutsche Übersetzung: Thilo Langbein"
t MSG_177 "Fehler und Anforderungen an:" t MSG_177 "Fehler und Anforderungen an:"
t MSG_178 "Weitere Copyrights:" t MSG_178 "Weitere Copyrights:"
@ -4956,8 +4956,8 @@ t MSG_014 "Καθημερινά"
t MSG_015 "Εβδομαδιαία" t MSG_015 "Εβδομαδιαία"
t MSG_016 "Μηνιαία" t MSG_016 "Μηνιαία"
t MSG_017 "Προσαρμογή" t MSG_017 "Προσαρμογή"
t MSG_018 "Η έκδοση σας: %d.%d.%d (Build %d)" t MSG_018 "Η έκδοση σας: %d.%d (Build %d)"
t MSG_019 "Τελευταία έκδοση: %d.%d.%d (Build %d)" t MSG_019 "Τελευταία έκδοση: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -5132,7 +5132,7 @@ t MSG_172 "Πληροφορίες για την άδεια χρήσης και c
t MSG_173 "Κάντε κλικ για επιλογή..." t MSG_173 "Κάντε κλικ για επιλογή..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Μία αξιόπιστη εφαρμογή διαμόρφωσης USB" t MSG_174 "Rufus - Μία αξιόπιστη εφαρμογή διαμόρφωσης USB"
t MSG_175 "Έκδοση %d.%d.%d (Build %d)" t MSG_175 "Έκδοση %d.%d (Build %d)"
t MSG_176 "Μετάφραση στα ελληνικά:\\line Konstantinos Margaritis <mailto:kotsos.marga@gmail.com> \\line Nikolaos Margaritis <mailto:marga.nikos@gmail.com>" t MSG_176 "Μετάφραση στα ελληνικά:\\line Konstantinos Margaritis <mailto:kotsos.marga@gmail.com> \\line Nikolaos Margaritis <mailto:marga.nikos@gmail.com>"
t MSG_177 "Για αναφορά σφαλμάτων ή βελτιώσεων επισκεφθείτε το:" t MSG_177 "Για αναφορά σφαλμάτων ή βελτιώσεων επισκεφθείτε το:"
t MSG_178 "Επιπλέον Πνευματικά δικαιώματα:" t MSG_178 "Επιπλέον Πνευματικά δικαιώματα:"
@ -5324,8 +5324,8 @@ t MSG_014 "Naponta"
t MSG_015 "Hetente" t MSG_015 "Hetente"
t MSG_016 "Havonta" t MSG_016 "Havonta"
t MSG_017 "Egyéni" t MSG_017 "Egyéni"
t MSG_018 "A Te verziód %d.%d.%d (%d)" t MSG_018 "A Te verziód %d.%d (%d)"
t MSG_019 "Legfrissebb verzió: %d.%d.%d (%d)" t MSG_019 "Legfrissebb verzió: %d.%d (%d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -5487,7 +5487,7 @@ t MSG_172 "Licenszszel kapcsolatos információk és készítők"
t MSG_173 "Kattints a kiválasztáshoz..." t MSG_173 "Kattints a kiválasztáshoz..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - A megbízható USB formázó" t MSG_174 "Rufus - A megbízható USB formázó"
t MSG_175 "Verzió: %d.%d.%d (Build %d)" t MSG_175 "Verzió: %d.%d (Build %d)"
t MSG_176 "Magyar fordítás: georg1136 <mailto:familyguyfan79@gmail.com>" t MSG_176 "Magyar fordítás: georg1136 <mailto:familyguyfan79@gmail.com>"
t MSG_177 "Hibák jelentése:" t MSG_177 "Hibák jelentése:"
t MSG_178 "Más jogok:" t MSG_178 "Más jogok:"
@ -5710,8 +5710,8 @@ t MSG_014 "Harian"
t MSG_015 "Mingguan" t MSG_015 "Mingguan"
t MSG_016 "Bulanan" t MSG_016 "Bulanan"
t MSG_017 "Custom" t MSG_017 "Custom"
t MSG_018 "Versi Anda: %d.%d.%d (Build %d)" t MSG_018 "Versi Anda: %d.%d (Build %d)"
t MSG_019 "Versi Terbaru: %d.%d.%d (Build %d)" t MSG_019 "Versi Terbaru: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bit" t MSG_020 "bit"
t MSG_021 "KB" t MSG_021 "KB"
@ -5874,7 +5874,7 @@ t MSG_172 "Informasi Perizinan dan kredit"
t MSG_173 "Klik untuk memilih..." t MSG_173 "Klik untuk memilih..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Versi %d.%d.%d (Build %d)" t MSG_175 "Versi %d.%d (Build %d)"
t MSG_176 "Terjemahan Indonesia: Abe Akatsuki <mailto:abeapple@live.com>" t MSG_176 "Terjemahan Indonesia: Abe Akatsuki <mailto:abeapple@live.com>"
t MSG_177 "Laporan bug atau permintaan perangkat tambahan di:" t MSG_177 "Laporan bug atau permintaan perangkat tambahan di:"
t MSG_178 "Hak Cipta Tambahan:" t MSG_178 "Hak Cipta Tambahan:"
@ -6078,8 +6078,8 @@ t MSG_014 "Giornaliero"
t MSG_015 "Settimanale" t MSG_015 "Settimanale"
t MSG_016 "Mensile" t MSG_016 "Mensile"
t MSG_017 "Personalizzato" t MSG_017 "Personalizzato"
t MSG_018 "Versione installata: %d.%d.%d (Build %d)" t MSG_018 "Versione installata: %d.%d (Build %d)"
t MSG_019 "Versione aggiornata: %d.%d.%d (Build %d)" t MSG_019 "Versione aggiornata: %d.%d (Build %d)"
t MSG_020 "byte" t MSG_020 "byte"
t MSG_021 "KB" t MSG_021 "KB"
t MSG_022 "MB" t MSG_022 "MB"
@ -6266,7 +6266,7 @@ t MSG_171 "Avvia l'operazione di formattazione.\nQuesta operazione DISTRUGGERA'
t MSG_172 "Informazioni licenza e ringraziamenti" t MSG_172 "Informazioni licenza e ringraziamenti"
t MSG_173 "Fai clic per selezionare..." t MSG_173 "Fai clic per selezionare..."
t MSG_174 "Rufus - Utility affidabile formattazione unità USB" t MSG_174 "Rufus - Utility affidabile formattazione unità USB"
t MSG_175 "Versione %d.%d.%d (build %d)" t MSG_175 "Versione %d.%d (build %d)"
t MSG_176 "Traduzione italiana a cura di bovirus" t MSG_176 "Traduzione italiana a cura di bovirus"
t MSG_177 "Segnala i problemi o richiedi nuove funzionalità a:" t MSG_177 "Segnala i problemi o richiedi nuove funzionalità a:"
t MSG_178 "Diritti aggiuntivi:" t MSG_178 "Diritti aggiuntivi:"
@ -6527,8 +6527,8 @@ t MSG_014 "毎日"
t MSG_015 "毎週" t MSG_015 "毎週"
t MSG_016 "毎月" t MSG_016 "毎月"
t MSG_017 "Custom" t MSG_017 "Custom"
t MSG_018 "このバージョン： %d.%d.%d (Build %d)" t MSG_018 "このバージョン： %d.%d (Build %d)"
t MSG_019 "最近バージョン： %d.%d.%d (Build %d)" t MSG_019 "最近バージョン： %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "バイト" t MSG_020 "バイト"
t MSG_021 "KB" t MSG_021 "KB"
@ -6706,7 +6706,7 @@ t MSG_172 "ライセンスインフォメーションとクレジット"
t MSG_173 "選択するにはクリック" t MSG_173 "選択するにはクリック"
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - 信頼出来るUSBフォーマットユーティリティ " t MSG_174 "Rufus - 信頼出来るUSBフォーマットユーティリティ "
t MSG_175 "バージョン %d.%d.%d (Build %d)" t MSG_175 "バージョン %d.%d (Build %d)"
t MSG_176 "日本語翻訳: チャンテラ・ジャクソン <mailto:chantella-eng@live.com>" t MSG_176 "日本語翻訳: チャンテラ・ジャクソン <mailto:chantella-eng@live.com>"
t MSG_177 "バグを伝えるまたはお問い合わせ等のためにはこちら：" t MSG_177 "バグを伝えるまたはお問い合わせ等のためにはこちら："
t MSG_178 "雑多な著作権：" t MSG_178 "雑多な著作権："
@ -6905,8 +6905,8 @@ t MSG_014 "매일"
t MSG_015 "매주" t MSG_015 "매주"
t MSG_016 "매월" t MSG_016 "매월"
t MSG_017 "사용자 정의" t MSG_017 "사용자 정의"
t MSG_018 "버전: %d.%d.%d (Build %d)" t MSG_018 "버전: %d.%d (Build %d)"
t MSG_019 "죄신 버전: %d.%d.%d (Build %d)" t MSG_019 "죄신 버전: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -7082,7 +7082,7 @@ t MSG_172 "라이센스 정보와 신용"
t MSG_173 "선택하려면 클릭..." t MSG_173 "선택하려면 클릭..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - 믿을 수 있는 USB 포맷 유틸리티" t MSG_174 "Rufus - 믿을 수 있는 USB 포맷 유틸리티"
t MSG_175 "버전 %d.%d.%d (빌드 %d)" t MSG_175 "버전 %d.%d (빌드 %d)"
t MSG_176 "한국어 번역: 세상사는이야기-나두 <mailto:ho82.kr@gmail.com>" t MSG_176 "한국어 번역: 세상사는이야기-나두 <mailto:ho82.kr@gmail.com>"
t MSG_177 "버그에 대한 보고나 프로그램의 개선을 요청:" t MSG_177 "버그에 대한 보고나 프로그램의 개선을 요청:"
t MSG_178 "추가 저작권:" t MSG_178 "추가 저작권:"
@ -7310,8 +7310,8 @@ t MSG_014 "Ik dienu"
t MSG_015 "Ik nedēļu" t MSG_015 "Ik nedēļu"
t MSG_016 "Ik mēnesi" t MSG_016 "Ik mēnesi"
t MSG_017 "Citādi" t MSG_017 "Citādi"
t MSG_018 "Jūsu versija: %d.%d.%d (Build %d)" t MSG_018 "Jūsu versija: %d.%d (Build %d)"
t MSG_019 "Pēdējā versija: %d.%d.%d (Build %d)" t MSG_019 "Pēdējā versija: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "baiti" t MSG_020 "baiti"
t MSG_021 "KB" t MSG_021 "KB"
@ -7505,7 +7505,7 @@ t MSG_172 "Informācija par licencēm un izstrādātājiem"
t MSG_173 "Piespiediet izvēlei..." t MSG_173 "Piespiediet izvēlei..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - uzticama un vienkārša USB formatēšanas utilīta" t MSG_174 "Rufus - uzticama un vienkārša USB formatēšanas utilīta"
t MSG_175 "Versija %d.%d.%d (Build %d)" t MSG_175 "Versija %d.%d (Build %d)"
t MSG_176 "Latviešu tulkojums: Aldis Tutins <mailto:alibaba@inbox.lv>" t MSG_176 "Latviešu tulkojums: Aldis Tutins <mailto:alibaba@inbox.lv>"
t MSG_177 "Paziņot par kļūdu vai ieteikt uzlabojumus:" t MSG_177 "Paziņot par kļūdu vai ieteikt uzlabojumus:"
t MSG_178 "Papildus autortiesības:" t MSG_178 "Papildus autortiesības:"
@ -7740,8 +7740,8 @@ t MSG_014 "Kasdien"
t MSG_015 "Kas savaitę" t MSG_015 "Kas savaitę"
t MSG_016 "Kas mėnesį" t MSG_016 "Kas mėnesį"
t MSG_017 "Pasirinktinai" t MSG_017 "Pasirinktinai"
t MSG_018 "Jūsų versija: %d.%d.%d (sąranka %d)" t MSG_018 "Jūsų versija: %d.%d (sąranka %d)"
t MSG_019 "Naujausia versija: %d.%d.%d (sąranka %d)" t MSG_019 "Naujausia versija: %d.%d (sąranka %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "baitai" t MSG_020 "baitai"
t MSG_021 "KB" t MSG_021 "KB"
@ -7919,7 +7919,7 @@ t MSG_172 "Licencijavimo informacija ir kreditai"
t MSG_173 "Spauskite pasirinkti..." t MSG_173 "Spauskite pasirinkti..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - patikima USB formatavimo priemonė" t MSG_174 "Rufus - patikima USB formatavimo priemonė"
t MSG_175 "Versija %d.%d.%d (sąranka %d)" t MSG_175 "Versija %d.%d (sąranka %d)"
t MSG_176 "Lietuviškas vertimas: Gintaras Venslovas <gintaras.venslovas@gmail.com>" t MSG_176 "Lietuviškas vertimas: Gintaras Venslovas <gintaras.venslovas@gmail.com>"
t MSG_177 "Dėl pastebėtų klaidų ar pageidaujamų patobulinimų kreipkitės:" t MSG_177 "Dėl pastebėtų klaidų ar pageidaujamų patobulinimų kreipkitės:"
t MSG_178 "Kitos autorių teisės:" t MSG_178 "Kitos autorių teisės:"
@ -8148,8 +8148,8 @@ t MSG_014 "Harian"
t MSG_015 "Mingguan" t MSG_015 "Mingguan"
t MSG_016 "Bulanan" t MSG_016 "Bulanan"
t MSG_017 "Tetapan sendiri" t MSG_017 "Tetapan sendiri"
t MSG_018 "Versi anda: %d.%d.%d (Build %d)" t MSG_018 "Versi anda: %d.%d (Build %d)"
t MSG_019 "Versi terkini: %d.%d.%d (Build %d)" t MSG_019 "Versi terkini: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bait" t MSG_020 "bait"
t MSG_021 "KB" t MSG_021 "KB"
@ -8328,7 +8328,7 @@ t MSG_172 "Maklumat pelesenan dan penghargaan"
t MSG_173 "Klik untuk memilih..." t MSG_173 "Klik untuk memilih..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Utiliti pemformatan USB yang dipercayai" t MSG_174 "Rufus - Utiliti pemformatan USB yang dipercayai"
t MSG_175 "Versi %d.%d.%d (Build %d)" t MSG_175 "Versi %d.%d (Build %d)"
t MSG_176 "Terjemahan Bahasa Malaysia: Muhammad Aman <aman.tifli@gmail.com>" t MSG_176 "Terjemahan Bahasa Malaysia: Muhammad Aman <aman.tifli@gmail.com>"
t MSG_177 "Laporkan masalah atau cadangan penambahbaikan di:" t MSG_177 "Laporkan masalah atau cadangan penambahbaikan di:"
t MSG_178 "Hak cipta tambahan:" t MSG_178 "Hak cipta tambahan:"
@ -8556,8 +8556,8 @@ t MSG_014 "Daglig"
t MSG_015 "Ukentlig" t MSG_015 "Ukentlig"
t MSG_016 "Månedlig" t MSG_016 "Månedlig"
t MSG_017 "Bruker" t MSG_017 "Bruker"
t MSG_018 "Din versjon: %d.%d.%d (Utgave %d)" t MSG_018 "Din versjon: %d.%d (Utgave %d)"
t MSG_019 "Siste versjon: %d.%d.%d (Utgave %d)" t MSG_019 "Siste versjon: %d.%d (Utgave %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -8756,7 +8756,7 @@ t MSG_172 "Lisens in formasjon og krediteringer"
t MSG_173 "Klikk for å velge..." t MSG_173 "Klikk for å velge..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Det pålitelig USB Formaterings Programmet" t MSG_174 "Rufus - Det pålitelig USB Formaterings Programmet"
t MSG_175 "Versjon %d.%d.%d (Utgave %d)" t MSG_175 "Versjon %d.%d (Utgave %d)"
t MSG_176 "Norsk oversettelse: JED <mailto:translator744@outlook.com >" t MSG_176 "Norsk oversettelse: JED <mailto:translator744@outlook.com >"
t MSG_177 "Rapporter feil, og forespør forbedringer på:" t MSG_177 "Rapporter feil, og forespør forbedringer på:"
t MSG_178 "Tilleggs Copyright:" t MSG_178 "Tilleggs Copyright:"
@ -9016,8 +9016,8 @@ t MSG_014 "Dziennie"
t MSG_015 "Tygodniowo" t MSG_015 "Tygodniowo"
t MSG_016 "Miesięcznie" t MSG_016 "Miesięcznie"
t MSG_017 "Własne" t MSG_017 "Własne"
t MSG_018 "Twoja wersja: %d.%d.%d (Build %d)" t MSG_018 "Twoja wersja: %d.%d (Build %d)"
t MSG_019 "Najnowsza wersja: %d.%d.%d (Build %d)" t MSG_019 "Najnowsza wersja: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bajtów" t MSG_020 "bajtów"
t MSG_021 "KB" t MSG_021 "KB"
@ -9213,7 +9213,7 @@ t MSG_172 "Informacje o licencji i creditsy"
t MSG_173 "Kliknij aby wybrać..." t MSG_173 "Kliknij aby wybrać..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Wersja %d.%d.%d (Build %d)" t MSG_175 "Wersja %d.%d (Build %d)"
t MSG_176 "Polski tłumacz: Piotr Halama <mailto:halamix2@o2.pl>" t MSG_176 "Polski tłumacz: Piotr Halama <mailto:halamix2@o2.pl>"
t MSG_177 "Zgłaszaj błędy lub ulepszenia na:" t MSG_177 "Zgłaszaj błędy lub ulepszenia na:"
t MSG_178 "Dodatkowe Prawa Autorskie:" t MSG_178 "Dodatkowe Prawa Autorskie:"
@ -9364,7 +9364,7 @@ t MSG_003 "AVISO: TODOS OS DADOS EM %s SERÃO ELIMINADOS.\n"
"Para continuar, clique em OK. Para sair da operação, clique em CANCELAR." "Para continuar, clique em OK. Para sair da operação, clique em CANCELAR."
t MSG_011 "Verificação completa: %d erros encontrados\n" t MSG_011 "Verificação completa: %d erros encontrados\n"
" %d erros de leitura\n %d erros de gravação\n %d erros de corrupção\n" " %d erros de leitura\n %d erros de gravação\n %d erros de corrupção\n"
t MSG_018 "Sua versão: %d.%d.%d (Build %d)" t MSG_018 "Sua versão: %d.%d (Build %d)"
t MSG_039 "Inciar" t MSG_039 "Inciar"
t MSG_048 "Rufus - Limpando bufers" t MSG_048 "Rufus - Limpando bufers"
t MSG_054 "Dispositivo está protegido contra gravação." t MSG_054 "Dispositivo está protegido contra gravação."
@ -9613,8 +9613,8 @@ t MSG_014 "Diariamente"
t MSG_015 "Semanalmente" t MSG_015 "Semanalmente"
t MSG_016 "Mensalmente" t MSG_016 "Mensalmente"
t MSG_017 "Personalizado" t MSG_017 "Personalizado"
t MSG_018 "A tua versão: %d.%d.%d (Build %d)" t MSG_018 "A tua versão: %d.%d (Build %d)"
t MSG_019 "Última versão: %d.%d.%d (Build %d)" t MSG_019 "Última versão: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -9780,7 +9780,7 @@ t MSG_172 "Informação da licença e créditos"
t MSG_173 "Faça clic para selecionar..." t MSG_173 "Faça clic para selecionar..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - O utilitário de formatação USB mais seguro" t MSG_174 "Rufus - O utilitário de formatação USB mais seguro"
t MSG_175 "Versão %d.%d.%d (Build %d)" t MSG_175 "Versão %d.%d (Build %d)"
t MSG_176 "Tradução para Português: Fernando Baptista mailto:gbatold@gmail.com" t MSG_176 "Tradução para Português: Fernando Baptista mailto:gbatold@gmail.com"
t MSG_177 "Para reportar bugs ou sugerir melhoras, dirija-se a:" t MSG_177 "Para reportar bugs ou sugerir melhoras, dirija-se a:"
t MSG_178 "Direitos de autor adicionais:" t MSG_178 "Direitos de autor adicionais:"
@ -9985,8 +9985,8 @@ t MSG_014 "Zilnic"
t MSG_015 "Săptămânal" t MSG_015 "Săptămânal"
t MSG_016 "Lunar" t MSG_016 "Lunar"
t MSG_017 "Personalizat" t MSG_017 "Personalizat"
t MSG_018 "Versionea instalată: %d.%d.%d (Build %d)" t MSG_018 "Versionea instalată: %d.%d (Build %d)"
t MSG_019 "Ultima versiune: %d.%d.%d (Build %d)" t MSG_019 "Ultima versiune: %d.%d (Build %d)"
t MSG_020 "octeţi" t MSG_020 "octeţi"
t MSG_021 "KO" t MSG_021 "KO"
t MSG_022 "MO" t MSG_022 "MO"
@ -10150,7 +10150,7 @@ t MSG_171 "Începe operaţiunea de formatare.\n Aceasta va distruge orice date d
t MSG_172 "Informaţii licenţă şi confirmări" t MSG_172 "Informaţii licenţă şi confirmări"
t MSG_173 "Faceţi clic pentru a selecta..." t MSG_173 "Faceţi clic pentru a selecta..."
t MSG_174 "Rufus - Dispozitive USB de formatare" t MSG_174 "Rufus - Dispozitive USB de formatare"
t MSG_175 "Versiune %d.%d.%d (build %d)" t MSG_175 "Versiune %d.%d (build %d)"
t MSG_176 "Traducere în română de Gîrlea Alexandru <girlea_alex@yahoo.com>" t MSG_176 "Traducere în română de Gîrlea Alexandru <girlea_alex@yahoo.com>"
t MSG_177 "Probleme de raportare sau cerere pentru caracteristici noi:" t MSG_177 "Probleme de raportare sau cerere pentru caracteristici noi:"
t MSG_178 "Drepturi suplimentare:" t MSG_178 "Drepturi suplimentare:"
@ -10347,8 +10347,8 @@ t MSG_014 "Ежедневно"
t MSG_015 "Еженедельно" t MSG_015 "Еженедельно"
t MSG_016 "Ежемесячно" t MSG_016 "Ежемесячно"
t MSG_017 "По выбору" t MSG_017 "По выбору"
t MSG_018 "Ваша версия: %d.%d.%d (Build %d)" t MSG_018 "Ваша версия: %d.%d (Build %d)"
t MSG_019 "Последняя версия: %d.%d.%d (Build %d)" t MSG_019 "Последняя версия: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "байт" t MSG_020 "байт"
t MSG_021 " Кб" t MSG_021 " Кб"
@ -10513,7 +10513,7 @@ t MSG_172 "Сведения о лицензировании и разработ
t MSG_173 "Нажмите для выбора..." t MSG_173 "Нажмите для выбора..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Версия %d.%d.%d (Build %d)" t MSG_175 "Версия %d.%d (Build %d)"
t MSG_176 "Русский перевод: Кирилл Иванов <mailto:tchack@rambler.ru>" t MSG_176 "Русский перевод: Кирилл Иванов <mailto:tchack@rambler.ru>"
t MSG_177 "Сообщить об ошибке или предложить улучшение на веб-сайте:" t MSG_177 "Сообщить об ошибке или предложить улучшение на веб-сайте:"
t MSG_178 "Дополнительные авторские права:" t MSG_178 "Дополнительные авторские права:"
@ -10711,8 +10711,8 @@ t MSG_014 "Denne"
t MSG_015 "Týždenne" t MSG_015 "Týždenne"
t MSG_016 "Mesačne" t MSG_016 "Mesačne"
t MSG_017 "Vlastné" t MSG_017 "Vlastné"
t MSG_018 "Vaša verzia: %d.%d.%d (Build %d)" t MSG_018 "Vaša verzia: %d.%d (Build %d)"
t MSG_019 "Posledná verzia: %d.%d.%d (Build %d)" t MSG_019 "Posledná verzia: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "B" t MSG_020 "B"
t MSG_021 "KB" t MSG_021 "KB"
@ -10909,7 +10909,7 @@ t MSG_172 "Informácie o licencii, aktualizácii a kredity"
t MSG_173 "Stlačením vybrať..." t MSG_173 "Stlačením vybrať..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Spoľahlivý program pre formátovanie USB" t MSG_174 "Rufus - Spoľahlivý program pre formátovanie USB"
t MSG_175 "Verzia %d.%d.%d (Build %d)" t MSG_175 "Verzia %d.%d (Build %d)"
t MSG_176 "Do slovenčiny preložil martinco78 <mailto:martinco78@azet.sk>" t MSG_176 "Do slovenčiny preložil martinco78 <mailto:martinco78@azet.sk>"
t MSG_177 "Oznámenie chýb alebo žiadosti o zlepšenie programu:" t MSG_177 "Oznámenie chýb alebo žiadosti o zlepšenie programu:"
t MSG_178 "Doplnkové Copyrighty:" t MSG_178 "Doplnkové Copyrighty:"
@ -11145,8 +11145,8 @@ t MSG_014 "dnevno"
t MSG_015 "tedensko" t MSG_015 "tedensko"
t MSG_016 "mesečno" t MSG_016 "mesečno"
t MSG_017 "po meri" t MSG_017 "po meri"
t MSG_018 "Vaša verzija: %d.%d.%d (izgradnja %d)" t MSG_018 "Vaša verzija: %d.%d (izgradnja %d)"
t MSG_019 "Najnovejša verzija: %d.%d.%d (izgradnja %d)" t MSG_019 "Najnovejša verzija: %d.%d (izgradnja %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bajtov" t MSG_020 "bajtov"
t MSG_021 "KB" t MSG_021 "KB"
@ -11341,7 +11341,7 @@ t MSG_172 "Licenčne informacije in zasluge"
t MSG_173 "Kliknite, da izberete…" t MSG_173 "Kliknite, da izberete…"
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - zanesljivi pripomoček za USB formatiranje" t MSG_174 "Rufus - zanesljivi pripomoček za USB formatiranje"
t MSG_175 "Verzija %d.%d.%d (izgradnja %d)" t MSG_175 "Verzija %d.%d (izgradnja %d)"
t MSG_176 "V slovenščino prevedel Matej Horvat <matej.horvat@guest.arnes.si>" t MSG_176 "V slovenščino prevedel Matej Horvat <matej.horvat@guest.arnes.si>"
t MSG_177 "Prijavite hrošče ali zahtevajte izboljšave na:" t MSG_177 "Prijavite hrošče ali zahtevajte izboljšave na:"
t MSG_178 "Dodatne avtorske pravice:" t MSG_178 "Dodatne avtorske pravice:"
@ -11570,8 +11570,8 @@ t MSG_014 "Diario"
t MSG_015 "Semanalmente" t MSG_015 "Semanalmente"
t MSG_016 "Mensualmente" t MSG_016 "Mensualmente"
t MSG_017 "Personalizado" t MSG_017 "Personalizado"
t MSG_018 "Su versión: %d.%d.%d (Build %d)" t MSG_018 "Su versión: %d.%d (Build %d)"
t MSG_019 "Última versión: %d.%d.%d (Build %d)" t MSG_019 "Última versión: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -11737,7 +11737,7 @@ t MSG_172 "Información de licencia y créditos"
t MSG_173 "Haga clic para seleccionar..." t MSG_173 "Haga clic para seleccionar..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - La utilería de formateo USB más confiable" t MSG_174 "Rufus - La utilería de formateo USB más confiable"
t MSG_175 "Versión %d.%d.%d (Build %d)" t MSG_175 "Versión %d.%d (Build %d)"
t MSG_176 "Traducción al castellano: José Pineda <mailto:battletroll@gmail.com>" t MSG_176 "Traducción al castellano: José Pineda <mailto:battletroll@gmail.com>"
t MSG_177 "Para reportar bugs o sugerir mejoras, diríjase a:" t MSG_177 "Para reportar bugs o sugerir mejoras, diríjase a:"
t MSG_178 "Derechos de autor adicionales:" t MSG_178 "Derechos de autor adicionales:"
@ -11961,8 +11961,8 @@ t MSG_014 "Dagligen"
t MSG_015 "Veckovis" t MSG_015 "Veckovis"
t MSG_016 "Månadsvis" t MSG_016 "Månadsvis"
t MSG_017 "Egen" t MSG_017 "Egen"
t MSG_018 "Din version: %d.%d.%d (Build %d)" t MSG_018 "Din version: %d.%d (Build %d)"
t MSG_019 "Senaste version: %d.%d.%d (Build %d)" t MSG_019 "Senaste version: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "bytes" t MSG_020 "bytes"
t MSG_021 "KB" t MSG_021 "KB"
@ -12157,7 +12157,7 @@ t MSG_172 "Licensinformation och beröm"
t MSG_173 "Tryck för att välja..." t MSG_173 "Tryck för att välja..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Det pålitliga USB-formateringsverktyget" t MSG_174 "Rufus - Det pålitliga USB-formateringsverktyget"
t MSG_175 "Version %d.%d.%d (Build %d)" t MSG_175 "Version %d.%d (Build %d)"
t MSG_176 "Svensk översättning: Sopor <mailto:sopor@hotmail.com>" t MSG_176 "Svensk översättning: Sopor <mailto:sopor@hotmail.com>"
t MSG_177 "Rapportera fel eller om du har några idéer:" t MSG_177 "Rapportera fel eller om du har några idéer:"
t MSG_178 "Andra upphovsrätter:" t MSG_178 "Andra upphovsrätter:"
@ -12418,8 +12418,8 @@ t MSG_014 "Günlük"
t MSG_015 "Haftalık" t MSG_015 "Haftalık"
t MSG_016 "Aylık" t MSG_016 "Aylık"
t MSG_017 "Özel" t MSG_017 "Özel"
t MSG_018 "Mevcut Sürüm: %d.%d.%d (Yapı %d)" t MSG_018 "Mevcut Sürüm: %d.%d (Yapı %d)"
t MSG_019 "En son sürüm: %d.%d.%d (Yapı %d)" t MSG_019 "En son sürüm: %d.%d (Yapı %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "byte" t MSG_020 "byte"
t MSG_021 "KB" t MSG_021 "KB"
@ -12615,7 +12615,7 @@ t MSG_172 "Lisans bilgisi ve Emeği Geçenler"
t MSG_173 "Seçmek için tıklayın..." t MSG_173 "Seçmek için tıklayın..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - Güvenilir USB Biçimlendirme Programı" t MSG_174 "Rufus - Güvenilir USB Biçimlendirme Programı"
t MSG_175 "Sürüm %d.%d.%d (Yapı %d)" t MSG_175 "Sürüm %d.%d (Yapı %d)"
t MSG_176 "Türkçe Çeviri: Mehmetali KURAN <mailto:mehmetalikuran@gmail.com>" t MSG_176 "Türkçe Çeviri: Mehmetali KURAN <mailto:mehmetalikuran@gmail.com>"
t MSG_177 "Hataları yada geliştirme isteklerini buraya raporlayın:" t MSG_177 "Hataları yada geliştirme isteklerini buraya raporlayın:"
t MSG_178 "Ek Telif Hakları:" t MSG_178 "Ek Telif Hakları:"
@ -12871,8 +12871,8 @@ t MSG_014 "Щодня"
t MSG_015 "Щотижня" t MSG_015 "Щотижня"
t MSG_016 "Щомісяця" t MSG_016 "Щомісяця"
t MSG_017 "За вибором" t MSG_017 "За вибором"
t MSG_018 "Ваша версія: %d.%d.%d (Build %d)" t MSG_018 "Ваша версія: %d.%d (Build %d)"
t MSG_019 "Остання версія: %d.%d.%d (Build %d)" t MSG_019 "Остання версія: %d.%d (Build %d)"
# *Short* size names. These can be used as suffixes # *Short* size names. These can be used as suffixes
t MSG_020 "байт" t MSG_020 "байт"
t MSG_021 " Кб" t MSG_021 " Кб"
@ -13037,7 +13037,7 @@ t MSG_172 "Відомості про ліцензування та розроб
t MSG_173 "Натисніть для вибору..." t MSG_173 "Натисніть для вибору..."
# The following will appear in the about dialog # The following will appear in the about dialog
t MSG_174 "Rufus - The Reliable USB Formatting Utility" t MSG_174 "Rufus - The Reliable USB Formatting Utility"
t MSG_175 "Версія %d.%d.%d (Build %d)" t MSG_175 "Версія %d.%d (Build %d)"
t MSG_176 "Українською переклав: VKS <mailto:mind.converter@gmail.com>" t MSG_176 "Українською переклав: VKS <mailto:mind.converter@gmail.com>"
t MSG_177 "Повідомити про помилку чи запропонувати покращення на веб-сайті:" t MSG_177 "Повідомити про помилку чи запропонувати покращення на веб-сайті:"
t MSG_178 "Додаткові авторські права:" t MSG_178 "Додаткові авторські права:"

2
src/format.c
View File

@ -1294,7 +1294,6 @@ BOOL SetupWinToGo(const char* drive_name, BOOL use_ms_efi)
wVolumeName[0] = ms_efi[0]; wVolumeName[0] = ms_efi[0];
// Boy do you *NOT* want to specify a label here, and spend HOURS figuring out why your EFI partition cannot boot... // Boy do you *NOT* want to specify a label here, and spend HOURS figuring out why your EFI partition cannot boot...
// TODO: Can we avoid resetting the progress bar here?
pfFormatEx(wVolumeName, SelectedDrive.Geometry.MediaType, L"FAT32", L"", TRUE, cluster_size, FormatExCallback); pfFormatEx(wVolumeName, SelectedDrive.Geometry.MediaType, L"FAT32", L"", TRUE, cluster_size, FormatExCallback);
if (IS_ERROR(FormatStatus)) { if (IS_ERROR(FormatStatus)) {
uprintf("Failed to format EFI partition"); uprintf("Failed to format EFI partition");
@ -1303,7 +1302,6 @@ BOOL SetupWinToGo(const char* drive_name, BOOL use_ms_efi)
} }
} }
// TODO: Don't use ALL but adjust to what we effectively support
static_sprintf(cmd, "%s\\Windows\\System32\\bcdboot.exe %s\\Windows /f ALL /s %s", static_sprintf(cmd, "%s\\Windows\\System32\\bcdboot.exe %s\\Windows /f ALL /s %s",
drive_name, drive_name, (use_ms_efi)?ms_efi:drive_name); drive_name, drive_name, (use_ms_efi)?ms_efi:drive_name);
uprintf("Enabling boot: '%s'", cmd); uprintf("Enabling boot: '%s'", cmd);

11
src/net.c
View File

@ -297,8 +297,8 @@ DWORD DownloadFile(const char* url, const char* file, HWND hProgressDialog)
uprintf("Network is unavailable: %s\n", WinInetErrorString()); uprintf("Network is unavailable: %s\n", WinInetErrorString());
goto out; goto out;
} }
_snprintf(agent, ARRAYSIZE(agent), APPLICATION_NAME "/%d.%d.%d.%d (WinNT %d.%d%s)", _snprintf(agent, ARRAYSIZE(agent), APPLICATION_NAME "/%d.%d.%d (WinNT %d.%d%s)",
rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3], rufus_version[0], rufus_version[1], rufus_version[2],
nWindowsVersion>>4, nWindowsVersion&0x0F, is_x64()?"; WOW64":""); nWindowsVersion>>4, nWindowsVersion&0x0F, is_x64()?"; WOW64":"");
hSession = InternetOpenA(agent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); hSession = InternetOpenA(agent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
if (hSession == NULL) { if (hSession == NULL) {
@ -412,7 +412,7 @@ HANDLE DownloadFileThreaded(const char* url, const char* file, HWND hProgressDia
static __inline uint64_t to_uint64_t(uint16_t x[4]) { static __inline uint64_t to_uint64_t(uint16_t x[4]) {
int i; int i;
uint64_t ret = 0; uint64_t ret = 0;
for (i=0; i<4; i++) for (i=0; i<3; i++)
ret = (ret<<16) + x[i]; ret = (ret<<16) + x[i];
return ret; return ret;
} }
@ -489,7 +489,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
goto out; goto out;
hostname[sizeof(hostname)-1] = 0; hostname[sizeof(hostname)-1] = 0;
safe_sprintf(agent, ARRAYSIZE(agent), APPLICATION_NAME "/%d.%d.%d.%d", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]); safe_sprintf(agent, ARRAYSIZE(agent), APPLICATION_NAME "/%d.%d.%d", rufus_version[0], rufus_version[1], rufus_version[2]);
hSession = InternetOpenA(agent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); hSession = InternetOpenA(agent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0);
if (hSession == NULL) if (hSession == NULL)
goto out; goto out;
@ -591,8 +591,7 @@ static DWORD WINAPI CheckForUpdatesThread(LPVOID param)
parse_update(buf, dwTotalSize+1); parse_update(buf, dwTotalSize+1);
vuprintf("UPDATE DATA:\n"); vuprintf("UPDATE DATA:\n");
vuprintf(" version: %d.%d.%d.%d (%s)\n", update.version[0], update.version[1], vuprintf(" version: %d.%d.%d (%s)\n", update.version[0], update.version[1], update.version[2], channel[k]);
update.version[2], update.version[3], channel[k]);
vuprintf(" platform_min: %d.%d\n", update.platform_min[0], update.platform_min[1]); vuprintf(" platform_min: %d.%d\n", update.platform_min[0], update.platform_min[1]);
vuprintf(" url: %s\n", update.download_url); vuprintf(" url: %s\n", update.download_url);

4
src/parser.c
View File

@ -927,14 +927,14 @@ void parse_update(char* buf, size_t len)
} }
} }
for (i=0; i<4; i++) for (i=0; i<3; i++)
update.version[i] = 0; update.version[i] = 0;
update.platform_min[0] = 5; update.platform_min[0] = 5;
update.platform_min[1] = 2; // XP or later update.platform_min[1] = 2; // XP or later
safe_free(update.download_url); safe_free(update.download_url);
safe_free(update.release_notes); safe_free(update.release_notes);
if ((data = get_sanitized_token_data_buffer("version", 1, buf, len)) != NULL) { if ((data = get_sanitized_token_data_buffer("version", 1, buf, len)) != NULL) {
for (i=0; (i<4) && ((token = strtok((i==0)?data:NULL, ".")) != NULL); i++) { for (i=0; (i<3) && ((token = strtok((i==0)?data:NULL, ".")) != NULL); i++) {
update.version[i] = (uint16_t)atoi(token); update.version[i] = (uint16_t)atoi(token);
} }
safe_free(data); safe_free(data);

17
src/rufus.c
View File

@ -133,12 +133,12 @@ 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, use_fake_units = TRUE; BOOL enable_HDDs = FALSE, advanced_mode = TRUE, force_update = FALSE, use_fake_units = TRUE;
BOOL allow_dual_uefi_bios = FALSE, enable_vmdk = FALSE, togo_mode = TRUE; BOOL allow_dual_uefi_bios = FALSE, enable_vmdk = FALSE, togo_mode = TRUE;
int dialog_showing = 0; int dialog_showing = 0;
uint16_t rufus_version[4], embedded_sl_version[2]; uint16_t rufus_version[3], embedded_sl_version[2];
char embedded_sl_version_str[2][12] = { "?.??", "?.??" }; char embedded_sl_version_str[2][12] = { "?.??", "?.??" };
char embedded_sl_version_ext[2][32]; char embedded_sl_version_ext[2][32];
char embedded_grub_version[] = GRUB4DOS_VERSION; char embedded_grub_version[] = GRUB4DOS_VERSION;
char embedded_grub2_version[] = GRUB2_PACKAGE_VERSION; char embedded_grub2_version[] = GRUB2_PACKAGE_VERSION;
RUFUS_UPDATE update = { {0,0,0,0}, {0,0}, NULL, NULL}; RUFUS_UPDATE update = { {0,0,0}, {0,0}, NULL, NULL};
StrArray DriveID, DriveLabel; StrArray DriveID, DriveLabel;
extern char* szStatusMessage; extern char* szStatusMessage;
@ -978,7 +978,6 @@ DWORD WINAPI ISOScanThread(LPVOID param)
r = ExtractISO(image_path, "", TRUE) || IsHDImage(image_path); r = ExtractISO(image_path, "", TRUE) || IsHDImage(image_path);
EnableControls(TRUE); EnableControls(TRUE);
if (!r) { if (!r) {
// TODO: is that needed?
SendMessage(hMainDialog, UM_PROGRESS_EXIT, 0, 0); SendMessage(hMainDialog, UM_PROGRESS_EXIT, 0, 0);
PrintInfoDebug(0, MSG_203); PrintInfoDebug(0, MSG_203);
safe_free(image_path); safe_free(image_path);
@ -1489,7 +1488,7 @@ static __inline const char* IsAlphaOrBeta(void)
#endif #endif
} }
INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LPARAM lParam) static INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HDC hdc; HDC hdc;
RECT rect; RECT rect;
@ -1515,7 +1514,7 @@ INT_PTR CALLBACK InfoCallback(HWND hCtrl, UINT message, WPARAM wParam, LPARAM lP
SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); SetBkColor(hdc, GetSysColor(COLOR_BTNFACE));
SetTextAlign(hdc , TA_CENTER | TA_BASELINE); SetTextAlign(hdc , TA_CENTER | TA_BASELINE);
GetClientRect(hCtrl , &rect); GetClientRect(hCtrl , &rect);
TextOutW(hdc, rect.right/2, rect.bottom/2 + (int)(5.0f * fScale), winfo, wcslen(winfo)); TextOutW(hdc, rect.right/2, rect.bottom/2 + (int)(5.0f * fScale), winfo, (int)wcslen(winfo));
EndPaint(hCtrl, &ps); EndPaint(hCtrl, &ps);
return (INT_PTR)TRUE; return (INT_PTR)TRUE;
} }
@ -1581,17 +1580,17 @@ void InitDialog(HWND hDlg)
// Count of Microsoft for making it more attractive to read a // Count of Microsoft for making it more attractive to read a
// version using strtok() than using GetFileVersionInfo() // version using strtok() than using GetFileVersionInfo()
token = strtok(tmp, " "); token = strtok(tmp, " ");
for (i=0; (i<4) && ((token = strtok(NULL, ".")) != NULL); i++) for (i=0; (i<3) && ((token = strtok(NULL, ".")) != NULL); i++)
rufus_version[i] = (uint16_t)atoi(token); rufus_version[i] = (uint16_t)atoi(token);
// Redefine the title to be able to add "Alpha" or "Beta" and get the version in the right order for RTL // Redefine the title to be able to add "Alpha" or "Beta" and get the version in the right order for RTL
if (!right_to_left_mode) { if (!right_to_left_mode) {
static_sprintf(tmp, APPLICATION_NAME " %d.%d.%d.%d%s", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3], IsAlphaOrBeta()); static_sprintf(tmp, APPLICATION_NAME " %d.%d.%d%s", rufus_version[0], rufus_version[1], rufus_version[2], IsAlphaOrBeta());
} else { } else {
static_sprintf(tmp, "%s%d.%d.%d.%d " APPLICATION_NAME, IsAlphaOrBeta(), rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3]); static_sprintf(tmp, "%s%d.%d.%d " APPLICATION_NAME, IsAlphaOrBeta(), rufus_version[0], rufus_version[1], rufus_version[2]);
} }
SetWindowTextU(hDlg, tmp); SetWindowTextU(hDlg, tmp);
uprintf(APPLICATION_NAME " version: %d.%d.%d.%d%s", rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3], IsAlphaOrBeta()); uprintf(APPLICATION_NAME " version: %d.%d.%d%s", rufus_version[0], rufus_version[1], rufus_version[2], IsAlphaOrBeta());
for (i=0; i<ARRAYSIZE(resource); i++) { for (i=0; i<ARRAYSIZE(resource); i++) {
buf = (char*)GetResource(hMainInstance, resource[i], _RT_RCDATA, "ldlinux_sys", &len, TRUE); buf = (char*)GetResource(hMainInstance, resource[i], _RT_RCDATA, "ldlinux_sys", &len, TRUE);
if (buf == NULL) { if (buf == NULL) {

4
src/rufus.h
View File

@ -276,7 +276,7 @@ typedef struct {
#define SL_MINOR(x) ((uint8_t)(x)) #define SL_MINOR(x) ((uint8_t)(x))
typedef struct { typedef struct {
uint16_t version[4]; uint16_t version[3];
uint32_t platform_min[2]; // minimum platform version required uint32_t platform_min[2]; // minimum platform version required
char* download_url; char* download_url;
char* release_notes; char* release_notes;
@ -350,7 +350,7 @@ extern BOOL use_own_c32[NB_OLD_C32], detect_fakes, iso_op_in_progress, format_op
extern BOOL allow_dual_uefi_bios, togo_mode; extern BOOL allow_dual_uefi_bios, togo_mode;
extern RUFUS_ISO_REPORT iso_report; extern RUFUS_ISO_REPORT iso_report;
extern int64_t iso_blocking_status; extern int64_t iso_blocking_status;
extern uint16_t rufus_version[4], embedded_sl_version[2]; extern uint16_t rufus_version[3], embedded_sl_version[2];
extern int nWindowsVersion; extern int nWindowsVersion;
extern char WindowsVersionStr[128]; extern char WindowsVersionStr[128];
extern char embedded_sl_version_str[2][12]; extern char embedded_sl_version_str[2][12];

16
src/rufus.rc
View File

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.0.0.608" CAPTION "Rufus 2.0.609"
FONT 8, "Segoe UI", 400, 0, 0x1 FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
@ -157,7 +157,7 @@ END
IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.0.0.608" CAPTION "Rufus 2.0.609"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
@ -283,7 +283,7 @@ END
IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU 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 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 2.0.0.608" CAPTION "Rufus 2.0.609"
FONT 8, "Segoe UI", 400, 0, 0x1 FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
@ -415,7 +415,7 @@ END
IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU 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 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 2.0.0.608" CAPTION "Rufus 2.0.609"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 DEFPUSHBUTTON "Start",IDC_START,127,339,50,14
@ -671,8 +671,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,608 FILEVERSION 2,0,609,0
PRODUCTVERSION 2,0,0,608 PRODUCTVERSION 2,0,609,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -689,13 +689,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", "2.0.0.608" VALUE "FileVersion", "2.0.609"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2015 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", "2.0.0.608" VALUE "ProductVersion", "2.0.609"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

6
src/stdlg.c
View File

@ -522,7 +522,7 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
if (settings_commcheck) if (settings_commcheck)
ShowWindow(GetDlgItem(hDlg, IDC_ABOUT_UPDATES), SW_SHOW); ShowWindow(GetDlgItem(hDlg, IDC_ABOUT_UPDATES), SW_SHOW);
safe_sprintf(about_blurb, sizeof(about_blurb), about_blurb_format, lmprintf(MSG_174), 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]), lmprintf(MSG_175, rufus_version[0], rufus_version[1], rufus_version[2]),
right_to_left_mode?"Akeo \\\\ Pete Batard 2011-2015 © Copyright":"Copyright © 2011-2015 Pete Batard / Akeo", right_to_left_mode?"Akeo \\\\ Pete Batard 2011-2015 © Copyright":"Copyright © 2011-2015 Pete Batard / Akeo",
lmprintf(MSG_176), lmprintf(MSG_177), lmprintf(MSG_178)); lmprintf(MSG_176), lmprintf(MSG_177), lmprintf(MSG_178));
for (i=0; i<ARRAYSIZE(hEdit); i++) { for (i=0; i<ARRAYSIZE(hEdit); i++) {
@ -1203,9 +1203,9 @@ INT_PTR CALLBACK NewVersionCallback(HWND hDlg, UINT message, WPARAM wParam, LPAR
SendMessage(hNotes, EM_SETSEL, -1, -1); SendMessage(hNotes, EM_SETSEL, -1, -1);
SendMessage(hNotes, EM_SETEVENTMASK, 0, ENM_LINK); SendMessage(hNotes, EM_SETEVENTMASK, 0, ENM_LINK);
SetWindowTextU(GetDlgItem(hDlg, IDC_YOUR_VERSION), lmprintf(MSG_018, SetWindowTextU(GetDlgItem(hDlg, IDC_YOUR_VERSION), lmprintf(MSG_018,
rufus_version[0], rufus_version[1], rufus_version[2], rufus_version[3])); rufus_version[0], rufus_version[1], rufus_version[2]));
SetWindowTextU(GetDlgItem(hDlg, IDC_LATEST_VERSION), lmprintf(MSG_019, SetWindowTextU(GetDlgItem(hDlg, IDC_LATEST_VERSION), lmprintf(MSG_019,
update.version[0], update.version[1], update.version[2], update.version[3])); update.version[0], update.version[1], update.version[2]));
SetWindowTextU(GetDlgItem(hDlg, IDC_DOWNLOAD_URL), update.download_url); SetWindowTextU(GetDlgItem(hDlg, IDC_DOWNLOAD_URL), update.download_url);
SendMessage(GetDlgItem(hDlg, IDC_PROGRESS), PBM_SETRANGE, 0, (MAX_PROGRESS<<16) & 0xFFFF0000); SendMessage(GetDlgItem(hDlg, IDC_PROGRESS), PBM_SETRANGE, 0, (MAX_PROGRESS<<16) & 0xFFFF0000);
if (update.download_url == NULL) if (update.download_url == NULL)