Skip to content

Commit

Permalink
Merge branch 'v4.44.1-hotfix' into release-v4.44.1
Browse files Browse the repository at this point in the history
  • Loading branch information
benma committed Oct 1, 2024
2 parents 84e75d4 + fef243b commit eee0c0b
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 41 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

## 4.44.1
- Minor UI bugfixes

## 4.44.0
- Bundle BitBox02 firmware version v9.20.0
- Add support for selling bitcoin in-app via Pocket
Expand Down
2 changes: 1 addition & 1 deletion backend/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const updateFileURL = "https://bitboxapp.shiftcrypto.io/desktop.json"

var (
// Version of the backend as displayed to the user.
Version = semver.NewSemVer(4, 44, 0)
Version = semver.NewSemVer(4, 44, 1)
)

// UpdateFile is retrieved from the server.
Expand Down
4 changes: 2 additions & 2 deletions frontends/android/BitBoxApp/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "ch.shiftcrypto.bitboxapp"
minSdkVersion 21
targetSdkVersion 34
versionCode 52
versionName "android-4.44.0"
versionCode 53
versionName "android-4.44.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
Expand Down
4 changes: 2 additions & 2 deletions frontends/qt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ linux:
cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
mkdir build/tmp-deb/opt/
cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.44.0 -C ../tmp-deb/
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.44.0 -C ../tmp-deb/
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.44.1 -C ../tmp-deb/
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.44.1 -C ../tmp-deb/
# create AppImage
cd build/linux-tmp && /opt/linuxdeployqt-7-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc
mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/
Expand Down
4 changes: 2 additions & 2 deletions frontends/qt/resources/MacOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
<string>APPL</string>

<key>CFBundleVersion</key>
<string>4.44.0</string>
<string>4.44.1</string>

<key>CFBundleShortVersionString</key>
<string>4.44.0</string>
<string>4.44.1</string>

<key>CFBundleSignature</key>
<string>????</string>
Expand Down
2 changes: 1 addition & 1 deletion frontends/qt/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SetCompressor /SOLID lzma

# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 4.44.0.0
!define VERSION 4.44.1.0
!define COMPANY "Shift Crypto AG"
!define URL https://github.com/BitBoxSwiss/bitbox-wallet-app/releases/
!define BINDIR "build\windows"
Expand Down
1 change: 0 additions & 1 deletion frontends/web/src/locales/ar/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
"button": {
"abort": "الايقاف",
"back": "العودة",
"buy": "الشراء",
"changepin": "قم بتغيير كلمة مرور الجهاز",
"check": "قم بالتحقق من النسخة الاحتياطية",
"continue": "الاستمرار",
Expand Down
7 changes: 4 additions & 3 deletions frontends/web/src/locales/cs/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Zrušit",
"back": "Zpět",
"buy": "Koupit",
"changepin": "Změňit heslo zařízení",
"check": "Zkontrolovat zálohu",
"continue": "Pokračovat",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Bankovní převod",
"bestDeal": "Nejvýhodnější nabídka",
"buy": "Koupit",
"creditCard": "Kreditní karta",
"fast": "Rychle",
"fee": "poplatek",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Je nám líto, ale v této oblasti nejsou k dispozici žádné burzy.",
"region": "Oblast",
"selectRegion": "Není uvedeno"
"selectRegion": "Není uvedeno",
"sell": "Prodat"
},
"info": {
"continue": "Souhlasím, pokračovat",
Expand Down Expand Up @@ -744,7 +745,7 @@
"buy": "Koupit {{coinCode}}",
"buySell": "Nákup a prodej",
"buy_bitcoin": "Koupit Bitcoin",
"buy_crypto": "Koupit crypto",
"buy_crypto": "Koupit krypto",
"enabled_false": "Vypnuto",
"enabled_true": "Zapnuto",
"receive": "Přijmout {{coinCode}}",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/de/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Abbrechen",
"back": "Zurück",
"buy": "Kaufen",
"changepin": "Gerätepasswort ändern",
"check": "Backup überprüfen",
"continue": "Weiter",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Überweisung",
"bestDeal": "Bestes Angebot",
"buy": "Kaufen",
"creditCard": "Kreditkarte",
"fast": "Schnell",
"fee": "Gebühr",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Leider sind in dieser Region keine Börsen verfügbar.",
"region": "Region",
"selectRegion": "Nicht angegeben"
"selectRegion": "Nicht angegeben",
"sell": "Verkaufen"
},
"info": {
"continue": "Zustimmen und fortfahren",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/en/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Abort",
"back": "Back",
"buy": "Buy",
"changepin": "Change device password",
"check": "Check backup",
"continue": "Continue",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Bank transfer",
"bestDeal": "Best deal",
"buy": "Buy",
"creditCard": "Credit card",
"fast": "Fast",
"fee": "fee",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Sorry, there are no available exchanges in this region.",
"region": "Region",
"selectRegion": "Not specified"
"selectRegion": "Not specified",
"sell": "Sell"
},
"info": {
"continue": "Agree and continue",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/es/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Cancel",
"back": "Atrás",
"buy": "Comprar",
"changepin": "Cambiar contraseña del dispositivo",
"check": "Comprobar la copia de seguridad",
"continue": "Continuar",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Transferencia bancaria",
"bestDeal": "La mejor oferta",
"buy": "Compra",
"creditCard": "Tarjeta de crédito",
"fast": "Rápido",
"fee": "tarifa",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Lo sentimos, no hay intercambios disponibles en esta región.",
"region": "Región",
"selectRegion": "No especificado"
"selectRegion": "No especificado",
"sell": "Venta"
},
"info": {
"continue": "Aceptar y continuar",
Expand Down
1 change: 0 additions & 1 deletion frontends/web/src/locales/fr/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,6 @@
"button": {
"abort": "Abandonner",
"back": "Retour",
"buy": "Acheter",
"changepin": "Changer le mot de passe de l'appareil",
"check": "Vérifier la sauvegarde",
"continue": "Continuer",
Expand Down
1 change: 0 additions & 1 deletion frontends/web/src/locales/he/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@
"button": {
"abort": "בטל",
"back": "חזור",
"buy": "קנה",
"changepin": "החלף סיסמת התקן",
"check": "בדוק גיבוי",
"continue": "המשך",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/it/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Interrompere",
"back": "Indietro",
"buy": "Acquista",
"changepin": "Cambia la password del dispositivo",
"check": "Verifica il backup",
"continue": "Continua",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Bonifico bancario",
"bestDeal": "Miglior prezzo",
"buy": "Compra",
"creditCard": "Carta di credito",
"fast": "Rapido",
"fee": "commissione",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Mi dispiace, non ci sono exchange disponibili in questo Paese",
"region": "Paese",
"selectRegion": "Non specificato"
"selectRegion": "Non specificato",
"sell": "Vendi"
},
"info": {
"continue": "Accetta e continua",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/ja/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "中止",
"back": "戻る",
"buy": "購入",
"changepin": "デバイスのパスワード変更",
"check": "バックアップの確認",
"continue": "続行",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "銀行振込",
"bestDeal": "最良の取引",
"buy": "買う",
"creditCard": "クレジットカード",
"fast": "高速",
"fee": "手数料",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "申し訳ございませんが、この地域では利用可能な取引所はございません。",
"region": "地域",
"selectRegion": "指定なし"
"selectRegion": "指定なし",
"sell": "売る"
},
"info": {
"continue": "同意して続ける",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/ms/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Tinggalkan",
"back": "Kembali",
"buy": "Beli",
"changepin": "Ubah kata laluan peranti",
"check": "Semak Backup",
"continue": "Teruskan",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Transfer bank",
"bestDeal": "Tawaran terbaik",
"buy": "Beli",
"creditCard": "Kad kredit",
"fast": "Cepat",
"fee": "bayaran",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Maaf, tiada pertukaran tersedia di rantau ini.",
"region": "Wilayah",
"selectRegion": "Tidak dinyatakan"
"selectRegion": "Tidak dinyatakan",
"sell": "jual"
},
"info": {
"continue": "Setuju dan teruskan",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/nl/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Annuleren",
"back": "Terug",
"buy": "Koop",
"changepin": "BitBox-wachtwoord veranderen",
"check": "Backup controleren",
"continue": "Verder",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Bankoverschrijving",
"bestDeal": "Beste deal",
"buy": "Kopen",
"creditCard": "Creditcard",
"fast": "Snel",
"fee": "transactiekosten",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Sorry, er zijn geen exchanges beschikbaar in jouw regio",
"region": "Regio",
"selectRegion": "Niet aangegeven"
"selectRegion": "Niet aangegeven",
"sell": "Verkopen"
},
"info": {
"continue": "Akkoord, verder",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/pt/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Abortar",
"back": "Voltar",
"buy": "Comprar",
"changepin": "Mudar senha do dispositivo",
"check": "Checar backup",
"continue": "Continuar",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Transferência bancária",
"bestDeal": "Melhor oferta",
"buy": "Comprar",
"creditCard": "Cartão de crédito",
"fast": "Rápido",
"fee": "taxa",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "Desculpe, não há exchanges disponíveis nesta região.",
"region": "Região",
"selectRegion": "Não especificada"
"selectRegion": "Não especificada",
"sell": "Vender"
},
"info": {
"continue": "Concordo e continue",
Expand Down
1 change: 0 additions & 1 deletion frontends/web/src/locales/ru/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@
"button": {
"abort": "Прервать",
"back": "Назад",
"buy": "Купить",
"changepin": "Изменить пароль устройства",
"check": "Проверить резервную копию",
"continue": "Продолжить",
Expand Down
5 changes: 3 additions & 2 deletions frontends/web/src/locales/sl/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
"button": {
"abort": "Prekini",
"back": "Nazaj",
"buy": "Kupi",
"changepin": "Spremenite geslo naprave",
"check": "Preverite varnostno kopijo",
"continue": "Nadaljujte",
Expand All @@ -398,6 +397,7 @@
"exchange": {
"bankTransfer": "Bančno nakazilo",
"bestDeal": "Najboljša ponudba",
"buy": "Nakup",
"creditCard": "Kreditna karica",
"fast": "Hitro",
"fee": "provizija",
Expand Down Expand Up @@ -459,7 +459,8 @@
},
"noExchanges": "V tej regiji žal ni razpoložljivih menjalnic.",
"region": "Regija",
"selectRegion": "Ni navedeno"
"selectRegion": "Ni navedeno",
"sell": "Prodaja"
},
"info": {
"continue": "Potrdi in nadaljuj",
Expand Down
Loading

0 comments on commit eee0c0b

Please sign in to comment.