Merge branch 'release/0.16.3/master'

CHANGES.md

@@ -1,3 +1,11 @@
+## Changes in 0.16.3 (2021-09-28)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.3](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.3)).
+- Exposed new room name localizable string to use for empty direct messages. ([#4717](https://github.com/vector-im/element-ios/issues/4717))
+
+
 ## Changes in 0.16.2 (2021-09-24)
 
 ✨ Features

MatrixKit.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.16.2"
+  s.version      = "0.16.3"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.20.2"
+  s.dependency 'MatrixSDK', "= 0.20.3"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'

MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings

@@ -124,7 +124,7 @@
 "notice_room_history_visible_to_members_from_invited_point_for_dm" = "%@ hat den zukünftigen Verlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
 "notice_room_history_visible_to_members_from_joined_point" = "%@ hat den zukünftigen Raumverlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
 "notice_room_history_visible_to_members_from_joined_point_for_dm" = "%@ hat den zukünftigen Verlauf für alle Raumteilnehmer ab deren Einladung sichtbar gemacht.";
-"notice_crypto_unable_to_decrypt" = "** Kann nicht entschlüsseln: %@ **";
+"notice_crypto_unable_to_decrypt" = "** Entschlüsselung nicht möglich: %@ **";
 "notice_crypto_error_unknown_inbound_session_id" = "Die Sitzung des Absenders hat uns keine Schlüssel für diese Nachricht gesendet.";
 "notice_sticker" = "Aufkleber";
 "notice_in_reply_to" = "Als Antwort auf";
@@ -204,7 +204,7 @@
 // Room
 "room_please_select" = "Bitte wähle einen Raum";
 "room_error_join_failed_title" = "Konnte Raum nicht betreten";
-"room_error_join_failed_empty_room" = "Leeren Raum erneut betreten derzeit nicht möglich.";
+"room_error_join_failed_empty_room" = "Es ist aktuell nicht möglich einen leeren Raum zu betreten.";
 "room_error_name_edition_not_authorized" = "Du bist nicht authorisiert den Raumnamen zu ändern";
 "room_error_topic_edition_not_authorized" = "Du bist nicht authorisiert das Raumthema zu ändern";
 "room_error_cannot_load_timeline" = "Konnte Verlauf nicht laden";
@@ -301,7 +301,7 @@
 "notice_room_ban" = "%@ sperrte %@";
 "notice_room_withdraw" = "%@ hat %@s Einladung zurückgezogen";
 "notice_room_reason" = ". Grund: %@";
-"notice_avatar_url_changed" = "%@ hat seinen Avatar geändert";
+"notice_avatar_url_changed" = "%@ hat den eigenen Avatar geändert";
 "notice_display_name_set" = "%@ setzte den Anzeigenamen auf %@";
 "notice_display_name_changed_from" = "%@ änderte den Anzeigenamen von %@ auf %@";
 "notice_display_name_removed" = "%@ hat den Anzeigenamen entfernt";

MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings

@@ -158,6 +158,7 @@
 "room_displayname_empty_room" = "Empty room";
 "room_displayname_two_members" = "%@ and %@";
 "room_displayname_more_than_two_members" = "%@ and %@ others";
+"room_displayname_all_other_participants_left" = "%@ (Left)";
 
 // Settings
 "settings" = "Settings";

MatrixKit/Assets/MatrixKitAssets.bundle/et.lproj/MatrixKit.strings

@@ -227,7 +227,7 @@
 // Room
 "room_please_select" = "Palun vali jututuba";
 "room_error_join_failed_title" = "Jututoaga liitumine ei õnnestunud";
-"room_error_join_failed_empty_room" = "Hetkel ei ole võimalik uuesti liituda tühja jututoaga.";
+"room_error_join_failed_empty_room" = "Hetkel ei ole võimalik liituda tühja jututoaga.";
 "room_error_timeline_event_not_found_title" = "Asukoha laadimine ajajoonel ei õnnestunud";
 "room_error_timeline_event_not_found" = "Rakendus üritas laadida teatud hetke selle jututoa ajajoonelt, kuid ei suutnud seda leida";
 "room_left" = "Sa lahkusid jututoast";

MatrixKit/Assets/MatrixKitAssets.bundle/hu.lproj/MatrixKit.strings

@@ -173,7 +173,7 @@
 // Room
 "room_please_select" = "Kérlek válassz szobát";
 "room_error_join_failed_title" = "A szobához való csatlakozás nem sikerült";
-"room_error_join_failed_empty_room" = "Üres szobába jelenleg nem lehet újra belépni.";
+"room_error_join_failed_empty_room" = "Üres szobába jelenleg nem lehet belépni.";
 "room_error_name_edition_not_authorized" = "A szoba nevének megváltoztatásához nincs jogosultságod";
 "room_event_encryption_verify_message" = "Ennek a munkamenet hitelességének a vizsgálatához vedd fel a kapcsolatot a tulajdonossal egy másik csatornán (pl. személyes találkozó vagy telefonhívás) és kérdezd meg, hogy amit ő lát a személyes beállításoknál mint a munkamenethez tartozó kulcs, az megegyezik az alábbi kulccsal:\n\n\tMunkamenet neve: %@\n\tMunkamenet azonosító: %@\n\tMunkamenet kulcs: %@\n\nHa egyezik akkor nyomd meg az ellenőrizve gombot alább. Ha nem egyezik, akkor valaki jogosulatlanul akarja használni a munkamenetet; talán a legjobb, ha a tiltólista gombot nyomod meg inkább.\n\nA jövőben ezen az ellenőrzési módon javítani fogunk.";
 "account_email_validation_message" = "Ellenőrizd a leveleidet, és kattints a levélben lévő hivatkozásra. Ha az megvan, akkor kattints itt a tovább gombra.";

MatrixKit/Assets/MatrixKitAssets.bundle/it.lproj/MatrixKit.strings

@@ -188,7 +188,7 @@
 // Room
 "room_please_select" = "Seleziona un canale";
 "room_error_join_failed_title" = "Accesso al canale fallito";
-"room_error_join_failed_empty_room" = "Non è possibile al momento rientrare in un canale senza partecipanti.";
+"room_error_join_failed_empty_room" = "Al momento non è possibile entrare in una stanza vuota.";
 "room_error_name_edition_not_authorized" = "Non sei autorizzato a modificare il nome di questo canale";
 "room_error_topic_edition_not_authorized" = "Non sei autorizzato a modificare l'argomento di questo canale";
 "room_error_cannot_load_timeline" = "Caricamento storico dei messaggi fallito";

MatrixKit/Assets/MatrixKitAssets.bundle/nl.lproj/MatrixKit.strings

@@ -193,7 +193,7 @@
 // Room
 "room_please_select" = "Selecteer een gesprek";
 "room_error_join_failed_title" = "Toetreden tot het gesprek is mislukt";
-"room_error_join_failed_empty_room" = "Het is momenteel niet mogelijk om opnieuw tot een leeg gesprek toe te treden.";
+"room_error_join_failed_empty_room" = "Het is momenteel niet mogelijk om tot een leeg gesprek toe te treden.";
 "room_error_name_edition_not_authorized" = "U bent niet bevoegd om de naam van dit gesprek te wijzigen";
 "room_error_topic_edition_not_authorized" = "U bent niet bevoegd om het onderwerp van dit gesprek te wijzigen";
 "room_error_cannot_load_timeline" = "Laden van tijdslijn is mislukt";

MatrixKit/Assets/MatrixKitAssets.bundle/pt_BR.lproj/MatrixKit.strings

@@ -187,7 +187,7 @@
 // Room
 "room_please_select" = "Por favor selecione uma sala";
 "room_error_join_failed_title" = "Falha para se juntar a sala";
-"room_error_join_failed_empty_room" = "Não é atualmente possível se rejuntar a uma sala vazia.";
+"room_error_join_failed_empty_room" = "Não é atualmente possível se juntar a uma sala vazia.";
 "room_error_name_edition_not_authorized" = "Você não está autorizada(o) a editar o nome deste sala";
 "room_error_topic_edition_not_authorized" = "Você não está autorizada(o) a editar o tópico desta sala";
 "room_error_cannot_load_timeline" = "Falha para carregar timeline";

MatrixKit/Assets/MatrixKitAssets.bundle/ru.lproj/MatrixKit.strings

@@ -227,7 +227,7 @@
 "room_creation_alias_placeholder" = "(напр. #foo:primer.ru)";
 "room_creation_alias_placeholder_with_homeserver" = "(напр. #foo%@)";
 "room_creation_participants_placeholder" = "(напр. @boris:homeserver1; @ivan:homeserver2...)";
-"room_error_join_failed_empty_room" = "В настоящее время невозможно перезайти в пустую комнату.";
+"room_error_join_failed_empty_room" = "В настоящее время невозможно присоединиться в пустую комнату.";
 "room_error_name_edition_not_authorized" = "У вас нет прав на редактирование названия этой комнаты";
 "room_error_topic_edition_not_authorized" = "У вас нет прав редактировать тему этой комнаты";
 "room_error_cannot_load_timeline" = "Не удалось загрузить хронологию";

MatrixKit/Assets/MatrixKitAssets.bundle/sq.lproj/MatrixKit.strings

@@ -153,10 +153,10 @@
 "room_left" = "Dolët prej dhomës";
 // Attachment
 "attachment_size_prompt" = "Doni të dërgohet si:";
-"attachment_original" = "Madhësi Faktike: %@";
-"attachment_small" = "E vogël: %@";
-"attachment_medium" = "E mesme: %@";
-"attachment_large" = "E madhe: %@";
+"attachment_original" = "Madhësi Faktike (%@)";
+"attachment_small" = "E vogël (~ %@)";
+"attachment_medium" = "Mesatare (~%@)";
+"attachment_large" = "E madhe (~ %@)";
 "attachment_cancel_download" = "Të anulohet shkarkimi?";
 "attachment_cancel_upload" = "Të anulohet ngarkimin?";
 "attachment_multiselection_size_prompt" = "Doni të dërgoni figura si:";
@@ -327,7 +327,7 @@
 "account_email_validation_error" = "S’arrihet të verifikohet adresë email. Ju lutemi, kontrolloni email-in tuaj dhe klikoni mbi lidhjen që përmban. Pasi të jetë bërë kjo, klikoni që të vazhdohet";
 "account_msisdn_validation_message" = "Kemi dërguar një SMS me një kod aktivizimi. Ju lutemi, jepeni këtë kod më poshtë.";
 "room_creation_participants_placeholder" = "(p.sh. @mane:homeserver1; @taku:homeserver2...)";
-"room_error_join_failed_empty_room" = "Hëpërhë s’është e mundur të rihyhet në një dhomë të zbrazët.";
+"room_error_join_failed_empty_room" = "Hëpërhë s’është e mundur të hyhet në një dhomë të zbrazët.";
 "room_error_timeline_event_not_found" = "Aplikacioni u rrek të ngarkonte një pikë të dhënë prej rrjedhës kohore në këtë dhomë, por s’qe në gjendje ta gjente";
 "room_no_power_to_create_conference_call" = "Ju duhen leje për ftesa, që të nisni një konferencë në këtë dhomë";
 "room_no_conference_call_in_encrypted_rooms" = "Thirrjet konferencë nuk mbulohen në dhoma të fshehtëzuara";

MatrixKit/Assets/MatrixKitAssets.bundle/uk.lproj/MatrixKit.strings

@@ -352,3 +352,45 @@
 "notice_feedback" = "Подія відгуку (id: %@): %@";
 "notice_room_related_groups" = "Групи пов'язані з цією кімнатою: %@";
 "notice_room_power_level_acting_requirement" = "Мінімальний рівень повноважень користувача для виконання дії:";
+"notification_settings_by_default" = "Типово...";
+"membership_leave" = "Виходить";
+"notice_redaction_by_you" = "Ви відредагували подію (id: %@)";
+"notice_encryption_enabled_unknown_algorithm_by_you" = "Ви ввімкнули наскрізне шифрування (нерозпізнаний алгоритм %@).";
+"notice_encryption_enabled_ok_by_you" = "Ви ввімкнули наскрізне шифрування.";
+"notice_room_created_by_you_for_dm" = "Ви приєдналися.";
+"notice_room_third_party_revoked_invite_by_you_for_dm" = "Ви відкликали запрошення для %@";
+"notice_room_third_party_revoked_invite_by_you" = "Ви відкликали запрошення приєднатися до кімнати для %@";
+"notice_room_third_party_registered_invite_by_you" = "Ви прийняли запрошення для %@";
+"notice_room_withdraw_by_you" = "Ви анулювали запрошення для %@";
+"notice_room_reject_by_you" = "Ви відхилили запрошення";
+"notice_room_third_party_invite_by_you" = "Ви надіслали запрошення приєднатися до кімнати для %@";
+"notice_room_name_changed_for_dm" = "%@ змінює назву на %@.";
+"notice_room_name_changed" = "%@ змінює назву кімнати на %@.";
+"notice_topic_changed" = "%@ змінює тему на «%@».";
+"notice_display_name_removed" = "%@ вилучає своє показуване ім'я";
+"notice_display_name_changed_from" = "%@ змінює своє показуване ім'я з %@ на %@";
+"notice_display_name_set" = "%@ встановлює своїм показуваним іменем %@";
+"notice_room_withdraw" = "%@ анульовує запрошення для %@";
+"notice_room_kick" = "%@ викидає %@";
+"notice_room_reject" = "%@ відхиляє запрошення";
+"notice_room_leave" = "%@ виходить";
+"notice_room_join" = "%@ приєднується";
+"notice_room_third_party_revoked_invite_for_dm" = "%@ відкликає запрошення для %@";
+"notice_room_third_party_revoked_invite" = "%@ відкликає запрошення приєднатися до кімнати для %@";
+"notice_room_third_party_invite" = "%@ надсилає запрошення приєднатися до кімнати для %@";
+"microphone_access_not_granted_for_voice_message" = "Для голосових повідомлень потрібен доступ до мікрофона, але %@ не має дозволу на його використання";
+"microphone_access_not_granted_for_call" = "Для викликів потрібен доступ до мікрофона, але %@ не має дозволу на його використання";
+
+// Permissions
+"camera_access_not_granted_for_call" = "Для відеовикликів потрібен доступ до камери, але %@ не має дозволу на її використання";
+"language_picker_default_language" = "Типово (%@)";
+
+// Language picker
+"language_picker_title" = "Виберіть мову";
+
+// Country picker
+"country_picker_title" = "Виберіть країну";
+"notice_room_join_by_you" = "Ви приєдналися";
+"notice_room_leave_by_you" = "Ви вийшли";
+"room_left_for_dm" = "Ви вийшли";
+"room_left" = "Ви вийшли з кімнати";

MatrixKit/Assets/MatrixKitAssets.bundle/zh_Hans.lproj/MatrixKit.strings

@@ -250,7 +250,7 @@
 "room_creation_participants_title" = "成员：";
 "room_creation_alias_placeholder_with_homeserver" = "（例如：#foo%@）";
 "room_creation_alias_placeholder" = "（例如：#foo:example.org）";
-"room_error_join_failed_empty_room" = "目前无法重新加入空聊天室。";
+"room_error_join_failed_empty_room" = "目前无法加入空聊天室。";
 "room_error_name_edition_not_authorized" = "你没有修改聊天室名称所需的权限";
 "room_error_topic_edition_not_authorized" = "你没有修改聊天室话题所需的权限";
 // Room members

MatrixKit/MatrixKitVersion.m

@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixKitVersion = @"0.16.2";
+NSString *const MatrixKitVersion = @"0.16.3";

MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizations.h

@@ -21,10 +21,6 @@
 /**
  The `MXKRoomNameStringLocalizations` implements localization strings for `MXRoomNameStringsLocalizable`.
  */
-@interface MXKRoomNameStringLocalizations : NSObject<MXRoomNameStringsLocalizable>
-
-@property (copy, readonly, nonnull) NSString *emptyRoom;
-@property (copy, readonly, nonnull) NSString *twoMembers;
-@property (copy, readonly, nonnull) NSString *moreThanTwoMembers;
+@interface MXKRoomNameStringLocalizations : NSObject <MXRoomNameStringsLocalizable>
 
 @end

MatrixKit/Utils/EventFormatter/MXKRoomNameStringLocalizations.m

@@ -18,6 +18,15 @@
 
 #import "NSBundle+MatrixKit.h"
 
+@interface MXKRoomNameStringLocalizations ()
+
+@property (nonatomic, copy) NSString *emptyRoom;
+@property (nonatomic, copy) NSString *twoMembers;
+@property (nonatomic, copy) NSString *moreThanTwoMembers;
+@property (nonatomic, copy) NSString *allOtherParticipantsLeft;
+
+@end
+
 @implementation MXKRoomNameStringLocalizations
 
 - (instancetype)init
@@ -28,6 +37,7 @@ - (instancetype)init
         _emptyRoom = [NSBundle mxk_localizedStringForKey:@"room_displayname_empty_room"];
         _twoMembers = [NSBundle mxk_localizedStringForKey:@"room_displayname_two_members"];
         _moreThanTwoMembers = [NSBundle mxk_localizedStringForKey:@"room_displayname_more_than_two_members"];
+        _allOtherParticipantsLeft = [NSBundle mxk_localizedStringForKey:@"room_displayname_all_other_participants_left"];
     }
     return self;
 }

Podfile

@@ -8,7 +8,7 @@ abstract_target 'MatrixKitSamplePods' do
 
     # Different flavours of pods to Matrix SDK
     # The tagged version on which this version of MatrixKit has been built
-    pod 'MatrixSDK', '= 0.20.2'
+    pod 'MatrixSDK', '= 0.20.3'
 
     # The lastest release available on the CocoaPods repository
     #pod 'MatrixSDK'

Podfile.lock

@@ -39,9 +39,9 @@ PODS:
   - JSQSystemSoundPlayer (2.0.1)
   - libbase58 (0.1.4)
   - libPhoneNumber-iOS (0.9.15)
-  - MatrixSDK (0.20.2):
-    - MatrixSDK/Core (= 0.20.2)
-  - MatrixSDK/Core (0.20.2):
+  - MatrixSDK (0.20.3):
+    - MatrixSDK/Core (= 0.20.3)
+  - MatrixSDK/Core (0.20.3):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -64,7 +64,7 @@ DEPENDENCIES:
   - HPGrowingTextView (~> 1.1)
   - JSQMessagesViewController (~> 7.3.5)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.20.2)
+  - MatrixSDK (= 0.20.3)
 
 SPEC REPOS:
   trunk:
@@ -94,11 +94,11 @@ SPEC CHECKSUMS:
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
-  MatrixSDK: bf3ebecbe643273c4439367175ccd4e5307831c8
+  MatrixSDK: de1158691a3b3bfb0cc7a294f358f9def3d3cd9c
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
   SwiftyBeaver: 84069991dd5dca07d7069100985badaca7f0ce82
 
-PODFILE CHECKSUM: 79ff8ad84a5bd5e3d7695273a889c5008a769709
+PODFILE CHECKSUM: 7ea8bc6bb3b9bf004857ffc9a7b1d0835afc8b9a
 
 COCOAPODS: 1.10.1