From c4e82eb3f8efb75bba153337755cf53af7a8eb6d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 26 May 2016 12:39:04 +0200
Subject: change hint in edit subject dialog

---
 src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 2 +-
 src/main/res/values/strings.xml                                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 541306ad3..f39883137 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -280,7 +280,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			case R.id.action_edit_subject:
 				if (mConversation != null) {
 					quickEdit(mConversation.getMucOptions().getSubject(),
-							R.string.action_edit_subject,
+							R.string.edit_subject_hint,
 							this.onSubjectEdited);
 				}
 				break;
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6c6a46f0b..8a1dc1b3c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -250,6 +250,7 @@
 	<string name="bookmark_already_exists">This bookmark already exists</string>
 	<string name="you">You</string>
 	<string name="action_edit_subject">Edit conference subject</string>
+	<string name="edit_subject_hint">The subject of this conference</string>
 	<string name="joining_conference">Joining conference…</string>
 	<string name="leave">Leave</string>
 	<string name="contact_added_you">Contact added you to contact list</string>
-- 
cgit v1.2.3