diff options
| -rwxr-xr-x | l10n/generate_template.sh | 4 | ||||
| -rw-r--r-- | l10n/po/bg.po | 2 | ||||
| -rw-r--r-- | l10n/po/cs.po | 2 | ||||
| -rw-r--r-- | l10n/po/de.po | 4 | ||||
| -rw-r--r-- | l10n/po/es.po | 4 | ||||
| -rw-r--r-- | l10n/po/fi.po | 2 | ||||
| -rw-r--r-- | l10n/po/fr.po | 2 | ||||
| -rw-r--r-- | l10n/po/he.po | 2 | ||||
| -rw-r--r-- | l10n/po/it.po | 2 | ||||
| -rw-r--r-- | l10n/po/ja.po | 4 | ||||
| -rw-r--r-- | l10n/po/messages.pot | 2 | ||||
| -rw-r--r-- | l10n/po/nl.po | 4 | ||||
| -rw-r--r-- | l10n/po/pt.po | 2 | ||||
| -rw-r--r-- | l10n/po/ru.po | 2 | ||||
| -rw-r--r-- | l10n/po/sk.po | 2 | ||||
| -rw-r--r-- | l10n/po/sv.po | 2 | ||||
| -rw-r--r-- | main.nsi | 11 |
17 files changed, 27 insertions, 26 deletions
diff --git a/l10n/generate_template.sh b/l10n/generate_template.sh index 7e445f3..ea8b0dd 100755 --- a/l10n/generate_template.sh +++ b/l10n/generate_template.sh @@ -40,7 +40,7 @@ LangString program_name \${$nsis_lang} "`gettext "Debian-Installer Loader"`" LangString d-i \${$nsis_lang} "`gettext "Debian Installer"`" LangString not_enough_space_for_debian \${$nsis_lang} "`gettext "There doesn't seem to be enough free disk space in drive @DOLLAR@c. For a complete desktop install, it is recommended to have at least 3 GB of free disk. If there is already a separate disk or partition to install Debian, or if you plan to replace Windows completely, you can safely ignore this warning."`" LangString not_enough_space_for_loader \${$nsis_lang} "`gettext "Error: not enough free disk space. Aborting install."`" -LangString unsupported_version_of_windows \${$nsis_lang} "`gettext "This program doesn't support Windows @DOLLAR@0 yet."`" +LangString unsupported_version_of_windows \${$nsis_lang} "`gettext "This program doesn't support Windows @DOLLAR@windows_version yet."`" LangString expert1 \${$nsis_lang} "`gettext "Select install mode:"`" LangString expert2 \${$nsis_lang} "`gettext "Normal mode. Recommended for most users."`" LangString expert3 \${$nsis_lang} "`gettext "Expert mode. Recommended for expert users who want full control of the install process."`" @@ -65,7 +65,7 @@ LangString nsisdl6 \${$nsis_lang} "`gettext "s"`" LangString nsisdl7 \${$nsis_lang} "`gettext "%dkB (%d%%) of %dkB at %d.%01dkB/s"`" LangString nsisdl8 \${$nsis_lang} "`gettext " (%d %s%s remaining)"`" LangString error \${$nsis_lang} "`gettext "Error"`" -LangString boot_ini_not_found \${$nsis_lang} "`gettext "Error: @DOLLAR@boot_ini not found. Your version of Windows might be too old, or damaged."`" +LangString boot_ini_not_found \${$nsis_lang} "`gettext "Error: @DOLLAR@boot_ini not found. Is this really Windows @DOLLAR@windows_version?"`" LangString warning \${$nsis_lang} "`gettext "VERY IMPORTANT NOTICE:\n\nYou need to reboot in order to proceed with your Debian install. During your next boot, you will be asked whether you want to start Windows or Debian Installer. Choose Debian Installer to continue the install process.\n\nDuring the install process, you will be offered the possibility of either reducing your Windows partition to install Debian or completely replacing it. In both cases, it is STRONGLY RECOMMENDED that you have previously made a backup of your data. Nor the authors of this loader neither the Debian project will take ANY RESPONSIBILITY in the event of data loss.\n\nOnce your Debian install is complete (and if you have chosen to keep Windows in your disk), you can uninstall the Debian-Installer Loader through the Windows Add/Remove Programs dialog in Control Panel."`" LangString reboot_now \${$nsis_lang} "`gettext "Do you want to reboot now?"`" EOF diff --git a/l10n/po/bg.po b/l10n/po/bg.po index 422d0ff..74ace9d 100644 --- a/l10n/po/bg.po +++ b/l10n/po/bg.po @@ -71,7 +71,7 @@ msgstr "" "инсталацията." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/cs.po b/l10n/po/cs.po index f67ba77..534830c 100644 --- a/l10n/po/cs.po +++ b/l10n/po/cs.po @@ -66,7 +66,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Chyba: nedostatek volného místa. Ruším instalaci." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/de.po b/l10n/po/de.po index 35c50bf..54057a4 100644 --- a/l10n/po/de.po +++ b/l10n/po/de.po @@ -66,8 +66,8 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Fehler: Nicht genügend Platz auf der Festplatte. Breche Installation ab." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." -msgstr "Dieses Programm unterstützt Windows @DOLLAR@0 noch nicht. " +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." +msgstr "Dieses Programm unterstützt Windows @DOLLAR@windows_version noch nicht. " #: generate_template.sh:44 generate_template.sh:47 msgid "Select install mode:" diff --git a/l10n/po/es.po b/l10n/po/es.po index bacd43e..d4afee8 100644 --- a/l10n/po/es.po +++ b/l10n/po/es.po @@ -67,8 +67,8 @@ msgstr "" "Error: no hay suficiente espacio libre en disco. Abortando instalación." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." -msgstr "Este programa todavía no soporta Windows @DOLLAR@0." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." +msgstr "Este programa todavía no soporta Windows @DOLLAR@windows_version." #: generate_template.sh:44 generate_template.sh:47 msgid "Select install mode:" diff --git a/l10n/po/fi.po b/l10n/po/fi.po index 79bd0b6..601c897 100644 --- a/l10n/po/fi.po +++ b/l10n/po/fi.po @@ -65,7 +65,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Virhe: levytila ei riitä. Keskeytetään asennus." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/fr.po b/l10n/po/fr.po index 989d7d7..8de7ff7 100644 --- a/l10n/po/fr.po +++ b/l10n/po/fr.po @@ -67,7 +67,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Espace disque insuffisant. Installation interrompue." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/he.po b/l10n/po/he.po index 8af713c..53b3052 100644 --- a/l10n/po/he.po +++ b/l10n/po/he.po @@ -66,7 +66,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "שגיאה: אין מספיק נפח דיסק פנוי. מבטל את ההתקנה." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/it.po b/l10n/po/it.po index bd7f5f0..99f2211 100644 --- a/l10n/po/it.po +++ b/l10n/po/it.po @@ -66,7 +66,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Errore: spazio disco libero non sufficiente. Installazione abortita." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/ja.po b/l10n/po/ja.po index 9cdc057..41fef90 100644 --- a/l10n/po/ja.po +++ b/l10n/po/ja.po @@ -67,8 +67,8 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "エラー: ディスクの空き領域が足りません。インストールを終了します。" #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." -msgstr "このプログラムはまだ Windows @DOLLAR@0 をサポートしていません。" +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." +msgstr "このプログラムはまだ Windows @DOLLAR@windows_version をサポートしていません。" #: generate_template.sh:44 generate_template.sh:47 msgid "Select install mode:" diff --git a/l10n/po/messages.pot b/l10n/po/messages.pot index 3364cad..744abbf 100644 --- a/l10n/po/messages.pot +++ b/l10n/po/messages.pot @@ -62,7 +62,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "" #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/nl.po b/l10n/po/nl.po index 7df2023..6c946e1 100644 --- a/l10n/po/nl.po +++ b/l10n/po/nl.po @@ -67,8 +67,8 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Fout: onvoldoende vrije schijfruimte. Installatie wordt afgebroken." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." -msgstr "Windows @DOLLAR@0 wordt nog niet ondersteund door dit programma." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." +msgstr "Windows @DOLLAR@windows_version wordt nog niet ondersteund door dit programma." #: generate_template.sh:44 generate_template.sh:47 msgid "Select install mode:" diff --git a/l10n/po/pt.po b/l10n/po/pt.po index 1cc7437..f7f2f13 100644 --- a/l10n/po/pt.po +++ b/l10n/po/pt.po @@ -67,7 +67,7 @@ msgstr "" "Erro: não existe espaço livre em disco suficiente. A abortar a instalação." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/ru.po b/l10n/po/ru.po index 6ea2029..8f53a9d 100644 --- a/l10n/po/ru.po +++ b/l10n/po/ru.po @@ -68,7 +68,7 @@ msgstr "" "Ошибка: не достаточно свободного места на жестком диске. Отмена установки." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/sk.po b/l10n/po/sk.po index 290ab55..7ecf8b9 100644 --- a/l10n/po/sk.po +++ b/l10n/po/sk.po @@ -66,7 +66,7 @@ msgid "Error: not enough free disk space. Aborting install." msgstr "Chyba: nedostatok voľného miesta. Inštalácia sa prerušuje." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 diff --git a/l10n/po/sv.po b/l10n/po/sv.po index a121ebb..5f0f502 100644 --- a/l10n/po/sv.po +++ b/l10n/po/sv.po @@ -67,7 +67,7 @@ msgstr "" "Fel: inte tillräckligt med ledigt diskutrymme. Avbryter installationen." #: generate_template.sh:43 -msgid "This program doesn't support Windows @DOLLAR@0 yet." +msgid "This program doesn't support Windows @DOLLAR@windows_version yet." msgstr "" #: generate_template.sh:44 generate_template.sh:47 @@ -183,12 +183,13 @@ Function ShowExpert ; Windows version is another abort condition Call GetWindowsVersion - Pop $0 - StrCpy $1 $0 3 + Var /GLOBAL windows_version + Pop $windows_version + StrCpy $1 $windows_version 3 ; StrCmp $1 "NT " windows_version_ok - StrCmp $0 "2000" windows_version_ok - StrCmp $0 "XP" windows_version_ok - StrCmp $0 "2003" windows_version_ok + StrCmp $windows_version "2000" windows_version_ok + StrCmp $windows_version "XP" windows_version_ok + StrCmp $windows_version "2003" windows_version_ok MessageBox MB_OK $(unsupported_version_of_windows) Quit windows_version_ok: |