From 7cd02aff8c79805879e0631360e861e5d3b1ed4f Mon Sep 17 00:00:00 2001 From: Alexander Koblov Date: Sat, 22 Nov 2025 16:41:54 +0300 Subject: [PATCH 001/199] UPD: German language file (cherry picked from commit 0b7aecc0deeb238f84b0290b4d35687fd16541ea) --- language/doublecmd.de.po | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/language/doublecmd.de.po b/language/doublecmd.de.po index 3989c9b531..aa5ea772c7 100644 --- a/language/doublecmd.de.po +++ b/language/doublecmd.de.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: Double Commander 1.1.0 alpha\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-11-15 11:15+0300\n" -"PO-Revision-Date: 2025-10-04 20:41+0200\n" +"PO-Revision-Date: 2025-11-22 10:00+0100\n" "Last-Translator: ㋡ \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -3334,58 +3334,57 @@ msgstr "Ode&r vordefinierten Auswahltyp wählen:" #: tfrmmasterkey.btntest.caption msgid "Test" -msgstr "" +msgstr "Test" #: tfrmmasterkey.caption msgid "Create Master Key" -msgstr "" +msgstr "Master-Schlüssel erstellen" #: tfrmmasterkey.gbkeytransform.caption msgid "Key transformation" -msgstr "" +msgstr "Transformation der Schlüssel" #: tfrmmasterkey.gbmasterkey.caption msgid "Master key" -msgstr "" +msgstr "Master-Schlüssel" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." -msgstr "" +msgstr "Je mehr Wiederholungen, desto schwieriger sind Wörterbuch- und Brute-Force-Angriffe, aber das Laden/Speichern des Passwortspeichers dauert auch länger." #: tfrmmasterkey.lblfunction.caption msgid "&Key derivation function:" -msgstr "" +msgstr "Schlüsselableitungsfunktion:" #: tfrmmasterkey.lblheader.caption msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." -msgstr "" +msgstr "Der Master-Schlüssel wird mithilfe einer Schlüsselableitungsfunktion transformiert. Dies erhöht den Arbeitsaufwand und erschwert Wörterbuch- und Brute-Force-Angriffe." #: tfrmmasterkey.lbliterations.caption msgid "&Iterations:" -msgstr "" +msgstr "Wiederholungen:" #: tfrmmasterkey.lblmemory.caption msgid "&Memory:" -msgstr "" +msgstr "Speicher:" #: tfrmmasterkey.lblparallelism.caption msgid "&Parallelism:" -msgstr "" +msgstr "Parallelität (Übereinstimmung):" #: tfrmmasterkey.lblpassword.caption msgid "Master pass&word:" -msgstr "" +msgstr "Master-Passwort:" #: tfrmmasterkey.lblrepeat.caption msgid "&Repeat password:" -msgstr "" +msgstr "Passwort wiederholen:" #: tfrmmasterkey.lbltext.caption msgid "Specify a new master key, which will be used to encrypt the password store." -msgstr "" +msgstr "Geben Sie einen neuen Master-Schlüssel an, der zum Verschlüsseln des Passwortspeichers verwendet wird." #: tfrmmasterkey.lblunit.caption -#, fuzzy msgctxt "tfrmmasterkey.lblunit.caption" msgid "MB" msgstr "MB" @@ -11949,12 +11948,12 @@ msgstr "Ungültige Auswahl." #: ulng.rsmsgkeytransformerror #, object-pascal-format msgid "The key transformation failed (error code %d)!" -msgstr "" +msgstr "Transformation der Schlüssel fehlgeschlagen (Fehlercode %d)!" #: ulng.rsmsgkeytransformtime #, object-pascal-format msgid "The key transformation took %f seconds." -msgstr "" +msgstr "Transformation der Schlüssel dauerte %f Sekunden." #: ulng.rsmsgloadingfilelist msgid "Loading file list..." @@ -14377,4 +14376,3 @@ msgstr "Eine Ersetzung hat nicht stattgefunden." #, object-pascal-format msgid "No setup named \"%s\"" msgstr "Keine Einstellung namens »%s«" - From 935e5a197472521985e1d7449cda3b20b51a1fe7 Mon Sep 17 00:00:00 2001 From: rich2014 Date: Sun, 23 Nov 2025 14:54:20 +0800 Subject: [PATCH 002/199] UPD: restore to min 11.0 on macOS-Intel (caused by the github compilation environment, DC itself supports macOS 10.11) (cherry picked from commit 8c0b8c1497c66e17af4eed9496b25f71cbe805b1) --- .github/scripts/create_snapshot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/create_snapshot.sh b/.github/scripts/create_snapshot.sh index 8185a81876..4a908c4a04 100755 --- a/.github/scripts/create_snapshot.sh +++ b/.github/scripts/create_snapshot.sh @@ -107,6 +107,6 @@ build_doublecmd # Set processor architecture export CPU_TARGET=x86_64 # Set minimal Mac OS X target version -export MACOSX_DEPLOYMENT_TARGET=10.11 +export MACOSX_DEPLOYMENT_TARGET=11.0 build_doublecmd From 5b8e7ac9d5ff2dc29c4c4691a95a79b875ccc12e Mon Sep 17 00:00:00 2001 From: rich2014 Date: Sun, 23 Nov 2025 14:57:49 +0800 Subject: [PATCH 003/199] UPD: improve the postion of Sharing Service Picker Popover on macOS 13+ (cherry picked from commit 57123c9be624393d1ff18684b1c1aaebfa5385b3) --- src/platform/unix/darwin/umydarwin.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/unix/darwin/umydarwin.pas b/src/platform/unix/darwin/umydarwin.pas index 933c1fb1b0..b150bcd0d7 100644 --- a/src/platform/unix/darwin/umydarwin.pas +++ b/src/platform/unix/darwin/umydarwin.pas @@ -521,10 +521,10 @@ procedure showMacOSSharingServiceMenu; point:= control.ScreenToClient( Mouse.CursorPos ); popupNSRect.origin.x:= point.X; popupNSRect.origin.y:= point.Y; - popupNSRect.size:= NSZeroSize; + popupNSRect.size:= NSMakeSize( 1, 1 ); picker:= NSSharingServicePicker.alloc.initWithItems( cocoaArray ); - picker.showRelativeToRect_ofView_preferredEdge( popupNSRect, NSView(control.handle) , NSMinYEdge ); + picker.showRelativeToRect_ofView_preferredEdge( popupNSRect, NSView(control.handle) , NSMaxXEdge ); picker.release; end; From 5b4fb6c1dd7180fc4733d363bbaeaa867444e593 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Nov 2025 18:29:48 +0300 Subject: [PATCH 004/199] UPD: Bump actions/checkout from 5 to 6 (#2625) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 6d3060aaf2125b5a46a1261cb34de24c75a6160e) --- .github/workflows/release.yml | 4 ++-- .github/workflows/snapshots.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c67026a34d..29de20c7d1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: lazarus-version: "stable" - name: Get Lazarus source - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: repository: 'fpc/Lazarus' ref: 'fixes_4' @@ -34,7 +34,7 @@ jobs: sudo sed -i -e "s|_PPCARCH_|fpc|g; s|/Developer/lazarus|/usr/local/share/lazarus|g" /etc/lazarus/environmentoptions.xml - name: Checkout source - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml index 450b84c9f6..99901b25bd 100644 --- a/.github/workflows/snapshots.yml +++ b/.github/workflows/snapshots.yml @@ -25,7 +25,7 @@ jobs: lazarus-version: "stable" - name: Get Lazarus source - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: repository: 'fpc/Lazarus' @@ -41,7 +41,7 @@ jobs: sudo sed -i -e "s|_PPCARCH_|fpc|g; s|/Developer/lazarus|/usr/local/share/lazarus|g" /etc/lazarus/environmentoptions.xml - name: Checkout source - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 @@ -69,7 +69,7 @@ jobs: lazarus-version: "stable" - name: Checkout source - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: 0 From 705f2e93706f9abedb061f5c0159eed56caac3bd Mon Sep 17 00:00:00 2001 From: Alexander Koblov Date: Tue, 25 Nov 2025 18:51:36 +0300 Subject: [PATCH 005/199] UPD: Use 'main' password instead 'master' (cherry picked from commit 9a0044e53293b70bfc38e1d02660ed536bd0ff6f) --- language/doublecmd.be.po | 4 ++-- language/doublecmd.bg.po | 4 ++-- language/doublecmd.ca.po | 4 ++-- language/doublecmd.cs.po | 4 ++-- language/doublecmd.da.po | 4 ++-- language/doublecmd.de.po | 4 ++-- language/doublecmd.el.po | 4 ++-- language/doublecmd.es.po | 4 ++-- language/doublecmd.fr.po | 4 ++-- language/doublecmd.hr.po | 4 ++-- language/doublecmd.hu.po | 4 ++-- language/doublecmd.it.po | 4 ++-- language/doublecmd.ja.po | 4 ++-- language/doublecmd.ko.po | 4 ++-- language/doublecmd.nb.po | 4 ++-- language/doublecmd.nl.po | 4 ++-- language/doublecmd.nn.po | 4 ++-- language/doublecmd.pl.po | 4 ++-- language/doublecmd.pot | 4 ++-- language/doublecmd.pt.po | 4 ++-- language/doublecmd.pt_BR.po | 4 ++-- language/doublecmd.ro.po | 4 ++-- language/doublecmd.ru.po | 4 ++-- language/doublecmd.sk.po | 4 ++-- language/doublecmd.sl.po | 4 ++-- language/doublecmd.sr.po | 4 ++-- language/doublecmd.sr@latin.po | 4 ++-- language/doublecmd.tr.po | 4 ++-- language/doublecmd.uk.po | 4 ++-- language/doublecmd.zh_CN.po | 4 ++-- language/doublecmd.zh_TW.po | 4 ++-- plugins/wfx/ftp/language/ftp.be.po | 2 +- plugins/wfx/ftp/language/ftp.de.po | 2 +- plugins/wfx/ftp/language/ftp.hu.po | 2 +- plugins/wfx/ftp/language/ftp.ko.po | 2 +- plugins/wfx/ftp/language/ftp.pot | 2 +- plugins/wfx/ftp/language/ftp.ru.po | 2 +- plugins/wfx/ftp/language/ftp.zh_CN.po | 2 +- plugins/wfx/ftp/src/FtpConfDlg.lfm | 2 +- src/fmasterkey.lfm | 11 +++++------ src/fmasterkey.lrj | 16 ++++++++++++++++ src/fmasterkey.pas | 1 - src/ulng.pas | 4 ++-- 43 files changed, 93 insertions(+), 79 deletions(-) create mode 100644 src/fmasterkey.lrj diff --git a/language/doublecmd.be.po b/language/doublecmd.be.po index f7f6f943f3..b0c1c2bac2 100644 --- a/language/doublecmd.be.po +++ b/language/doublecmd.be.po @@ -12077,11 +12077,11 @@ msgid "Wipe directory %s" msgstr "Сцерці каталог %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Галоўны пароль" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Калі ласка, ўвядзіце галоўны пароль:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.bg.po b/language/doublecmd.bg.po index 2500f442d5..458c9966c2 100644 --- a/language/doublecmd.bg.po +++ b/language/doublecmd.bg.po @@ -12537,11 +12537,11 @@ msgid "Wipe directory %s" msgstr "Унищожаване на папка „%s‟" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Главна парола" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.ca.po b/language/doublecmd.ca.po index 49561b7b45..bddd6b530f 100644 --- a/language/doublecmd.ca.po +++ b/language/doublecmd.ca.po @@ -13013,11 +13013,11 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Contrasenya mestra" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Per favor, introduiu la contrasenya mestra:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.cs.po b/language/doublecmd.cs.po index d8d4744ad8..494e6f8f86 100644 --- a/language/doublecmd.cs.po +++ b/language/doublecmd.cs.po @@ -12101,11 +12101,11 @@ msgid "Wipe directory %s" msgstr "Nevratně smaže adresář %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hlavní heslo" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Prosíme zadejte hlavní heslo:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.da.po b/language/doublecmd.da.po index 42cc4ee912..d0cd9a7776 100644 --- a/language/doublecmd.da.po +++ b/language/doublecmd.da.po @@ -13158,11 +13158,11 @@ msgid "Wipe directory %s" msgstr "Sikker sletning af mappe %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hovedadgangskode" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Indtast venligst hovedadgangskoden:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.de.po b/language/doublecmd.de.po index aa5ea772c7..7eb1276f86 100644 --- a/language/doublecmd.de.po +++ b/language/doublecmd.de.po @@ -12056,11 +12056,11 @@ msgid "Wipe directory %s" msgstr "Verzeichnis %s gründlich löschen" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Master-Passwort" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Bitte Master-Passwort eingeben:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.el.po b/language/doublecmd.el.po index 74deb66d87..d50fe9d7a4 100644 --- a/language/doublecmd.el.po +++ b/language/doublecmd.el.po @@ -12280,11 +12280,11 @@ msgid "Wipe directory %s" msgstr "Ασφαλής Διαγραφή καταλόγου %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Κύριο Συνθηματικό" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Παρακαλώ εισάγετε το κύριο συνθηματικό:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.es.po b/language/doublecmd.es.po index c21cb13021..30a739186d 100644 --- a/language/doublecmd.es.po +++ b/language/doublecmd.es.po @@ -12201,11 +12201,11 @@ msgid "Wipe directory %s" msgstr "Destruir carpeta «%s»" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Contraseña maestra" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Por favor, introduce la contraseña maestra:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.fr.po b/language/doublecmd.fr.po index b2c0eb7267..44618aca9a 100644 --- a/language/doublecmd.fr.po +++ b/language/doublecmd.fr.po @@ -12404,11 +12404,11 @@ msgid "Wipe directory %s" msgstr "Supprimer de manière sécurisée le dossier %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Mot de passe principal" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Veuillez entrer le mot de passe principal :" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.hr.po b/language/doublecmd.hr.po index 97c319927d..4372b63a21 100644 --- a/language/doublecmd.hr.po +++ b/language/doublecmd.hr.po @@ -12759,11 +12759,11 @@ msgid "Wipe directory %s" msgstr "Izbriši potpuno Mapa %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Glavna lozinka" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Unesite ponovo glavnu lozinku:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.hu.po b/language/doublecmd.hu.po index 9834ed2106..87d527379d 100644 --- a/language/doublecmd.hu.po +++ b/language/doublecmd.hu.po @@ -12053,11 +12053,11 @@ msgid "Wipe directory %s" msgstr "%s könyvtár törlése" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Fő jelszó" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Kérem, adja meg a fő jelszót:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.it.po b/language/doublecmd.it.po index 5ef48cd0f4..9ef482099d 100644 --- a/language/doublecmd.it.po +++ b/language/doublecmd.it.po @@ -12061,11 +12061,11 @@ msgid "Wipe directory %s" msgstr "Cancella la cartella %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Password principale" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Prego inserire password principale:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.ja.po b/language/doublecmd.ja.po index e1b55cc13d..4b0f837d87 100644 --- a/language/doublecmd.ja.po +++ b/language/doublecmd.ja.po @@ -12319,11 +12319,11 @@ msgid "Wipe directory %s" msgstr "ディレクトリ＜%s＞を完全消去（抹殺）" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "マスターパスワード" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "マスターパスワードを入力して下さい：" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.ko.po b/language/doublecmd.ko.po index 5641a8ba66..7c7c94ab12 100644 --- a/language/doublecmd.ko.po +++ b/language/doublecmd.ko.po @@ -12054,11 +12054,11 @@ msgid "Wipe directory %s" msgstr "%s 폴더 영구 삭제" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "마스터 암호" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "마스터 암호를 입력하세요:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.nb.po b/language/doublecmd.nb.po index 67b4798a87..f4356497b7 100644 --- a/language/doublecmd.nb.po +++ b/language/doublecmd.nb.po @@ -12564,11 +12564,11 @@ msgid "Wipe directory %s" msgstr "Sikker sletting av mappe %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hovedpassord" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Tast inn hovedpassordet:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.nl.po b/language/doublecmd.nl.po index fd6db8de17..ca8eb4df54 100644 --- a/language/doublecmd.nl.po +++ b/language/doublecmd.nl.po @@ -12096,11 +12096,11 @@ msgid "Wipe directory %s" msgstr "Wis map %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hoofdwachtwoord" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Geef a.u.b. het hoofdwachtwoord in:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.nn.po b/language/doublecmd.nn.po index 995ff71959..a48a040745 100644 --- a/language/doublecmd.nn.po +++ b/language/doublecmd.nn.po @@ -12564,11 +12564,11 @@ msgid "Wipe directory %s" msgstr "Sikker sletting av mappe %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hovudpassord" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Tast inn hovudpassordet:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.pl.po b/language/doublecmd.pl.po index 22b40db564..45c60ab235 100644 --- a/language/doublecmd.pl.po +++ b/language/doublecmd.pl.po @@ -12025,11 +12025,11 @@ msgid "Wipe directory %s" msgstr "Wyczyść katalog %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hasło główne" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Wprowadź hasło główne:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.pot b/language/doublecmd.pot index 2e08fa7d45..49666dccfc 100644 --- a/language/doublecmd.pot +++ b/language/doublecmd.pot @@ -12013,11 +12013,11 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.pt.po b/language/doublecmd.pt.po index c580114b3c..7080b6211c 100644 --- a/language/doublecmd.pt.po +++ b/language/doublecmd.pt.po @@ -12288,11 +12288,11 @@ msgid "Wipe directory %s" msgstr "Limpar pasta %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Senha mestra" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Por favor insira a senha mestra:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.pt_BR.po b/language/doublecmd.pt_BR.po index efb874cb95..66faa83d1f 100644 --- a/language/doublecmd.pt_BR.po +++ b/language/doublecmd.pt_BR.po @@ -12505,11 +12505,11 @@ msgid "Wipe directory %s" msgstr "Limpar pasta %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Senha Mestra" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Por favor introduza senha mestra:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.ro.po b/language/doublecmd.ro.po index 07226c389a..2198d6c814 100644 --- a/language/doublecmd.ro.po +++ b/language/doublecmd.ro.po @@ -12359,11 +12359,11 @@ msgid "Wipe directory %s" msgstr "Șterge definitiv dosarul %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Parolă" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Introduceți parola:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.ru.po b/language/doublecmd.ru.po index 60514dd79d..3374c00ade 100644 --- a/language/doublecmd.ru.po +++ b/language/doublecmd.ru.po @@ -12318,11 +12318,11 @@ msgid "Wipe directory %s" msgstr "Стирание каталога %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Главный пароль:" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Введите главный пароль:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.sk.po b/language/doublecmd.sk.po index b6fdc8b31d..3606f55ccf 100644 --- a/language/doublecmd.sk.po +++ b/language/doublecmd.sk.po @@ -12052,11 +12052,11 @@ msgid "Wipe directory %s" msgstr "Bezpečne vymazať priečinok %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Hlavné heslo" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Prosím, zadajte hlavné heslo:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.sl.po b/language/doublecmd.sl.po index bbe414bcac..d5d50d4cb4 100644 --- a/language/doublecmd.sl.po +++ b/language/doublecmd.sl.po @@ -12066,11 +12066,11 @@ msgid "Wipe directory %s" msgstr "Neobnovljivo izbriši mapo %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Glavno geslo" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Vnesite glavno geslo:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.sr.po b/language/doublecmd.sr.po index 0dd880d5fe..5a6a474b21 100644 --- a/language/doublecmd.sr.po +++ b/language/doublecmd.sr.po @@ -12297,11 +12297,11 @@ msgid "Wipe directory %s" msgstr "Избриши потпуно фасциклу %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Главна лозинка" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Унесите поново главну лозинку:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.sr@latin.po b/language/doublecmd.sr@latin.po index cac7b58714..8b88927654 100644 --- a/language/doublecmd.sr@latin.po +++ b/language/doublecmd.sr@latin.po @@ -12593,11 +12593,11 @@ msgid "Wipe directory %s" msgstr "Izbriši potpuno fasciklu %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Glavna lozinka" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Unesite ponovo glavnu lozinku:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.tr.po b/language/doublecmd.tr.po index d4c3ab577d..9b25f5f70e 100644 --- a/language/doublecmd.tr.po +++ b/language/doublecmd.tr.po @@ -12708,11 +12708,11 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Ana şifre" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Lütfen ana şifreyi girin:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.uk.po b/language/doublecmd.uk.po index 220ba2811d..fd85f26632 100644 --- a/language/doublecmd.uk.po +++ b/language/doublecmd.uk.po @@ -12421,11 +12421,11 @@ msgid "Wipe directory %s" msgstr "Знищення каталогу %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "Суперпароль" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "Будь ласка, введіть суперпароль:" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.zh_CN.po b/language/doublecmd.zh_CN.po index c42d7ba62c..5519238daf 100644 --- a/language/doublecmd.zh_CN.po +++ b/language/doublecmd.zh_CN.po @@ -12073,11 +12073,11 @@ msgid "Wipe directory %s" msgstr "擦除文件夹 %s" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "主密码" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "请输入主密码：" #: ulng.rsmsgnewfile diff --git a/language/doublecmd.zh_TW.po b/language/doublecmd.zh_TW.po index cc1f5e3c5d..b6df2452c1 100644 --- a/language/doublecmd.zh_TW.po +++ b/language/doublecmd.zh_TW.po @@ -12279,11 +12279,11 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword -msgid "Master Password" +msgid "Main Password" msgstr "主要密碼" #: ulng.rsmsgmasterpasswordenter -msgid "Please enter the master password:" +msgid "Please enter the main password:" msgstr "請輸入主要密碼:" #: ulng.rsmsgnewfile diff --git a/plugins/wfx/ftp/language/ftp.be.po b/plugins/wfx/ftp/language/ftp.be.po index 694c955d7f..0e00beb6ee 100644 --- a/plugins/wfx/ftp/language/ftp.be.po +++ b/plugins/wfx/ftp/language/ftp.be.po @@ -54,7 +54,7 @@ msgid "Send keepalive during a transfer" msgstr "Падтрымліваць злучэнне падчас перадачы" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "Выкарыcтоўваць &галоўны пароль для абароны пароля" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/language/ftp.de.po b/plugins/wfx/ftp/language/ftp.de.po index f92cf6a921..9e3878a7df 100644 --- a/plugins/wfx/ftp/language/ftp.de.po +++ b/plugins/wfx/ftp/language/ftp.de.po @@ -54,7 +54,7 @@ msgid "Send keepalive during a transfer" msgstr "'Keepalive'-Pakete senden aktivieren" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "Master-Passwort zum Schutz des Passworts verwenden" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/language/ftp.hu.po b/plugins/wfx/ftp/language/ftp.hu.po index 8c54a8ecef..88914a84a3 100644 --- a/plugins/wfx/ftp/language/ftp.hu.po +++ b/plugins/wfx/ftp/language/ftp.hu.po @@ -53,7 +53,7 @@ msgid "Send keepalive during a transfer" msgstr "Életjel küldése az átvitel alatt" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "Mesterjelszóval védett jelszó használata" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/language/ftp.ko.po b/plugins/wfx/ftp/language/ftp.ko.po index 1449dbdf99..7a5ac7ce40 100644 --- a/plugins/wfx/ftp/language/ftp.ko.po +++ b/plugins/wfx/ftp/language/ftp.ko.po @@ -54,7 +54,7 @@ msgid "Send keepalive during a transfer" msgstr "전송 중 킵얼라이브 전송" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "마스터 암호를 사용하여 암호 보호" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/language/ftp.pot b/plugins/wfx/ftp/language/ftp.pot index 7a649a266e..bff355f739 100644 --- a/plugins/wfx/ftp/language/ftp.pot +++ b/plugins/wfx/ftp/language/ftp.pot @@ -43,7 +43,7 @@ msgid "Send keepalive during a transfer" msgstr "" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/language/ftp.ru.po b/plugins/wfx/ftp/language/ftp.ru.po index 153e8abd68..1cc1105fe3 100644 --- a/plugins/wfx/ftp/language/ftp.ru.po +++ b/plugins/wfx/ftp/language/ftp.ru.po @@ -43,7 +43,7 @@ msgid "Send keepalive during a transfer" msgstr "Поддерживать соединение во время передачи" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "Использовать &главный пароль для защиты пароля" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/language/ftp.zh_CN.po b/plugins/wfx/ftp/language/ftp.zh_CN.po index 005b73574a..278b25176e 100644 --- a/plugins/wfx/ftp/language/ftp.zh_CN.po +++ b/plugins/wfx/ftp/language/ftp.zh_CN.po @@ -43,7 +43,7 @@ msgid "Send keepalive during a transfer" msgstr "在传输期间发送 keepalive" #: tdialogbox.chkmasterpassword.caption -msgid "Use master password to protect the password" +msgid "Use main password to protect the password" msgstr "使用主密码保护密码" #: tdialogbox.chkpassivemode.caption diff --git a/plugins/wfx/ftp/src/FtpConfDlg.lfm b/plugins/wfx/ftp/src/FtpConfDlg.lfm index 445afd1bf8..eeb691d711 100644 --- a/plugins/wfx/ftp/src/FtpConfDlg.lfm +++ b/plugins/wfx/ftp/src/FtpConfDlg.lfm @@ -254,7 +254,7 @@ object DialogBox: TDialogBox Width = 306 BorderSpacing.Left = 12 BorderSpacing.Top = 12 - Caption = 'Use master password to protect the password' + Caption = 'Use main password to protect the password' TabOrder = 7 OnChange = CheckBoxChange end diff --git a/src/fmasterkey.lfm b/src/fmasterkey.lfm index a7c623ad7a..e1c665fbd8 100644 --- a/src/fmasterkey.lfm +++ b/src/fmasterkey.lfm @@ -5,7 +5,7 @@ object frmMasterKey: TfrmMasterKey Width = 480 AutoSize = True BorderStyle = bsDialog - Caption = 'Create Master Key' + Caption = 'Create Key' ChildSizing.LeftRightSpacing = 12 ChildSizing.TopBottomSpacing = 12 ClientHeight = 494 @@ -26,7 +26,7 @@ object frmMasterKey: TfrmMasterKey Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 12 - Caption = 'Master key' + Caption = 'Main Password' ChildSizing.LeftRightSpacing = 12 ChildSizing.TopBottomSpacing = 10 ChildSizing.VerticalSpacing = 6 @@ -42,7 +42,7 @@ object frmMasterKey: TfrmMasterKey Height = 25 Top = 10 Width = 243 - Caption = 'Master pass&word:' + Caption = 'Pass&word:' end object edtPassword: TEdit Left = 255 @@ -100,7 +100,7 @@ object frmMasterKey: TfrmMasterKey Top = 12 Width = 428 Anchors = [akTop, akLeft, akRight] - Caption = 'The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder.' + Caption = 'The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder.' WordWrap = True end object pnlKeyTransform: TPanel @@ -144,7 +144,6 @@ object frmMasterKey: TfrmMasterKey ) Style = csDropDownList TabOrder = 0 - Text = 'Argon2d' end object lblIterations: TLabel Left = 0 @@ -260,7 +259,7 @@ object frmMasterKey: TfrmMasterKey Height = 17 Top = 12 Width = 441 - Caption = 'Specify a new master key, which will be used to encrypt the password store.' + Caption = 'Specify a new key, which will be used to encrypt the password store.' end object pnlButtons: TButtonPanel AnchorSideTop.Control = gbKeyTransform diff --git a/src/fmasterkey.lrj b/src/fmasterkey.lrj new file mode 100644 index 0000000000..56729ec4f1 --- /dev/null +++ b/src/fmasterkey.lrj @@ -0,0 +1,16 @@ +{"version":1,"strings":[ +{"hash":144963961,"name":"tfrmmasterkey.caption","sourcebytes":[67,114,101,97,116,101,32,75,101,121],"value":"Create Key"}, +{"hash":187360180,"name":"tfrmmasterkey.gbmasterkey.caption","sourcebytes":[77,97,105,110,32,80,97,115,115,119,111,114,100],"value":"Main Password"}, +{"hash":98107610,"name":"tfrmmasterkey.lblpassword.caption","sourcebytes":[80,97,115,115,38,119,111,114,100,58],"value":"Pass&word:"}, +{"hash":16880282,"name":"tfrmmasterkey.lblrepeat.caption","sourcebytes":[38,82,101,112,101,97,116,32,112,97,115,115,119,111,114,100,58],"value":"&Repeat password:"}, +{"hash":104957070,"name":"tfrmmasterkey.gbkeytransform.caption","sourcebytes":[75,101,121,32,116,114,97,110,115,102,111,114,109,97,116,105,111,110],"value":"Key transformation"}, +{"hash":14598126,"name":"tfrmmasterkey.lblheader.caption","sourcebytes":[84,104,101,32,107,101,121,32,105,115,32,116,114,97,110,115,102,111,114,109,101,100,32,117,115,105,110,103,32,97,32,107,101,121,32,100,101,114,105,118,97,116,105,111,110,32,102,117,110,99,116,105,111,110,46,32,84,104,105,115,32,97,100,100,115,32,97,32,119,111,114,107,32,102,97,99,116,111,114,32,97,110,100,32,109,97,107,101,115,32,100,105,99,116,105,111,110,97,114,121,32,97,110,100,32,103,117,101,115,115,105,110,103,32,97,116,116,97,99,107,115,32,104,97,114,100,101,114,46],"value":"The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder."}, +{"hash":245823418,"name":"tfrmmasterkey.lblfunction.caption","sourcebytes":[38,75,101,121,32,100,101,114,105,118,97,116,105,111,110,32,102,117,110,99,116,105,111,110,58],"value":"&Key derivation function:"}, +{"hash":169937386,"name":"tfrmmasterkey.lbliterations.caption","sourcebytes":[38,73,116,101,114,97,116,105,111,110,115,58],"value":"&Iterations:"}, +{"hash":63204218,"name":"tfrmmasterkey.lblmemory.caption","sourcebytes":[38,77,101,109,111,114,121,58],"value":"&Memory:"}, +{"hash":1298,"name":"tfrmmasterkey.lblunit.caption","sourcebytes":[77,66],"value":"MB"}, +{"hash":166429210,"name":"tfrmmasterkey.lblparallelism.caption","sourcebytes":[38,80,97,114,97,108,108,101,108,105,115,109,58],"value":"&Parallelism:"}, +{"hash":81675854,"name":"tfrmmasterkey.lblfooter.caption","sourcebytes":[84,104,101,32,109,111,114,101,32,105,116,101,114,97,116,105,111,110,115,44,32,116,104,101,32,104,97,114,100,101,114,32,97,114,101,32,100,105,99,116,105,111,110,97,114,121,32,97,110,100,32,103,117,101,115,115,105,110,103,32,97,116,116,97,99,107,115,44,32,98,117,116,32,97,108,115,111,32,112,97,115,115,119,111,114,100,32,115,116,111,114,101,32,108,111,97,100,105,110,103,47,115,97,118,105,110,103,32,116,97,107,101,115,32,109,111,114,101,32,116,105,109,101,46],"value":"The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time."}, +{"hash":371876,"name":"tfrmmasterkey.btntest.caption","sourcebytes":[84,101,115,116],"value":"Test"}, +{"hash":181307342,"name":"tfrmmasterkey.lbltext.caption","sourcebytes":[83,112,101,99,105,102,121,32,97,32,110,101,119,32,107,101,121,44,32,119,104,105,99,104,32,119,105,108,108,32,98,101,32,117,115,101,100,32,116,111,32,101,110,99,114,121,112,116,32,116,104,101,32,112,97,115,115,119,111,114,100,32,115,116,111,114,101,46],"value":"Specify a new key, which will be used to encrypt the password store."} +]} diff --git a/src/fmasterkey.pas b/src/fmasterkey.pas index 8941cc891b..3814b6e2b1 100644 --- a/src/fmasterkey.pas +++ b/src/fmasterkey.pas @@ -56,7 +56,6 @@ function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Ta seParallelism.Value:= P; cmbFunction.ItemIndex:= 0; seMemory.Value:= M div 1024; - lblText.Visible:= not Short; gbMasterKey.Visible:= not Short; pnlButtons.OKButton.Enabled:= Short; diff --git a/src/ulng.pas b/src/ulng.pas index 10f6535b3b..f447db664d 100644 --- a/src/ulng.pas +++ b/src/ulng.pas @@ -186,8 +186,8 @@ interface rsOptToolTipFileTypeExportCaption = 'Export tooltip file type configuration'; rsOptToolTipFileTypeExportDone = 'Exportation of %d elements to file "%s" completed.'; - rsMsgMasterPassword = 'Master Password'; - rsMsgMasterPasswordEnter = 'Please enter the master password:'; + rsMsgMasterPassword = 'Main Password'; + rsMsgMasterPasswordEnter = 'Please enter the main password:'; rsMsgWrongPasswordTryAgain = 'Wrong password!'#13'Please try again!'; rsMsgPasswordEnter = 'Please enter the password:'; rsMsgPasswordVerify = 'Please re-enter the password for verification:'; From e92a362e115b81fde44a6f5945c373977fd15619 Mon Sep 17 00:00:00 2001 From: Alexander Koblov Date: Tue, 25 Nov 2025 19:22:19 +0300 Subject: [PATCH 006/199] UPD: Language files (cherry picked from commit 50af183b700685ede802bc7d02dcad35789695f6) --- language/doublecmd.be.po | 15 +++++++++------ language/doublecmd.bg.po | 15 +++++++++------ language/doublecmd.ca.po | 15 +++++++++------ language/doublecmd.cs.po | 15 +++++++++------ language/doublecmd.da.po | 15 +++++++++------ language/doublecmd.de.po | 23 ++++++++++++++++++----- language/doublecmd.el.po | 15 +++++++++------ language/doublecmd.es.po | 15 +++++++++------ language/doublecmd.fr.po | 15 +++++++++------ language/doublecmd.hr.po | 15 +++++++++------ language/doublecmd.hu.po | 15 +++++++++------ language/doublecmd.it.po | 15 +++++++++------ language/doublecmd.ja.po | 15 +++++++++------ language/doublecmd.ko.po | 15 +++++++++------ language/doublecmd.nb.po | 15 +++++++++------ language/doublecmd.nl.po | 15 +++++++++------ language/doublecmd.nn.po | 15 +++++++++------ language/doublecmd.pl.po | 15 +++++++++------ language/doublecmd.pot | 12 +++++++----- language/doublecmd.pt.po | 15 +++++++++------ language/doublecmd.pt_BR.po | 15 +++++++++------ language/doublecmd.ro.po | 15 +++++++++------ language/doublecmd.ru.po | 22 ++++++++++++---------- language/doublecmd.sk.po | 15 +++++++++------ language/doublecmd.sl.po | 15 +++++++++------ language/doublecmd.sr.po | 15 +++++++++------ language/doublecmd.sr@latin.po | 15 +++++++++------ language/doublecmd.tr.po | 15 +++++++++------ language/doublecmd.uk.po | 15 +++++++++------ language/doublecmd.zh_CN.po | 15 +++++++++------ language/doublecmd.zh_TW.po | 15 +++++++++------ 31 files changed, 289 insertions(+), 188 deletions(-) diff --git a/language/doublecmd.be.po b/language/doublecmd.be.po index b0c1c2bac2..a65c6ddd08 100644 --- a/language/doublecmd.be.po +++ b/language/doublecmd.be.po @@ -3343,7 +3343,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3351,8 +3351,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Галоўны пароль" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3363,7 +3365,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3379,7 +3381,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3387,7 +3389,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12077,6 +12079,7 @@ msgid "Wipe directory %s" msgstr "Сцерці каталог %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Галоўны пароль" diff --git a/language/doublecmd.bg.po b/language/doublecmd.bg.po index 458c9966c2..5a3f48e3df 100644 --- a/language/doublecmd.bg.po +++ b/language/doublecmd.bg.po @@ -3439,7 +3439,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3447,8 +3447,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Главна парола" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3459,7 +3461,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3475,7 +3477,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3483,7 +3485,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12537,6 +12539,7 @@ msgid "Wipe directory %s" msgstr "Унищожаване на папка „%s‟" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Главна парола" diff --git a/language/doublecmd.ca.po b/language/doublecmd.ca.po index bddd6b530f..7be477e550 100644 --- a/language/doublecmd.ca.po +++ b/language/doublecmd.ca.po @@ -3666,7 +3666,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3674,8 +3674,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Contrasenya mestra" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3686,7 +3688,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3702,7 +3704,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3710,7 +3712,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -13013,6 +13015,7 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Contrasenya mestra" diff --git a/language/doublecmd.cs.po b/language/doublecmd.cs.po index 494e6f8f86..3eeaaff62a 100644 --- a/language/doublecmd.cs.po +++ b/language/doublecmd.cs.po @@ -3353,7 +3353,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3361,8 +3361,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hlavní heslo" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3373,7 +3375,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3389,7 +3391,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3397,7 +3399,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12101,6 +12103,7 @@ msgid "Wipe directory %s" msgstr "Nevratně smaže adresář %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hlavní heslo" diff --git a/language/doublecmd.da.po b/language/doublecmd.da.po index d0cd9a7776..1492fcbcbb 100644 --- a/language/doublecmd.da.po +++ b/language/doublecmd.da.po @@ -3565,7 +3565,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3573,8 +3573,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hovedadgangskode" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3585,7 +3587,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3601,7 +3603,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3609,7 +3611,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -13158,6 +13160,7 @@ msgid "Wipe directory %s" msgstr "Sikker sletning af mappe %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hovedadgangskode" diff --git a/language/doublecmd.de.po b/language/doublecmd.de.po index 7eb1276f86..b84515af79 100644 --- a/language/doublecmd.de.po +++ b/language/doublecmd.de.po @@ -3337,7 +3337,9 @@ msgid "Test" msgstr "Test" #: tfrmmasterkey.caption -msgid "Create Master Key" +#, fuzzy +#| msgid "Create Master Key" +msgid "Create Key" msgstr "Master-Schlüssel erstellen" #: tfrmmasterkey.gbkeytransform.caption @@ -3345,7 +3347,10 @@ msgid "Key transformation" msgstr "Transformation der Schlüssel" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" +#, fuzzy +#| msgid "Master key" +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" msgstr "Master-Schlüssel" #: tfrmmasterkey.lblfooter.caption @@ -3357,7 +3362,9 @@ msgid "&Key derivation function:" msgstr "Schlüsselableitungsfunktion:" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +#, fuzzy +#| msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "Der Master-Schlüssel wird mithilfe einer Schlüsselableitungsfunktion transformiert. Dies erhöht den Arbeitsaufwand und erschwert Wörterbuch- und Brute-Force-Angriffe." #: tfrmmasterkey.lbliterations.caption @@ -3373,7 +3380,9 @@ msgid "&Parallelism:" msgstr "Parallelität (Übereinstimmung):" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +#, fuzzy +#| msgid "Master pass&word:" +msgid "Pass&word:" msgstr "Master-Passwort:" #: tfrmmasterkey.lblrepeat.caption @@ -3381,7 +3390,9 @@ msgid "&Repeat password:" msgstr "Passwort wiederholen:" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +#, fuzzy +#| msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "Geben Sie einen neuen Master-Schlüssel an, der zum Verschlüsseln des Passwortspeichers verwendet wird." #: tfrmmasterkey.lblunit.caption @@ -12056,6 +12067,7 @@ msgid "Wipe directory %s" msgstr "Verzeichnis %s gründlich löschen" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Master-Passwort" @@ -14376,3 +14388,4 @@ msgstr "Eine Ersetzung hat nicht stattgefunden." #, object-pascal-format msgid "No setup named \"%s\"" msgstr "Keine Einstellung namens »%s«" + diff --git a/language/doublecmd.el.po b/language/doublecmd.el.po index d50fe9d7a4..945c677912 100644 --- a/language/doublecmd.el.po +++ b/language/doublecmd.el.po @@ -3399,7 +3399,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3407,8 +3407,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Κύριο Συνθηματικό" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3419,7 +3421,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3435,7 +3437,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3443,7 +3445,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12280,6 +12282,7 @@ msgid "Wipe directory %s" msgstr "Ασφαλής Διαγραφή καταλόγου %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Κύριο Συνθηματικό" diff --git a/language/doublecmd.es.po b/language/doublecmd.es.po index 30a739186d..9afbce2775 100644 --- a/language/doublecmd.es.po +++ b/language/doublecmd.es.po @@ -3363,7 +3363,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3371,8 +3371,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Contraseña maestra" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3383,7 +3385,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3399,7 +3401,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3407,7 +3409,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12201,6 +12203,7 @@ msgid "Wipe directory %s" msgstr "Destruir carpeta «%s»" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Contraseña maestra" diff --git a/language/doublecmd.fr.po b/language/doublecmd.fr.po index 44618aca9a..eb4e86c301 100644 --- a/language/doublecmd.fr.po +++ b/language/doublecmd.fr.po @@ -3460,7 +3460,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3468,8 +3468,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Mot de passe principal" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3480,7 +3482,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3496,7 +3498,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3504,7 +3506,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12404,6 +12406,7 @@ msgid "Wipe directory %s" msgstr "Supprimer de manière sécurisée le dossier %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Mot de passe principal" diff --git a/language/doublecmd.hr.po b/language/doublecmd.hr.po index 4372b63a21..b5b358174c 100644 --- a/language/doublecmd.hr.po +++ b/language/doublecmd.hr.po @@ -3597,7 +3597,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3605,8 +3605,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Glavna lozinka" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3617,7 +3619,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3633,7 +3635,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3641,7 +3643,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12759,6 +12761,7 @@ msgid "Wipe directory %s" msgstr "Izbriši potpuno Mapa %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Glavna lozinka" diff --git a/language/doublecmd.hu.po b/language/doublecmd.hu.po index 87d527379d..624056d1e8 100644 --- a/language/doublecmd.hu.po +++ b/language/doublecmd.hu.po @@ -3336,7 +3336,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3344,8 +3344,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Fő jelszó" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3356,7 +3358,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3372,7 +3374,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3380,7 +3382,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12053,6 +12055,7 @@ msgid "Wipe directory %s" msgstr "%s könyvtár törlése" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Fő jelszó" diff --git a/language/doublecmd.it.po b/language/doublecmd.it.po index 9ef482099d..1bf5523ac5 100644 --- a/language/doublecmd.it.po +++ b/language/doublecmd.it.po @@ -3338,7 +3338,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3346,8 +3346,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Password principale" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3358,7 +3360,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3374,7 +3376,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3382,7 +3384,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12061,6 +12063,7 @@ msgid "Wipe directory %s" msgstr "Cancella la cartella %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Password principale" diff --git a/language/doublecmd.ja.po b/language/doublecmd.ja.po index 4b0f837d87..bd1d63fa37 100644 --- a/language/doublecmd.ja.po +++ b/language/doublecmd.ja.po @@ -3408,7 +3408,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3416,8 +3416,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "マスターパスワード" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3428,7 +3430,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3444,7 +3446,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3452,7 +3454,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12319,6 +12321,7 @@ msgid "Wipe directory %s" msgstr "ディレクトリ＜%s＞を完全消去（抹殺）" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "マスターパスワード" diff --git a/language/doublecmd.ko.po b/language/doublecmd.ko.po index 7c7c94ab12..5664a4f888 100644 --- a/language/doublecmd.ko.po +++ b/language/doublecmd.ko.po @@ -3336,7 +3336,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3344,8 +3344,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "마스터 암호" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3356,7 +3358,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3372,7 +3374,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3380,7 +3382,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12054,6 +12056,7 @@ msgid "Wipe directory %s" msgstr "%s 폴더 영구 삭제" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "마스터 암호" diff --git a/language/doublecmd.nb.po b/language/doublecmd.nb.po index f4356497b7..3e9092e10e 100644 --- a/language/doublecmd.nb.po +++ b/language/doublecmd.nb.po @@ -3422,7 +3422,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3430,8 +3430,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hovedpassord" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3442,7 +3444,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3458,7 +3460,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3466,7 +3468,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12564,6 +12566,7 @@ msgid "Wipe directory %s" msgstr "Sikker sletting av mappe %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hovedpassord" diff --git a/language/doublecmd.nl.po b/language/doublecmd.nl.po index ca8eb4df54..30293811be 100644 --- a/language/doublecmd.nl.po +++ b/language/doublecmd.nl.po @@ -3350,7 +3350,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3358,8 +3358,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hoofdwachtwoord" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3370,7 +3372,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3386,7 +3388,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3394,7 +3396,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12096,6 +12098,7 @@ msgid "Wipe directory %s" msgstr "Wis map %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hoofdwachtwoord" diff --git a/language/doublecmd.nn.po b/language/doublecmd.nn.po index a48a040745..f84d2b6bc9 100644 --- a/language/doublecmd.nn.po +++ b/language/doublecmd.nn.po @@ -3422,7 +3422,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3430,8 +3430,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hovudpassord" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3442,7 +3444,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3458,7 +3460,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3466,7 +3468,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12564,6 +12566,7 @@ msgid "Wipe directory %s" msgstr "Sikker sletting av mappe %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hovudpassord" diff --git a/language/doublecmd.pl.po b/language/doublecmd.pl.po index 45c60ab235..c4a0fd1022 100644 --- a/language/doublecmd.pl.po +++ b/language/doublecmd.pl.po @@ -3328,7 +3328,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3336,8 +3336,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hasło główne" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3348,7 +3350,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3364,7 +3366,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3372,7 +3374,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12025,6 +12027,7 @@ msgid "Wipe directory %s" msgstr "Wyczyść katalog %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hasło główne" diff --git a/language/doublecmd.pot b/language/doublecmd.pot index 49666dccfc..6c106a9c12 100644 --- a/language/doublecmd.pot +++ b/language/doublecmd.pot @@ -3334,7 +3334,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3342,7 +3342,8 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" msgstr "" #: tfrmmasterkey.lblfooter.caption @@ -3354,7 +3355,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3370,7 +3371,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3378,7 +3379,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12013,6 +12014,7 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "" diff --git a/language/doublecmd.pt.po b/language/doublecmd.pt.po index 7080b6211c..41217b941e 100644 --- a/language/doublecmd.pt.po +++ b/language/doublecmd.pt.po @@ -3401,7 +3401,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3409,8 +3409,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Senha mestra" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3421,7 +3423,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3437,7 +3439,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3445,7 +3447,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12288,6 +12290,7 @@ msgid "Wipe directory %s" msgstr "Limpar pasta %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Senha mestra" diff --git a/language/doublecmd.pt_BR.po b/language/doublecmd.pt_BR.po index 66faa83d1f..3ca231ac6e 100644 --- a/language/doublecmd.pt_BR.po +++ b/language/doublecmd.pt_BR.po @@ -3455,7 +3455,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3463,8 +3463,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Senha Mestra" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3475,7 +3477,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3491,7 +3493,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3499,7 +3501,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12505,6 +12507,7 @@ msgid "Wipe directory %s" msgstr "Limpar pasta %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Senha Mestra" diff --git a/language/doublecmd.ro.po b/language/doublecmd.ro.po index 2198d6c814..d3b406094f 100644 --- a/language/doublecmd.ro.po +++ b/language/doublecmd.ro.po @@ -3419,7 +3419,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3427,8 +3427,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Parolă" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3439,7 +3441,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3455,7 +3457,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3463,7 +3465,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12359,6 +12361,7 @@ msgid "Wipe directory %s" msgstr "Șterge definitiv dosarul %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Parolă" diff --git a/language/doublecmd.ru.po b/language/doublecmd.ru.po index 3374c00ade..2748230f96 100644 --- a/language/doublecmd.ru.po +++ b/language/doublecmd.ru.po @@ -3391,16 +3391,17 @@ msgid "Test" msgstr "Тест" #: tfrmmasterkey.caption -msgid "Create Master Key" -msgstr "Создание мастер ключа" +msgid "Create Key" +msgstr "Создание ключа" #: tfrmmasterkey.gbkeytransform.caption msgid "Key transformation" msgstr "Трансформация ключа" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "Мастер ключ" +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Главный пароль" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3411,8 +3412,8 @@ msgid "&Key derivation function:" msgstr "&Функция формирования ключа:" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." -msgstr "Мастер ключ преобразуется с помощью функции формирования ключа, что добавляет вычисления и усложняет атаки по словарю и угадывание." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgstr "Ключ преобразуется с помощью функции формирования ключа, что добавляет вычисления и усложняет атаки по словарю и угадывание." #: tfrmmasterkey.lbliterations.caption msgid "&Iterations:" @@ -3427,16 +3428,16 @@ msgid "&Parallelism:" msgstr "П&араллелизм:" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" -msgstr "&Мастер пароль:" +msgid "Pass&word:" +msgstr "Па&роль:" #: tfrmmasterkey.lblrepeat.caption msgid "&Repeat password:" msgstr "П&овторите пароль:" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." -msgstr "Укажите новый мастер-ключ, который будет использоваться для шифрования хранилища паролей." +msgid "Specify a new key, which will be used to encrypt the password store." +msgstr "Укажите новый ключ, который будет использоваться для шифрования хранилища паролей." #: tfrmmasterkey.lblunit.caption msgctxt "tfrmmasterkey.lblunit.caption" @@ -12318,6 +12319,7 @@ msgid "Wipe directory %s" msgstr "Стирание каталога %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Главный пароль:" diff --git a/language/doublecmd.sk.po b/language/doublecmd.sk.po index 3606f55ccf..94d829dea3 100644 --- a/language/doublecmd.sk.po +++ b/language/doublecmd.sk.po @@ -3336,7 +3336,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3344,8 +3344,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Hlavné heslo" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3356,7 +3358,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3372,7 +3374,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3380,7 +3382,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12052,6 +12054,7 @@ msgid "Wipe directory %s" msgstr "Bezpečne vymazať priečinok %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Hlavné heslo" diff --git a/language/doublecmd.sl.po b/language/doublecmd.sl.po index d5d50d4cb4..892c8068cb 100644 --- a/language/doublecmd.sl.po +++ b/language/doublecmd.sl.po @@ -3344,7 +3344,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3352,8 +3352,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Glavno geslo" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3364,7 +3366,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3380,7 +3382,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3388,7 +3390,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12066,6 +12068,7 @@ msgid "Wipe directory %s" msgstr "Neobnovljivo izbriši mapo %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Glavno geslo" diff --git a/language/doublecmd.sr.po b/language/doublecmd.sr.po index 5a6a474b21..b19b1061e0 100644 --- a/language/doublecmd.sr.po +++ b/language/doublecmd.sr.po @@ -3398,7 +3398,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3406,8 +3406,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Главна лозинка" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3418,7 +3420,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3434,7 +3436,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3442,7 +3444,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12297,6 +12299,7 @@ msgid "Wipe directory %s" msgstr "Избриши потпуно фасциклу %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Главна лозинка" diff --git a/language/doublecmd.sr@latin.po b/language/doublecmd.sr@latin.po index 8b88927654..b2a43dd540 100644 --- a/language/doublecmd.sr@latin.po +++ b/language/doublecmd.sr@latin.po @@ -3455,7 +3455,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3463,8 +3463,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Glavna lozinka" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3475,7 +3477,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3491,7 +3493,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3499,7 +3501,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12593,6 +12595,7 @@ msgid "Wipe directory %s" msgstr "Izbriši potpuno fasciklu %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Glavna lozinka" diff --git a/language/doublecmd.tr.po b/language/doublecmd.tr.po index 9b25f5f70e..38f9060136 100644 --- a/language/doublecmd.tr.po +++ b/language/doublecmd.tr.po @@ -3586,7 +3586,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3594,8 +3594,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Ana şifre" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3606,7 +3608,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3622,7 +3624,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3630,7 +3632,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12708,6 +12710,7 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Ana şifre" diff --git a/language/doublecmd.uk.po b/language/doublecmd.uk.po index fd85f26632..56bf8e1942 100644 --- a/language/doublecmd.uk.po +++ b/language/doublecmd.uk.po @@ -3414,7 +3414,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3422,8 +3422,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "Суперпароль" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3434,7 +3436,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3450,7 +3452,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3458,7 +3460,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12421,6 +12423,7 @@ msgid "Wipe directory %s" msgstr "Знищення каталогу %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "Суперпароль" diff --git a/language/doublecmd.zh_CN.po b/language/doublecmd.zh_CN.po index 5519238daf..25effb9de9 100644 --- a/language/doublecmd.zh_CN.po +++ b/language/doublecmd.zh_CN.po @@ -3335,7 +3335,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3343,8 +3343,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "主密码" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3355,7 +3357,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3371,7 +3373,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3379,7 +3381,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12073,6 +12075,7 @@ msgid "Wipe directory %s" msgstr "擦除文件夹 %s" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "主密码" diff --git a/language/doublecmd.zh_TW.po b/language/doublecmd.zh_TW.po index b6df2452c1..b7b75a383a 100644 --- a/language/doublecmd.zh_TW.po +++ b/language/doublecmd.zh_TW.po @@ -3384,7 +3384,7 @@ msgid "Test" msgstr "" #: tfrmmasterkey.caption -msgid "Create Master Key" +msgid "Create Key" msgstr "" #: tfrmmasterkey.gbkeytransform.caption @@ -3392,8 +3392,10 @@ msgid "Key transformation" msgstr "" #: tfrmmasterkey.gbmasterkey.caption -msgid "Master key" -msgstr "" +#, fuzzy +msgctxt "tfrmmasterkey.gbmasterkey.caption" +msgid "Main Password" +msgstr "主要密碼" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3404,7 +3406,7 @@ msgid "&Key derivation function:" msgstr "" #: tfrmmasterkey.lblheader.caption -msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." +msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgstr "" #: tfrmmasterkey.lbliterations.caption @@ -3420,7 +3422,7 @@ msgid "&Parallelism:" msgstr "" #: tfrmmasterkey.lblpassword.caption -msgid "Master pass&word:" +msgid "Pass&word:" msgstr "" #: tfrmmasterkey.lblrepeat.caption @@ -3428,7 +3430,7 @@ msgid "&Repeat password:" msgstr "" #: tfrmmasterkey.lbltext.caption -msgid "Specify a new master key, which will be used to encrypt the password store." +msgid "Specify a new key, which will be used to encrypt the password store." msgstr "" #: tfrmmasterkey.lblunit.caption @@ -12279,6 +12281,7 @@ msgid "Wipe directory %s" msgstr "" #: ulng.rsmsgmasterpassword +msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" msgstr "主要密碼" From bcc703ebec5880c39bb77e22b306316cd7901061 Mon Sep 17 00:00:00 2001 From: Alexander Koblov Date: Tue, 25 Nov 2025 21:08:59 +0300 Subject: [PATCH 007/199] ADD: Calculate key transformation at least one time (cherry picked from commit 15c0c27e7972c27ff7fcddb522a0a7d99c61be0d) --- src/fmasterkey.lfm | 2 ++ src/fmasterkey.pas | 39 +++++++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/fmasterkey.lfm b/src/fmasterkey.lfm index e1c665fbd8..856d56efd8 100644 --- a/src/fmasterkey.lfm +++ b/src/fmasterkey.lfm @@ -84,6 +84,7 @@ object frmMasterKey: TfrmMasterKey Width = 456 Anchors = [akTop, akLeft, akRight] AutoSize = True + BorderSpacing.Top = 6 Caption = 'Key transformation' ChildSizing.LeftRightSpacing = 12 ChildSizing.TopBottomSpacing = 12 @@ -274,6 +275,7 @@ object frmMasterKey: TfrmMasterKey OKButton.Name = 'OKButton' OKButton.DefaultCaption = True OKButton.Enabled = False + OKButton.OnClick = OKButtonClick HelpButton.Name = 'HelpButton' HelpButton.DefaultCaption = True CloseButton.Name = 'CloseButton' diff --git a/src/fmasterkey.pas b/src/fmasterkey.pas index 3814b6e2b1..d18b4e0f21 100644 --- a/src/fmasterkey.pas +++ b/src/fmasterkey.pas @@ -37,6 +37,10 @@ TfrmMasterKey = class(TForm) pnlMemory: TPanel; procedure btnTestClick(Sender: TObject); procedure edtPasswordChange(Sender: TObject); + procedure OKButtonClick(Sender: TObject); + private + FTest: Boolean; + function Test(Finish: Boolean): Boolean; end; function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Targon2_type; var M: UInt32; var T, P: UInt16): Boolean; @@ -58,6 +62,7 @@ function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Ta seMemory.Value:= M div 1024; gbMasterKey.Visible:= not Short; pnlButtons.OKButton.Enabled:= Short; + pnlButtons.OKButton.ModalResult:= mrNone; Result:= (ShowModal = mrOK); @@ -80,13 +85,16 @@ function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Ta { TfrmMasterKey } -procedure TfrmMasterKey.btnTestClick(Sender: TObject); +function TfrmMasterKey.Test(Finish: Boolean): Boolean; const HASH_LEN = 88; SALT = 'a5abbcdd86a5d7f9c8a76ea7d0197ed1'; + Buttons: array[Boolean] of TMsgDlgButtons = ([mbOK], [mbOK, mbCancel]); var - Res: Integer; + Ret: Integer; + Delay: Double; StartTime: QWord; + Res: TModalResult; ArgonType: Targon2_type; t_cost, m_cost, parallelism: UInt32; Hash: array[0..Pred(HASH_LEN)] of Byte; @@ -102,14 +110,25 @@ procedure TfrmMasterKey.btnTestClick(Sender: TObject); end; StartTime:= GetTickCount64; - Res:= argon2_kdf(t_cost, m_cost, parallelism, 'password', 8, + Ret:= argon2_kdf(t_cost, m_cost, parallelism, 'password', 8, SALT, Length(SALT), @Hash[0], HASH_LEN, ArgonType); - if (Res <> ARGON2_OK) then - ShowMessage(Format(rsMsgKeyTransformError, [Res])) + FTest:= (Ret = ARGON2_OK); + + if (not FTest) then + MessageDlg(Format(rsMsgKeyTransformError, [Ret]), mtError, [mbOK], 0) else begin - ShowMessage(Format(rsMsgKeyTransformTime, [Double(GetTickCount64 - StartTime) / 1000])); + Delay:= Double(GetTickCount64 - StartTime) / 1000; + Res:= MessageDlg(Format(rsMsgKeyTransformTime, [Delay]), mtInformation, Buttons[Finish], 0); + if Finish and (Res <> mrOK) then FTest:= False; end; + + Result:= FTest; +end; + +procedure TfrmMasterKey.btnTestClick(Sender: TObject); +begin + Test(False); end; procedure TfrmMasterKey.edtPasswordChange(Sender: TObject); @@ -117,5 +136,13 @@ procedure TfrmMasterKey.edtPasswordChange(Sender: TObject); pnlButtons.OKButton.Enabled:= (Length(edtPassword.Text) > 0) and (edtPassword.Text = edtRepeat.Text); end; +procedure TfrmMasterKey.OKButtonClick(Sender: TObject); +begin + if FTest or Test(True) then + begin + ModalResult:= mrOK; + end; +end; + end. From be0efbde24c19a083565bd19c743064a94162f24 Mon Sep 17 00:00:00 2001 From: Alexander Koblov Date: Thu, 27 Nov 2025 18:04:50 +0300 Subject: [PATCH 008/199] UPD: Argon2 default parameters (cherry picked from commit 79cc65f739551c904a0f3b5fca54f16b64961fee) --- src/fmasterkey.lfm | 4 ++-- src/fmasterkey.pas | 10 +++++----- src/ucryptproc.pas | 16 +++++++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/fmasterkey.lfm b/src/fmasterkey.lfm index 856d56efd8..d397232b72 100644 --- a/src/fmasterkey.lfm +++ b/src/fmasterkey.lfm @@ -159,7 +159,7 @@ object frmMasterKey: TfrmMasterKey Top = 49 Width = 161 MaxValue = 64 - MinValue = 2 + MinValue = 1 TabOrder = 1 Value = 4 end @@ -185,7 +185,7 @@ object frmMasterKey: TfrmMasterKey Height = 25 Top = 0 Width = 65 - MaxValue = 1024 + MaxValue = 2048 MinValue = 64 TabOrder = 0 Value = 64 diff --git a/src/fmasterkey.pas b/src/fmasterkey.pas index d18b4e0f21..d57f6ebd03 100644 --- a/src/fmasterkey.pas +++ b/src/fmasterkey.pas @@ -43,7 +43,7 @@ TfrmMasterKey = class(TForm) function Test(Finish: Boolean): Boolean; end; -function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Targon2_type; var M: UInt32; var T, P: UInt16): Boolean; +function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Targon2_type; out M: UInt32; out T, P: UInt16): Boolean; implementation @@ -52,14 +52,14 @@ implementation uses uLng; -function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Targon2_type; var M: UInt32; var T, P: UInt16): Boolean; +function CreateMasterKey(Short: Boolean; out Password: String; out ArgonType: Targon2_type; out M: UInt32; out T, P: UInt16): Boolean; begin with TfrmMasterKey.Create(Application) do try - seIterations.Value:= T; - seParallelism.Value:= P; + seMemory.Value:= 256; + seIterations.Value:= 2; + seParallelism.Value:= 4; cmbFunction.ItemIndex:= 0; - seMemory.Value:= M div 1024; gbMasterKey.Visible:= not Short; pnlButtons.OKButton.Enabled:= Short; pnlButtons.OKButton.ModalResult:= mrNone; diff --git a/src/ucryptproc.pas b/src/ucryptproc.pas index 737fe3b27a..317cd606ba 100644 --- a/src/ucryptproc.pas +++ b/src/ucryptproc.pas @@ -302,18 +302,20 @@ procedure TPasswordStore.UpdateMasterKey(var MasterKey: AnsiString; var procedure TPasswordStore.LoadParameters; const - ARGON2_MTP = (1 << 17) or (4 << 32) or (4 << 48); ARGON2_TYP: array[0..1] of Targon2_type = (Argon2_d, Argon2_id); var ATemp: TArgon2Params; begin - ATemp.Value:= ReadInt64('General', 'Parameters', ARGON2_MTP); FMasterKeyHash:= ReadString('General', 'MasterKey', EmptyStr); - // Validate parameters - FArgon2.T:= Max(ATemp.T, ARGON2_T); - FArgon2.P:= Max(ATemp.P, ARGON2_P); - FArgon2.A:= ARGON2_TYP[ATemp.M >> 31]; - FArgon2.M:= Max(ATemp.M and $7FFFFFFF, ARGON2_M); + if (Length(FMasterKeyHash) > 0) then + begin + ATemp.Value:= ReadInt64('General', 'Parameters', 0); + // Validate parameters + FArgon2.A:= ARGON2_TYP[ATemp.M >> 31]; + FArgon2.T:= Min(64, Max(ATemp.T, ARGON2_T)); + FArgon2.P:= Min(64, Max(ATemp.P, ARGON2_P)); + FArgon2.M:= Min(2048, Max(ATemp.M and $7FFFFFFF, ARGON2_M)); + end; end; procedure TPasswordStore.SaveParameters; From 8b958beb631de08701d9e7920a05de20337d4b6a Mon Sep 17 00:00:00 2001 From: Alexander Koblov Date: Sat, 29 Nov 2025 12:43:01 +0300 Subject: [PATCH 009/199] UPD: German language file (cherry picked from commit 542cbb925a6e013e31893befa60c93afc4359aaf) --- language/doublecmd.de.po | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/language/doublecmd.de.po b/language/doublecmd.de.po index b84515af79..b73c1afacb 100644 --- a/language/doublecmd.de.po +++ b/language/doublecmd.de.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: Double Commander 1.1.0 alpha\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-11-15 11:15+0300\n" -"PO-Revision-Date: 2025-11-22 10:00+0100\n" +"PO-Revision-Date: 2025-11-26 11:39+0100\n" "Last-Translator: ㋡ \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -3337,21 +3337,17 @@ msgid "Test" msgstr "Test" #: tfrmmasterkey.caption -#, fuzzy -#| msgid "Create Master Key" msgid "Create Key" -msgstr "Master-Schlüssel erstellen" +msgstr "Schlüssel erstellen" #: tfrmmasterkey.gbkeytransform.caption msgid "Key transformation" msgstr "Transformation der Schlüssel" #: tfrmmasterkey.gbmasterkey.caption -#, fuzzy -#| msgid "Master key" msgctxt "tfrmmasterkey.gbmasterkey.caption" msgid "Main Password" -msgstr "Master-Schlüssel" +msgstr "Hauptpasswort" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." @@ -3362,10 +3358,8 @@ msgid "&Key derivation function:" msgstr "Schlüsselableitungsfunktion:" #: tfrmmasterkey.lblheader.caption -#, fuzzy -#| msgid "The master key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." -msgstr "Der Master-Schlüssel wird mithilfe einer Schlüsselableitungsfunktion transformiert. Dies erhöht den Arbeitsaufwand und erschwert Wörterbuch- und Brute-Force-Angriffe." +msgstr "Der Schlüssel wird mithilfe einer Schlüsselableitungsfunktion transformiert. Dies erhöht den Arbeitsaufwand und erschwert Wörterbuch- und Brute-Force-Angriffe." #: tfrmmasterkey.lbliterations.caption msgid "&Iterations:" @@ -3380,20 +3374,16 @@ msgid "&Parallelism:" msgstr "Parallelität (Übereinstimmung):" #: tfrmmasterkey.lblpassword.caption -#, fuzzy -#| msgid "Master pass&word:" msgid "Pass&word:" -msgstr "Master-Passwort:" +msgstr "Pass&wort:" #: tfrmmasterkey.lblrepeat.caption msgid "&Repeat password:" msgstr "Passwort wiederholen:" #: tfrmmasterkey.lbltext.caption -#, fuzzy -#| msgid "Specify a new master key, which will be used to encrypt the password store." msgid "Specify a new key, which will be used to encrypt the password store." -msgstr "Geben Sie einen neuen Master-Schlüssel an, der zum Verschlüsseln des Passwortspeichers verwendet wird." +msgstr "Geben Sie einen neuen Schlüssel an, der zum Verschlüsseln des Passwortspeichers verwendet wird." #: tfrmmasterkey.lblunit.caption msgctxt "tfrmmasterkey.lblunit.caption" @@ -12069,11 +12059,11 @@ msgstr "Verzeichnis %s gründlich löschen" #: ulng.rsmsgmasterpassword msgctxt "ulng.rsmsgmasterpassword" msgid "Main Password" -msgstr "Master-Passwort" +msgstr "Hauptpasswort" #: ulng.rsmsgmasterpasswordenter msgid "Please enter the main password:" -msgstr "Bitte Master-Passwort eingeben:" +msgstr "Bitte Hauptpasswort eingeben:" #: ulng.rsmsgnewfile msgid "New file" From 5b46ef24b5a3582abfbb52772b9bbb765fff7f44 Mon Sep 17 00:00:00 2001 From: Jozef Gaal Date: Sun, 30 Nov 2025 10:41:49 +0100 Subject: [PATCH 010/199] UPD: Slovak language (#2628) (cherry picked from commit 06fe73ec278496e78abf052d3c26c1a96a7c8f2b) --- language/doublecmd.sk.po | 164 +++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 84 deletions(-) diff --git a/language/doublecmd.sk.po b/language/doublecmd.sk.po index 94d829dea3..15771e47b8 100644 --- a/language/doublecmd.sk.po +++ b/language/doublecmd.sk.po @@ -1,9 +1,9 @@ msgid "" msgstr "" -"Project-Id-Version: Double Commander 1.1.22g\n" +"Project-Id-Version: Double Commander 1.1.30g\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-11-15 11:15+0300\n" -"PO-Revision-Date: 2025-01-18 15:45+0100\n" +"PO-Revision-Date: 2025-11-30 00:27+0100\n" "Last-Translator: Jozef Gaal \n" "Language-Team: Jozef Gaál \n" "Language: sk\n" @@ -11,7 +11,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Native-Language: Slovenčina\n" -"X-Generator: Poedit 3.4.2\n" +"X-Generator: Poedit 3.6\n" #: fsyncdirsdlg.rscomparingpercent #, object-pascal-format @@ -355,7 +355,7 @@ msgstr "Windows (CRLF)" #: tfrmchecksumcalc.rghashalgorithm.caption msgid "Algorithm" -msgstr "" +msgstr "Algoritmus" #: tfrmchecksumverify.btnclose.caption msgctxt "TFRMCHECKSUMVERIFY.BTNCLOSE.CAPTION" @@ -1006,7 +1006,7 @@ msgstr "Vybrať všetko" #: tfrmeditor.actedittimedate.caption msgid "Time/Date" -msgstr "" +msgstr "Čas/Dátum" #: tfrmeditor.acteditundo.caption msgctxt "TFRMEDITOR.ACTEDITUNDO.CAPTION" @@ -3333,60 +3333,58 @@ msgstr "Alebo zvoľte preddefinovaný typ výbe&ru:" #: tfrmmasterkey.btntest.caption msgid "Test" -msgstr "" +msgstr "Vyskúšať" #: tfrmmasterkey.caption msgid "Create Key" -msgstr "" +msgstr "Vytvoriť kľúč" #: tfrmmasterkey.gbkeytransform.caption msgid "Key transformation" -msgstr "" +msgstr "Transformácia kľúča" #: tfrmmasterkey.gbmasterkey.caption -#, fuzzy msgctxt "tfrmmasterkey.gbmasterkey.caption" msgid "Main Password" msgstr "Hlavné heslo" #: tfrmmasterkey.lblfooter.caption msgid "The more iterations, the harder are dictionary and guessing attacks, but also password store loading/saving takes more time." -msgstr "" +msgstr "Čím viac iterácií, tým ťažšie sú slovníkové a odhadovacie útoky, ale aj načítanie/ukladanie hesiel trvá dlhšie." #: tfrmmasterkey.lblfunction.caption msgid "&Key derivation function:" -msgstr "" +msgstr "Funkcia odvodenia &kľúča:" #: tfrmmasterkey.lblheader.caption msgid "The key is transformed using a key derivation function. This adds a work factor and makes dictionary and guessing attacks harder." -msgstr "" +msgstr "Kľúč sa transformuje pomocou funkcie odvodenia kľúča. To pridáva pracovný faktor a sťažuje útoky pomocou slovníkov a hádania." #: tfrmmasterkey.lbliterations.caption msgid "&Iterations:" -msgstr "" +msgstr "&Iterácie:" #: tfrmmasterkey.lblmemory.caption msgid "&Memory:" -msgstr "" +msgstr "Pa&mäť:" #: tfrmmasterkey.lblparallelism.caption msgid "&Parallelism:" -msgstr "" +msgstr "&Paralelizmus:" #: tfrmmasterkey.lblpassword.caption msgid "Pass&word:" -msgstr "" +msgstr "&Heslo:" #: tfrmmasterkey.lblrepeat.caption msgid "&Repeat password:" -msgstr "" +msgstr "&Opakovať heslo:" #: tfrmmasterkey.lbltext.caption msgid "Specify a new key, which will be used to encrypt the password store." -msgstr "" +msgstr "Určite nový kľúč, ktorý sa bude používať na šifrovanie úložiska hesiel." #: tfrmmasterkey.lblunit.caption -#, fuzzy msgctxt "tfrmmasterkey.lblunit.caption" msgid "MB" msgstr "MB" @@ -3571,7 +3569,7 @@ msgstr "Načítať poslednú predvoľbu" #: tfrmmultirename.actloadnamesfromclipboard.caption msgid "Load Names from Clipboard" -msgstr "" +msgstr "Načítať názvy zo schránky" #: tfrmmultirename.actloadnamesfromfile.caption msgid "Load Names from File..." @@ -3720,11 +3718,11 @@ msgstr "&Regulárne výrazy" #: tfrmmultirename.cbrepext.caption msgid "E" -msgstr "" +msgstr "E" #: tfrmmultirename.cbrepext.hint msgid "Replace also in file extensions" -msgstr "" +msgstr "Nahradiť aj v príponách súborov" #: tfrmmultirename.cbusesubs.caption msgid "&Use substitution" @@ -4237,11 +4235,11 @@ msgstr "Binárny mód" #: tfrmoptionscolors.dbbookmode.caption msgid "Book Mode" -msgstr "Režim prezerania knihy" +msgstr "Režim knihy" #: tfrmoptionscolors.dbimagemode.caption msgid "Image Mode" -msgstr "Typ obrázku" +msgstr "Režim obrázku" #: tfrmoptionscolors.dbtextmode.caption msgid "Text Mode" @@ -4267,7 +4265,7 @@ msgstr "Kategória:" #: tfrmoptionscolors.lbldeleted.caption msgid "Deleted:" -msgstr "Vymazať:" +msgstr "Vymazané:" #: tfrmoptionscolors.lblerror.caption msgid "Error:" @@ -4275,7 +4273,7 @@ msgstr "Chyba:" #: tfrmoptionscolors.lblimagebackground1.caption msgid "Background 1:" -msgstr "Pozadie 2:" +msgstr "Pozadie 1:" #: tfrmoptionscolors.lblimagebackground2.caption msgctxt "tfrmoptionscolors.lblimagebackground2.caption" @@ -4288,19 +4286,19 @@ msgstr "&Indikátor Zadnej Farby:" #: tfrmoptionscolors.lblindcolor.caption msgid "&Indicator Fore Color:" -msgstr "&Indikátor Prednej Farby:" +msgstr "&Indikátor farby popredia:" #: tfrmoptionscolors.lblindthresholdcolor.caption msgid "Indicator &Threshold Color:" -msgstr "&Indikátor Prednej Farby:" +msgstr "Indikátor &hraničnej farby:" #: tfrmoptionscolors.lblinformation.caption msgid "Information:" -msgstr "Nastavenie:" +msgstr "Informácie:" #: tfrmoptionscolors.lblleft.caption msgid "Left:" -msgstr "&Ľavý:" +msgstr "Ľavý:" #: tfrmoptionscolors.lblmodified.caption msgctxt "tfrmoptionscolors.lblmodified.caption" @@ -4314,7 +4312,7 @@ msgstr "Upravený:" #: tfrmoptionscolors.lblright.caption msgid "Right:" -msgstr "&Pravý:" +msgstr "Pravý:" #: tfrmoptionscolors.lblsuccess.caption msgctxt "tfrmoptionscolors.lblsuccess.caption" @@ -4327,7 +4325,7 @@ msgstr "Neznáme:" #: tfrmoptionscolors.rgdarkmode.caption msgid "State" -msgstr "Otočiť" +msgstr "Stav" #: tfrmoptionscolumnsview.cbcolumnstitlelikevalues.caption msgid "Column titles alignment &like values" @@ -5309,7 +5307,7 @@ msgstr "Umožňuje odsadiť striešku, keď sa nový riadok vytvorí pomocou