Merge branch 'develop' into privacy

This commit is contained in:
manuroe
2019-10-04 11:56:55 +02:00
committed by GitHub
45 changed files with 2273 additions and 129 deletions
+19 -1
View File
@@ -130,6 +130,8 @@
"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";
// Errors
"error_user_already_logged_in" = "It looks like youre trying to connect to another homeserver. Do you want to sign out?";
// Chat creation
"room_creation_title" = "New Chat";
@@ -215,7 +217,7 @@
"room_participants_leave_prompt_msg" = "Are you sure you want to leave the room?";
"room_participants_remove_prompt_title" = "Confirmation";
"room_participants_remove_prompt_msg" = "Are you sure you want to remove %@ from this chat?";
"room_participants_remove_third_party_invite_msg" = "Remove third-party invite is not supported yet until the api exists";
"room_participants_remove_third_party_invite_prompt_msg" = "Are you sure you want to revoke this invite?";
"room_participants_invite_prompt_title" = "Confirmation";
"room_participants_invite_prompt_msg" = "Are you sure you want to invite %@ to this chat?";
"room_participants_filter_room_members" = "Filter room members";
@@ -254,6 +256,7 @@
// Chat
"room_jump_to_first_unread" = "Jump to first unread message";
"room_accessiblity_scroll_to_bottom" = "Scroll to bottom";
"room_new_message_notification" = "%d new message";
"room_new_messages_notification" = "%d new messages";
"room_one_user_is_typing" = "%@ is typing…";
@@ -321,6 +324,18 @@
"room_resource_usage_limit_reached_message_2" = "some users will not be able to log in.";
"room_resource_usage_limit_reached_message_contact_3" = " to get this limit increased.";
"room_message_edits_history_title" = "Message edits";
"room_accessibility_search" = "Search";
"room_accessibility_integrations" = "Integrations";
"room_accessibility_upload" = "Upload";
"room_accessibility_call" = "Call";
"room_accessibility_hangup" = "Hang up";
"media_type_accessibility_image" = "Image";
"media_type_accessibility_audio" = "Audio";
"media_type_accessibility_video" = "Video";
"media_type_accessibility_location" = "Location";
"media_type_accessibility_file" = "File";
"media_type_accessibility_sticker" = "Sticker";
// Unknown devices
"unknown_devices_alert_title" = "Room contains unknown devices";
@@ -748,6 +763,9 @@
"widget_integration_missing_user_id" = "Missing user_id in request.";
"widget_integration_room_not_visible" = "Room %@ is not visible.";
// Widget Picker
"widget_picker_title" = "Integrations";
// Share extension
"share_extension_auth_prompt" = "Login in the main app to share content";
"share_extension_failed_to_encrypt" = "Failed to send. Check in the main app the encryption settings for this room";