Merge remote-tracking branch 'upstream/main'

ziadOUA · Nov 26, 2023 · fd68bc5 · fd68bc5
2 parents 458405b + 7f03f37
commit fd68bc5
Show file tree

Hide file tree

Showing 12 changed files with 220 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true
 
-        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
+        resourceConfigurations += listOf("ar", "bg", "bn", "bn-rIN", "bs", "cs", "da", "de", "el-rGR", "en", "eo", "es", "es-rAR", "fi", "fr", "he-rIL", "hi", "hr", "hu", "in-rID", "is", "it", "ja", "ko", "lt", "lv", "nb-rNO", "nl", "oc", "pl", "pt-rPT", "ro-rRO", "ru", "sk", "sl", "sv", "tr", "uk", "vi", "zh-rCN", "zh-rTW")
     }
 
     buildTypes {

diff --git a/app/src/debug/res/values-pt/strings.xml → app/src/debug/res/values-pt-rPT/strings.xml b/app/src/debug/res/values-pt/strings.xml → app/src/debug/res/values-pt-rPT/strings.xml
diff --git a/app/src/debug/res/values-ro/strings.xml b/app/src/debug/res/values-ro/strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <string name="app_name">Depanare Catima</string>
+</resources>
diff --git a/app/src/main/res/raw/contributors.txt b/app/src/main/res/raw/contributors.txt
@@ -66,6 +66,7 @@ Rohan H
 betsythefc
 waffshappen
 Robin
+Alex
 ati3
 enolp
 Evgeniy Khramov
@@ -229,6 +230,7 @@ Manan Jhaveri
 Marco
 BRBsoup
 Mateo Gomez
+Matti O
 Mattia
 Mattia Beccari
 Md. Al-Amin
@@ -274,6 +276,7 @@ tkraljevic
 Tony C
 Vancha March
 tyap-lyap-ivprod
+gokomurodokomodo
 Viviana Yanez
 Waldemar Stoczkowski
 Wiktor Kwapisiewicz
@@ -308,6 +311,7 @@ redha salah
 z369369
 sergio
 skauVictor
+SravyaHSN
 080502
 Marcus
 techwebpd

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
@@ -249,7 +249,7 @@
     <string name="validFromSentence">Kelvollinen alkaen: <xliff:g>%s</xliff:g></string>
     <string name="donate">Lahjoita</string>
     <string name="permissionReadCardsLabel">Lue Catima-kortteja</string>
-    <string name="permissionReadCardsDescription">Lue korttisi ja kaikki niiden tiedot, mukaan lukien huomautukset ja kuvat</string>
+    <string name="permissionReadCardsDescription">lue korttisi ja kaikki niiden tiedot, mukaan lukien huomautukset ja kuvat</string>
     <string name="settings_allow_content_provider_read_summary">Sovellusten tulee silti pyytää lupaa saadakseen pääsyn</string>
     <string name="settings_category_title_privacy">Yksityisyys</string>
     <string name="height">Korkeus:</string>
@@ -280,4 +280,6 @@
     <string name="enter_card_id">Anna kortin tunnistenumero tai kortissa oleva teksti</string>
     <string name="addWithoutBarcode">Lisää kortti jossa ei ole viivakoodia</string>
     <string name="field_must_not_be_empty">Kenttä ei saa olla tyhjä</string>
+    <string name="manually_enter_barcode_instructions">Syötä kortissa näkyvä numero tai teksti ja klikkaa viivakoodia, joka vastaa kortissa olevaa koodia.</string>
+    <string name="app_name">Catima</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml → app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt/strings.xml → app/src/main/res/values-pt-rPT/strings.xml
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
@@ -264,4 +264,5 @@
     <string name="deleteConfirmationGroup">Xóa nhóm\?</string>
     <string name="rate_this_app">Đánh giá ứng dụng</string>
     <string name="credits">Ghi nhận</string>
+    <string name="app_name">Catima</string>
 </resources>
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
@@ -106,7 +106,7 @@
         <item>nl</item>
         <item>oc</item>
         <item>pl</item>
-        <item>pt</item>
+        <item>pt-rPT</item>
         <item>ro-rRO</item>
         <item>ru</item>
         <item>sk</item>

diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
@@ -30,7 +30,7 @@
     <locale android:name="nl" />
     <locale android:name="oc" />
     <locale android:name="pl" />
-    <locale android:name="pt" />
+    <locale android:name="pt-PT" />
     <locale android:name="ro-RO" />
     <locale android:name="ru" />
     <locale android:name="sk" />

diff --git a/fastlane/metadata/android/ro/short_description.txt b/fastlane/metadata/android/ro/short_description.txt
@@ -0,0 +1 @@
+Pentru codurile de bare, abonamentele, programele de loialitate, cupoanele și biletele dvs.
diff --git a/fastlane/metadata/android/ru-RU/changelogs/132.txt b/fastlane/metadata/android/ru-RU/changelogs/132.txt
@@ -2,3 +2,4 @@
 - Улучшены проверки
 - Исправлен сбой пользовательского интерфейса при переключении отображения архивных карт
 - В панели навигации используются цвета темы или карты (Android 8.1+)
+- Обновлён выбор дат срока действия