diff --git a/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict index d6ff53294..b9bea523c 100644 --- a/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/be.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Прачытана %1$@ і %2$d іншымі + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d іншы + few + %d іншыя + many + %d іншых + + common_member_count NSStringLocalizedFormatKey @@ -306,24 +324,6 @@ %1$@, %2$@ і %3$d іншыя - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d іншы - few - %d іншыя - many - %d іншых - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict index 633653651..7e64fda09 100644 --- a/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/bg.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Прочетено от %1$@ и %2$d други + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d друг + other + %d други + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ и %3$d други - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d друг - other - %d други - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict index 6c3a3959e..30fa36904 100644 --- a/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/cs.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Přečetl(a) %1$@ a %2$d dalších + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d další + few + %d další + other + %d dalších + + common_member_count NSStringLocalizedFormatKey @@ -308,24 +326,6 @@ %1$@, %2$@ a %3$d dalších - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d další - few - %d další - other - %d dalších - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict index a1a293113..97c6d3e8d 100644 --- a/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/cy.lproj/Localizable.stringsdict @@ -50,6 +50,30 @@ Wedi'i ddarllen gan %1$@ a %2$d arall + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + zero + %d arall + one + %d arall + two + %d arall + few + %d arall + many + %d arall + other + %d arall + + common_member_count NSStringLocalizedFormatKey @@ -410,30 +434,6 @@ %1$@, %2$@ a %3$d arall - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - zero - %d arall - one - %d arall - two - %d arall - few - %d arall - many - %d arall - other - %d arall - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict index 6ce7634c6..1d8596d23 100644 --- a/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/de.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Gelesen von %1$@ und %2$d anderen + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d weitere + other + %d weitere + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ und %3$d weitere Person - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d weitere - other - %d weitere - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict index de66f8270..9c45c34c4 100644 --- a/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/el.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Διαβάστηκε από %1$@ και %2$d ακόμη + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d ακόμη + other + %d ακόμη + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ και %3$d ακόμη - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d ακόμη - other - %d ακόμη - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict index 31f348283..9aa07f915 100644 --- a/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/en.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Read by %1$@ and %2$d others + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d other + other + %d others + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ and %3$d others - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d other - other - %d others - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict index 374adfd06..4fecff324 100644 --- a/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/es.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Leído por %1$@ y %2$d otros + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d otro + other + %d otros + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ y %3$d otros - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d otro - other - %d otros - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict index 643243c91..5302a7c5c 100644 --- a/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/et.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Seda lugesid %1$@ ja veel %2$d kasutajat + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d muu + other + %d muud + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ ja veel %3$d osalejat - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d muu - other - %d muud - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict index 97010710b..8f832379b 100644 --- a/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/eu.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ %1$@(e)k eta beste %2$d(e)k irakurri dute + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + beste %d + other + beste %d + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@, eta beste %3$d - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - beste %d - other - beste %d - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict index 73c0a1740..4484f6ded 100644 --- a/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/fa.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Read by %1$@ and %2$d others + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d other + other + %d others + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ and %3$d others - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d other - other - %d others - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict index 77970718a..3aa9ec381 100644 --- a/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/fi.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ %1$@ ja %2$d muuta on lukenut viestin + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d muu + other + %d muuta + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ ja %3$d muuta - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d muu - other - %d muuta - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict index e12dce7a4..a5486fb5c 100644 --- a/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/fr.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Lu par %1$@ et %2$d autres + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d autre + other + %d autres + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ et %3$d autres - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d autre - other - %d autres - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict index 405c3a640..eca3b96b2 100644 --- a/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/hu.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Olvasta: %1$@ és még %2$d felhasználó + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d további felhasználó + other + %d további felhasználó + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ és %3$d további felhasználó - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d további felhasználó - other - %d további felhasználó - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict index a8e945392..0cbcf1a10 100644 --- a/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/id.lproj/Localizable.stringsdict @@ -30,6 +30,20 @@ Dibaca oleh %1$@ dan %2$d lainnya + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + other + %d lainnya + + common_member_count NSStringLocalizedFormatKey @@ -240,20 +254,6 @@ %1$@, %2$@, dan %3$d lainnya - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - other - %d lainnya - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict index e14512de8..e9f6d7bb9 100644 --- a/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/it.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Visualizzato da %1$@ e altri %2$d + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d altro + other + altri %d + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ e altri %3$d - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d altro - other - altri %d - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict index 1dc644a80..ede11fadf 100644 --- a/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/ka.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ წაკითხულია %1$@ და %2$d-ს ადამიანის მიერ + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d სხვა + other + %d სხვა + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@%2$@და %3$d სხვა - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d სხვა - other - %d სხვა - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict index dc794bb19..dce0d22ad 100644 --- a/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/lt.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Read by %1$@ and %2$d others + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d other + other + %d others + + common_member_count NSStringLocalizedFormatKey @@ -292,22 +308,6 @@ %1$@, %2$@ and %3$d others - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d other - other - %d others - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict index 890aec201..477a769ea 100644 --- a/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/nb.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Lest av %1$@ og %2$d andre + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d andre + other + %d andre + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ og %3$d andre - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d andre - other - %d andre - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict index 564de20b4..790b265b8 100644 --- a/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/nl.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Gelezen door %1$@ en %2$d anderen + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d andere + other + %d anderen + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ en %3$d anderen - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d andere - other - %d anderen - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict index 98d598d3b..aec248923 100644 --- a/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/pl.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Odczytano przez %1$@ i %2$d innych + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d inny + few + %d innych + many + %d innych + + common_member_count NSStringLocalizedFormatKey @@ -308,24 +326,6 @@ %1$@, %2$@ i %3$d innych - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d inny - few - %d innych - many - %d innych - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict index 18b1f01b1..365bc13ae 100644 --- a/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/pt-BR.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Lido por %1$@ e %2$d outros + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d outro + other + %d outros + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ e %3$d outros - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d outro - other - %d outros - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict index deeac84bc..185d5ec5f 100644 --- a/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/pt.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Lida por %1$@ e %2$d outros + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d outro + other + %d outros + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ e %3$d outros - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d outro - other - %d outros - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict index bd3c7f0c9..7dc1085be 100644 --- a/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/ro.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Citit de %1$@ și incă %2$d + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d altul + few + %d alții + other + %d alții + + common_member_count NSStringLocalizedFormatKey @@ -292,24 +310,6 @@ %1$@, %2$@ și încă %3$d - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d altul - few - %d alții - other - %d alții - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict index b56aa9e5b..93957f660 100644 --- a/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/ru.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Прочитано %1$@ и %2$d другими + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d + few + %d другие + many + %d другие + + common_member_count NSStringLocalizedFormatKey @@ -308,24 +326,6 @@ %1$@, %2$@ и другие %3$d - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d - few - %d другие - many - %d другие - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict index 3cf16f0d9..b3680e1f0 100644 --- a/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/sk.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Prečítal/a %1$@ a %2$d ďalších + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d ďalší + few + %d ďalší + other + %d ďalších + + common_member_count NSStringLocalizedFormatKey @@ -308,24 +326,6 @@ %1$@, %2$@ a %3$d ďalší - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d ďalší - few - %d ďalší - other - %d ďalších - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict index d5e0757e1..36afba3e7 100644 --- a/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/sv.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Läst av %1$@ och %2$d andra + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d annan + other + %d andra + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ och %3$d andra - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d annan - other - %d andra - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict index 2bc964490..d9c155552 100644 --- a/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/tr.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ %1$@ ve %2$d diğer kişi tarafından okundu + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d diğer + other + %d diğer + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ ve %3$d diğer - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d diğer - other - %d diğer - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict index 615806ee5..5f0454370 100644 --- a/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/uk.lproj/Localizable.stringsdict @@ -38,6 +38,24 @@ Прочитано %1$@ та %2$d іншими + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d інший + few + %d інші + many + %d інші + + common_member_count NSStringLocalizedFormatKey @@ -308,24 +326,6 @@ %1$@%2$@ та %3$d інших - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d інший - few - %d інші - many - %d інші - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict index 1f8d3d886..cdfce732b 100644 --- a/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/uz.lproj/Localizable.stringsdict @@ -34,6 +34,22 @@ Read by %1$@ and %2$d others + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d other + other + %d others + + common_member_count NSStringLocalizedFormatKey @@ -274,22 +290,6 @@ %1$@, %2$@ and %3$d others - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d other - other - %d others - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict index 6d36f3522..f1cf5b5b1 100644 --- a/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/zh-Hans.lproj/Localizable.stringsdict @@ -30,6 +30,20 @@ %1$@ 及其他 %2$d 人已读 + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + other + 其他 %d 人 + + common_member_count NSStringLocalizedFormatKey @@ -240,20 +254,6 @@ %1$@，%2$@ 和其他 %3$d 个人 - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - other - 其他 %d 人 - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict b/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict index 8cef424c3..89f8a1d8f 100644 --- a/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict +++ b/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.stringsdict @@ -30,6 +30,20 @@ %1$@ 與其他 %2$d 個人已讀 + common_many_members + + NSStringLocalizedFormatKey + %#@COUNT@ + COUNT + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + other + 其他 %d 個人 + + common_member_count NSStringLocalizedFormatKey @@ -240,20 +254,6 @@ %1$@、%2$@ 和其他 %3$d 個人 - screen_room_typing_many_members_second_component_ios - - NSStringLocalizedFormatKey - %#@COUNT@ - COUNT - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - other - 其他 %d 個人 - - screen_room_typing_notification NSStringLocalizedFormatKey diff --git a/ElementX/Sources/Generated/Strings.swift b/ElementX/Sources/Generated/Strings.swift index a83425e90..e4c60e2d9 100644 --- a/ElementX/Sources/Generated/Strings.swift +++ b/ElementX/Sources/Generated/Strings.swift @@ -433,6 +433,10 @@ internal enum L10n { /// Loading more… internal static var commonLoadingMore: String { return L10n.tr("Localizable", "common_loading_more") } /// Plural format key: "%#@COUNT@" + internal static func commonManyMembers(_ p1: Int) -> String { + return L10n.tr("Localizable", "common_many_members", p1) + } + /// Plural format key: "%#@COUNT@" internal static func commonMemberCount(_ p1: Int) -> String { return L10n.tr("Localizable", "common_member_count", p1) } @@ -2311,10 +2315,6 @@ internal enum L10n { return L10n.tr("Localizable", "screen_room_typing_many_members_first_component_ios", String(describing: p1), String(describing: p2)) } /// Plural format key: "%#@COUNT@" - internal static func screenRoomTypingManyMembersSecondComponentIos(_ p1: Int) -> String { - return L10n.tr("Localizable", "screen_room_typing_many_members_second_component_ios", p1) - } - /// Plural format key: "%#@COUNT@" internal static func screenRoomTypingNotification(_ p1: Int) -> String { return L10n.tr("Localizable", "screen_room_typing_notification", p1) } diff --git a/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift b/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift index 358df2343..4fa0240f7 100644 --- a/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift +++ b/ElementX/Sources/Mocks/RoomSummaryProviderMock.swift @@ -78,6 +78,7 @@ extension RoomSummary { isDirect: false, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: AttributedString("I do not wish to take the trouble to understand mysticism"), lastMessageDate: .mock, unreadMessagesCount: 0, @@ -101,6 +102,7 @@ extension Array where Element == RoomSummary { isDirect: false, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: AttributedString("I do not wish to take the trouble to understand mysticism"), lastMessageDate: .mock, unreadMessagesCount: 0, @@ -119,6 +121,7 @@ extension Array where Element == RoomSummary { isDirect: false, avatarURL: .mockMXCAvatar, heroes: [], + activeMembersCount: 0, lastMessage: AttributedString("How do you see the Emperor then? You think he keeps office hours?"), lastMessageDate: .mock, unreadMessagesCount: 2, @@ -137,6 +140,7 @@ extension Array where Element == RoomSummary { isDirect: false, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: try? AttributedString(markdown: "He certainly seemed no *mental genius* to me"), lastMessageDate: .mock, unreadMessagesCount: 3, @@ -155,6 +159,7 @@ extension Array where Element == RoomSummary { isDirect: false, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: AttributedString("There's an archaic measure of time that's called the month"), lastMessageDate: .mock, unreadMessagesCount: 2, @@ -173,6 +178,7 @@ extension Array where Element == RoomSummary { isDirect: true, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: AttributedString("Clearly, if Earth is powerful enough to do that, it might also be capable of adjusting minds in order to force belief in its radioactivity"), lastMessageDate: .mock, unreadMessagesCount: 1, @@ -191,6 +197,7 @@ extension Array where Element == RoomSummary { isDirect: true, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: AttributedString("Are you groping for the word 'paranoia'?"), lastMessageDate: .mock, unreadMessagesCount: 6, @@ -209,6 +216,7 @@ extension Array where Element == RoomSummary { isDirect: false, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, @@ -260,6 +268,7 @@ extension Array where Element == RoomSummary { isDirect: false, avatarURL: .mockMXCAvatar, heroes: [], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, @@ -278,6 +287,7 @@ extension Array where Element == RoomSummary { isDirect: true, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift index bfe2e6789..65d1b34d4 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift @@ -206,6 +206,7 @@ private extension HomeScreenRoom { isDirect: true, avatarURL: nil, heroes: [.init(userID: "@someone:somewhere.com")], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, @@ -234,6 +235,7 @@ private extension HomeScreenRoom { isDirect: false, avatarURL: avatarURL, heroes: [.init(userID: "@someone:somewhere.com")], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift index 47a494e68..f70ed74c9 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift @@ -151,6 +151,7 @@ private extension HomeScreenRoom { isDirect: true, avatarURL: nil, heroes: [.init(userID: "@someone:somewhere.com")], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, @@ -179,6 +180,7 @@ private extension HomeScreenRoom { isDirect: false, avatarURL: avatarURL, heroes: [.init(userID: "@someone:somewhere.com")], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0, diff --git a/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift b/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift index 14f696a2f..68f8e0235 100644 --- a/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift +++ b/ElementX/Sources/Screens/Timeline/View/TypingIndicatorView.swift @@ -48,7 +48,7 @@ struct TypingIndicatorView: View { let lastMember = typingMembers.members[1] Text(L10n.tr("Localizable", "screen_room_typing_many_members_first_component_ios", firstMember, lastMember)).bold() + - Text(L10n.tr("Localizable", "screen_room_typing_many_members_second_component_ios", typingMembers.members.count - 2)).bold() + + Text(L10n.tr("Localizable", "common_many_members", typingMembers.members.count - 2)).bold() + Text(L10n.screenRoomTypingNotificationPluralIos) default: if didShowTextOnce { diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift index d6ca56907..da50d29ba 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift @@ -38,7 +38,10 @@ struct RoomSummary { let name: String let isDirect: Bool let avatarURL: URL? + let heroes: [UserProfileProxy] + let activeMembersCount: UInt + let lastMessage: AttributedString? let lastMessageDate: Date? let unreadMessagesCount: UInt @@ -81,7 +84,18 @@ extension RoomSummary: CustomStringConvertible { return alias } - return heroes.compactMap(\.displayName).formatted(.list(type: .and)) + guard heroes.count > 0 else { + return "" + } + + var heroComponents = heroes.compactMap(\.displayName) + + let othersCount = Int(activeMembersCount) - heroes.count + if othersCount > 0 { + heroComponents.append(L10n.commonManyMembers(othersCount)) + } + + return heroComponents.formatted(.list(type: .and)) } } @@ -93,7 +107,10 @@ extension RoomSummary { name = string isDirect = true avatarURL = nil + heroes = [] + activeMembersCount = 0 + lastMessage = AttributedString(string) lastMessageDate = .mock unreadMessagesCount = hasUnreadMessages ? 1 : 0 diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift index e06d62fc9..d8cfb79a3 100644 --- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift +++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProvider.swift @@ -270,6 +270,7 @@ class RoomSummaryProvider: RoomSummaryProviderProtocol { isDirect: roomInfo.isDirect, avatarURL: roomInfo.avatarUrl.flatMap(URL.init(string:)), heroes: roomInfo.heroes.map(UserProfileProxy.init), + activeMembersCount: UInt(roomInfo.activeMembersCount), lastMessage: attributedLastMessage, lastMessageDate: lastMessageDate, unreadMessagesCount: UInt(roomInfo.numUnreadMessages), diff --git a/UnitTests/Sources/HomeScreenRoomTests.swift b/UnitTests/Sources/HomeScreenRoomTests.swift index cc9d37805..7d292378d 100644 --- a/UnitTests/Sources/HomeScreenRoomTests.swift +++ b/UnitTests/Sources/HomeScreenRoomTests.swift @@ -27,6 +27,7 @@ class HomeScreenRoomTests: XCTestCase { isDirect: false, avatarURL: nil, heroes: [], + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: unreadMessagesCount, diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift index ed02b2134..3de5ba64f 100644 --- a/UnitTests/Sources/LoggingTests.swift +++ b/UnitTests/Sources/LoggingTests.swift @@ -85,6 +85,7 @@ class LoggingTests: XCTestCase { isDirect: true, avatarURL: nil, heroes: [.init(userID: "", displayName: heroName)], + activeMembersCount: 0, lastMessage: AttributedString(lastMessage), lastMessageDate: .mock, unreadMessagesCount: 0, diff --git a/UnitTests/Sources/RoomSummaryTests.swift b/UnitTests/Sources/RoomSummaryTests.swift index b5bc09329..0226d1756 100644 --- a/UnitTests/Sources/RoomSummaryTests.swift +++ b/UnitTests/Sources/RoomSummaryTests.swift @@ -61,6 +61,7 @@ class RoomSummaryTests: XCTestCase { isDirect: isDirect, avatarURL: hasRoomAvatar ? roomDetails.avatarURL : nil, heroes: heroes, + activeMembersCount: 0, lastMessage: nil, lastMessageDate: nil, unreadMessagesCount: 0,