aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-07-30 21:25:24 +0200
committerChristian S <christian@pix-art.de>2015-07-30 21:25:24 +0200
commite42dc661c217724ccb8ab0d71c5c337eee64464d (patch)
tree96e9db4f3af84f1d22114296ceaaa65ea2a2c99a
parent35293d6293357736e9aafc75d385aca69a74a635 (diff)
removed username from typing info
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java2
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values/strings.xml1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 5e05c1138..7f7dcd617 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -332,7 +332,7 @@ public class ConversationActivity extends XmppActivity
if (conversation.getMode() == Conversation.MODE_SINGLE) {
ChatState state = conversation.getIncomingChatState();
if (state == ChatState.COMPOSING) {
- ab.setSubtitle(getString(R.string.contact_is_typing, conversation.getName()));
+ ab.setSubtitle(getString(R.string.is_typing));
} else if (state == ChatState.PAUSED) {
ab.setSubtitle(null);
} else {
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index efe00a4f5..01a849c20 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -451,4 +451,5 @@
<string name="choose_quick_action">wähle Schnell-Taste</string>
<string name="file_not_found_on_remote_host">Datei auf Server nicht gefunden</string>
<string name="search_for_contacts_or_groups">Nach Kontakten oder Konferenzen suchen</string>
+ <string name="is_typing">schreibt...</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index a0cac6ea6..7e7913a91 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -499,4 +499,5 @@
<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
<string name="send_private_message">Send private message</string>
<string name="user_has_left_conference">%s has left the conference!</string>
+ <string name="is_typing">is typing...</string>
</resources>