Merge branch 'main' into CW-118-Allow-disabling-of-fiat

res/values/strings_de.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "GETRENNT",
   "sync_status_connecting" : "VERBINDEN",
   "sync_status_connected" : "VERBUNDEN",
+  "sync_status_attempting_sync" : "SYNC VERSUCHEN",
 
 
   "transaction_priority_slow" : "Langsam",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider}-Fehler",
 
   "use_ssl" : "SSL verwenden",
+  "trusted" : "Vertrauenswürdige",
 
   "color_theme" : "Farbthema",
   "light_theme" : "Hell",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Teilen Sie diese nicht mit anderen, einschließlich des Supports.\n\nSie werden Ihr Geld stehlen!",
   "help": "hilfe",
   "disable_fiat": "Fiat deaktivieren",
-  "disable_exchange": "Exchange deaktivieren"
+  "disable_exchange": "Exchange deaktivieren",
+  "connection_sync": "Verbindung und Synchronisierung",
+  "security_and_backup": "Sicherheit und Datensicherung",
+  "create_backup": "Backup erstellen",
+  "privacy_settings": "Datenschutzeinstellungen",
+  "privacy": "Datenschutz",
+  "display_settings": "Anzeigeeinstellungen",
+  "other_settings": "Andere Einstellungen",
 }

res/values/strings_en.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "DISCONNECTED",
   "sync_status_connecting" : "CONNECTING",
   "sync_status_connected" : "CONNECTED",
+  "sync_status_attempting_sync" : "ATTEMPTING SYNC",
 
 
   "transaction_priority_slow" : "Slow",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} error",
 
   "use_ssl" : "Use SSL",
+  "trusted" : "Trusted",
 
   "color_theme" : "Color theme",
   "light_theme" : "Light",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Do not share these with anyone else, including support.\n\nThey will steal your money!",
   "help": "help",
   "disable_fiat": "Disable fiat",
-  "disable_exchange": "Disable exchange"
+  "disable_exchange": "Disable exchange",
+  "connection_sync": "Connection and sync",
+  "security_and_backup": "Security and backup",
+  "create_backup": "Create backup",
+  "privacy_settings": "Privacy settings",
+  "privacy": "Privacy",
+  "display_settings": "Display settings",
+  "other_settings": "Other settings"
 }

res/values/strings_es.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "DESCONECTADO",
   "sync_status_connecting" : "CONECTANDO",
   "sync_status_connected" : "CONECTADO",
+  "sync_status_attempting_sync" : "INTENTAR SINCRONIZAR",
 
 
   "transaction_priority_slow" : "Lento",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} error",
 
   "use_ssl" : "Utilice SSL",
+  "trusted" : "de confianza",
 
   "color_theme" : "Tema de color",
   "light_theme" : "Ligera",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "No comparta estos con nadie más, incluido el soporte.\n\n¡Te robarán tu dinero!",
   "help": "ayuda",
   "disable_fiat": "Deshabilitar fiat",
-  "disable_exchange": "Deshabilitar intercambio"
+  "disable_exchange": "Deshabilitar intercambio",
+  "connection_sync": "Conexión y sincronización",
+  "security_and_backup": "Seguridad y respaldo",
+  "create_backup": "Crear copia de seguridad",
+  "privacy_settings": "Configuración de privacidad",
+  "privacy": "Privacidad",
+  "display_settings": "Configuración de pantalla",
+  "other_settings": "Otras configuraciones"
 }

res/values/strings_fr.arb

@@ -354,6 +354,7 @@
   "sync_status_failed_connect" : "DÉCONNECTÉ",
   "sync_status_connecting" : "CONNEXION EN COURS",
   "sync_status_connected" : "CONNECTÉ",
+  "sync_status_attempting_sync" : "TENTATIVE DE SYNCHRONISATION",
 
 
   "transaction_priority_slow" : "Lent",
@@ -434,6 +435,7 @@
   "provider_error" : "Erreur de ${provider}",
 
   "use_ssl" : "Utiliser SSL",
+  "trusted" : "de confiance",
 
   "color_theme" : "Thème",
   "light_theme" : "Clair",
@@ -651,5 +653,12 @@
   "do_not_share_warning_text" : "Ne les partagez avec personne d'autre, y compris avec l'assistance.\n\nIls vont voler votre argent!",
   "help": "aider",
   "disable_fiat": "Désactiver fiat",
-  "disable_exchange": "Désactiver l'échange"
+  "disable_exchange": "Désactiver l'échange",
+  "connection_sync": "Connexion et synchronisation",
+  "security_and_backup": "Sécurité et sauvegarde",
+  "create_backup": "Créer une sauvegarde",
+  "privacy_settings": "Paramètres de confidentialité",
+  "privacy": "Confidentialité",
+  "display_settings": "Paramètres d'affichage",
+  "other_settings": "Autres paramètres"
 }

res/values/strings_hi.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "डिस्कनेक्ट किया गया",
   "sync_status_connecting" : "कनेक्ट",
   "sync_status_connected" : "जुड़े हुए",
+  "sync_status_attempting_sync" : "सिंक करने का प्रयास",
 
 
   "transaction_priority_slow" : "धीरे",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} त्रुटि",
 
   "use_ssl" : "उपयोग SSL",
+  "trusted" : "भरोसा",
 
   "color_theme" : "रंग विषय",
   "light_theme" : "रोशनी",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "इन्हें समर्थन सहित किसी और के साथ साझा न करें।\n\nवे आपका पैसा चुरा लेंगे!",
   "help": "मदद करना",
   "disable_fiat": "िएट अक्षम करें",
-  "disable_exchange": "एक्सचेंज अक्षम करें"
+  "disable_exchange": "एक्सचेंज अक्षम करें",
+  "connection_sync": "कनेक्शन और सिंक",
+  "security_and_backup": "सुरक्षा और बैकअप",
+  "create_backup": "बैकअप बनाएँ",
+  "privacy_settings": "गोपनीयता सेटिंग्स",
+  "privacy": "गोपनीयता",
+  "display_settings": "प्रदर्शन सेटिंग्स",
+  "other_settings": "अन्य सेटिंग्स"
 }

res/values/strings_hr.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "ISKLJUČENO",
   "sync_status_connecting" : "SPAJANJE",
   "sync_status_connected" : "SPOJENO",
+  "sync_status_attempting_sync" : "POKUŠAJ SINKRONIZACIJE",
 
 
   "transaction_priority_slow" : "Sporo",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} greška",
 
   "use_ssl" : "Koristi SSL",
+  "trusted" : "vjerovao",
 
   "color_theme" : "Shema boja",
   "light_theme" : "Svijetla",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nUkrast će vam novac!",
   "help": "pomozite",
   "disable_fiat": "Isključi, fiat",
-  "disable_exchange": "Onemogući exchange"
+  "disable_exchange": "Onemogući exchange",
+  "connection_sync": "Povezivanje i sinkronizacija",
+  "security_and_backup": "Sigurnost i sigurnosna kopija",
+  "create_backup": "Stvori sigurnosnu kopiju",
+  "privacy_settings": "Postavke privatnosti",
+  "privacy": "Privatnost",
+  "display_settings": "Postavke zaslona",
+  "other_settings": "Ostale postavke"
 }

res/values/strings_it.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "DISCONNESSO",
   "sync_status_connecting" : "CONNESSIONE",
   "sync_status_connected" : "CONNESSO",
+  "sync_status_attempting_sync" : "TENTATIVO DI SINCRONIZZAZIONE",
 
 
   "transaction_priority_slow" : "Bassa",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} errore",
 
   "use_ssl" : "Usa SSL",
+  "trusted" : "di fiducia",
 
   "color_theme" : "Colore tema",
   "light_theme" : "Bianco",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Non condividerli con nessun altro, incluso il supporto.\n\nTi ruberanno i soldi!",
   "help": "aiuto",
   "disable_fiat": "Disabilita fiat",
-  "disable_exchange": "Disabilita scambio"
+  "disable_exchange": "Disabilita scambio",
+  "connection_sync": "Connessione e sincronizzazione",
+  "security_and_backup": "Sicurezza e backup",
+  "create_backup": "Crea backup",
+  "privacy_settings": "Impostazioni privacy",
+  "privacy": "Privacy",
+  "display_settings": "Impostazioni di visualizzazione",
+  "other_settings": "Altre impostazioni"
 }

res/values/strings_ja.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "切断されました",
   "sync_status_connecting" : "接続中",
   "sync_status_connected" : "接続済み",
+  "sync_status_attempting_sync" : "同期を試みています",
 
 
   "transaction_priority_slow" : "スロー",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} エラー",
 
   "use_ssl" : "SSLを使用する",
+  "trusted" : "信頼できる",
 
   "color_theme" : "カラーテーマ",
   "light_theme" : "光",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "サポートを含め、これらを他の誰とも共有しないでください。\n\n彼らはあなたのお金を盗みます！",
   "help": "ヘルプ",
   "disable_fiat": "フィアットを無効にする",
-  "disable_exchange": "交換を無効にする"
+  "disable_exchange": "交換を無効にする",
+  "connection_sync": "接続と同期",
+  "security_and_backup": "セキュリティとバックアップ",
+  "create_backup": "バックアップを作成",
+  "privacy_settings": "プライバシー設定",
+  "privacy": "プライバシー",
+  "display_settings": "表示設定",
+  "other_settings": "その他の設定"
 }

res/values/strings_ko.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "연결 해제",
   "sync_status_connecting" : "연결 중",
   "sync_status_connected" : "연결됨",
+  "sync_status_attempting_sync" : "동기화 시도 중",
 
 
   "transaction_priority_slow" : "느린",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} 오류",
 
   "use_ssl" : "SSL 사용",
+  "trusted" : "신뢰할 수 있는",
 
   "color_theme" : "색상 테마",
   "light_theme" : "빛",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n그들은 당신의 돈을 훔칠 것입니다!",
   "help": "돕다",
   "disable_fiat": "법정화폐 비활성화",
-  "disable_exchange": "교환 비활성화"
+  "disable_exchange": "교환 비활성화",
+  "connection_sync": "연결 및 동기화",
+  "security_and_backup": "보안 및 백업",
+  "create_backup": "백업 생성",
+  "privacy_settings": "개인정보 설정",
+  "privacy": "프라이버시",
+  "display_settings": "디스플레이 설정",
+  "other_settings": "기타 설정"
 }

res/values/strings_nl.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "LOSGEKOPPELD",
   "sync_status_connecting" : "AANSLUITING",
   "sync_status_connected" : "VERBONDEN",
+  "sync_status_attempting_sync" : "SYNCHRONISATIE PROBEREN",
 
 
   "transaction_priority_slow" : "Langzaam",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} fout",
 
   "use_ssl" : "Gebruik SSL",
+  "trusted" : "vertrouwd",
 
   "color_theme" : "Kleur thema",
   "light_theme" : "Licht",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Deel deze met niemand anders, ook niet met support.\n\nZe zullen je geld stelen!",
   "help": "helpen",
   "disable_fiat": "법정화폐 비활성화",
-  "disable_exchange": "Uitwisseling uitschakelen"
+  "disable_exchange": "Uitwisseling uitschakelen",
+  "connection_sync": "Verbinding en synchronisatie",
+  "security_and_backup": "Beveiliging en back-up",
+  "create_backup": "Maak een back-up",
+  "privacy_settings": "Privacy-instellingen",
+  "privacy": "Privacy",
+  "display_settings": "Weergave-instellingen",
+  "other_settings": "Andere instellingen"
 }

res/values/strings_pl.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "NIEPOWIĄZANY",
   "sync_status_connecting" : "ZŁĄCZONY",
   "sync_status_connected" : "POŁĄCZONY",
+  "sync_status_attempting_sync" : "PRÓBA SYNCHRONIZACJI",
 
 
   "transaction_priority_slow" : "Powolny",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} pomyłka",
 
   "use_ssl" : "Użyj SSL",
+  "trusted" : "zaufany",
 
   "color_theme" : "Motyw kolorystyczny",
   "light_theme" : "Lekki",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Nie udostępniaj ich nikomu innemu, w tym wsparcia.\n\nUkradną twoje pieniądze!",
   "help": "pomoc",
   "disable_fiat": "Wyłącz fiat",
-  "disable_exchange": "Wyłącz wymianę"
+  "disable_exchange": "Wyłącz wymianę",
+  "connection_sync": "Połączenie i synchronizacja",
+  "security_and_backup": "Bezpieczeństwo i kopia zapasowa",
+  "create_backup": "Utwórz kopię zapasową",
+  "privacy_settings": "Ustawienia prywatności",
+  "privacy": "Prywatność",
+  "display_settings": "Ustawienia wyświetlania",
+  "other_settings": "Inne ustawienia"
 }

res/values/strings_pt.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "DESCONECTADO",
   "sync_status_connecting" : "CONECTANDO",
   "sync_status_connected" : "CONECTADO",
+  "sync_status_attempting_sync" : "TENTANDO SINCRONIZAR",
 
 
   "transaction_priority_slow" : "Lenta",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} erro",
 
   "use_ssl" : "Use SSL",
+  "trusted" : "confiável",
 
   "color_theme" : "Tema de cor",
   "light_theme" : "Luz",
@@ -544,7 +546,6 @@
   "create_account": "Criar conta",
   "privacy_policy": "Política de privacidade",
   "welcome_to_cakepay": "Bem-vindo ao Cake Pay!",
-  "create_account": "Registar-se",
   "forgot_password": "Esqueci a senha",
   "reset_password": "Redefinir senha",
   "gift_cards": "Cartões de presente",
@@ -653,5 +654,12 @@
   "do_not_share_warning_text" : "Não os compartilhe com mais ninguém, incluindo suporte.\n\nEles vão roubar seu dinheiro!",
   "help": "ajuda",
   "disable_fiat": "Desativar fiat",
-  "disable_exchange": "Desativar troca"
+  "disable_exchange": "Desativar troca",
+  "connection_sync": "Conexão e sincronização",
+  "security_and_backup": "Segurança e backup",
+  "create_backup": "Criar backup",
+  "privacy_settings": "Configurações de privacidade",
+  "privacy": "Privacidade",
+  "display_settings": "Configurações de exibição",
+  "other_settings": "Outras configurações"
 }

res/values/strings_ru.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "ОТКЛЮЧЕНО",
   "sync_status_connecting" : "ПОДКЛЮЧЕНИЕ",
   "sync_status_connected" : "ПОДКЛЮЧЕНО",
+  "sync_status_attempting_sync" : "ПОПЫТКА СИНХРОНИЗАЦИИ",
 
 
   "transaction_priority_slow" : "Медленный",
@@ -436,6 +437,7 @@
   "provider_error" : "${provider} ошибка",
 
   "use_ssl" : "Использовать SSL",
+  "trusted" : "доверенный",
 
   "color_theme" : "Цветовая тема",
   "light_theme" : "Светлая",
@@ -653,5 +655,12 @@
   "do_not_share_warning_text" : "Не делитесь ими с кем-либо еще, в том числе со службой поддержки.\n\nОни украдут ваши деньги!",
   "help": "помощь",
   "disable_fiat": "Отключить фиат",
-  "disable_exchange": "Отключить обмен"
+  "disable_exchange": "Отключить обмен",
+  "connection_sync": "Подключение и синхронизация",
+  "security_and_backup": "Безопасность и резервное копирование",
+  "create_backup": "Создать резервную копию",
+  "privacy_settings": "Настройки конфиденциальности",
+  "privacy": "Конфиденциальность",
+  "display_settings": "Настройки отображения",
+  "other_settings": "Другие настройки"
 }

res/values/strings_uk.arb

@@ -355,6 +355,7 @@
   "sync_status_failed_connect" : "ВІДКЛЮЧЕНО",
   "sync_status_connecting" : "ПІДКЛЮЧЕННЯ",
   "sync_status_connected" : "ПІДКЛЮЧЕНО",
+  "sync_status_attempting_sync" : "СПРОБА СИНХРОНІЗАЦІЇ",
 
 
   "transaction_priority_slow" : "Повільний",
@@ -435,6 +436,7 @@
   "provider_error" : "${provider} помилка",
 
   "use_ssl" : "Використати SSL",
+  "trusted" : "довіряють",
 
   "color_theme" : "Кольорова тема",
   "light_theme" : "Світла",
@@ -652,5 +654,13 @@
   "do_not_share_warning_text" : "Не повідомляйте їх нікому, включно зі службою підтримки.\n\nВони вкрадуть ваші гроші!",
   "help": "допомога",
   "disable_fiat": "Вимкнути фиат",
-  "disable_exchange": "Вимкнути exchange"
+  "disable_exchange": "Вимкнути exchange",
+  "connection_sync": "Підключення та синхронізація",
+  "security_and_backup": "Безпека та резервне копіювання",
+  "create_backup": "Створити резервну копію",
+  "privacy_settings": "Налаштування конфіденційності",
+  "privacy": "Конфіденційність",
+  "display_settings": "Налаштування дисплея",
+  "other_settings": "Інші налаштування"
+
 }

res/values/strings_zh.arb

@@ -356,6 +356,7 @@
   "sync_status_failed_connect" : "断线",
   "sync_status_connecting" : "连接中",
   "sync_status_connected" : "已连接",
+  "sync_status_attempting_sync" : "嘗試同步",
 
 
   "transaction_priority_slow" : "慢速",
@@ -435,6 +436,7 @@
   "provider_error" : "${provider} 错误",
 
   "use_ssl" : "使用SSL",
+  "trusted" : "值得信赖",
 
   "color_theme" : "主题",
   "light_theme" : "艳丽",
@@ -651,5 +653,12 @@
   "do_not_share_warning_text" : "不要與其他任何人分享這些內容，包括支持。\n\n他們會偷你的錢！",
   "help": "帮助",
   "disable_fiat": "禁用法令",
-  "disable_exchange": "禁用交换"
+  "disable_exchange": "禁用交换",
+  "connection_sync": "连接和同步",
+  "security_and_backup": "安全和备份",
+  "create_backup": "创建备份",
+  "privacy_settings": "隐私设置",
+  "privacy":"隐私",
+  "display_settings": "显示设置",
+  "other_settings": "其他设置"
 }