diff options
| author | lookshe <github@lookshe.org> | 2016-03-08 21:13:24 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-08 21:13:24 +0100 |
| commit | 74d6d10cb76b7440f57db193a3c38e476206969c (patch) | |
| tree | 665b7787c0f7bcb6d759e849972fa9658e84423f /src/main/res/values/strings.xml | |
| parent | 7be757de90fb71042b79b88a76cd36fc07b2ee87 (diff) | |
| parent | f051dd0bcdbd35d101420fb1f75f33a565a1e0f8 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/res/values/strings.xml')
| -rw-r--r-- | src/main/res/values/strings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 15b7efc5..a34c81d5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -358,6 +358,7 @@ <string name="checking_x">Checking %s on HTTP host</string> <string name="not_connected_try_again">You are not connected. Try again later</string> <string name="check_x_filesize">Check %s size</string> + <string name="check_x_filesize_on_host">Check %1$s size on %2$s</string> <string name="message_options">Message options</string> <string name="copy_text">Copy text</string> <string name="copy_original_url">Copy original URL</string> @@ -598,6 +599,8 @@ <string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string> <string name="pref_xa_on_silent_mode">Not available in silent mode</string> <string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when device is in silent mode</string> + <string name="pref_treat_vibrate_as_silent">Treat vibrate as silent mode</string> + <string name="pref_treat_vibrate_as_silent_summary">Marks your resource as not available when device is on vibrate</string> <string name="pref_show_connection_options">Extended connection settings</string> <string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string> <string name="hostname_example">xmpp.example.com</string> @@ -656,4 +659,7 @@ <string name="retry_decryption">Retry decryption</string> <string name="pref_omemo_enabled_summary">Enable OMEMO?</string> <string name="pref_omemo_enabled_title">Enable OMEMO</string> + <string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string> + <string name="select_image_and_crop">Select image and crop</string> + <string name="this_account_is_disabled">You have disabled this account</string> </resources> |