aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-24 10:03:42 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-24 10:03:42 +0200
commit03854f30c95eb5146ca5019c16d747cd472f0f33 (patch)
treec0878feb9edf6af7f5c37aee56b0ca933afeaa58 /src/eu/siacs/conversations
parent00377b64c796f191947b99e3093e7122e7b296ac (diff)
parentd74faa3f7c6c8b93ea94e1ef54b9d23e0093f2d7 (diff)
Merge pull request #146 from kruks23/development
More harcoded translations + Spanish
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java10
-rw-r--r--src/eu/siacs/conversations/ui/MucDetailsActivity.java4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index ba570364..70af44e0 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -261,10 +261,10 @@ public class ManageAccountActivity extends XmppActivity {
mode.finish();
} else if (item.getItemId()==R.id.mgmt_account_delete) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
- builder.setTitle("Are you sure?");
+ builder.setTitle(getString(R.string.mgmt_account_are_you_sure));
builder.setIconAttribute(android.R.attr.alertDialogIcon);
- builder.setMessage("If you delete your account your entire conversation history will be lost");
- builder.setPositiveButton("Delete", new OnClickListener() {
+ builder.setMessage(getString(R.string.mgmt_account_delete_confirm_text));
+ builder.setPositiveButton(getString(R.string.delete), new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -273,7 +273,7 @@ public class ManageAccountActivity extends XmppActivity {
mode.finish();
}
});
- builder.setNegativeButton("Cancel",null);
+ builder.setNegativeButton(getString(R.string.cancel),null);
builder.create().show();
} else if (item.getItemId()==R.id.mgmt_account_announce_pgp) {
if (activity.hasPgp()) {
@@ -293,7 +293,7 @@ public class ManageAccountActivity extends XmppActivity {
noFingerprintView.setVisibility(View.GONE);
}
builder.setView(view);
- builder.setPositiveButton("Done", null);
+ builder.setPositiveButton(getString(R.string.done), null);
builder.create().show();
} else if (item.getItemId() == R.id.mgmt_account_info) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
diff --git a/src/eu/siacs/conversations/ui/MucDetailsActivity.java b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
index c6807c61..d1725d41 100644
--- a/src/eu/siacs/conversations/ui/MucDetailsActivity.java
+++ b/src/eu/siacs/conversations/ui/MucDetailsActivity.java
@@ -153,11 +153,11 @@ public class MucDetailsActivity extends XmppActivity {
switch (self.getAffiliation()) {
case User.AFFILIATION_ADMIN:
mRoleAffiliaton.setText(getReadableRole(self.getRole())
- + " (Admin)");
+ + " (" + getString(R.string.admin) + ")");
break;
case User.AFFILIATION_OWNER:
mRoleAffiliaton.setText(getReadableRole(self.getRole())
- + " (Owner)");
+ + " (" + getString(R.string.owner) + ")");
break;
default:
mRoleAffiliaton