diff options
Diffstat (limited to 'src/main/res/values')
-rw-r--r-- | src/main/res/values/arrays.xml | 10 | ||||
-rw-r--r-- | src/main/res/values/defaults.xml | 4 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 29 |
3 files changed, 39 insertions, 4 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index f8028ea3..bf9b11a1 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -5,7 +5,7 @@ <item>Mobile</item> <item>Phone</item> <item>Tablet</item> - <item>Conversations</item> + <item>@string/app_name</item> <item>Android</item> </string-array> <string-array name="filesizes"> @@ -85,4 +85,12 @@ <item>@string/contacts</item> <item>@string/always</item> </string-array> + + <string-array name="presence_show_options"> + <item>@string/presence_chat</item> + <item>@string/presence_online</item> + <item>@string/presence_away</item> + <item>@string/presence_xa</item> + <item>@string/presence_dnd</item> + </string-array> </resources> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml new file mode 100644 index 00000000..be795ed4 --- /dev/null +++ b/src/main/res/values/defaults.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="default_resource">Phone</string> +</resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 77e4fc8c..b08f9ddd 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -178,6 +178,8 @@ <string name="mgmt_account_disable">Temporarily disable</string> <string name="mgmt_account_publish_avatar">Publish avatar</string> <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> + <string name="openpgp_has_been_published">OpenPGP public key has been published.</string> + <string name="republish_pgp_keys">Remember to republish your OpenPGP public keys!</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> @@ -458,7 +460,7 @@ <string name="disable_all_accounts">Disable all accounts</string> <string name="perform_action_with">Perform action with</string> <string name="no_affiliation">No affiliation</string> - <string name="no_role">No role</string> + <string name="no_role">Offline</string> <string name="outcast">Outcast</string> <string name="member">Member</string> <string name="advanced_mode">Advanced mode</string> @@ -599,6 +601,8 @@ <string name="download_failed_file_not_found">Download failed: File not found</string> <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> <string name="account_status_tor_unavailable">Tor network unavailable</string> + <string name="account_status_bind_failure">Bind failure</string> + <string name="account_status_host_unknown">Host unknown</string> <string name="server_info_broken">Broken</string> <string name="pref_presence_settings">Presence</string> <string name="pref_away_when_screen_off">Away when screen is off</string> @@ -617,9 +621,8 @@ <string name="server_side_mam_prefs">Server-side archiving preferences</string> <string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string> <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string> - <string name="captcha_ocr">Captcha text</string> <string name="captcha_required">Captcha required</string> - <string name="captcha_hint">enter the text from the image</string> + <string name="captcha_hint">Enter the text from the image above</string> <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string> <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string> <string name="action_renew_certificate">Renew certificate</string> @@ -674,4 +677,24 @@ <string name="security_error_invalid_file_access">Security error: Invalid file access</string> <string name="no_application_to_share_uri">No application found to share URI</string> <string name="share_uri_with">Share URI with…</string> + <string translatable="false" name="welcome_header">Join the Conversation</string> + <string name="welcome_text">XMPP is a provider independent protocol. You can use this client with what ever XMPP server you choose.\nHowever for your convenience we made it easy to create an account on conversations.im; a provider specially suited for the use with Conversations.</string> + <string name="magic_create_text">We will guide you through the process of creating an account on conversations.im.\nWhen picking conversations.im as a provider you will be able to communicate with users of other providers by giving them your full Jabber ID.</string> + <string name="your_full_jid_will_be">Your full Jabber ID will be: %s</string> + <string name="create_account">Create Account</string> + <string name="use_own_provider">Use my own provider</string> + <string name="pick_your_username">Pick your username</string> + <string name="pref_manually_change_presence">Manually change presence</string> + <string name="pref_manually_change_presence_summary">Touch your avatar to change your presence</string> + <string name="change_presence">Change Presence</string> + <string name="status_message">Status message</string> + <string name="all_accounts_on_this_device">Set for all accounts on this device</string> + <string name="presence_chat">Free for Chat</string> + <string name="presence_online">Online</string> + <string name="presence_away">Away</string> + <string name="presence_xa">Not Available</string> + <string name="presence_dnd">Busy</string> + <string name="secure_password_generated">A secure password has been generated</string> + <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string> + <string name="show_password">Show password</string> </resources> |