diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 43 |
2 files changed, 31 insertions, 14 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index b6477939..ed0a0ffb 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -9,5 +9,5 @@ <color name="secondarybackground" type="color">#ffeeeeee</color> <color name="darkbackground" type="color">#ff323232</color> <color name="divider">#1f000000</color> - <color name="red">#ffe51c23</color> + <color name="warningtext">#ffe51c23</color> </resources>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index c636be79..3a849733 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -118,6 +118,7 @@ <string name="otr_file_transfer">OTR encryption not available</string> <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either OpenPGP or no encryption.</string> <string name="use_pgp_encryption">Use OpenPGP encryption</string> + <string name="pref_general">General</string> <string name="pref_xmpp_resource">XMPP resource</string> <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> <string name="pref_accept_files">Accept files</string> @@ -185,9 +186,11 @@ <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> <string name="mgmt_account_edit">Edit account</string> - <string name="mgmt_account_delete">Delete</string> + <string name="mgmt_account_delete">Delete account</string> <string name="mgmt_account_disable">Temporarily disable</string> - <string name="mgmt_account_enable">Enable</string> + <string name="mgmt_account_publish_avatar">Publish avatar</string> + <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> + <string name="mgmt_account_enable">Enable account</string> <string name="mgmt_account_are_you_sure">Are you sure?</string> <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string> <string name="mgmt_account_account_offline">Account is offline</string> @@ -215,16 +218,11 @@ <string name="muc_details_other_members">Other Members</string> <string name="subscription_not_updated_offline">Account offline. Could not update subscription</string> <string name="share_with_active_conversations">Active Conversations</string> - <string name="server_info_statistics">Statistics</string> - <string name="server_info_connection_age">Connection age</string> - <string name="server_info_session_age">Session age</string> - <string name="server_info_packets_sent">Packets sent</string> - <string name="server_info_packets_received">Packets received</string> - <string name="server_info_connected_accounts">Connected accounts</string> - <string name="server_info_server_features">Server Features</string> - <string name="server_info_roster_versioning">Roster Versioning</string> - <string name="server_info_carbon_messages">Carbon Messages</string> - <string name="server_info_stream_management">Stream Management</string> + <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_stream_management">XEP-0198: Stream Management</string> + <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> + <string name="server_info_available">available</string> + <string name="server_info_unavailable">unavailable</string> <string name="hours">hours</string> <string name="mins">mins</string> <string name="missing_public_keys">Missing public key announcements</string> @@ -268,4 +266,23 @@ <string name="contact_added_you">Contact added you to contact list</string> <string name="add_back">Add back</string> <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> -</resources> + <string name="publish_avatar">Publish avatar</string> + <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string> + <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string> + <string name="publishing">Publishing…</string> + <string name="error_publish_avatar_server_reject">The server rejected your publication</string> + <string name="error_publish_avatar_converting">Something went wrong while converting your picture</string> + <string name="error_saving_avatar">Could not save avatar to disk</string> + <string name="or_long_press_for_default">(Or long press to bring back default)</string> + <string name="error_publish_avatar_no_server_support">Your server does not support the publication of avatars</string> + <string name="private_message">whispered</string> + <string name="private_message_to">to %s</string> + <string name="send_private_message_to">Send private message to %s</string> + <string name="connect">Connect</string> + <string name="account_already_exists">This account does already exist</string> + <string name="next">Next</string> + <string name="server_info_session_established">Current session established</string> + <string name="additional_information">Additional Information</string> + <string name="skip">Skip</string> + +</resources>
\ No newline at end of file |