Skip to content

Commit

Permalink
Merge pull request #45 from jdlcdl/miniscript_and_486_fix
Browse files Browse the repository at this point in the history
loaded descriptors no longer forced to "xpub" version
  • Loading branch information
odudex authored Dec 10, 2024
2 parents 213224e + 5e28dda commit 741ed84
Show file tree
Hide file tree
Showing 25 changed files with 70 additions and 39 deletions.
3 changes: 2 additions & 1 deletion i18n/translations/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Speicherort",
"Message": "Nachricht",
"Message:": "Nachricht:",
"Miniscript": "Miniscript",
"Missing signature file": "Fehlende Signaturdatei",
"Mnemonic": "Mnemonic",
"Mnemonic ID": "Mnemonische ID",
"Mnemonic and passphrase will be kept.": "Mnemotechnik und Passphrase werden beibehalten.",
"Mnemonic was not encrypted": "Mnemonic wurde nicht verschlüsselt",
"Modified:": "Geändert:",
"Multisig": "Multisig",
"Native Segwit - 84 would be assumed": "Native Segwit - 84 würde angenommen",
"Network": "Netzwerk",
"New Mnemonic": "Neue Mnemonic",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "Klartext-QR",
"Please load a wallet output descriptor": "Bitte lade einen Wallet Ausgabedeskriptor",
"Plunge Rate": "Tauchrate",
"Policy Type": "Richtlinientyp:",
"Poor entropy": "Schlechte Entropie",
"Poor entropy detected!": "Schlechte Entropie erkannt!",
"Print Test QR": "Drucke Test-QR",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/es-MX.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Ubicación",
"Message": "Mensaje",
"Message:": "Mensaje:",
"Miniscript": "Miniscript",
"Missing signature file": "Falta archivo de firma",
"Mnemonic": "Mnemónico",
"Mnemonic ID": "Identificación del Mnemónico",
"Mnemonic and passphrase will be kept.": "Mnemónico y passphrase se mantendrán.",
"Mnemonic was not encrypted": "Mnemónico no fue descifrado",
"Modified:": "Modificado:",
"Multisig": "Multisig",
"Native Segwit - 84 would be assumed": "Segwit nativo - 84 se supondría",
"Network": "Red",
"New Mnemonic": "Nuevo Mnemónico",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "QR de Texto",
"Please load a wallet output descriptor": "Carga un descriptor de cartera",
"Plunge Rate": "Tasa de Caída",
"Policy Type": "Tipo de póliza",
"Poor entropy": "Baja entropía",
"Poor entropy detected!": "Mala entropía detectada!",
"Print Test QR": "Prueba de Impresión QR",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Emplacement",
"Message": "Message",
"Message:": "Message :",
"Miniscript": "Miniscript",
"Missing signature file": "Fichier de signature manquant",
"Mnemonic": "Mnémonique",
"Mnemonic ID": "ID Mnémonique",
"Mnemonic and passphrase will be kept.": "Mnémonique et phrase secrète seront conservés.",
"Mnemonic was not encrypted": "Mnémonique n'était pas chiffré",
"Modified:": "Modifié :",
"Multisig": "Multi\nsignature",
"Native Segwit - 84 would be assumed": "Native Segwit - 84 serait supposé",
"Network": "Réseau",
"New Mnemonic": "Nouveau Mnémonique",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "QR en Texte Brut",
"Please load a wallet output descriptor": "Veuillez charger un descripteur de sortie de portefeuille",
"Plunge Rate": "Taux de plongée",
"Policy Type": "Type de politique",
"Poor entropy": "Entropie faible",
"Poor entropy detected!": "Entropie faible détectée !",
"Print Test QR": "Impression Test QR",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/ja-JP.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "場所",
"Message": "メッセージ",
"Message:": "メッセージ:",
"Miniscript": "ミニスクリプト",
"Missing signature file": "署名ファイルが欠落しています",
"Mnemonic": "Mnemonic",
"Mnemonic ID": "Mnemonic ID",
"Mnemonic and passphrase will be kept.": "Mnemonicとパスフレーズは保持されます.",
"Mnemonic was not encrypted": "Mnemonicは暗号化されていませんでした",
"Modified:": "修正されました:",
"Multisig": "マルチシグ",
"Native Segwit - 84 would be assumed": "ネイティブSegwit - 84が仮定されます",
"Network": "ネットワーク",
"New Mnemonic": "新しい Mnemonic",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "プレーンテキストQR",
"Please load a wallet output descriptor": "ウォレットの出力記述子をロードしてください",
"Plunge Rate": "沈下率",
"Policy Type": "証券の種類",
"Poor entropy": "低品質なエントロピー",
"Poor entropy detected!": "低品質なエントロピーが検出されました!",
"Print Test QR": "テストQRを印刷",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "기본 저장소",
"Message": "메시지",
"Message:": "메시지:",
"Miniscript": "미니스크립트",
"Missing signature file": "서명 파일이 누락되었습니다",
"Mnemonic": "니모닉",
"Mnemonic ID": "니모닉 ID",
"Mnemonic and passphrase will be kept.": "니모닉과 암호는 유지됩니다.",
"Mnemonic was not encrypted": "니모닉이 암호화되지 않았습니다",
"Modified:": "수정되었습니다:",
"Multisig": "멀티시그",
"Native Segwit - 84 would be assumed": "네이티브 세그윗 - BIP84를 적용합니다",
"Network": "네트워크",
"New Mnemonic": "새로운 니모닉",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "일반텍스트 QR",
"Please load a wallet output descriptor": "지갑 출력 디스크립터를 불러오십시오",
"Plunge Rate": "침수율",
"Policy Type": "정책 유형",
"Poor entropy": "엔트로피가 부족합니다",
"Poor entropy detected!": "엔트로피가 부족합니다!",
"Print Test QR": "QR 테스트 인쇄",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/nl-NL.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Opslaglocatie",
"Message": "Bericht",
"Message:": "Bericht:",
"Miniscript": "Miniscript",
"Missing signature file": "Handtekening bestand mist",
"Mnemonic": "Geheugensteun",
"Mnemonic ID": "Geheugensteun ID",
"Mnemonic and passphrase will be kept.": "Geheugensteun en wachtwoord worden bewaard.",
"Mnemonic was not encrypted": "Geheugensteun is niet versleuteld",
"Modified:": "Aangepast:",
"Multisig": "Multisig",
"Native Segwit - 84 would be assumed": "Native Segwit - 84 zal worden gebruikt",
"Network": "Netwerk",
"New Mnemonic": "Geheugensteun aanmaken",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "Platte tekst QR",
"Please load a wallet output descriptor": "Laadt een portemonnee descriptor in",
"Plunge Rate": "Duik tarief",
"Policy Type": "Type beleid",
"Poor entropy": "Slechte entropie",
"Poor entropy detected!": "Lage entropie gedetecteerd!",
"Print Test QR": "Test QR afdrukken",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Local",
"Message": "Mensagem",
"Message:": "Mensagem:",
"Miniscript": "Miniscript",
"Missing signature file": "Arquivo de assinatura faltando",
"Mnemonic": "Mnemônico",
"Mnemonic ID": "ID do mnemônico",
"Mnemonic and passphrase will be kept.": "Mnemônico e senha serão mantidos.",
"Mnemonic was not encrypted": "Mnemônico não foi criptografado",
"Modified:": "Modificado:",
"Multisig": "Multisig",
"Native Segwit - 84 would be assumed": "Segwit nativo - 84 seria assumido",
"Network": "Rede",
"New Mnemonic": "Novo Mnemônico",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "QR em Texto",
"Please load a wallet output descriptor": "Carregue um descritor da carteira",
"Plunge Rate": "Taxa de Mergulho",
"Policy Type": "Tipo de Apólice",
"Poor entropy": "Entropia fraca",
"Poor entropy detected!": "Baixa entropia detectada!",
"Print Test QR": "Imprimir QR de teste",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Расположение",
"Message": "Сообщение",
"Message:": "Сообщение:",
"Miniscript": "Минискрипт",
"Missing signature file": "Отсутствует файл подписи",
"Mnemonic": "Мнемоника",
"Mnemonic ID": "ID Мнемоники",
"Mnemonic and passphrase will be kept.": "Мнемоника и парольная фраза будут сохранены.",
"Mnemonic was not encrypted": "Мнемоника не была зашифрована",
"Modified:": "Изменено:",
"Multisig": "Мультиподпись",
"Native Segwit - 84 would be assumed": "Native Segwit - 84 будет принято",
"Network": "Сеть",
"New Mnemonic": "Новая Мнемоника",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "QR Открытым Текстом",
"Please load a wallet output descriptor": "Пожалуйста загрузите выходной дескриптор кошелька",
"Plunge Rate": "Скорость Погружения",
"Policy Type": "Тип политики",
"Poor entropy": "Плохая энтропия",
"Poor entropy detected!": "Обнаружена плохая энтропия!",
"Print Test QR": "Напечатать Тестовый QR",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/tr-TR.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Konum",
"Message": "Mesaj",
"Message:": "Mesaj:",
"Miniscript": "Mini senaryo",
"Missing signature file": "İmza dosyası eksik",
"Mnemonic": "Mnemonic",
"Mnemonic ID": "Mnemonic ID",
"Mnemonic and passphrase will be kept.": "Mnemonik ve parola tutulacaktır.",
"Mnemonic was not encrypted": "Mnemonic şifrelenmedi",
"Modified:": "Değiştirildi:",
"Multisig": "Çoklu imza",
"Native Segwit - 84 would be assumed": "Yerel Segwit - 84 varsayılacaktır",
"Network": "",
"New Mnemonic": "Yeni Mnemonic",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "Düz Metin QR'ı",
"Please load a wallet output descriptor": "Lütfen bir cüzdan çıktı tanımlayıcısı yükleyin",
"Plunge Rate": "Dalış Hızı",
"Policy Type": "Politika türü",
"Poor entropy": "Düşük entropi",
"Poor entropy detected!": "Düşük entropi tespit edildi!",
"Print Test QR": "Test QR'ını Yazdır",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/vi-VN.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "Vị trí lưu",
"Message": "Tin nhắn",
"Message:": "Tin nhắn:",
"Miniscript": "Chi tiết nhỏ",
"Missing signature file": "Thiếu tập tin chữ ký",
"Mnemonic": "Mã mnemonic",
"Mnemonic ID": "Mnemonic ID ",
"Mnemonic and passphrase will be kept.": "Từ gợi nhớ và cụm mật khẩu sẽ được lưu giữ.",
"Mnemonic was not encrypted": "Mnemonic không được mã hóa",
"Modified:": "Đã sửa đổi:",
"Multisig": "Đa chữ kí",
"Native Segwit - 84 would be assumed": "Native Segwit - 84 sẽ được giả định",
"Network": "Mạng lưới",
"New Mnemonic": "Mnemonic mới",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "QR dạng văn bản",
"Please load a wallet output descriptor": "Vui lòng tải bộ mô tả đầu ra ví",
"Plunge Rate": "Tỷ lệ sụt giảm",
"Policy Type": "Loại Chính sách",
"Poor entropy": "Entropy kém",
"Poor entropy detected!": "Phát hiện entropy yếu!",
"Print Test QR": "In kiểm tra QR",
Expand Down
3 changes: 2 additions & 1 deletion i18n/translations/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,13 @@
"Location": "位置",
"Message": "消息",
"Message:": "消息:",
"Miniscript": "Miniscript",
"Missing signature file": "缺少签名文件",
"Mnemonic": "助记词",
"Mnemonic ID": "助记词 ID",
"Mnemonic and passphrase will be kept.": "助记词和密码将被保留。",
"Mnemonic was not encrypted": "助记词未加密",
"Modified:": "修改时间:",
"Multisig": "多签",
"Native Segwit - 84 would be assumed": "假定为原生 Segwit - 84",
"Network": "网络",
"New Mnemonic": "新助记词",
Expand All @@ -185,6 +185,7 @@
"Plaintext QR": "明文二维码",
"Please load a wallet output descriptor": "请加载钱包输出描述符",
"Plunge Rate": "下刀速度",
"Policy Type": "政策类型",
"Poor entropy": "熵值低",
"Poor entropy detected!": "检测到低熵!",
"Print Test QR": "打印测试二维码",
Expand Down
3 changes: 2 additions & 1 deletion src/krux/translations/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@
2817059741,
2030045667,
762611188,
235032255,
3928301843,
1948316555,
2123991188,
1443208255,
1746030071,
1237332019,
1845376098,
4265479636,
2939797024,
73574491,
Expand All @@ -219,6 +219,7 @@
1703779997,
3561756278,
784609464,
473757803,
3761518438,
3639136476,
3037062877,
Expand Down
3 changes: 2 additions & 1 deletion src/krux/translations/de.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@
"Speicherort",
"Nachricht",
"Nachricht:",
"Miniscript",
"Fehlende Signaturdatei",
"Mnemonic",
"Mnemonische ID",
"Mnemotechnik und Passphrase werden beibehalten.",
"Mnemonic wurde nicht verschlüsselt",
"Geändert:",
"Multisig",
"Native Segwit - 84 würde angenommen",
"Netzwerk",
"Neue Mnemonic",
Expand All @@ -207,6 +207,7 @@
"Klartext-QR",
"Bitte lade einen Wallet Ausgabedeskriptor",
"Tauchrate",
"Richtlinientyp:",
"Schlechte Entropie",
"Schlechte Entropie erkannt!",
"Drucke Test-QR",
Expand Down
3 changes: 2 additions & 1 deletion src/krux/translations/es.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@
"Ubicación",
"Mensaje",
"Mensaje:",
"Miniscript",
"Falta archivo de firma",
"Mnemónico",
"Identificación del Mnemónico",
"Mnemónico y passphrase se mantendrán.",
"Mnemónico no fue descifrado",
"Modificado:",
"Multisig",
"Segwit nativo - 84 se supondría",
"Red",
"Nuevo Mnemónico",
Expand All @@ -207,6 +207,7 @@
"QR de Texto",
"Carga un descriptor de cartera",
"Tasa de Caída",
"Tipo de póliza",
"Baja entropía",
"Mala entropía detectada!",
"Prueba de Impresión QR",
Expand Down
3 changes: 2 additions & 1 deletion src/krux/translations/fr.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@
"Emplacement",
"Message",
"Message\u2009:",
"Miniscript",
"Fichier de signature manquant",
"Mnémonique",
"ID Mnémonique",
"Mnémonique et phrase secrète seront conservés.",
"Mnémonique n'était pas chiffré",
"Modifié\u2009:",
"Multi\nsignature",
"Native Segwit - 84 serait supposé",
"Réseau",
"Nouveau Mnémonique",
Expand All @@ -207,6 +207,7 @@
"QR en Texte Brut",
"Veuillez charger un descripteur de sortie de portefeuille",
"Taux de plongée",
"Type de politique",
"Entropie faible",
"Entropie faible détectée\u2009!",
"Impression Test QR",
Expand Down
3 changes: 2 additions & 1 deletion src/krux/translations/ja.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@
"場所",
"メッセージ",
"メッセージ:",
"ミニスクリプト",
"署名ファイルが欠落しています",
"Mnemonic",
"Mnemonic ID",
"Mnemonicとパスフレーズは保持されます.",
"Mnemonicは暗号化されていませんでした",
"修正されました:",
"マルチシグ",
"ネイティブSegwit - 84が仮定されます",
"ネットワーク",
"新しい Mnemonic",
Expand All @@ -207,6 +207,7 @@
"プレーンテキストQR",
"ウォレットの出力記述子をロードしてください",
"沈下率",
"証券の種類",
"低品質なエントロピー",
"低品質なエントロピーが検出されました!",
"テストQRを印刷",
Expand Down
3 changes: 2 additions & 1 deletion src/krux/translations/ko.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,13 @@
"기본 저장소",
"메시지",
"메시지:",
"미니스크립트",
"서명 파일이 누락되었습니다",
"니모닉",
"니모닉 ID",
"니모닉과 암호는 유지됩니다.",
"니모닉이 암호화되지 않았습니다",
"수정되었습니다:",
"멀티시그",
"네이티브 세그윗 - BIP84를 적용합니다",
"네트워크",
"새로운 니모닉",
Expand All @@ -207,6 +207,7 @@
"일반텍스트 QR",
"지갑 출력 디스크립터를 불러오십시오",
"침수율",
"정책 유형",
"엔트로피가 부족합니다",
"엔트로피가 부족합니다!",
"QR 테스트 인쇄",
Expand Down
Loading

0 comments on commit 741ed84

Please sign in to comment.