fixed #389
This commit is contained in:
parent
37e87e7252
commit
33172246c9
|
@ -93,7 +93,7 @@
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity"
|
android:name="eu.siacs.conversations.ui.PublishProfilePictureActivity"
|
||||||
android:label="@string/publish_avatar"
|
android:label="@string/mgmt_account_publish_avatar"
|
||||||
android:windowSoftInputMode="stateHidden" >
|
android:windowSoftInputMode="stateHidden" >
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:enabled="false"
|
android:enabled="false"
|
||||||
android:text="@string/publish_avatar"
|
android:text="@string/publish"
|
||||||
android:textColor="@color/secondarytext" />
|
android:textColor="@color/secondarytext" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -265,7 +265,7 @@
|
||||||
<string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
|
<string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
|
||||||
<string name="add_back">Auch hinzufügen</string>
|
<string name="add_back">Auch hinzufügen</string>
|
||||||
<string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
|
<string name="contact_has_read_up_to_this_point">%s hat bis zu diesem Punkt gelesen</string>
|
||||||
<string name="publish_avatar">Veröffentlichen</string>
|
<string name="publish">Veröffentlichen</string>
|
||||||
<string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string>
|
<string name="touch_to_choose_picture">Klicke hier, um einen Avatar auszuwählen</string>
|
||||||
<string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
|
<string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch deinen Avatar.</string>
|
||||||
<string name="publishing">Veröffentliche…</string>
|
<string name="publishing">Veröffentliche…</string>
|
||||||
|
|
|
@ -265,7 +265,7 @@
|
||||||
<string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
|
<string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
|
||||||
<string name="add_back">Añadir contacto</string>
|
<string name="add_back">Añadir contacto</string>
|
||||||
<string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
|
<string name="contact_has_read_up_to_this_point">%s ha leído hasta aquí</string>
|
||||||
<string name="publish_avatar">Publicar imagen</string>
|
<string name="publish">Publicar</string>
|
||||||
<string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
|
<string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
|
||||||
<string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
|
<string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
|
||||||
<string name="publishing">Publicando…</string>
|
<string name="publishing">Publicando…</string>
|
||||||
|
|
|
@ -266,7 +266,7 @@
|
||||||
<string name="contact_added_you">Contact added you to contact list</string>
|
<string name="contact_added_you">Contact added you to contact list</string>
|
||||||
<string name="add_back">Add back</string>
|
<string name="add_back">Add back</string>
|
||||||
<string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
|
<string name="contact_has_read_up_to_this_point">%s has read up to this point</string>
|
||||||
<string name="publish_avatar">Publish avatar</string>
|
<string name="publish">Publish</string>
|
||||||
<string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
|
<string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
|
||||||
<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
|
<string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
|
||||||
<string name="publishing">Publishing…</string>
|
<string name="publishing">Publishing…</string>
|
||||||
|
|
|
@ -201,7 +201,11 @@ public class EditAccountActivity extends XmppActivity {
|
||||||
this.mSaveButton.setEnabled(true);
|
this.mSaveButton.setEnabled(true);
|
||||||
this.mSaveButton.setTextColor(getPrimaryTextColor());
|
this.mSaveButton.setTextColor(getPrimaryTextColor());
|
||||||
if (jidToEdit != null) {
|
if (jidToEdit != null) {
|
||||||
|
if (mAccount!= null && mAccount.getStatus() == Account.STATUS_ONLINE) {
|
||||||
|
this.mSaveButton.setText(R.string.save);
|
||||||
|
} else {
|
||||||
this.mSaveButton.setText(R.string.connect);
|
this.mSaveButton.setText(R.string.connect);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.mSaveButton.setText(R.string.next);
|
this.mSaveButton.setText(R.string.next);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue