Merge branch 'main' into amber

This commit is contained in:
greenart7c3
2023-09-08 15:48:13 -03:00
committed by GitHub
40 changed files with 2318 additions and 759 deletions
+12
View File
@@ -562,4 +562,16 @@
<string name="error_dialog_zap_error">Unable to send zap</string>
<string name="error_dialog_talk_to_user">Message the User</string>
<string name="error_dialog_button_ok">Ok</string>
<string name="relay_information_document_error_assemble_url">Failed to reach %1$s: %2$s</string>
<string name="relay_information_document_error_reach_server">Failed to reach %1$s: %2$s</string>
<string name="relay_information_document_error_parse_result">Failed to parse result from %1$s: %2$s</string>
<string name="relay_information_document_error_http_status">%1$s failed with code %2$s</string>
<string name="active_for">Active for: </string>
<string name="active_for_home">Home</string>
<string name="active_for_msg">DMs</string>
<string name="active_for_chats">Chats</string>
<string name="active_for_global">Global</string>
<string name="active_for_search">Search</string>
</resources>