From fbb1d180348f027974269dc22696a9d74a47f61d Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 20 Jun 2023 23:15:46 +0200 Subject: [PATCH] Windows: Allow selecting size unit (KB/MB/GB) for generated keyfiles This change also makes it possible to generate keyfiles larger than 1 MiB although only the first 1 MiB will be taken into account by VeraCrypt. Update strings in XML files --- Translations/Language.ar.xml | 4 +- Translations/Language.be.xml | 4 +- Translations/Language.bg.xml | 4 +- Translations/Language.ca.xml | 4 +- Translations/Language.co.xml | 4 +- Translations/Language.cs.xml | 4 +- Translations/Language.da.xml | 4 +- Translations/Language.de.xml | 4 +- Translations/Language.el.xml | 4 +- Translations/Language.es.xml | 4 +- Translations/Language.et.xml | 4 +- Translations/Language.eu.xml | 4 +- Translations/Language.fa.xml | 4 +- Translations/Language.fi.xml | 4 +- Translations/Language.fr.xml | 4 +- Translations/Language.he.xml | 4 +- Translations/Language.hu.xml | 4 +- Translations/Language.id.xml | 4 +- Translations/Language.it.xml | 4 +- Translations/Language.ja.xml | 4 +- Translations/Language.ka.xml | 4 +- Translations/Language.ko.xml | 4 +- Translations/Language.lv.xml | 4 +- Translations/Language.my.xml | 4 +- Translations/Language.nl.xml | 4 +- Translations/Language.nn.xml | 4 +- Translations/Language.pl.xml | 4 +- Translations/Language.pt-br.xml | 4 +- Translations/Language.ro.xml | 4 +- Translations/Language.ru.xml | 4 +- Translations/Language.sk.xml | 4 +- Translations/Language.sl.xml | 4 +- Translations/Language.sv.xml | 4 +- Translations/Language.th.xml | 4 +- Translations/Language.tr.xml | 4 +- Translations/Language.uk.xml | 4 +- Translations/Language.uz.xml | 4 +- Translations/Language.vi.xml | 4 +- Translations/Language.zh-cn.xml | 4 +- Translations/Language.zh-hk.xml | 4 +- Translations/Language.zh-tw.xml | 4 +- src/Common/Common.rc | 15 +++---- src/Common/Dlgcode.c | 73 +++++++++++++++++++++++++-------- src/Common/Language.xml | 4 +- src/Common/Resource.h | 3 +- 45 files changed, 150 insertions(+), 109 deletions(-) diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml index bf916446..c7e6817c 100644 --- a/Translations/Language.ar.xml +++ b/Translations/Language.ar.xml @@ -356,7 +356,7 @@ ‮تحذير: إذا فَقدّت الملف المفتاح أو تغيرت أي بتة من أوّل ‪1024‬ كيلوبايت منه فسيكون من المستحيل وصل المجلدات التي تستخدم ذلك المفتاح! ‮بتات عدد ملفات المفتاح - حجم ملفات المفتاح (بايت): + حجم ملفات المفتاح: اسم قاعدة ملفات المفتاح: ‮ترجمه: ‮حجم النص الصريح: @@ -938,7 +938,7 @@ ‮أدخل كلمة سر الترويسة المحفوظة في الملف ‮أُنشئ ملف المفتاح بنجاح. عدد ملفات المفتاح المدخل غير صحيح. - حجم ملف المفتاح يجب أن يكون بين 64 و 1048576 بايت. + حجم ملف المفتاح يجب أن يكون على الأقل 64 بايت. الرجاء إدخال إسم لملف/ملفات المفاتيح المراد توليدها إسم ملف/ملفات المفتاح غير صحيح ملف المفتاح '%s' موجود من قبل.\nهل تريد استبداله? عملية التوليد ستتوقف لو كانت الإجابة بلا. diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml index 380809d9..722ec645 100644 --- a/Translations/Language.be.xml +++ b/Translations/Language.be.xml @@ -356,7 +356,7 @@ УВАГА: Пры страце ключавога файла, ці пашкоджанні яго першых 1024 кілабайт - мантаванне тамоў, што яго выкарыстоўваюць, будзе немагчымае! біт Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Аўтар перакладу: Памер: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Ключавы файл паспяхова створаны. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml index 7055116b..ec352248 100644 --- a/Translations/Language.bg.xml +++ b/Translations/Language.bg.xml @@ -356,7 +356,7 @@ ВНИМАНИЕ: Ако изгубите ключ-файл или ако първите му 1024 KB са повредени, няма да е възможно да се монтират томове, които го използват! битов Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Превод: Размер: @@ -938,7 +938,7 @@ Въведете парола за заглавната част съхранена в бекъп файл Ключ-файла е създаден успешно. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml index 16cee5e1..3e4c5c7d 100644 --- a/Translations/Language.ca.xml +++ b/Translations/Language.ca.xml @@ -356,7 +356,7 @@ ATENCIÓ: Si perd un fitxer de claus o si canvia algun dels seus primers 1024 kilobytes, serà impossible de muntar els volums que utilitzin aquest fitxer de claus! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Traduït per: Mida del text pla: @@ -938,7 +938,7 @@ Introdueixi la contrasenya de la capçalera guardada a la còpia de seguretat El fitxer de claus s'ha creat amb èxit. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.co.xml b/Translations/Language.co.xml index 84790387..94e18ac2 100644 --- a/Translations/Language.co.xml +++ b/Translations/Language.co.xml @@ -375,7 +375,7 @@ Information about Corsican localization: AVERTIMENTU : S’è vo pirdite un schedariu chjave o s’è un solu bit di i so 1024 primi chiloottetti cambia, serà impussibule di muntà i vulumi chì impieganu stu schedariu chjave ! bits Numeru di sch. chjave : - Dimens. di i sch. chjave (ottetti) : + Dimens. di i sch. chjave : Nome di basa di i sch. chjave : Traduttu da : Dimensione di u testu in chjaru : @@ -957,7 +957,7 @@ Information about Corsican localization: Stampittate a parolla d’intesa per l°intestatura piazzata in u schedariu di salvaguardia I schedarii chjave sò stati creati currettamente. U numeru di schedarii chjave stampittatu hè inaccettevule. - A dimensione di u schedariu chjave deve esse trà 64 è 1048576 ottetti. + The keyfile size must be at least 64 bytes. Stampittate un nome per u(i) schedariu(i) chjave chì hà(anu) da esse ingeneratu(i) U nome di basa di u(i) schedariu(i) chjave hè inaccettevule U schedariu chjave « %s » esiste dighjà.\nVulete rimpiazzallu ? U trattamentu di generazione serà piantatu s’è vò rispundite Nò. diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml index 988b6e34..5553a78d 100644 --- a/Translations/Language.cs.xml +++ b/Translations/Language.cs.xml @@ -356,7 +356,7 @@ UPOZORNĚNÍ: ztratíte-li souborový klíč nebo změní-li se jediný bit z prvních 1024 kilobajtů, bude nemožné připojit svazek používající souborový klíč. bitů Počet klíčů: - Velikost klíče (v bajtech): + Velikost klíče: Název úložiště klíče: Přeložil: Velikost textu: @@ -938,7 +938,7 @@ Zadejte heslo pro hlavičku uloženou v záložním souboru Souborový klíč byl úspěšně vytvořen. Počet poskytnutých souborových klíčů je neplatný. - Velikost souborových klíčů musí mít hodnotu mezi 64 a 1048576 bajtů. + The keyfile size must be at least 64 bytes. Prosím, zadejte název pro vygenerovaný souborový klíč Základní název souborového klíče je neplatný Souborový klíč '%s' již existuje.\nPřejete si ho přepsat? Jeho vygenerování bude zastaveno, odpovíte-li „Ne”. diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml index 7c51831f..c8e3371c 100644 --- a/Translations/Language.da.xml +++ b/Translations/Language.da.xml @@ -356,7 +356,7 @@ ADVARSEL: Hvis du mister en nøglefil eller dele af dens første 1024 kilobytes ændres, vil det være umuligt at tilslutte bindet som bruger denne nøglefil! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Oversat af: Ren tekst størrelse: @@ -938,7 +938,7 @@ Indtast kodeord for header gemt i backup filen Nøglefil er oprettet med succes. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml index 56d67144..d02b2205 100644 --- a/Translations/Language.de.xml +++ b/Translations/Language.de.xml @@ -359,7 +359,7 @@ WARNUNG: Ein Volume kann nicht mehr eingehängt werden, wenn eine der Schlüsseldateien fehlt oder in den ersten 1024 KB verändert wurde! Bit Anzahl der Schlüsseldateien: - Schlüsseldateigröße (in Bytes): + Schlüsseldateigröße: Name der Schlüsseldatei(en): Übersetzt von: Klartextgröße: @@ -941,7 +941,7 @@ Geben Sie das Passwort für die in der Sicherungsdatei abgelegten Kopfdaten ein. Die Schlüsseldatei(en) wurde(n) erfolgreich erstellt. Die Anzahl der gewählten Schlüsseldateien ist unzulässig. - Die Schlüsseldatei muss zwischen 64 und 1048576 Bytes groß sein. + The keyfile size must be at least 64 bytes. Bitte geben Sie einen Namen für die zu erstellenden Schlüsseldateien ein. Der Name für die Schlüsseldateien ist unzulässig. Die Schlüsseldatei „%s“ existiert bereits.\nMöchten Sie sie überschreiben? Der Erstellungsprozess wird abgebrochen, wenn Sie „Nein“ wählen. diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml index 25c50a90..e7b6033d 100644 --- a/Translations/Language.el.xml +++ b/Translations/Language.el.xml @@ -356,7 +356,7 @@ ΠΡΟΣΟΧΗ: Αν χάσετε ένα αρχείο-κλειδί ή κάποιο bit από τα πρώτα 1024 ΚΒ του αλλάξει, θα είναι αδύνατο να φορτώσετε τόμους που το χρησιμοποιούν! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Μετάφραση: Μέγεθος απλού κειμένου: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Το αρχείο-κλειδί δημιουργήθηκε επιτυχώς. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml index deb9b3e8..8e2f925e 100644 --- a/Translations/Language.es.xml +++ b/Translations/Language.es.xml @@ -356,7 +356,7 @@ PRECAUCIÓN: ¡si pierde un archivo-llave o si cambian sus primeros 1024 KB, será imposible montar los volúmenes que usan ese archivo-llave! bits Número de archivos-clave: - Tamaño de los ficheros-llave (en Bytes): + Tamaño de los ficheros-llave: Nombre base de los ficheros-llave: Traducido por: Tamaño del texto legible: @@ -938,7 +938,7 @@ Introduzca contraseña para la cabecera almacenada en archivo de respaldo Se ha creado con éxito el archivo-llave. El número de archivos-clave que proporcionó es inválido. - El tamaño del archivo-clave debe estar comprendido entre 64 y 1048576 bytes. + The keyfile size must be at least 64 bytes. Por favor, introduzca un nombre para que se genere el fichero-llave El nombre base del/de los fichero(s)-llave es inválido El fichero-llave '%s' ya existe.\n¿Quiere sobrescribirlo? Se detendrá el proceso si responde No. diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml index bb229c61..405074ca 100644 --- a/Translations/Language.et.xml +++ b/Translations/Language.et.xml @@ -356,7 +356,7 @@ HOIATUS: Kui sa kaotad võtmefaili või isegi üks bit selle esimesest 1024 kilobaidist muutub, muutub võimatuks selle võtmefailiga konteinerite haakimine! bitti Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Tõlkija: Lihtteksti suurus: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Võtmefail on edukalt loodud. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml index c8124873..f10d609a 100644 --- a/Translations/Language.eu.xml +++ b/Translations/Language.eu.xml @@ -356,7 +356,7 @@ KONTUZ: Gako-fitxategi bat galtzen baduzu edo lehenengo 1024 kilobytetako bit bat aldatzen bada, ezinezkoa izango da gako-fitxategi hori erabiltzen duten bolumenak muntatzea! bit-ak Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Hauek Izulita: Testu Arruntako tamaina: @@ -938,7 +938,7 @@ Babeskopia fitxategian gordetako goiburuaren pasahitza sartu Gako-fitxategia sortu egin da. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml index feb2c24b..9f16eb34 100644 --- a/Translations/Language.fa.xml +++ b/Translations/Language.fa.xml @@ -356,7 +356,7 @@ WARNING: If you lose a keyfile or if any bit of its first 1024 kilobytes changes, it will be impossible to mount volumes that use the keyfile! بيت ها Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Translated by: Plaintext size: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Keyfiles have been successfully created. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml index 1ae9f6c0..5868f43f 100644 --- a/Translations/Language.fi.xml +++ b/Translations/Language.fi.xml @@ -356,7 +356,7 @@ VAROITUS: Jos hävität avaintiedoston tai jokin ensimmäisen 1024 kilotavua bitti muuttuu, on mahdotonta yhdistää taltiota, joka käyttää tätä avaintiedostoa! bittiä Avaintiedotojen määrä: - Avaintiedostojen koko (tavuina): + Avaintiedostojen koko: Avaintiedoston perusnimi: Käännös: Ilmitekstin koko: @@ -938,7 +938,7 @@ Anna salasana otsikolle talletettuna varmuus tiedostoon Avaintiedosto on nyt luotu onnistuneesti. Toimittamasi avaintiedostot ovat virheellisiä. - Avaintiedostot koon on oltava 64 ja 1048576 tavun välillä. + The keyfile size must be at least 64 bytes. Anna nimi generoitavalle avaintiedostolle Nimi avaintiedostolle(t) on virheellinen Avaintiedoto '%s' on jo olemassa.\nHaluatko ylikirjoittaa sen? Generointi keskeytetään, jos vastaat kysymykseen En. diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml index e5a3613a..1cd1a318 100644 --- a/Translations/Language.fr.xml +++ b/Translations/Language.fr.xml @@ -356,7 +356,7 @@ AVERTISSEMENT : Si vous perdez un fichier clé ou si tout bit de ses 1024 premiers kilooctets change, il sera impossible de monter les volumes utilisant ce fichier clé ! bits Nombre de fichiers clé: - Taille fichiers clé (en Octets): + Taille fichiers clé: Nom de base fichiers clé: Traduit par : Taille text en clair : @@ -938,7 +938,7 @@ Entrez le mot de passe pour l’en-tête stocké dans un fichier de sauvegarde Fichiers clé créés avec succès. Le nombre de fichiers clé que vous avez saisi est invalide. - La taille du fichier clé doit être comprise entre 64 and 1048576 octets. + La taille du fichier clé doit être au mois 64 octets. Merci de saisir le nom de base des fichiers clé qui vont être crées Le nom de base saisi des fichiers clé est invalide Le fichier clé ’%s’ existe déjà.\nVoulez-vous l’écraser? L’opération de génération va s’arrêter si vous répondez non. diff --git a/Translations/Language.he.xml b/Translations/Language.he.xml index fefb6b13..5a3ca89d 100644 --- a/Translations/Language.he.xml +++ b/Translations/Language.he.xml @@ -356,7 +356,7 @@ אזהרה: אם אתה מאבד קובץ מפתח או אם כל חלק מה 1024 קילובייט הראשונים שלו משתנה, אי אפשר יהיה לעלות אמצעי אחסוןים המשתמשים בקובץ המפתחות! ביטים מספר קובצי המפתח: - גודל מפתחות (בבתים): + גודל מפתחות: שם בסיס קובץ המפתח: תורגם ע&quot;י: גודל טקסט רגיל: @@ -938,7 +938,7 @@ הזן סיסמה לכותרת המאוחסנת בקובץ הגיבוי קבצי המפתחות נוצרו בהצלחה. מספר קבצי המפתחות שסיפקת אינו חוקי. - יש להכין את גודל הקליפ בין 64 ל -1048576 בתים. + The keyfile size must be at least 64 bytes. אנא הזן שם לקובץ המפתחות שייווצר שם הבסיס של קובץ המפתחות לא חוקי קובץ המפתח %s כבר קיים.\nהאם ברצונך להחליף אותו?\nהתהליך ייפסק אם תבחר שלא. diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml index 4477e2ad..6d498c35 100644 --- a/Translations/Language.hu.xml +++ b/Translations/Language.hu.xml @@ -356,7 +356,7 @@ FIGYELEM: Ha elveszíti a kulcsfájlt, vagy az első 1024 kilobájt bármely része megváltozik, lehetetlenné válik a kulcsfájlt használó kötetek csatlakoztatása! bit Kulcsfájlok száma: - Kulcsfájlok mérete (bájtban): + Kulcsfájlok mérete: Kulcsfájlok alapneve: Fordította: Egyszerű szöveg mérete: @@ -938,7 +938,7 @@ Adja meg a biztonsági másolatban tárolt fejléc jelszavát A kulcsfájlok sikeresen létre lettek hozva. A megadott kulcsfájlok száma érvénytelen. - A kulcsfájl méretének 64 és 1048576 bájt között kell lennie. + The keyfile size must be at least 64 bytes. Adja meg a létrehozandó kulcsfájl(ok) nevét A kulcsfájl(ok) alapneve érvénytelen A(z) '%s' kulcsfájl már létezik.\nFelülírja? A létrehozási folyamat leáll, ha nemmel válaszol. diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml index 60e0a0c3..004b1c93 100644 --- a/Translations/Language.id.xml +++ b/Translations/Language.id.xml @@ -356,7 +356,7 @@ PERINGATAN: Jika Anda kehilangan berkas kunci atau sembarang bit dari 1024 kilobyte pertamanya berubah, tidak mungkin untuk mengait volume yang menggunakan berkas kunci tersebut! bit Banyaknya berkas kunci: - Ukuran berkas kunci (dalam Byte): + Ukuran berkas kunci: Nama basis berkas kunci: Diterjemahkan oleh: Ukuran teks polos: @@ -938,7 +938,7 @@ Masukkan kata sandi untuk header yang disimpan dalam berkas cadangan Berkas kunci telah berhasil dibuat. Banyaknya berkas kunci yang Anda berikan tidak valid. - Ukuran berkas kunci harus antara 64 dan 1048576 byte. + The keyfile size must be at least 64 bytes. Silakan masukkan nama untuk berkas kunci yang akan dihasilkan Nama dasar berkas kunci tidak valid Berkas kunci '%s' sudah ada.\nApakah Anda ingin menimpanya? Proses pembuatan akan dihentikan jika Anda menjawab Tidak. diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml index a3d4f9d5..677de249 100644 --- a/Translations/Language.it.xml +++ b/Translations/Language.it.xml @@ -356,7 +356,7 @@ ATTENZIONE: se viene perso un file chiave o se cambiano i bit nei primi 1024 KB, sarà impossibile montare i volumi che usano questo file chiave! bits Numero di file chiave: - Dimensione del file chiave (in Bytes): + Dimensione del file chiave: Nome del file chiave di base: Tradotto da: Dimensione testo: @@ -938,7 +938,7 @@ Digitare la password per la testa memorizzata nel file di backup Il file chiave è stato creato correttamente. Il numero di file chiavi che hai fornito non è valido. - La dimensione del file chiave deve essere compresa tra 64 e 1048576 bytes. + The keyfile size must be at least 64 bytes. Per favore inserisci un nome per il/i file chiave per essere generato/i. Il nome del(dei) file chiave di base non è valido Il file chiave '%s' esiste già.\nVuoi sovrascriverlo? Il processo di generazione sarà interrotto se rispondi No. diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml index adbe1817..1b6b15a0 100644 --- a/Translations/Language.ja.xml +++ b/Translations/Language.ja.xml @@ -356,7 +356,7 @@ 警告：もしキーファイルを紛失、あるいはその先頭1024キロバイト中に1ビットでも変化があった場合、そのキーファイルを使っているボリュームはマウントできなくなります！ ビット Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: 翻訳者： 平文のサイズ： @@ -938,7 +938,7 @@ バックアップファイルに保存されたヘッダのパスワードを入力してください。 キーファイルの生成に成功しました。 The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml index 4e72e1dd..22784254 100644 --- a/Translations/Language.ka.xml +++ b/Translations/Language.ka.xml @@ -356,7 +356,7 @@ !!!გასაღების ფაილის დაკარგვის ან პირველი 1024კბ დაზიანების შემდეგ, ტომების მიერთება შეუძლებელი იქნება! ბიტი Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: თარგმანის ავტორი: ზომა: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file გასაღების ფაილი წარმატებით შეიქმნა. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml index 4c464b92..81ff0bd9 100644 --- a/Translations/Language.ko.xml +++ b/Translations/Language.ko.xml @@ -356,7 +356,7 @@ 경고: 키 파일을 잃어버리거나 처음 1024KB 의 일부가 변경된 경우, 키 파일을 사용하는 볼륨을 마운트하는 것은 불가능할 것입니다. 비트 키 파일 수: - 키 파일 크기(바이트): + 키 파일 크기: 키 파일 기본 이름: 번역자: 일반 글자 크기: @@ -938,7 +938,7 @@ 백업 파일에 저장된 헤더의 비밀번호를 입력하세요. 키 파일이 성공적으로 작성되었습니다. 입력 한 키 파일의 수가 유효하지 않습니다. - 키 파일 크기는 64에서 1048576 바이트 사이에서 구해야합니다. + The keyfile size must be at least 64 bytes. 생성 할 키 파일의 이름을 입력하세요. 키 파일의 기본 이름이 유효하지 않습니다. 키 파일 '%s'이 (가) 이미 존재합니다.\n덮어 쓰시겠습니까? 대답을하지 않으면 생성 프로세스가 중지됩니다. diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml index c953edc9..4836096c 100644 --- a/Translations/Language.lv.xml +++ b/Translations/Language.lv.xml @@ -356,7 +356,7 @@ WARNING: If you lose a keyfile or if any bit of its first 1024 kilobytes changes, it will be impossible to mount volumes that use the keyfile! biti Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Tulkojis: Vienkāršteksta izmērs: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Atslēgdatne izveidota sekmīgi. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml index 405dd0af..a65583e9 100644 --- a/Translations/Language.my.xml +++ b/Translations/Language.my.xml @@ -356,7 +356,7 @@ သတိပေးချက် - ကီးဖိုင်​ ပျောက်သွားသည် ဖြစ်စေ (သို့) ၄င်း၏ ပထမဆုံး ၁၀၂၄ kilobytes ပြောင်းသွားသည် ဖြစ်စေ၊ အဲဒီ ကီးဖိုင်ကို အသုံးပြုသော volumes များကို အစပျိုးနိုင်မည် မဟုတ်ပါ။ bits စကားဝှက်သော့ဖိုင် အရေအတွက် - - စကားဝှက်သော့ဖိုင်များ၏ အရွယ်အစား (ဘိုက်) - + စကားဝှက်သော့ဖိုင်များ၏ အရွယ်အစား - စကားဝှက်သော့ဖိုင်များ အခြေ အမည် - ဘာသာပြန်ဆိုသူ - စာသား သက်သက် အရွယ် - @@ -940,7 +940,7 @@ အရံသင့် ဖိုင်ထဲ၌ သိမ်းဆည်းထားသော ခေါင်းစီးအတွက် စကားဝှက် ရေးထည့်ပါ ကီးဖိုင်ကို အောင်မြင်စွာ ဖန်တီးလိုက်ပြီ။ သင် ပေးသွင်းခဲ့သော စကားဝှက်သော့ဖိုင် အရေအတွက်မှာ မမှန်ကန်ပါ။ - စကားဝှက်သော့ဖိုင် အရွယ်အစားသည် ၆၄ နှင့် ၁၀၄၈၅၇၆ ဘိုက် အကြား ရှိရမည်။ + The keyfile size must be at least 64 bytes. ကျေးဇူးပြု၍ စကားဝှက်သော့ဖိုင်(များ)ကို ထုတ်လုပ်ရန် အမည်တစ်ခု ရိုက်ထည့်ပါ စကားဝှက်သော့ဖိုင်(များ)၏ အခြေအမည်မှာ မမှန်ကန်ပါ စကားဝှက်သော့ဖိုင် '%s' သည် ရှိပြီးသားဖြစ်သည်။\nသင်သည် ၎င်းကို ထပ်ရေးလိုပါသလား။ ထပ်မရေးလိုပါ ဟု သင်ဖြေပါက ထုတ်လုပ်သည့်လုပ်ငန်းစဉ်ကို ရပ်လိုက်ပါမည်။ diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml index 4b4ead09..d626dd2d 100644 --- a/Translations/Language.nl.xml +++ b/Translations/Language.nl.xml @@ -356,7 +356,7 @@ WAARSCHUWING: als u een sleutelbestand verliest of als er een bit van de eerste 1024 KiB verandert, is het onmogelijk om volumes te koppelen die het sleutelbestand gebruiken! bits Aantal sleutelbestanden: - Grootte sleutelbestand (bytes): + Grootte sleutelbestand: Basisnaam sleutelbestanden: Vertaald door: Grootte van platte tekst: @@ -938,7 +938,7 @@ Voer het wachtwoord in voor de header die in het back-upbestand is opgeslagen Sleutelbestanden zijn met succes aangemaakt. Het aantal door u opgegeven sleutelbestanden is ongeldig. - De grootte van het sleutelbestand moet liggen tussen 64 en 1048576 bytes. + The keyfile size must be at least 64 bytes. Voer een naam in voor de aan te maken sleutelbestanden. Basisnaam van sleutelbestand(en) is ongeldig Het sleutelbestand '%s' bestaat al.\nWilt u het overschrijven? Het genereren wordt gestopt als u nee antwoordt. diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml index 2c3923ac..f9f6b41b 100644 --- a/Translations/Language.nn.xml +++ b/Translations/Language.nn.xml @@ -356,7 +356,7 @@ ÅTVARING: Vist du misser ei nøkkel fil eller vist ein bit av dei fyrste 1024 kilobyta i fila vert endra, vill det ikkje vera mogeleg å montera volum som brukar nøkkelfila! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Omsett av: Klartekst storleik: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Nøkkelfil har vorte laga. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml index 18b9e04a..43ed98e8 100644 --- a/Translations/Language.pl.xml +++ b/Translations/Language.pl.xml @@ -356,7 +356,7 @@ Uwaga: Jeśli zgubisz plik-klucz lub zostanie zmieniony choć jeden bit z pierwszych 1024 kB, podłączenie wolumenów nie będzie możliwe! bity Liczba plików-kluczy: - Rozmiar plków-kluczy (w bajtach): + Rozmiar plków-kluczy: Nazwa bazowa plików-kluczy: Przetłumaczony przez: Długość: @@ -938,7 +938,7 @@ Wprowadź hasło do zapisania do pliku kopii bezpieczeństwa nagłówka Plik-klucz został pomyślnie utworzony. Liczba plików-kluczy, którą podałeś jest nieprawidłowa. - Rozmiar pliku-klucza musi być zawarty pomiędzy 64 a 1048576 bajtów. + The keyfile size must be at least 64 bytes. Proszę podać nazwę pliku/ów-klucza/y do wygenerowania Nazwa bazowa pliku/ów-klucza/ów jest nieprawidłowa. Plik-klucz'%s' już istnieje.\nCzy chcesz go nadpisać? Proces generowania zostanie zakończony, jeżeli odpowiesz Nie. diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml index 4d0f5996..0381418d 100644 --- a/Translations/Language.pt-br.xml +++ b/Translations/Language.pt-br.xml @@ -356,7 +356,7 @@ ALERTA: Se você perder um arquivo-chave ou algum bit dos seus primeiros 1024 kilobytes for alterado, será impossível montar os volumes que usam esse arquivo-chave! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Traduzido por: Tamanho do Texto em Claro: @@ -938,7 +938,7 @@ Digite a senha para o cabeçalho armazenado no arquivo de backup O arquivo-chave foi criado com sucesso. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.ro.xml b/Translations/Language.ro.xml index 2f26d0d2..37a23413 100644 --- a/Translations/Language.ro.xml +++ b/Translations/Language.ro.xml @@ -356,7 +356,7 @@ ATENȚIONARE:\nDacă pierdeți un fișier-cheie sau orice bit din primii 1024 kiloocteți este modificat, va fi imposibil de montat volumul care utilizează acel fișier-cheie! biți Număr fișiere-cheie: - Mărime (în octeți): + Mărime: Nume de bază fișiere-cheie: Tradus de: Mărime text simplu: @@ -938,7 +938,7 @@ Introduceți parola pentru antetul stocat în fișierul de rezervă Fișierele-cheie au fost create cu succes. Numărul de fișiere-cheie furnizate este invalid. - Dimensiunea fișierului cheie trebuie cuprinsă între 64 și 1048576 octeți. + The keyfile size must be at least 64 bytes. Introduceți un nume pentru fișierele-cheie ce vor fi generate Numele de bază a fișierelor cheie este invalid Fișierul cheie '%s' deja există.\nDoriți să-l suprascrieți? Procesul de generare va fi oprit dacă răspundeți nu. diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml index 31a9a17b..aa37b5d4 100644 --- a/Translations/Language.ru.xml +++ b/Translations/Language.ru.xml @@ -356,7 +356,7 @@ * При утере ключевого файла или повреждении его первых 1024 килобайт монтирование использующих этот файл томов невозможно! бит Число ключевых файлов: - Размер файлов (в байтах): + Размер файлов: Базовое имя ключевых файлов: Автор перевода: Размер: @@ -938,7 +938,7 @@ Введите пароль для заголовка в файле резервной копии Ключевой файл успешно создан. Недопустимое количество ключевых файлов. - Размер ключевого файла должен быть между 64 и 1 048 576 байтами. + The keyfile size must be at least 64 bytes. Введите имя создаваемого ключевого файла Недопустимое базовое имя ключевых файлов Ключевой файл "%s" уже существует.\nПерезаписать его? При ответе "Нет" процесс генерирования будет остановлен. diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml index 1a1a39e4..4f8798ce 100644 --- a/Translations/Language.sk.xml +++ b/Translations/Language.sk.xml @@ -356,7 +356,7 @@ VÝSTRAHA: Ak stratíte súborový kľúč alebo sa zmení jediný bit z prvých 1024 kilobytov, nebude viac možné pripojiť zväzok používajúci súbor. kľúč! bitov Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Preložil: Veľkosť obyč. textu: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Súborový kľúč bol úspešne vytvorený. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml index b3d0234b..66175cc0 100644 --- a/Translations/Language.sl.xml +++ b/Translations/Language.sl.xml @@ -356,7 +356,7 @@ POZOR: Če izgubite ključno datoteko ali če se ji spremeni katerikoli bit njenih prvih 1024 kilobajtov, bo nemogoče priključiti zbirnike, ki uporabljajo to ključno datoteko! bitov Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Prevedel: Velik. gol. sporoč.: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Keyfile has been successfully created. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml index c82d4df9..a4dd9948 100644 --- a/Translations/Language.sv.xml +++ b/Translations/Language.sv.xml @@ -356,7 +356,7 @@ VARNING: Om du tappar bort en nyckelfil eller om någon bit av de första 1 024 kB ändras, blir det omöjligt att montera volymer som använder den nyckelfilen! bitar Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Översatt av: Storlek på klartext: @@ -938,7 +938,7 @@ Ange lösenordet för volymhuvudet lagrat i säkerhetskopian Nyckelfilen har skapats utan fel. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml index 5eb0e9a5..3c8fb966 100644 --- a/Translations/Language.th.xml +++ b/Translations/Language.th.xml @@ -356,7 +356,7 @@ WARNING: If you lose a keyfile or if any bit of its first 1024 kilobytes changes, it will be impossible to mount volumes that use the keyfile! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Translated by: Plaintext size: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Keyfiles have been successfully created. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml index 42712ae3..5be5fb79 100644 --- a/Translations/Language.tr.xml +++ b/Translations/Language.tr.xml @@ -356,7 +356,7 @@ UYARI: Anahtar dosyasını kaybederseniz veya ilk 1024 kilobayt'ının bir bit'i değişirse, bu anahtar dosyasını kullanan birimleri bağlamak imkansız hale gelecektir! bit Anahtar dosya sayısı: - Anahtar dosya boyutu (in Bytes): + Anahtar dosya boyutu: Anahtar dosya temel adı: Çevirenler: Şifresiz metin boyutu: @@ -938,7 +938,7 @@ Yedekleme dosyasında saklanan başlık için parolayı girin Anahtar dosyası başarıyla oluşturuldu. Sağladığınız anahtar dosya sayısı geçersiz. - Anahtar dosyasının boyutu 64 ile 1048576 bayt arasında oluşturulmalıdır. + The keyfile size must be at least 64 bytes. Lütfen oluşturulacak anahtar dosya(lar) için bir ad girin Anahtar dosya(lar)ın temel adı geçersiz '%s' anahtar dosyası zaten var.\nÜzerine yazmak istiyor musunuz? Hayır cevabını verirseniz oluşturma işlemi durdurulacaktır.. diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml index 65ec080c..cac77aa7 100644 --- a/Translations/Language.uk.xml +++ b/Translations/Language.uk.xml @@ -356,7 +356,7 @@ УВАГА: При втраті ключового файлу або пошкодженні його перших 1024 кілобайт монтувати використовуючи цей файл томів неможливо! біт Кількість ключових файлів: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Автор перкладу: Розмір тексту: @@ -938,7 +938,7 @@ Введіть пароль для заголовку в файлі резервної копії Файл-ключ успішно створено. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml index 89e26eab..b2b486ad 100644 --- a/Translations/Language.uz.xml +++ b/Translations/Language.uz.xml @@ -356,7 +356,7 @@ !!! При утере ключевого файла или повреждении его первых 1024 килобайт монтирование использующих этот файл томов невозможно! бит Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Автор перевода: Размер: @@ -938,7 +938,7 @@ Введите пароль для заголовка в файле резервной копии Ключевой файл успешно создан. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml index c4bda907..21b603d7 100644 --- a/Translations/Language.vi.xml +++ b/Translations/Language.vi.xml @@ -356,7 +356,7 @@ CẢNH BÁO: Nếu bạn mất một tập tin khóa hoặc nếu bất cứ phần nào trong 1024 kilobytes đầu của nó thay đổi thì sẽ không thể nào nạp lên các tập đĩa nào dùng tập tin khóa được! bits Số tập tin khóa: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Dịch bởi: Kích cỡ chữ thường: @@ -938,7 +938,7 @@ Nhập khẩu cho phần đầu giữ trong tập tin sao lưu Keytập tin has been successfully cấu tạod. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml index 7aaa624f..d717c088 100644 --- a/Translations/Language.zh-cn.xml +++ b/Translations/Language.zh-cn.xml @@ -357,7 +357,7 @@ 警告：如果您丢失了密钥文件或者密钥文件的前 1024 KB 内容被改变，该密钥将无法加载相应的加密卷！ 位 密钥文件数量: - 密钥文件大小(以字节计算): + 密钥文件大小: 密钥文件名: 翻译人员： 明文密码长度： @@ -939,7 +939,7 @@ 输入存储在备份文件中的加密卷头的密码 密钥文件已成功创建。 你提供的密钥文件数量无效。 - 密钥文件的大小必须介于64字节至1048576字节之间。 + The keyfile size must be at least 64 bytes. 输入要生成的密钥文件的文件名 输入的密钥文件基底文件名无效 密钥文件 '%s' 已存在。\n你希望覆盖它吗？选择“否”会停止生成过程... diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml index a3b225d4..90e615ec 100644 --- a/Translations/Language.zh-hk.xml +++ b/Translations/Language.zh-hk.xml @@ -356,7 +356,7 @@ 警告：如果您失去加密鑰檔案或者加密鑰檔案的首 1024 KiB 被修改，使用該加密鑰的加密區將會無法掛載！ 位元 加密鑰檔案數量 - 加密鑰檔案大小 (位元組): + 加密鑰檔案大小: 加密鑰檔案名稱前綴: 翻譯人員： 純文字長度： @@ -938,7 +938,7 @@ 輸入儲存在備份檔案中的加密區頭的密碼 已成功建立加密鑰檔案。 你提供的加密鑰檔案數量無效 - 加密鑰檔案大小必須在介乎 64 至 1048576 位元之間。 + The keyfile size must be at least 64 bytes. 請輸入一個名稱給將會產生的加密鑰檔案 加密鑰檔案的基名無效 加密鑰檔案「%s」已經存在。\n你是否想覆寫它？如您回應否的話產生程序將會停止。 diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml index e6701b47..1ecd57c2 100644 --- a/Translations/Language.zh-tw.xml +++ b/Translations/Language.zh-tw.xml @@ -356,7 +356,7 @@ 警告：如果您遺失了金鑰檔或者金鑰檔的前 1024 KB 位元組已改變，將不可能再掛載使用該金鑰的加密區！ 位元 密鑰檔案數量： - 密鑰檔案大小(位元組)： + 密鑰檔案大小： Keyfiles base name: 翻譯人員： 純文字密碼長度： @@ -938,7 +938,7 @@ Enter password for the header stored in backup file 金鑰檔已成功建立。 The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/src/Common/Common.rc b/src/Common/Common.rc index 6d50a1fb..aa1ca18f 100644 --- a/src/Common/Common.rc +++ b/src/Common/Common.rc @@ -211,7 +211,7 @@ BEGIN CONTROL "",IDC_INFO_BOX_TEXT,"RichEdit20W",ES_MULTILINE | ES_READONLY | ES_NUMBER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,5,6,361,188 END -IDD_KEYFILE_GENERATOR DIALOGEX 0, 0, 357, 362 +IDD_KEYFILE_GENERATOR DIALOGEX 0, 0, 357, 369 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "VeraCrypt - Keyfile Generator" FONT 8, "MS Shell Dlg", 400, 0, 0x1 @@ -221,18 +221,19 @@ BEGIN CONTROL "Display pool content",IDC_DISPLAY_POOL_CONTENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,51,141,10 EDITTEXT IDC_NUMBER_KEYFILES,124,278,51,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_KEYFILES_SIZE,124,298,51,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + COMBOBOX IDC_KEYFILES_SIZE_UNIT,182,299,41,137,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Random size ( 64 <-> 1048576 )",IDC_KEYFILES_RANDOM_SIZE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,300,174,10 - EDITTEXT IDC_KEYFILES_BASE_NAME,124,318,141,14,ES_AUTOHSCROLL - PUSHBUTTON "Generate and Save Keyfile...",IDC_GENERATE_AND_SAVE_KEYFILE,124,336,141,14 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,317,174,10 + EDITTEXT IDC_KEYFILES_BASE_NAME,124,331,141,14,ES_AUTOHSCROLL + PUSHBUTTON "Generate and Save Keyfile...",IDC_GENERATE_AND_SAVE_KEYFILE,124,349,141,14 LTEXT "IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases the cryptographic strength of the keyfile.",IDT_KEYFILE_GENERATOR_NOTE,11,5,271,33 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,1,40,356,1,WS_EX_STATICEDGE RTEXT "Mixing PRF:",IDT_PRF,7,51,85,10,SS_CENTERIMAGE GROUPBOX "Current Pool Content",IDT_POOL_CONTENTS,6,70,344,170 CTEXT "",IDC_POOL_CONTENTS,16,83,323,148,0,WS_EX_TRANSPARENT RTEXT "Number of keyfiles:",IDT_NUMBER_KEYFILES,9,281,110,8 - RTEXT "Keyfiles base name:",IDT_KEYFILES_BASE_NAME,9,321,110,8 - RTEXT "Keyfiles size (in Bytes):",IDT_KEYFILES_SIZE,9,300,110,8 + RTEXT "Keyfiles base name:",IDT_KEYFILES_BASE_NAME,9,334,110,8 + RTEXT "Keyfiles size:",IDT_KEYFILES_SIZE,9,300,110,8 CONTROL "",IDC_ENTROPY_BAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,18,255,321,12 GROUPBOX "Randomness Collected From Mouse Movements",IDT_ENTROPY_BAR,6,244,344,29 END @@ -424,7 +425,7 @@ BEGIN BEGIN LEFTMARGIN, 7 TOPMARGIN, 7 - BOTTOMMARGIN, 358 + BOTTOMMARGIN, 365 END IDD_MULTI_CHOICE_DLG, DIALOG diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 2fd18606..76748fe5 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -7167,6 +7167,7 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: { HWND hComboBox = GetDlgItem (hwndDlg, IDC_PRF_ID); + HWND hSizeUnit = GetDlgItem (hwndDlg, IDC_KEYFILES_SIZE_UNIT); HCRYPTPROV hRngProv = NULL; VirtualLock (randPool, sizeof(randPool)); @@ -7196,6 +7197,16 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP } SelectAlgo (hComboBox, &hash_algo); + // populate keyfiles size unit combo + SendMessage (hSizeUnit, CB_RESETCONTENT, 0, 0); + AddComboPair (hSizeUnit, GetString ("BYTES"), 0); + AddComboPair (hSizeUnit, GetString ("KB"), 1); + AddComboPair (hSizeUnit, GetString ("MB"), 2); + AddComboPair (hSizeUnit, GetString ("GB"), 3); + + // set default keyfiles size unit + SendMessage (hSizeUnit, CB_SETCURSEL, 0, 0); + SetCheckBox (hwndDlg, IDC_DISPLAY_POOL_CONTENTS, bDisplayPoolContents); hEntropyBar = GetDlgItem (hwndDlg, IDC_ENTROPY_BAR); SendMessage (hEntropyBar, PBM_SETRANGE32, 0, maxEntropyLevel); @@ -7303,6 +7314,7 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP if (lw == IDC_KEYFILES_RANDOM_SIZE) { EnableWindow(GetDlgItem (hwndDlg, IDC_KEYFILES_SIZE), !GetCheckBox (hwndDlg, IDC_KEYFILES_RANDOM_SIZE)); + EnableWindow(GetDlgItem (hwndDlg, IDC_KEYFILES_SIZE_UNIT), !GetCheckBox (hwndDlg, IDC_KEYFILES_RANDOM_SIZE)); } if (lw == IDC_GENERATE_AND_SAVE_KEYFILE) @@ -7313,7 +7325,10 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP wchar_t szFileName [2*TC_MAX_PATH + 16]; unsigned char *keyfile = NULL; int fhKeyfile = -1, status; - long keyfilesCount = 0, keyfilesSize = 0, i; + long keyfilesCount = 0, i; + unsigned long long keyfilesSize = 0, remainingBytes = 0; + int selectedUnitIndex, selectedUnitFactor, loopIndex, rndBytesLength; + DWORD dwLastError = 0; wchar_t* fileExtensionPtr = 0; wchar_t szSuffix[32]; BOOL bRandomSize = GetCheckBox (hwndDlg, IDC_KEYFILES_RANDOM_SIZE); @@ -7335,12 +7350,23 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP szNumber[0] = 0; keyfilesSize = wcstoul(szNumber, NULL, 0); - if (keyfilesSize < 64 || keyfilesSize > 1024*1024) + // multiply by the unit factor + selectedUnitIndex = ComboBox_GetCurSel (GetDlgItem (hwndDlg, IDC_KEYFILES_SIZE_UNIT)); + if (selectedUnitIndex != CB_ERR) + { + selectedUnitFactor = (CK_SLOT_ID) ComboBox_GetItemData (GetDlgItem (hwndDlg, IDC_KEYFILES_SIZE_UNIT), selectedUnitIndex); + for (loopIndex = 0; loopIndex < selectedUnitFactor; loopIndex++) + keyfilesSize *= 1024ULL; + } + + if (keyfilesSize < 64) { Warning("KEYFILE_INCORRECT_SIZE", hwndDlg); SendMessage(hwndDlg, WM_NEXTDLGCTL, (WPARAM) GetDlgItem (hwndDlg, IDC_KEYFILES_SIZE), TRUE); return 1; } + + remainingBytes = keyfilesSize; } if (!GetWindowText(GetDlgItem (hwndDlg, IDC_KEYFILES_BASE_NAME), szFileBaseName, TC_MAX_PATH)) @@ -7372,7 +7398,7 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP WaitCursor(); - keyfile = (unsigned char*) TCalloc( bRandomSize? KEYFILE_MAX_READ_LEN : keyfilesSize ); + keyfile = (unsigned char*) TCalloc(KEYFILE_MAX_READ_LEN); for (i= 0; i < keyfilesCount; i++) { @@ -7435,32 +7461,45 @@ BOOL CALLBACK KeyfileGeneratorDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LP return 1; } - /* since keyfilesSize < 1024 * 1024, we mask with 0x000FFFFF */ - keyfilesSize = (long) (((unsigned long) keyfilesSize) & 0x000FFFFF); + /* since random keyfilesSize < 1024 * 1024, we mask with 0x000FFFFF */ + keyfilesSize = (unsigned long long) (((unsigned long) keyfilesSize) & 0x000FFFFF); keyfilesSize %= ((KEYFILE_MAX_READ_LEN - 64) + 1); keyfilesSize += 64; + + remainingBytes = keyfilesSize; } - /* Generate the keyfile */ - if (!RandgetBytesFull (hwndDlg, keyfile, keyfilesSize, TRUE, TRUE)) - { - _close (fhKeyfile); - DeleteFile (szFileName); - TCfree(keyfile); - NormalCursor(); - return 1; - } + do { + rndBytesLength = (int) min (remainingBytes, (unsigned long long) KEYFILE_MAX_READ_LEN); - /* Write the keyfile */ - status = _write (fhKeyfile, keyfile, keyfilesSize); - burn (keyfile, keyfilesSize); + /* Generate the keyfile */ + if (!RandgetBytesFull (hwndDlg, keyfile, rndBytesLength, TRUE, TRUE)) + { + _close (fhKeyfile); + DeleteFile (szFileName); + TCfree(keyfile); + NormalCursor(); + return 1; + } + + /* Write the keyfile */ + status = _write (fhKeyfile, keyfile, rndBytesLength); + } while (status != -1 && (remainingBytes -= (unsigned long long) rndBytesLength) > 0); + + /* save last error code */ + if (status == -1) + dwLastError = GetLastError(); + + burn (keyfile, KEYFILE_MAX_READ_LEN); _close (fhKeyfile); if (status == -1) { TCfree(keyfile); NormalCursor(); + /* restore last error code */ + SetLastError(dwLastError); handleWin32Error (hwndDlg, SRC_POS); return 1; } diff --git a/src/Common/Language.xml b/src/Common/Language.xml index a2555147..8d6fb7ab 100644 --- a/src/Common/Language.xml +++ b/src/Common/Language.xml @@ -356,7 +356,7 @@ WARNING: If you lose a keyfile or if any bit of its first 1024 kilobytes changes, it will be impossible to mount volumes that use the keyfile! bits Number of keyfiles: - Keyfiles size (in Bytes): + Keyfiles size: Keyfiles base name: Translated by: Plaintext size: @@ -938,7 +938,7 @@ Enter password for the header stored in backup file Keyfiles have been successfully created. The number of keyfiles you supplied is invalid. - The keyfile size must be comprized between 64 and 1048576 bytes. + The keyfile size must be at least 64 bytes. Please enter a name for the keyfile(s) to be generated The base name of the keyfile(s) is invalid The keyfile '%s' already exists.\nDo you want to overwrite it? The generation process will be stopped if you answer No. diff --git a/src/Common/Resource.h b/src/Common/Resource.h index a913bc26..c9142ece 100644 --- a/src/Common/Resource.h +++ b/src/Common/Resource.h @@ -224,6 +224,7 @@ #define IDC_BENCHMARK_PREBOOT 5140 #define IDD_TEXT_EDIT_DLG 5141 #define IDC_DISABLE_MOUNT_MANAGER 5142 +#define IDC_KEYFILES_SIZE_UNIT 5143 // Next default values for new objects // @@ -232,7 +233,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 578 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 5143 +#define _APS_NEXT_CONTROL_VALUE 5144 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif