Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ILIYANGERMANOV authored Jun 3, 2022
2 parents c4b3224 + 7babe2c commit bfe67e4
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -311,14 +311,14 @@ private fun BoxWithConstraintsScope.UI(
}

item {
SettingsSectionDivider(text = "Experimental")
SettingsSectionDivider(text = stringResource(R.string.experimental))

Spacer(Modifier.height(16.dp))

val nav = navigation()
SettingsDefaultButton(
icon = R.drawable.ic_custom_atom_m,
text = "Experimental Settings"
text = stringResource(R.string.experimental_settings)
) {
nav.navigateTo(ExperimentalScreen)
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -434,4 +434,6 @@
<string name="switch_to_offline_mode">التبديل إلى وضع بدون انترنت</string>
<string name="delete_all_user_cloud_data_warning">تحذير! سوف يؤدي هذا الى حذف كل بياناتك المخزنة في السحابة ل%1$s نهائيا, لن يتم حذف البيانات المخزنة على جهازك.</string>
<string name="delete_all_cloud_data_question">حذف كل اليانات على السحابة؟</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -434,4 +434,6 @@
<string name="switch_to_offline_mode">Switch to offline mode</string>
<string name="delete_all_user_cloud_data_warning">WARNING! This action will delete all your cloud-stored data for %1$s PERMANENTLY, the offline data stored in your local app will remain.</string>
<string name="delete_all_cloud_data_question">Delete all cloud-stored data?</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -434,4 +434,6 @@
<string name="switch_to_offline_mode">Switch to offline mode</string>
<string name="delete_all_user_cloud_data_warning">WARNING! This action will delete all your cloud-stored data for %1$s PERMANENTLY, the offline data stored in your local app will remain.</string>
<string name="delete_all_cloud_data_question">Delete all cloud-stored data?</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -431,4 +431,9 @@
<string name="make_a_report_description">आप अपनी आय और खर्च के बारे में गहन जानकारी प्राप्त करने के लिए रिपोर्ट तैयार कर सकते हैं। अपने वित्त के बारे में बेहतर दृष्टिकोण प्राप्त करने के लिए अपने लेन-देन को प्रकार, समय अवधि, श्रेणी, खातों, राशि, कीवर्ड आदि के आधार पर फ़िल्टर करें।</string>
<string name="make_ivy_wallet_better_description">आइवी वॉलेट को बेहतर बनाना चाहते हैं? हमें एक समीक्षा लिखें। आप जो चाहते हैं उसे विकसित करने का यही एकमात्र तरीका है। साथ ही हमें PlayStore में उच्च रैंक देने में मदद करें ताकि हम मार्केटिंग के बजाय उत्पाद पर पैसा खर्च कर सकें।\\nहम अपनी तरफ से हमेशाअच्छा करते रहेंगे।\\n Ivy टीम</string>
<string name="transfers_as_income_expense_description">खाता स्थानान्तरण को खाता स्क्रीन में आय या व्यय के रूप में मानता है</string>
<string name="switch_to_offline_mode">Switch to offline mode</string>
<string name="delete_all_user_cloud_data_warning">WARNING! This action will delete all your cloud-stored data for %1$s PERMANENTLY, the offline data stored in your local app will remain.</string>
<string name="delete_all_cloud_data_question">Delete all cloud-stored data?</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
</resources>
8 changes: 5 additions & 3 deletions app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,9 @@
<string name="confirm_skip_all_description">Sei sicuro di voler ignorare tutti i pagamenti pianificati scaduti?</string>
<string name="confirm_skip_all">Conferma e ignora tutto</string>
<string name="skip_all">Ignora tutto</string>
<string name="switch_to_offline_mode">Switch to offline mode</string>
<string name="delete_all_user_cloud_data_warning">WARNING! This action will delete all cloud-stored data for %1$s PERMANENTLY, the offline data stored in your local app will remain.</string>
<string name="delete_all_cloud_data_question">Delete all cloud-stored data?</string>
<string name="switch_to_offline_mode">Passa alla modalità offline</string>
<string name="delete_all_user_cloud_data_warning">ATTENZIONE! Questa azione eliminerà PERMANENTEMENTE tutti i dati salvati nel cloud per %1$s, i file offline salvati in locale nella tua app rimaranno.</string>
<string name="delete_all_cloud_data_question">Eliminare tutti i dati salvati nel cloud?</string>
<string name="experimental">Sperimantale</string>
<string name="experimental_settings">Impostazioni Sperimentali</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -434,4 +434,6 @@
<string name="switch_to_offline_mode">Switch to offline mode</string>
<string name="delete_all_user_cloud_data_warning">WARNING! This action will delete all your cloud-stored data for %1$s PERMANENTLY, the offline data stored in your local app will remain.</string>
<string name="delete_all_cloud_data_question">Delete all cloud-stored data?</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
</resources>
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -434,4 +434,6 @@
<string name="switch_to_offline_mode">Switch to offline mode</string>
<string name="delete_all_user_cloud_data_warning">WARNING! This action will delete all your cloud-stored data for %1$s PERMANENTLY, the offline data stored in your local app will remain.</string>
<string name="delete_all_cloud_data_question">Delete all cloud-stored data?</string>
<string name="experimental">Experimental</string>
<string name="experimental_settings">Experimental Settings</string>
</resources>

0 comments on commit bfe67e4

Please sign in to comment.