diff options
| author | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-03-04 10:16:11 +0100 |
| commit | c18696c85d5801dfd39ffe494240b5f849deedb8 (patch) | |
| tree | a51ac3bbfab1c656a3e00f8725d5e09b774f94c1 /src/main/res/values | |
| parent | 024b2c80aa6da4adf2a48d89047a72bbb2bda5ad (diff) | |
| parent | cc67bfd8dbae334a121c9d40c13c3816b9eb72a0 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 49f3730d6..9247ba075 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -550,6 +550,8 @@ <string name="pref_xa_on_silent_mode">Not available in silent mode</string> <string name="update_info">Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.</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> @@ -622,5 +624,5 @@ <string name="no_participants">No participants</string> <string name="correct_message">Correct message</string> <string name="send_corrected_message">Send corrected message</string> ->>>>>>> refs/heads/pr/73 + <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> </resources> |