From 33172246c9a038cefb68d12477513afcb64f89d2 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Fri, 29 Aug 2014 10:24:25 +0200 Subject: [PATCH] fixed #389 --- AndroidManifest.xml | 2 +- res/layout/activity_publish_profile_picture.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values/strings.xml | 2 +- src/eu/siacs/conversations/ui/EditAccountActivity.java | 6 +++++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a10a9cc5f..5133041be 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -93,7 +93,7 @@ diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 19ec1eff0..b2b1ff5e7 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -265,7 +265,7 @@ Der Kontakt hat dich zur Kontaktliste hinzugefügt Auch hinzufügen %s hat bis zu diesem Punkt gelesen - Veröffentlichen + Veröffentlichen Klicke hier, um einen Avatar auszuwählen Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar. Veröffentliche… diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0087e9e9c..77e5d2f77 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -265,7 +265,7 @@ El contacto te ha añadido a su lista de contactos Añadir contacto %s ha leído hasta aquí - Publicar imagen + Publicar Pulsa para seleccionar una imagen de la galería Nota: Todos tus contactos podrán ver esta imagen. Publicando… diff --git a/res/values/strings.xml b/res/values/strings.xml index 3a8497337..223ed984a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -266,7 +266,7 @@ Contact added you to contact list Add back %s has read up to this point - Publish avatar + Publish Touch avatar to select picture from gallery Please note: Everyone subscribed to your presence updates will be allowed to see this picture. Publishing… diff --git a/src/eu/siacs/conversations/ui/EditAccountActivity.java b/src/eu/siacs/conversations/ui/EditAccountActivity.java index 2d24aa499..d98a0ca71 100644 --- a/src/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/eu/siacs/conversations/ui/EditAccountActivity.java @@ -201,7 +201,11 @@ public class EditAccountActivity extends XmppActivity { this.mSaveButton.setEnabled(true); this.mSaveButton.setTextColor(getPrimaryTextColor()); if (jidToEdit != null) { - this.mSaveButton.setText(R.string.connect); + if (mAccount!= null && mAccount.getStatus() == Account.STATUS_ONLINE) { + this.mSaveButton.setText(R.string.save); + } else { + this.mSaveButton.setText(R.string.connect); + } } else { this.mSaveButton.setText(R.string.next); }