aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-06-01 21:36:08 +0200
committerChristian Schneppe <christian@pix-art.de>2018-06-01 21:36:08 +0200
commit51439dc2e59a5d8ff3ef8b68b32c5617f7ebec27 (patch)
tree4a32d7208785504445b898b213c3ab59c3b264ef /src/main
parentc819a655a150ccc5e10d6304583b7e62f1a829a0 (diff)
rename useOwnProvider to useAdvancedMode in WelcomeActivity
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/WelcomeActivity.java4
-rw-r--r--src/main/res/layout/welcome.xml4
-rw-r--r--src/main/res/values-ceb/strings.xml2
-rw-r--r--src/main/res/values-de/strings.xml2
-rw-r--r--src/main/res/values-es/strings.xml2
-rw-r--r--src/main/res/values-fil/strings.xml2
-rw-r--r--src/main/res/values-id/strings.xml2
-rw-r--r--src/main/res/values-ro/strings.xml2
-rw-r--r--src/main/res/values-tr/strings.xml2
-rw-r--r--src/main/res/values/strings.xml2
10 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
index 052abaf33..7906c7f40 100644
--- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java
@@ -109,8 +109,8 @@ public class WelcomeActivity extends XmppActivity {
addInviteUri(intent);
startActivity(intent);
});
- final Button useOwnProvider = findViewById(R.id.use_existing_account);
- useOwnProvider.setOnClickListener(v -> {
+ final Button useAdvancedMode = findViewById(R.id.use_advanced_mode);
+ useAdvancedMode.setOnClickListener(v -> {
List<Account> accounts = xmppConnectionService.getAccounts();
Intent intent = new Intent(WelcomeActivity.this, EditAccountActivity.class);
if (accounts.size() == 1) {
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index a388f1d91..f16cc92b8 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -77,12 +77,12 @@
android:textColor="?attr/colorAccent" />
<Button
- android:id="@+id/use_existing_account"
+ android:id="@+id/use_advanced_mode"
style="@style/Widget.Conversations.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
- android:text="@string/use_existing_accout"
+ android:text="@string/welcome_advanced_mode"
android:textColor="?attr/colorAccent" />
</LinearLayout>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index d92839805..28dedcb93 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -496,7 +496,7 @@ Pili %d mga kontak</item>
<string name="magic_create_text">Giyahan ka namo sa pag proseso sa pagmugna og usa ka account gamit ang random nga password, nga mahimo nimong gamiton o usbon sa imong kaugalingong password sa sunod nga pahina. \nLabaw kay makahimo ka sa pagpakig-estorya sa mga tiggamit niini ug sa ubang mga tighatag pinaagi sa paghatag kanila sa imong full Jabber-ID.</string>
<string name="your_full_jid_will_be">Ang imong Jabber-ID mahimong: %s</string>
<string name="create_account">Buhat ug bag-o nga account</string>
- <string name="use_existing_accout">Paggamit ug kasamtangan nga account</string>
+ <string name="welcome_advanced_mode">Paggamit ug kasamtangan nga account</string>
<string name="pick_your_username">Pili ug imung username</string>
<string name="status_message">Status ang mensahe</string>
<string name="presence_chat">Libre alang sa Chat</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 16f686a6b..2bfabeccd 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -538,7 +538,7 @@
<string name="magic_create_text">Wir erstellen nun mit dir gemeinsam ein Profil mit einem zufällig generierten Passwort, welches du benutzen oder auf der nächsten Seite ändern kannst\nDanach kannst du mit Kontakten auf diesem und anderen Servern in Kontakt treten, indem du ihnen deine Jabber-ID gibst.</string>
<string name="your_full_jid_will_be">Deine Jabber-ID lautet: %s</string>
<string name="create_account">Neues Profil erstellen</string>
- <string name="use_existing_accout">Nutze ein bestehendes Profil</string>
+ <string name="welcome_advanced_mode">Nutze ein bestehendes Profil</string>
<string name="pick_your_username">Wähle deinen Benutzernamen</string>
<string name="pref_manually_change_presence">Status manuell ändern</string>
<string name="pref_manually_change_presence_summary">Lege deinen Status fest, wenn du deine Statusnachricht bearbeitest.</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 3d3b11fd2..4848048a5 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -536,7 +536,7 @@
<string name="magic_create_text">A continuación crearemos un perfil con una contraseña generada aleatoriamente que podrás utilizar o cambiar en la página siguiente\ny posteriormente podrás ponerte en contacto con los contactos de este y otros servidores dándoles tu Jabber-ID.</string>
<string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string>
<string name="create_account">Crear cuenta</string>
- <string name="use_existing_accout">Conectase con una cuenta ya existente</string>
+ <string name="welcome_advanced_mode">Conectase con una cuenta ya existente</string>
<string name="pick_your_username">Selecciona tu nombre de usuario</string>
<string name="pref_manually_change_presence">Cambiar disponibilidad manualmente</string>
<string name="pref_manually_change_presence_summary">Establezca su disponibilidad cuando edite su mensaje de estado.</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 034ca3074..949df04e7 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -533,7 +533,7 @@
<string name="magic_create_text">Gagabayan ka namin sa pamamagitan ng proseso ng paglikha ng isang account na may isang random na password, na maaari mong gamitin o baguhin sa iyong sariling password sa susunod na pahina.\nKaysa makakausap mo ang mga gumagamit ng ito at iba pang mga provider sa pamamagitan ng pagbibigay sa kanila ng iyong buong Jabber-ID.</string>
<string name="your_full_jid_will_be">Ang iyong Jabber-ID ay magiging: %s</string>
<string name="create_account">Lumikha ng bagong account</string>
- <string name="use_existing_accout">Gumamit ng isang umiiral na account</string>
+ <string name="welcome_advanced_mode">Gumamit ng isang umiiral na account</string>
<string name="pick_your_username">Piliin ang iyong username</string>
<string name="status_message">Katayuan ng mensahe</string>
<string name="presence_chat">Libre para sa Chat</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index d318aabeb..e3273e806 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -530,7 +530,7 @@
<string name="magic_create_text">Kami akan memandu anda dalam proses pembuatan akun dengan kata kunci acak, yang dapat anda gunakan atau ubah ke kata sandi anda sendiri di halaman berikutnya.\nAnda akan dapat berkomunikasi dengan pengguna dan penyedia layanan lainnya dengan memberi mereka Jabber-ID anda.</string>
<string name="your_full_jid_will_be">Jabber-ID anda adalah: %s</string>
<string name="create_account">Buat akun baru</string>
- <string name="use_existing_accout">Gunakan akun yang ada</string>
+ <string name="welcome_advanced_mode">Gunakan akun yang ada</string>
<string name="pick_your_username">Pilih nama pengguna Anda</string>
<string name="status_message">Status pesan</string>
<string name="presence_chat">Gratis untuk obrolan</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 5a7382695..0edec7911 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -511,7 +511,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
<string name="magic_create_text">Vă vom ghida prin procesul de creare al unui cont cu o parolă aleatoare, pe care o puteți păstra sau schimba pe pagina următoare.\nApoi veți putea comunica cu utilizatorii acestui furnizor sau ai altor furnizori oferindu-le ID-ul dumneavoastră Jabber.</string>
<string name="your_full_jid_will_be">ID-ul Jabber va fi: %s</string>
<string name="create_account">Creează cont</string>
- <string name="use_existing_accout">Folosește un cont existent</string>
+ <string name="welcome_advanced_mode">Folosește un cont existent</string>
<string name="pick_your_username">Alege un nume de utilizator</string>
<string name="status_message">Mesaj de stare</string>
<string name="presence_chat">Disponibil/ă pentru conversație</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index e5e21a8f7..e19a5d953 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -533,7 +533,7 @@
<string name="magic_create_text">Bir sonraki sayfada kendi şifrenizi değiştirebileceğiniz veya kullanabileceğiniz rastgele bir şifreyle bir hesap oluşturma sürecinde size yol göstereceğiz.\n Bu kişilere ve diğer sağlayıcıların kullanıcılarına tam Jabber Kimliği vererek iletişime geçebileceksiniz.</string>
<string name="your_full_jid_will_be">Jabber-ID\'niz şu şekilde olacaktır: %s</string>
<string name="create_account">Yeni hesap oluştur</string>
- <string name="use_existing_accout">Mevcut bir hesap kullanın</string>
+ <string name="welcome_advanced_mode">Mevcut bir hesap kullanın</string>
<string name="pick_your_username">Kullanıcı adınızı seçin</string>
<string name="status_message">Durum mesajı</string>
<string name="presence_chat">Sohbet için Ücretsiz</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 513dffc74..8d842af79 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -538,7 +538,7 @@
<string name="magic_create_text">We will guide you through the process of creating an account with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string>
<string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string>
<string name="create_account">Create new account</string>
- <string name="use_existing_accout">Use an existing account</string>
+ <string name="welcome_advanced_mode">Advanced mode</string>
<string name="pick_your_username">Choose your username</string>
<string name="pref_manually_change_presence">Manage availability manually</string>
<string name="pref_manually_change_presence_summary">Set your availability when editing your status message.</string>