aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java4
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 9b908138f..6e56d2b3b 100644
--- a/src/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/eu/siacs/conversations/ui/ConversationActivity.java
@@ -287,7 +287,7 @@ public class ConversationActivity extends XmppActivity {
Intent attachFileIntent = new Intent();
attachFileIntent.setType("image/*");
attachFileIntent.setAction(Intent.ACTION_GET_CONTENT);
- Intent chooser = Intent.createChooser(attachFileIntent, "Attach File");
+ Intent chooser = Intent.createChooser(attachFileIntent, getString(R.string.attach_file));
startActivityForResult(chooser, ATTACH_FILE);
}
}
@@ -557,7 +557,7 @@ public class ConversationActivity extends XmppActivity {
listener.onPresenceSelected(true, presence);
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setTitle("Choose Presence");
+ builder.setTitle(getString(R.string.choose_presence));
final String[] presencesArray = new String[presences.size()];
presences.keySet().toArray(presencesArray);
builder.setItems(presencesArray,
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index ea5f89ebb..f43f37a36 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -124,20 +124,20 @@ public class ConversationFragment extends Fragment {
public void updateChatMsgHint() {
if (conversation.getMode() == Conversation.MODE_MULTI) {
- chatMsg.setHint("Send message to conference");
+ chatMsg.setHint(getString(R.string.send_message_to_conference));
} else {
switch (conversation.nextMessageEncryption) {
case Message.ENCRYPTION_NONE:
- chatMsg.setHint("Send plain text message");
+ chatMsg.setHint(getString(R.string.send_plain_text_message));
break;
case Message.ENCRYPTION_OTR:
- chatMsg.setHint("Send OTR encrypted message");
+ chatMsg.setHint(getString(R.string.send_otr_message));
break;
case Message.ENCRYPTION_PGP:
- chatMsg.setHint("Send openPGP encryted messeage");
+ chatMsg.setHint(getString(R.string.send_pgp_message));
break;
case Message.ENCRYPTION_DECRYPTED:
- chatMsg.setHint("Send openPGP encryted messeage");
+ chatMsg.setHint(getString(R.string.send_pgp_message));
break;
default:
break;
@@ -403,11 +403,11 @@ public class ConversationFragment extends Fragment {
if (success) {
Toast.makeText(
getActivity(),
- "Your nickname has been changed",
+ getString(R.string.your_nick_has_been_changed),
Toast.LENGTH_SHORT).show();
} else {
Toast.makeText(getActivity(),
- "Nichname is already in use",
+ getString(R.string.nick_in_use),
Toast.LENGTH_SHORT).show();
}
}