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

Merge branch 'develop' into element_3816

Browse Source 
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/BugReport/BugReportViewController.m
This commit is contained in:
Gil Eluard
2021-01-11 12:18:30 +01:00
parent d7cc489253 8225d7bb6f
commit 2c2dd41677
73 changed files with 2240 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Assets/en.lproj/Vector.strings
+12
View File
@@ -139,6 +139,16 @@
"auth_softlogout_clear_data_sign_out_msg" = "Are you sure you want to clear all data currently stored on this device? Sign in again to access your account data and messages.";
"auth_softlogout_clear_data_sign_out" = "Sign out";
// Social login
"social_login_list_title_continue" = "Continue with";
"social_login_list_title_sign_in" = "Or login with";
"social_login_list_title_sign_up" = "Or register with";
"social_login_button_title_continue" = "Continue with %@";
"social_login_button_title_sign_in" = "Sign In with %@";
"social_login_button_title_sign_up" = "Sign Up with %@";
// Errors
"error_user_already_logged_in" = "It looks like you’re trying to connect to another homeserver. Do you want to sign out?";
@@ -1461,6 +1471,7 @@ Tap the + to start adding people.";
"pin_protection_choose_pin" = "Create a PIN for security";
"pin_protection_confirm_pin" = "Confirm your PIN";
"pin_protection_confirm_pin_to_disable" = "Confirm PIN to disable PIN";
"pin_protection_confirm_pin_to_change" = "Confirm PIN to change PIN";
"pin_protection_enter_pin" = "Enter your PIN";
"pin_protection_forgot_pin" = "Forgot PIN";
"pin_protection_reset_alert_title" = "Reset PIN";
@@ -1473,6 +1484,7 @@ Tap the + to start adding people.";
"pin_protection_settings_section_footer" = "To reset your PIN, you'll need to re-login and create a new one.";
"pin_protection_settings_enabled_forced" = "PIN enabled";
"pin_protection_settings_enable_pin" = "Enable PIN";
"pin_protection_settings_change_pin" = "Change PIN";
"pin_protection_not_allowed_pin" = "For security reasons, this PIN isn’t available. Please try another PIN";
"pin_protection_explanatory" = "Setting up a PIN lets you protect data like messages and contacts, so only you can access them by entering the PIN at the start of the app.";
"pin_protection_kick_user_alert_message" = "Too many errors, you've been logged out";