lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-09 23:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into bugfix/gui_improvment

Browse source
This commit is contained in:
Jacques Foucry 2024-05-17 19:35:48 +02:00 committed by GitHub
commit f8177557d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/layout/custom_barcode_scanner.xml
View file

@ -29,7 +29,9 @@
android:layout_marginTop="@dimen/app_bar_height"
android:background="@color/zxing_transparent"
android:fontFamily="sans-serif-black"
android:text="@string/zxing_msg_default_status"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:text="@string/scan_label"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="32sp"

1
app/src/main/res/values-fr/strings.xml
View file

@ -22,6 +22,7 @@
<string name="enter_cip_13_here">Saisir la fin du code CIP 13 ici..</string>
<string name="enter_cip_13">Saisir le code CIP 13</string>
<string name="button_close">Fermer</string>
<string name="scan_label">Visez le code-barres pour le scanner</string>
<!-- Slide Strings -->
<string name="slide1_Pilldroid">Bienvenue dans Pilldroid</string>

1
app/src/main/res/values/strings.xml
View file

@ -23,6 +23,7 @@
<string name="channel_description" translatable="false">Pilldroid_NotificationChannel</string>
<string name="channel_name" translatable="false">PilldroidChannel</string>
<string name="button_close">Close</string>
<string name="scan_label">Aim at the barcode to scan it</string>
<!-- slides strings -->
<string name="slide1_Pilldroid">Welcome on Pilldroid</string>