Merge commit '21c5e2d' into mergemeister
Change-Id: I4203215f522fd2efda575aa56d7f7d75f856add8
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e49310d..408d570 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -758,7 +758,8 @@
<string name="tty_mode_option_summary">Set TTY mode</string>
<string name="auto_retry_mode_title">Auto-retry</string>
<string name="auto_retry_mode_summary">Enable Auto-retry mode</string>
-
+ <!-- TTY Mode change is NOT allowed during a video call -->
+ <string name="tty_mode_not_allowed_video_call">TTY Mode change is not allowed during a video call</string>
<!-- FDN list screen: menu item label -->
<string name="menu_add">Add contact</string>
<!-- FDN list screen: menu item label -->
@@ -1300,4 +1301,18 @@
<!-- String used in place of a message that could not be properly decoded (e.g. bad base64
data was received.) [CHAR LIMIT=none] -->
<string name="message_decode_error">There was an error while decoding the message.</string>
+
+ <!-- IMS settings related strings -->
+ <!-- Title of the ims editor screen. [CHAR LIMIT=NONE] -->
+ <string name="ims_edit_title">IMS account details</string>
+ <!-- Title displayed IMS account settings in the sip settings category. [CHAR LIMIT=NONE] -->
+ <string name="ims_accounts_title">IMS Account</string>
+
+ <!-- VT call quality settings. -->
+ <string translatable="false" name="ims_vt_call_quality">VtCallQuality</string>
+ <string name="ims_vt_call_quality_title">VT Call Quality</string>
+ <string name="ims_vt_call_quality_low">Low</string>
+ <string name="ims_vt_call_quality_high">High</string>
+ <string name="ims_vt_call_quality_unknown">Unknown</string>
+ <string name="ims_vt_call_quality_set_failed">Failed to set video quality</string>
</resources>
