aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-26 12:39:04 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-26 12:39:04 +0200
commitc4e82eb3f8efb75bba153337755cf53af7a8eb6d (patch)
tree3a2047833f12568fb7f9ac42a81c0c7abca2d190 /src/main
parentc06e2787c7192bb450389f0b6352fae6fa1eeb61 (diff)
change hint in edit subject dialog
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java2
-rw-r--r--src/main/res/values/strings.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 541306ad..f3988313 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 6c6a46f0..8a1dc1b3 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>