Merge branch 'CatimaLoyalty:main' into main

ziadOUA · Sep 13, 2023 · d450af7 · d450af7
2 parents 2a187ec + d127d7f
commit d450af7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -281,6 +281,8 @@
     <string name="settings_category_title_privacy">Datenschutz</string>
     <string name="settings_category_title_general">Allgemein</string>
     <string name="view_online">Zeige online</string>
-    <string name="action_display_options">Anzeige Optionen</string>
+    <string name="action_display_options">Anzeigeoptionen</string>
     <string name="show_archived_cards">Zeige archivierte Karten</string>
-</resources>
+    <string name="app_copyright_short">Copyright © Sylvia van Os und Mitwirkende</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os und Mitwirkende</string>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -90,7 +90,7 @@
 \n
 \nAUCUNE DONNÉE N’EST COLLECTÉE, ce que tout le monde peut confirmer puisque notre application est un logiciel libre.</string>
     <string name="privacy_policy">Politique de confidentialité</string>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Porte-clés de cartes de fidélité</string>
     <string name="chooseImportType">Importer les données depuis</string>
     <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> ne semble pas être un solde valide.</string>
     <string name="points">Points</string>

diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
@@ -269,4 +269,11 @@
     <string name="settings_allow_content_provider_read_title">다른 앱의 내 정보 접근 허용</string>
     <string name="permissionReadCardsLabel">Catima 카드 읽기</string>
     <string name="settings_keep_screen_on_summary">카드가 보일 때 화면 꺼짐 방지</string>
+    <string name="view_online">온라인에서 보기</string>
+    <string name="settings_category_title_general">일반</string>
+    <string name="action_display_options">디스플레이 옵션</string>
+    <string name="settings_display_barcode_max_brightness_summary">스캐너가 작동하는 데 필요합니다</string>
+    <string name="settings_category_title_cards">카드</string>
+    <string name="show_archived_cards">보관된 카드 표시</string>
+    <string name="settings_category_title_privacy">프라이버시</string>
 </resources>