felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 23:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gil/143_create_public_space

Browse Source 
# Conflicts:
#	Common/Mock/MockAppScreens.swift
This commit is contained in:
Gil Eluard
2021-12-23 15:28:41 +01:00
parent 8f93d61ab7 16fd3f3eea
commit 8dbaded318
155 changed files with 4314 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+21 -3
View File
@@ -41,6 +41,7 @@
"retry" = "Retry";
"on" = "On";
"off" = "Off";
"enable" = "Enable";
"cancel" = "Cancel";
"save" = "Save";
"join" = "Join";
@@ -80,6 +81,7 @@
// Accessibility
"accessibility_checkbox_label" = "checkbox";
"accessibility_button_label" = "button";
// Authentication
"auth_login" = "Log in";
@@ -580,7 +582,7 @@ Tap the + to start adding people.";
"settings_term_conditions" = "Terms & Conditions";
"settings_privacy_policy" = "Privacy Policy";
"settings_third_party_notices" = "Third-party Notices";
"settings_send_crash_report" = "Send anon crash & usage data";
"settings_analytics_and_crash_data" = "Send crash and analytics data";
"settings_enable_rageshake" = "Rage shake to report bug";
"settings_clear_cache" = "Clear cache";
@@ -948,8 +950,24 @@ Tap the + to start adding people.";
"no_voip_title" = "Incoming call";
"no_voip" = "%@ is calling you but %@ does not support calls yet.\nYou can ignore this notification and answer the call from another device or you can reject it.";
// Crash report
"google_analytics_use_prompt" = "Would you like to help improve %@ by automatically reporting anonymous crash reports and usage data?";
// Analytics
"analytics_prompt_title" = "Help improve %@";
"analytics_prompt_message_new_user" = "Help us identify issues and improve Element by sharing anonymous usage data. To understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
"analytics_prompt_message_upgrade" = "You previously consented to share anonymous usage data with us. Now, to help understand how people use multiple devices, we’ll generate a random identifier, shared by your devices.";
/* Note: The placeholder is for the contents of analytics_prompt_terms_link_new_user */
"analytics_prompt_terms_new_user" = "You can read all our terms %@.";
"analytics_prompt_terms_link_new_user" = "here";
/* Note: The placeholder is for the contents of analytics_prompt_terms_link_upgrade */
"analytics_prompt_terms_upgrade" = "Read all our terms %@. Is that OK?";
"analytics_prompt_terms_link_upgrade" = "here";
/* Note: The word "don't" is formatted in bold */
"analytics_prompt_point_1" = "We <b>don't</b> record or profile any account data";
/* Note: The word "don't" is formatted in bold */
"analytics_prompt_point_2" = "We <b>don't</b> share information with third parties";
"analytics_prompt_point_3" = "You can turn this off anytime in settings";
"analytics_prompt_not_now" = "Not now";
"analytics_prompt_yes" = "Yes, that's fine";
"analytics_prompt_stop" = "Stop sharing";
// Crypto
"e2e_enabling_on_app_update" = "%@ now supports end-to-end encryption but you need to log in again to enable it.\n\nYou can do it now or later from the application settings.";