Skip to content

Commit

Permalink
Merge pull request #630 from HathorNetwork/release
Browse files Browse the repository at this point in the history 
Sync master with release
  • Loading branch information
@andreabadesso
andreabadesso authored Nov 13, 2024
2 parents 65a972e + 8232f98 commit 84f599c
Show file tree
Hide file tree
Showing 12 changed files with 282 additions and 245 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ android {
applicationId "network.hathor.wallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 81
versionName "0.29.0"
versionCode 84
versionName "0.30.0"
missingDimensionStrategy "react-native-camera", "general"
}
signingConfigs {
Expand Down
4 changes: 2 additions & 2 deletions ios/HathorMobile.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.29.0;
MARKETING_VERSION = 0.30.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -514,7 +514,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.29.0;
MARKETING_VERSION = 0.30.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
100 changes: 50 additions & 50 deletions locale/da/texts.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ msgid "[Last] dddd [•] HH:mm"
msgstr "[Sidste] dddd [•] HH:mm"

#. See https://momentjs.com/docs/#/displaying/calendar-time/
#: src/models.js:107 src/utils.js:546
#: src/models.js:107 src/utils.js:553
msgid "DD MMM YYYY [•] HH:mm"
msgstr "DD MMM YYYY [•] HH:mm"

#: src/utils.js:220
#: src/utils.js:227
msgid "Invalid address"
msgstr "Ugyldig adresse"

Expand Down Expand Up @@ -441,7 +441,7 @@ msgstr "Indtast dine seed-ord adskilt med mellemrum"
#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:358
#: src/screens/LoadHistoryScreen.js:51 src/screens/LoadWalletErrorScreen.js:20
#: src/screens/NanoContract/NanoContractRegisterScreen.js:168
#: src/screens/PinScreen.js:274
#: src/screens/PinScreen.js:285
msgid "Try again"
msgstr ""

Expand All @@ -463,49 +463,50 @@ msgstr "**${ props.loadedData.addresses } adresser** fundet"
msgid "There's been an error connecting to the server."
msgstr ""

#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:303
#: src/screens/Settings.js:161
#: src/screens/LoadWalletErrorScreen.js:21 src/screens/PinScreen.js:314
#: src/screens/Settings.js:162
msgid "Reset wallet"
msgstr "Nulstil wallet"

#: src/screens/MainScreen.js:126
#: src/screens/MainScreen.js:127
msgid "No transactions"
msgstr "Ingen transaktioner"

#: src/screens/MainScreen.js:129
#: src/screens/MainScreen.js:130
msgid "|share:Share your address| with friends and start exchanging tokens"
msgstr "|share:Del din adresse| med venner og begynd at udveksle tokens"

#: src/screens/MainScreen.js:146
#: src/screens/MainScreen.js:147
msgid "Loading transactions"
msgstr "Indlæser dine transaktioner"

#: src/screens/MainScreen.js:155
#: src/screens/MainScreen.js:156
msgid "There was an error loading your transaction history"
msgstr ""

#: src/screens/MainScreen.js:158
#: src/screens/MainScreen.js:159
msgid "Please |tryAgain:try again|"
msgstr ""

#: src/screens/MainScreen.js:535 src/screens/MainScreen.js:567
#: src/screens/MainScreen.js:536 src/screens/MainScreen.js:568
msgid "Available Balance"
msgstr "Tilgængelig saldo"

#: src/screens/MainScreen.js:544
#: src/screens/MainScreen.js:545
msgid "Locked"
msgstr "Låst"

#. translator: Used when the QR Code Scanner is opened, and user will manually
#. enter the information.
#: src/screens/NanoContractRegisterQrCodeScreen.js:26
#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
msgid "Manual info"
msgstr "Manuel information"
#: src/screens/Reown/ReownScan.js:41
msgid "Manual"
msgstr ""

#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
#: src/screens/NanoContractRegisterQrCodeScreen.js:48
msgid "Nano Contract Registration"
msgid "Register Nano Contract"
msgstr ""

#: src/screens/NanoContractRegisterQrCodeScreen.js:63
Expand Down Expand Up @@ -546,31 +547,31 @@ msgstr "Modtaget"
msgid "Waiting confirmation"
msgstr "Venter på bekræftelse"

#: src/screens/PinScreen.js:263
#: src/screens/PinScreen.js:274
msgid "Incorrect PIN Code. Try again."
msgstr "Forkert PIN-kode. Prøv igen."

#: src/screens/PinScreen.js:74
#: src/screens/PinScreen.js:77
msgid "Enter your PIN Code "
msgstr "Indtast din pinkode "

#: src/screens/PinScreen.js:75
#: src/screens/PinScreen.js:78
msgid "Unlock Hathor Wallet"
msgstr "Lås Hathor-wallet op"

#: src/components/Reown/CreateTokenModal.js:60
#: src/components/Reown/NanoContract/NewNanoContractTransactionModal.js:65
#: src/components/Reown/NanoContract/SignOracleDataModal.js:79
#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:300
#: src/components/Reown/SignMessageModal.js:79 src/screens/PinScreen.js:311
#: src/screens/Reown/ReownList.js:125
msgid "Cancel"
msgstr "Annuller"

#: src/screens/PinScreen.js:334 src/screens/PinScreen.js:338
#: src/screens/PinScreen.js:345 src/screens/PinScreen.js:349
msgid "Biometry failed or canceled."
msgstr "Biometri mislykkedes eller blev annulleret."

#: src/screens/PushNotification.js:58 src/screens/Settings.js:135
#: src/screens/PushNotification.js:58 src/screens/Settings.js:136
msgid "Push Notification"
msgstr ""

Expand Down Expand Up @@ -603,6 +604,12 @@ msgstr "Betalingsanmodning"
msgid "RECEIVE"
msgstr "MODTAG"

#. translator: Used when the QR Code Scanner is opened, and user will manually
#. enter the information.
#: src/screens/RegisterToken.js:27 src/screens/SendScanQRCode.js:87
msgid "Manual info"
msgstr "Manuel information"

#: src/screens/RegisterToken.js:42 src/screens/RegisterTokenManual.js:126
msgid "REGISTER TOKEN"
msgstr "REGISTRER TOKEN"
Expand Down Expand Up @@ -662,36 +669,36 @@ msgstr ""
msgid "Reset Wallet"
msgstr "Nulstil wallet"

#: src/screens/Security.js:130
#: src/screens/Security.js:131
msgid "Disable biometry"
msgstr "Deaktiver biometri"

#: src/screens/Security.js:131
#: src/screens/Security.js:132
msgid "Disabling biometry"
msgstr "Deaktiverer biometri"

#: src/screens/Security.js:143
#: src/screens/Security.js:144
msgid "Enter your 6-digit pin to enable biometry"
msgstr "Indtast din 6-cifrede pin for at aktivere biometri"

#: src/screens/Security.js:154
#: src/screens/Security.js:155
msgid "No biometry supported"
msgstr "Ingen biometri understøttet"

#: src/screens/Security.js:154
#: src/screens/Security.js:155
#, javascript-format
msgid "Use ${ this.supportedBiometry }"
msgstr "Brug ${ this.supportedBiometry }"

#: src/screens/Security.js:159
#: src/screens/Security.js:160
msgid "SECURITY"
msgstr "SIKKERHED"

#: src/screens/Security.js:183
#: src/screens/Security.js:184
msgid "Change PIN"
msgstr "Skift pinkode"

#: src/screens/Security.js:188
#: src/screens/Security.js:189
msgid "Lock wallet"
msgstr "Lås wallet"

Expand Down Expand Up @@ -764,43 +771,43 @@ msgstr "Du har ikke den anmodede token [${ tokenLabel }]"
msgid "Scan the QR code"
msgstr "Scan QR-koden"

#: src/screens/Settings.js:104
#: src/screens/Settings.js:105
msgid "You are connected to"
msgstr "Du er tilsluttet til"

#: src/screens/Settings.js:112
#: src/screens/Settings.js:113
msgid "General Settings"
msgstr ""

#: src/screens/Settings.js:116
#: src/screens/Settings.js:117
msgid "Connected to"
msgstr "Forbundet til"

#: src/screens/Settings.js:129
#: src/screens/Settings.js:130
msgid "Security"
msgstr "Sikkerhed"

#: src/screens/Settings.js:142
#: src/screens/Settings.js:143
msgid "Create a new token"
msgstr "Opret en ny token"

#: src/screens/Settings.js:149
#: src/screens/Settings.js:150
msgid "Register a token"
msgstr "Registrer en token"

#: src/screens/Settings.js:165
#: src/screens/Settings.js:166
msgid "About"
msgstr "Om"

#: src/screens/Settings.js:172
#: src/screens/Settings.js:173
msgid "Unique app identifier"
msgstr ""

#: src/screens/Settings.js:186
#: src/screens/Settings.js:187
msgid "Developer Settings"
msgstr ""

#: src/screens/Settings.js:188
#: src/screens/Settings.js:189
msgid "Network Settings"
msgstr ""

Expand Down Expand Up @@ -881,12 +888,6 @@ msgstr ""
msgid "Connect"
msgstr ""

#. translator: Used when the QR Code Scanner is opened, and user will manually
#. enter the information.
#: src/screens/Reown/ReownScan.js:41
msgid "Manual"
msgstr ""

#: src/screens/Reown/SignMessageRequestScreen.js:25
msgid "Sign Message Request"
msgstr ""
Expand Down Expand Up @@ -1042,9 +1043,8 @@ msgstr ""
msgid "after the contract is registered."
msgstr ""

#: src/components/Reown/NanoContract/NewNanoContractTransactionRequest.js:260
#: src/screens/NanoContract/NanoContractRegisterScreen.js:233
msgid "Register Nano Contract"
#: src/screens/NanoContract/NanoContractRegisterScreen.js:251
msgid "Nano Contract Registration"
msgstr ""

#: src/screens/NanoContract/NanoContractTransactionScreen.js:39
Expand Down
Loading

0 comments on commit 84f599c

Please sign in to comment.