Skip to content

Commit

Permalink
Merge pull request #434 from tangem/merge_5.19_dev
Browse files Browse the repository at this point in the history
Merge 5.19 dev
  • Loading branch information
kozarezvlad authored Dec 24, 2024
2 parents bf79e20 + 7e4ddaa commit 525abd4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@

</FrameLayout>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tangem_never_pregenerate_code_alert"
android:layout_marginTop="12dp"
android:layout_marginHorizontal="16dp"
android:textColor="@color/dark_gray"
/>

<View
android:layout_width="match_parent"
android:layout_height="0dp"
Expand Down
1 change: 1 addition & 0 deletions tangem-sdk-android/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<string name="reset_codes_scan_to_reset">Отсканируйте карту или кольцо для сброса кода</string>
<string name="reset_codes_success_message">Код успешно сброшен</string>
<string name="sign_multiple_chunks_part">Подпись части %1$d из %2$d</string>
<string name="tangem_never_pregenerate_code_alert">Tangem никогда не продает кошельки вместе с кодом доступа</string>
<string name="view_delegate_delay">Операция в процессе</string>
<string name="view_delegate_header_card">Карта</string>
<string name="view_delegate_scan">Готово к сканированию</string>
Expand Down
1 change: 1 addition & 0 deletions tangem-sdk-android/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<string name="reset_codes_scan_to_reset">Scan card or ring to reset user codes</string>
<string name="reset_codes_success_message">Code was reset successfully</string>
<string name="sign_multiple_chunks_part">Signing part %1$d of %2$d</string>
<string name="tangem_never_pregenerate_code_alert">Tangem never sells wallets along with the pre-generated access code</string>
<string name="view_delegate_delay">Operation is in progress</string>
<string name="view_delegate_header_card">Card</string>
<string name="view_delegate_scan">Ready to scan</string>
Expand Down

0 comments on commit 525abd4

Please sign in to comment.