Merge pull request #146 from kruks23/development

More harcoded translations + Spanish

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