aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-05-29 18:17:21 +0200
committerkruks23 <scardenas@openmailbox.org>2014-05-29 18:17:21 +0200
commit75b14a1d5c08d10b795b92e4f2b21035d773dc8c (patch)
tree33657df11f16e8cf032d7961b56fe9733fbfdcf8 /src/eu/siacs/conversations/ui
parent655565ecccc722ad72e2dbad247d67dbc1b2a911 (diff)
More harcoded translations + updated Spanish
Diffstat (limited to 'src/eu/siacs/conversations/ui')
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java24
-rw-r--r--src/eu/siacs/conversations/ui/ShareWithActivity.java2
2 files changed, 13 insertions, 13 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 70af44e0..d1c9c7f7 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -317,36 +317,36 @@ public class ManageAccountActivity extends XmppActivity {
pcks_received.setText(""+xmpp.getReceivedStanzas());
pcks_sent.setText(""+xmpp.getSentStanzas());
if (connectionAgeHours >= 2) {
- connection.setText(connectionAgeHours+" hours");
+ connection.setText(connectionAgeHours+" " + getString(R.string.hours));
} else {
- connection.setText(connectionAge+" mins");
+ connection.setText(connectionAge+" " + getString(R.string.mins));
}
if (xmpp.hasFeatureStreamManagment()) {
if (sessionAgeHours >= 2) {
- session.setText(sessionAgeHours+" hours");
+ session.setText(sessionAgeHours+" " + getString(R.string.hours));
} else {
- session.setText(sessionAge+" mins");
+ session.setText(sessionAge+" " + getString(R.string.mins));
}
- stream.setText("Yes");
+ stream.setText(getString(R.string.yes));
} else {
- stream.setText("No");
+ stream.setText(getString(R.string.no));
session.setText(connection.getText());
}
if (xmpp.hasFeaturesCarbon()) {
- carbon.setText("Yes");
+ carbon.setText(getString(R.string.yes));
} else {
- carbon.setText("No");
+ carbon.setText(getString(R.string.no));
}
if (xmpp.hasFeatureRosterManagment()) {
- roster.setText("Yes");
+ roster.setText(getString(R.string.yes));
} else {
- roster.setText("No");
+ roster.setText(getString(R.string.no));
}
builder.setView(view);
} else {
- builder.setMessage("Account is offline");
+ builder.setMessage(getString(R.string.mgmt_account_account_offline));
}
- builder.setPositiveButton("Hide", null);
+ builder.setPositiveButton(getString(R.string.hide), null);
builder.create().show();
}
return true;
diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java
index 6dbb20c9..0a8ee1a7 100644
--- a/src/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -34,7 +34,7 @@ public class ShareWithActivity extends XmppActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.share_with);
- setTitle("Share with Conversation");
+ setTitle(getString(R.string.title_activity_sharewith));
contacts = (LinearLayout) findViewById(R.id.contacts);
conversations = (LinearLayout) findViewById(R.id.conversations);