From 38ae1c31d4b038d846874d100c97bd4aa81c2448 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 11 Mar 2017 17:20:21 +0100
Subject: display chat states in conferences

---
 src/main/res/values-de/strings.xml | 4 ++++
 src/main/res/values/strings.xml    | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ae3d33496..7780b68ab 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -697,5 +697,9 @@
     <string name="video_high">hoch (720p)</string>
     <string name="video_low">niedrig (144p)</string>
     <string name="video_mid">mittelmäßig (360p)</string>
+    <string name="contact_is_typing">%s schreibt…</string>
+    <string name="contacts_are_typing">%s tippen…</string>
+    <string name="more_participants">%d Teilnehmer</string>
+    <string name="one_participant">Ein Teilnehmer</string>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c16c7b921..0c665884f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -167,7 +167,7 @@
     <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>
     <string name="attach_record_voice">Record voice</string>
-    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_jabber_id">Jabber-ID</string>
     <string name="account_settings_password">Password</string>
     <string name="account_settings_example_jabber_id">username@pix-art.de</string>
     <string name="account_settings_confirm_password">Confirm password</string>
@@ -752,4 +752,8 @@
     <string name="pref_notifications_from_strangers">Notifications from strangers</string>
     <string name="pref_notifications_from_strangers_summary">Notify for messages received from strangers.</string>
     <string name="received_message_from_stranger">Received message from stranger</string>
+    <string name="contacts_are_typing">%s are typing…</string>
+    <string name="contact_is_typing">%s is typing…</string>
+    <string name="one_participant">one participant</string>
+    <string name="more_participants">%d participants</string>
 </resources>
-- 
cgit v1.2.3