aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-16 23:58:53 +0200
committerAndreas Straub <andy@strb.org>2014-04-18 00:17:34 +0200
commit8006931f80fcba014c141bc726307ceea782f4fe (patch)
tree8360b8dc929bedfa606bf8869dc323d7bca6a21e
parent0de0cb90a09ca545f7bac5a7859eef417b5eb5d1 (diff)
put more string into strings.xml
-rw-r--r--res/menu/conversations.xml2
-rw-r--r--res/values/strings.xml8
-rw-r--r--src/eu/siacs/conversations/ui/ConversationActivity.java4
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java14
4 files changed, 17 insertions, 11 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index b6e82c40..58fd3bfa 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -19,7 +19,7 @@
android:orderInCategory="30"
android:showAsAction="ifRoom"
android:icon="@drawable/ic_action_new_attachment"
- android:title="@string/action_attach_file" />
+ android:title="@string/attach_file" />
<item
android:id="@+id/action_contact_details"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0adec56..738332c2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,7 +47,7 @@
<string name="problem_connecting_to_account">Unable to connect to account</string>
<string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string>
<string name="touch_to_fix">Touch here to manage your accounts</string>
- <string name="action_attach_file">Attach file</string>
+ <string name="attach_file">Attach file</string>
<string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
<string name="add_contact">Add contact</string>
<string name="send_failed">unsuccessful delivery</string>
@@ -59,4 +59,10 @@
<string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string>
<string name="delete_messages">Delete messages</string>
<string name="also_end_conversation">End this conversations afterwards</string>
+ <string name="choose_presence">Choose presence to contact</string>
+ <string name="send_message_to_conference">Send message to conference</string>
+ <string name="send_plain_text_message">Send plain text message</string>
+ <string name="send_otr_message">Send OTR encrypted message</string>
+ <string name="send_pgp_message">Send openPGP encrypted message</string>
+ <string name="your_nick_has_been_changed">Your nickname has been changed</string>
</resources>
diff --git a/src/eu/siacs/conversations/ui/ConversationActivity.java b/src/eu/siacs/conversations/ui/ConversationActivity.java
index 9b908138..6e56d2b3 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 ea5f89eb..f43f37a3 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();
}
}