aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-11-15 20:54:28 +0100
committerChristian Schneppe <christian@pix-art.de>2018-11-15 20:54:28 +0100
commit0bffe0ef9edc7b382da53d7518fa51ec995902c0 (patch)
tree6a0c96c8d702d7ff033725381163d38fbcf2b723 /src/main
parentba3e6ffba2d27470c448be3c3e28c06b8932b8ee (diff)
rename variable
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationsActivity.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/StartConversationActivity.java2
-rw-r--r--src/main/res/menu/start_conversation.xml2
-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-ru/strings.xml2
-rw-r--r--src/main/res/values-tr/strings.xml2
-rw-r--r--src/main/res/values/strings.xml2
12 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index a0b91a8c7..847efc831 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -456,7 +456,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
}
}
if (xmppConnectionServiceBound && xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
- menuEditProfiles.setTitle(R.string.mgmt_account_edit);
+ menuEditProfiles.setTitle(R.string.action_account);
} else {
menuEditProfiles.setTitle(R.string.action_accounts);
}
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index ade478aa1..60c94042d 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -590,7 +590,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
MenuItem menuHideOffline = menu.findItem(R.id.action_hide_offline);
MenuItem menuActionAccounts = menu.findItem(R.id.action_accounts);
if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
- menuActionAccounts.setTitle(R.string.mgmt_account_edit);
+ menuActionAccounts.setTitle(R.string.action_account);
} else {
menuActionAccounts.setTitle(R.string.action_accounts);
}
diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index 19a55ad52..554131c8d 100644
--- a/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
@@ -28,7 +28,7 @@
<item
android:id="@+id/action_accounts"
android:orderInCategory="90"
- android:title="@string/mgmt_account_edit"
+ android:title="@string/action_account"
app:showAsAction="never" />
<item
android:id="@+id/action_settings"
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index 58c017a16..cb2ace5f1 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -151,7 +151,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">AbliPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">I-edit ang account</string>
+ <string name="action_account">I-edit ang account</string>
<string name="mgmt_account_delete">Tangtanga ang account</string>
<string name="mgmt_account_publish_avatar">I-publikar ang avatar</string>
<string name="mgmt_account_publish_pgp">I-publikar sa OpenPGP ang publikong yawe</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f28abdf43..ee67d617f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -154,7 +154,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Profil bearbeiten</string>
+ <string name="action_account">Profil bearbeiten</string>
<string name="mgmt_account_delete">Löschen</string>
<string name="mgmt_account_publish_avatar">Profilbild veröffentlichen</string>
<string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 4433aca26..c07dff997 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -151,7 +151,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Editar cuenta</string>
+ <string name="action_account">Editar cuenta</string>
<string name="mgmt_account_delete">Eliminar cuenta</string>
<string name="mgmt_account_publish_avatar">Imagen de perfil</string>
<string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 4b427d4b6..886bcd63f 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -151,7 +151,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">I-edit ang account</string>
+ <string name="action_account">I-edit ang account</string>
<string name="mgmt_account_delete">Tanggalin ang account</string>
<string name="mgmt_account_publish_avatar">Magpublish ng kahit anong larawan</string>
<string name="mgmt_account_publish_pgp">Magpublish ng OpenPGP public key</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 6171a8110..b0ac75148 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -151,7 +151,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Sunting akun</string>
+ <string name="action_account">Sunting akun</string>
<string name="mgmt_account_delete">Hapus akun</string>
<string name="mgmt_account_publish_avatar">Menampilkan avatar</string>
<string name="mgmt_account_publish_pgp">Menampilkan kunci terbuka OpenPGP</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 9982a4c02..eb5c8bc6c 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -143,7 +143,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenGPG</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Editare cont</string>
+ <string name="action_account">Editare cont</string>
<string name="mgmt_account_delete">Șterge cont</string>
<string name="mgmt_account_publish_avatar">Publică avatar</string>
<string name="mgmt_account_publish_pgp">Publică cheia publică OpenPGP</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 47200443f..80f05ee94 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -152,7 +152,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Изменить аккаунт</string>
+ <string name="action_account">Изменить аккаунт</string>
<string name="mgmt_account_delete">Удалить аккаунт</string>
<string name="mgmt_account_publish_avatar">Опубликовать аватар</string>
<string name="mgmt_account_publish_pgp">Опубликовать публичный OpenPGP ключ</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 9b5a71e96..a2ca5ca81 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -151,7 +151,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Hesabı düzenle</string>
+ <string name="action_account">Hesabı düzenle</string>
<string name="mgmt_account_delete">Hesabı silin</string>
<string name="mgmt_account_publish_avatar">Avatarı paylaş</string>
<string name="mgmt_account_publish_pgp">OpenPGP genel anahtarı paylaş</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 215483b8b..0fd36d8b1 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -153,7 +153,7 @@
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
<string name="encryption_choice_omemo">OMEMO</string>
- <string name="mgmt_account_edit">Edit account</string>
+ <string name="action_account">Edit account</string>
<string name="mgmt_account_delete">Delete account</string>
<string name="mgmt_account_publish_avatar">Publish avatar</string>
<string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string>