aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/res/values/strings.xml4
-rw-r--r--src/main/res/values/styles.xml4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 611334782..96b095277 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -850,4 +850,8 @@
<string name="no_market_app_installed">No market app installed.</string>
<string name="group_chat_will_make_your_jabber_id_public">This group chat will make your Jabber ID public</string>
<string name="ebook">e-book</string>
+ <string name="your_name">Your name</string>
+ <string name="enter_your_name">Enter your name</string>
+ <string name="enter_your_name_instructions">Please enter your nickname which will be visible to your contacts.</string>
+ <string name="no_name_set_instructions">No nickname set.</string>
</resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 3f693fccc..4418706e1 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -67,6 +67,10 @@
<item name="android:textColor">?android:textColorSecondary</item>
</style>
+ <style name="TextAppearance.Conversations.Body1.Tertiary" parent="TextAppearance.Conversations.Body1">
+ <item name="android:textColor">?android:textColorTertiary</item>
+ </style>
+
<style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.Conversations.Body1">
<item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item>
<item name="android:typeface">monospace</item>