narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 +2 -1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5920533cf5 - Show all commits

2
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -761,7 +761,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
if (conversation.getMode() == Conversational.MODE_MULTI) { if (conversation.getMode() == Conversational.MODE_MULTI) {
actionBar.setTitle(getString(R.string.muc_private_conversation_title, conversation.getNextCounterpart().getResource(), conversation.getName())); actionBar.setTitle(getString(R.string.muc_private_conversation_title, conversation.getNextCounterpart().getResource(), conversation.getName()));
} else { } else {
actionBar.setTitle(getString(R.string.secret_chat_title, conversation.getName(), "")); actionBar.setTitle(getString(R.string.secret_chat_title_no_resource, conversation.getName()));
} }
} else { } else {
actionBar.setTitle(conversation.getName()); actionBar.setTitle(conversation.getName());

1
src/main/res/values/strings.xml
View file

@ -1091,6 +1091,7 @@
<string name="filter">filter</string> <string name="filter">filter</string>
<string name="could_not_create_file">could_not_create_file</string> <string name="could_not_create_file">could_not_create_file</string>
<string name="secret_chat_title">%1$s (Secret Chat / %2$s)</string> <string name="secret_chat_title">%1$s (Secret Chat / %2$s)</string>
<string name="secret_chat_title_no_resource">%1$s (Secret Chat / %2$s)</string>
<string name="muc_private_conversation_title">%1$s (%2$s)</string> <string name="muc_private_conversation_title">%1$s (%2$s)</string>
<string name="note_to_self_conversation_title">Note to self (%1$s)</string> <string name="note_to_self_conversation_title">Note to self (%1$s)</string>
<string name="muc_private_conversation_info_title">Private conversation with:</string> <string name="muc_private_conversation_info_title">Private conversation with:</string>