diff --git a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java
index f127a70af..8b1403e5a 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java
@@ -136,7 +136,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
else if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP )
{
title = LocaleController.getString("NewGroup", R.string.NewGroup);
- subtitle = LocaleController.getString("MeAnd", R.string.MeAnd) + " " + LocaleController.formatPluralString("Members", 0);
+ subtitle = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.MeAndMembers, 0, 0);
}
else if( do_what == ADD_CONTACTS_TO_GROUP )
{
@@ -163,7 +163,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
private volatile boolean m_in_sync = false;
@Override
- public View createView(Context context) {
+ public View createView(final Context context) {
// do sync?
boolean do_sync_now = true;
@@ -464,7 +464,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
span.uid = user.id;
ignoreChange = false;
}
- actionBar.setSubtitle(LocaleController.getString("MeAnd", R.string.MeAnd) + " " + LocaleController.formatPluralString("Members", selectedContacts.size()));
+ actionBar.setSubtitle(context.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContacts.size(), selectedContacts.size()));
if (searching || searchWas) {
ignoreChange = true;
SpannableStringBuilder ssb = new SpannableStringBuilder("");
diff --git a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java
index 439508a57..7decf7da0 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java
@@ -271,7 +271,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
}
GreySectionCell sectionCell = new GreySectionCell(context);
- sectionCell.setText(LocaleController.formatPluralString("Members", selectedContacts.size()));
+ sectionCell.setText(context.getResources().getQuantityString(R.plurals.Members, selectedContacts.size(), selectedContacts.size()));
linearLayout.addView(sectionCell);
listView = new ListView(context);
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index bdf34e710..1711b5a31 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -339,12 +339,14 @@
Jetzt beginnen
- %1$d Mitglieder
- %1$d Mitglied
- %1$d Mitglieder
- %1$d Mitglieder
- %1$d Mitglieder
- %1$d Mitglieder
+
+ - %d Mitglied
+ - %d Mitglieder
+
+
+ - Ich und %d Mitglied
+ - Ich und %d Mitglieder
+
- %d neue Nachricht
- %d neue Nachrichten
@@ -479,7 +481,6 @@
Benutzer suchen
Name
E-Mail-Adresse
- Ich und
Der Benutzer kann nicht gelöscht werden, da er verwendet wird; er kann aber blockiert werden.
Ungültige E-Mail-Adresse.
Benutzer gelöscht.
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index 3e2cbb2ac..89b64a997 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -318,12 +318,10 @@
Empieza a conversar
- %1$d miembros
- %1$d miembro
- %1$d miembros
- %1$d miembros
- %1$d miembros
- %1$d miembros
+
+ - %d miembro
+ - %d miembros
+
- %d nuevo mensaje
- %d nuevos mensajes
diff --git a/MessengerProj/src/main/res/values-fr/strings.xml b/MessengerProj/src/main/res/values-fr/strings.xml
index c7c1b23c6..ccd9abb9c 100644
--- a/MessengerProj/src/main/res/values-fr/strings.xml
+++ b/MessengerProj/src/main/res/values-fr/strings.xml
@@ -336,12 +336,14 @@
Commencez à converser
- %1$d membre
- %1$d membre
- %1$d membres
- %1$d membres
- %1$d membres
- %1$d membres
+
+ - %d membre
+ - %d membres
+
+
+ - Moi et %d membre
+ - Moi et %d membres
+
- %d nouveau message
- %d nouveaux messages
@@ -476,7 +478,6 @@
Recherche un contact
Nom
Adresse e-mail
- Moi et
Impossible de supprimer les contacts en cours d\'utilisation, bloquez-les à la place.
Mauvaise adresse e-mail.
Utilisateur supprimé.
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 99adb28af..632a10c89 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -318,12 +318,10 @@
Inizia a chattare
- %1$d membri
- %1$d membro
- %1$d membri
- %1$d membri
- %1$d membri
- %1$d membri
+
+ - %d membro
+ - %d membri
+
- %d nuovo messaggio
- %d nuovi messaggi
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index ae993381f..a55bd1d37 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -318,12 +318,10 @@
Begin met chatten
- %1$d leden
- %1$d leden
- %1$d leden
- %1$d leden
- %1$d leden
- %1$d leden
+
+ - %d leden
+ - %d leden
+
- %d nieuw bericht
- %d nieuwe berichten
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 6c97eda39..4b083da4f 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -318,12 +318,10 @@
Comece a conversar
- %1$d membros
- %1$d membro
- %1$d membros
- %1$d membros
- %1$d membros
- %1$d membros
+
+ - %d membro
+ - %d membros
+
- %d nova mensagem
- %d novas mensagens
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index e85aad57b..5a70e9e90 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -338,12 +338,14 @@
Start Messaging
- %1$d members
- %1$d member
- %1$d members
- %1$d members
- %1$d members
- %1$d members
+
+ - %d member
+ - %d members
+
+
+ - Me and %d member
+ - Me and %d members
+
- %d new message
- %d new messages
@@ -478,7 +480,6 @@
Search user
Name
E-mail address
- Me and
Cannot delete users in use, block user instead.
Bad e-mail address.
User deleted.