Skip to content

Commit eee0c0b

Browse files
committed
Merge branch 'v4.44.1-hotfix' into release-v4.44.1
2 parents 84e75d4 + fef243b commit eee0c0b

File tree

22 files changed

+50
-41
lines changed

22 files changed

+50
-41
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
## 4.44.1
6+
- Minor UI bugfixes
7+
58
## 4.44.0
69
- Bundle BitBox02 firmware version v9.20.0
710
- Add support for selling bitcoin in-app via Pocket

backend/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const updateFileURL = "https://bitboxapp.shiftcrypto.io/desktop.json"
2727

2828
var (
2929
// Version of the backend as displayed to the user.
30-
Version = semver.NewSemVer(4, 44, 0)
30+
Version = semver.NewSemVer(4, 44, 1)
3131
)
3232

3333
// UpdateFile is retrieved from the server.

frontends/android/BitBoxApp/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "ch.shiftcrypto.bitboxapp"
88
minSdkVersion 21
99
targetSdkVersion 34
10-
versionCode 52
11-
versionName "android-4.44.0"
10+
versionCode 53
11+
versionName "android-4.44.1"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {

frontends/qt/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ linux:
3838
cp resources/linux/usr/share/icons/hicolor/128x128/apps/bitbox.png build/linux-tmp
3939
mkdir build/tmp-deb/opt/
4040
cp -aR build/linux-tmp build/tmp-deb/opt/bitbox
41-
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.44.0 -C ../tmp-deb/
42-
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.44.0 -C ../tmp-deb/
41+
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t deb -n bitbox -v 4.44.1 -C ../tmp-deb/
42+
cd build/linux && fpm --after-install ../../resources/deb-afterinstall.sh -s dir -t rpm -n bitbox -v 4.44.1 -C ../tmp-deb/
4343
# create AppImage
4444
cd build/linux-tmp && /opt/linuxdeployqt-7-x86_64.AppImage BitBox -appimage -unsupported-allow-new-glibc
4545
mv build/linux-tmp/BitBoxApp-*-x86_64.AppImage build/linux/

frontends/qt/resources/MacOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
<string>APPL</string>
2222

2323
<key>CFBundleVersion</key>
24-
<string>4.44.0</string>
24+
<string>4.44.1</string>
2525

2626
<key>CFBundleShortVersionString</key>
27-
<string>4.44.0</string>
27+
<string>4.44.1</string>
2828

2929
<key>CFBundleSignature</key>
3030
<string>????</string>

frontends/qt/setup.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SetCompressor /SOLID lzma
2222

2323
# General Symbol Definitions
2424
!define REGKEY "SOFTWARE\$(^Name)"
25-
!define VERSION 4.44.0.0
25+
!define VERSION 4.44.1.0
2626
!define COMPANY "Shift Crypto AG"
2727
!define URL https://github.com/BitBoxSwiss/bitbox-wallet-app/releases/
2828
!define BINDIR "build\windows"

frontends/web/src/locales/ar/app.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@
276276
"button": {
277277
"abort": "الايقاف",
278278
"back": "العودة",
279-
"buy": "الشراء",
280279
"changepin": "قم بتغيير كلمة مرور الجهاز",
281280
"check": "قم بالتحقق من النسخة الاحتياطية",
282281
"continue": "الاستمرار",

frontends/web/src/locales/cs/app.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Zrušit",
374374
"back": "Zpět",
375-
"buy": "Koupit",
376375
"changepin": "Změňit heslo zařízení",
377376
"check": "Zkontrolovat zálohu",
378377
"continue": "Pokračovat",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Bankovní převod",
400399
"bestDeal": "Nejvýhodnější nabídka",
400+
"buy": "Koupit",
401401
"creditCard": "Kreditní karta",
402402
"fast": "Rychle",
403403
"fee": "poplatek",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Je nám líto, ale v této oblasti nejsou k dispozici žádné burzy.",
461461
"region": "Oblast",
462-
"selectRegion": "Není uvedeno"
462+
"selectRegion": "Není uvedeno",
463+
"sell": "Prodat"
463464
},
464465
"info": {
465466
"continue": "Souhlasím, pokračovat",
@@ -744,7 +745,7 @@
744745
"buy": "Koupit {{coinCode}}",
745746
"buySell": "Nákup a prodej",
746747
"buy_bitcoin": "Koupit Bitcoin",
747-
"buy_crypto": "Koupit crypto",
748+
"buy_crypto": "Koupit krypto",
748749
"enabled_false": "Vypnuto",
749750
"enabled_true": "Zapnuto",
750751
"receive": "Přijmout {{coinCode}}",

frontends/web/src/locales/de/app.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Abbrechen",
374374
"back": "Zurück",
375-
"buy": "Kaufen",
376375
"changepin": "Gerätepasswort ändern",
377376
"check": "Backup überprüfen",
378377
"continue": "Weiter",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Überweisung",
400399
"bestDeal": "Bestes Angebot",
400+
"buy": "Kaufen",
401401
"creditCard": "Kreditkarte",
402402
"fast": "Schnell",
403403
"fee": "Gebühr",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Leider sind in dieser Region keine Börsen verfügbar.",
461461
"region": "Region",
462-
"selectRegion": "Nicht angegeben"
462+
"selectRegion": "Nicht angegeben",
463+
"sell": "Verkaufen"
463464
},
464465
"info": {
465466
"continue": "Zustimmen und fortfahren",

frontends/web/src/locales/en/app.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@
372372
"button": {
373373
"abort": "Abort",
374374
"back": "Back",
375-
"buy": "Buy",
376375
"changepin": "Change device password",
377376
"check": "Check backup",
378377
"continue": "Continue",
@@ -398,6 +397,7 @@
398397
"exchange": {
399398
"bankTransfer": "Bank transfer",
400399
"bestDeal": "Best deal",
400+
"buy": "Buy",
401401
"creditCard": "Credit card",
402402
"fast": "Fast",
403403
"fee": "fee",
@@ -459,7 +459,8 @@
459459
},
460460
"noExchanges": "Sorry, there are no available exchanges in this region.",
461461
"region": "Region",
462-
"selectRegion": "Not specified"
462+
"selectRegion": "Not specified",
463+
"sell": "Sell"
463464
},
464465
"info": {
465466
"continue": "Agree and continue",

0 commit comments

Comments
 (0)