Merge branch 'rebranding' into 8-update-strings-localizations

# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
This commit is contained in:
Ismail Gulek
2020-07-03 17:08:21 +03:00
5 changed files with 15 additions and 18 deletions
-3
View File
@@ -489,11 +489,8 @@
"settings_version" = "Version %@";
"settings_olm_version" = "Olm Version %@";
"settings_copyright" = "Copyright";
"settings_copyright_url" = "https://element.io/copyright";
"settings_term_conditions" = "Terms & Conditions";
"settings_term_conditions_url" = "https://element.io/tac_apple";
"settings_privacy_policy" = "Privacy Policy";
"settings_privacy_policy_url" = "https://element.io/privacy";
"settings_third_party_notices" = "Third-party Notices";
"settings_send_crash_report" = "Send anon crash & usage data";
"settings_enable_rageshake" = "Rage shake to report bug";