Skip to content

Commit

Permalink
Merge branch 'release/1.4.7/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
SBiOSoftWhare committed Jul 22, 2021
2 parents b56890c + 1cc23c6 commit 45dfecd
Show file tree
Hide file tree
Showing 13 changed files with 260 additions and 57 deletions.
27 changes: 27 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
Changes in 1.4.7 (2021-07-22)
=================================================

✨ Features
*

🙌 Improvements
*

🐛 Bugfix
*

⚠️ API Changes
*

🗣 Translations
*

🧱 Build
*

Others
*

Improvements:
* Upgrade MatrixKit version ([v0.15.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.15.5)).

Changes in 1.4.6 (2021-07-16)
=================================================

Expand Down
4 changes: 2 additions & 2 deletions Config/AppIdentifiers.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ APPLICATION_GROUP_IDENTIFIER = group.im.vector
APPLICATION_SCHEME = element

// Version
MARKETING_VERSION = 1.4.6
CURRENT_PROJECT_VERSION = 1.4.6
MARKETING_VERSION = 1.4.7
CURRENT_PROJECT_VERSION = 1.4.7


// Team
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use_frameworks!
# - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
#
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
$matrixKitVersion = '= 0.15.4'
$matrixKitVersion = '= 0.15.5'
# $matrixKitVersion = :local
# $matrixKitVersion = {'develop' => 'develop'}

Expand Down
26 changes: 13 additions & 13 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@ PODS:
- MatomoTracker (7.4.1):
- MatomoTracker/Core (= 7.4.1)
- MatomoTracker/Core (7.4.1)
- MatrixKit (0.15.4):
- MatrixKit (0.15.5):
- Down (~> 0.11.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixKit/Core (= 0.15.4)
- MatrixSDK (= 0.19.4)
- MatrixKit/Core (0.15.4):
- MatrixKit/Core (= 0.15.5)
- MatrixSDK (= 0.19.5)
- MatrixKit/Core (0.15.5):
- Down (~> 0.11.0)
- DTCoreText (~> 1.6.25)
- HPGrowingTextView (~> 1.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.19.4)
- MatrixSDK (0.19.4):
- MatrixSDK/Core (= 0.19.4)
- MatrixSDK/Core (0.19.4):
- MatrixSDK (= 0.19.5)
- MatrixSDK (0.19.5):
- MatrixSDK/Core (= 0.19.5)
- MatrixSDK/Core (0.19.5):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- OLMKit (~> 3.2.4)
- Realm (= 10.7.6)
- SwiftyBeaver (= 1.9.5)
- MatrixSDK/JingleCallStack (0.19.4):
- MatrixSDK/JingleCallStack (0.19.5):
- JitsiMeetSDK (= 3.5.0)
- MatrixSDK/Core
- OLMKit (3.2.4):
Expand Down Expand Up @@ -120,7 +120,7 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- MatomoTracker (~> 7.4.1)
- MatrixKit (= 0.15.4)
- MatrixKit (= 0.15.5)
- MatrixSDK
- MatrixSDK/JingleCallStack
- OLMKit
Expand Down Expand Up @@ -196,8 +196,8 @@ SPEC CHECKSUMS:
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
MatrixKit: 477690d6dd38b1526042f8e83ff34e3db87e3a00
MatrixSDK: 0c9d1845a45d71abcfcabe82b706cadbda1297ae
MatrixKit: 7606227237cf58c1a1a2235547222c5d75b464c4
MatrixSDK: 9fa30f9ca2504c4251b99212dcf4ff569bbf45b1
OLMKit: 2d73cd67d149b5c3e3a8eb8ecae93d0b429d8a02
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
Realm: ed860452717c8db8f4bf832b6807f7f2ce708839
Expand All @@ -211,6 +211,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 2b61b852a5b62fbb75643a30281e362fd4566f12
PODFILE CHECKSUM: 6e4ab90565384faccee0cb985abe05663c36f517

COCOAPODS: 1.10.1
85 changes: 85 additions & 0 deletions Riot/Assets/ar.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,88 @@
"room_participants_filter_room_members_for_dm" = "تَصفِيَةُ الأعضَاء";
"room_participants_filter_room_members" = "تَصفِيَةُ أعضَاءِ الغُرفَة";
"room_participants_invite_prompt_msg" = "هَل أنتَ مُتَأكِّدٌ أنَّكَ تٌريدُ دَعوةَ %@ إلَى هَذِهِ المُحادَثَة؟";
"room_event_action_reaction_show_less" = "إظهَارُ أقَل";
"room_event_action_reaction_show_all" = "إظهَارُ الكُل";
"room_event_action_edit" = "تَحرِير";
"room_event_action_reply" = "الرَّدّ";
"room_event_action_view_encryption" = "مَعلُومَاتُ التَّعمِيَة";
"room_event_action_cancel_download" = "إلغَاءُ التَّنزيل";
"room_event_action_cancel_send" = "إلغَاءُ الإرسَال";
"room_event_action_delete_confirmation_message" = "هَل أنتَ مُتَأكِّدٌ أنَّكَ تٌريدُ حَذفَ هَذِهِ الرِّسَالَةَ غَيرِ المُرسَلَة؟";
"room_event_action_delete_confirmation_title" = "حَذفُ الرَّسَائِلِ غَيرِ المُرسَلَة";
"room_event_action_delete" = "حَذف";
"room_event_action_resend" = "إعادَةُ الإرسَال";
"room_event_action_save" = "حِفظ";
"room_event_action_report_prompt_ignore_user" = "هَل تُريدُ إخفَاءَ جَميعِ الرَّسَائِلِ مِن هَذَا المُستَخدِم؟";
"room_event_action_ban_prompt_reason" = "سَبَبُ حَظْرِ هَذَا المُستَخدِم";
"room_event_action_kick_prompt_reason" = "سَبَبُ طَردِ هَذَا المُستَخدِم";
"room_event_action_report_prompt_reason" = "سَبَبُ الإبلَاغِ عَن هَذَا المُحتَوى";
"room_event_action_report" = "التَّبلِيغُ عَنِ المُحتَوَى";
"room_event_action_view_decrypted_source" = "الاِطِّلاعُ عَلَى المَصدَرِ مَفكُوكِ التَّعميَة";
"room_event_action_view_source" = "الاِطِّلاعُ عَلَى المَصدَر";
"room_event_action_permalink" = "رَابِطٌ دَائِم";
"room_event_action_share" = "مُشارَكَة";
"room_event_action_more" = "مَزيد";
"room_event_action_redact" = "إزالَة";
"room_event_action_quote" = "اِقتِبَاس";
"room_event_action_copy" = "نَسخ";
"room_delete_unsent_messages" = "حَذفُ الرَّسائِلِ غَيرِ المُرسَلَة";
"room_resend_unsent_messages" = "إعادَةُ إرسَالِ الرَّسائِلِ غَيرِ المُرسَلَة";
"room_prompt_cancel" = "إلغَاءُ الكُل";
"room_prompt_resend" = "إعادَةُ إرسَالِ الكُل";
"room_conference_call_no_power" = "تَحتَاجُ إلَى إذنٍ لِإدَارَةِ مُكالَمَةِ اِجتِمَاعٍ فِي هَذِهِ الغُرفَة";
"room_ongoing_conference_call_with_close" = "مُكالَمَةُ اِجتِمَاعٍ مُستَمِرَّة. الاِنضِمَامُ كَـ%@ أَو %@. %@ها.";
"room_ongoing_conference_call_close" = "إِغلَاق";
"room_ongoing_conference_call" = "مُكالَمَةُ اِجتِمَاعٍ مُستَمِرَّة. الاِنضِمَامُ كَـ%@ أَو %@.";
"room_unsent_messages_cancel_message" = "هَل أنتَ مُتَأكِّدٌ أنَّكَ تٌريدُ حَذفَ جَميعِ الرَّسائِلِ غَيرِ المُرسَلَةِ فِي هَذِهِ الغُرفَة؟";
"room_unsent_messages_cancel_title" = "حَذفُ الرَّسائِلِ غَيرِ المُرسَلَة";
"room_unsent_messages_unknown_devices_notification" = "فَشَلَ إرسَالُ الرَّسائِلِ بِسَبَبِ جَلسَاتٍ حَاليةٍ غَيرِ مَعرُوفَة.";
"room_unsent_messages_notification" = "فَشَلَ إرسَالُ الرَّسائِل.";
"room_offline_notification" = "فُقِدَ الاِتِّصَالُ بِالخَادِم.";
"room_message_reply_to_short_placeholder" = "إرسَالُ رَدّ…";
"room_message_short_placeholder" = "إرسَالُ رِسَالَة…";
"room_participants_security_information_room_encrypted_for_dm" = "الرَّسائِلُ هُنا مُعمَاةٌ مِنَ النِّهايَةِ إلَى النِّهايَةِ. \n\nيَتِمُ تَأمينُ رَسائِلَكَ بِأقفَال، فَقَط أنتَ وَالمُستَلِمُ مَن لَديهِم مِفتَاحَينِ فَريدَينِ لِفتحِهَا.";
"room_participants_security_information_room_encrypted" = "الرَّسائِلُ فِي هَذِهِ الغُرفَة مُعمَاةٌ مِنَ النِّهايَةِ إلَى النِّهايَةِ. \n\nيَتِمُ تَأمينُ رَسائِلَكَ بِأقفَال، فَقَط أنتَ وَالمُستَلِمُ مَن لَديهِم مِفتَاحَينِ فَريدَينِ لِفتحِهَا.";
"room_participants_security_information_room_not_encrypted_for_dm" = "الرَّسائِلُ هُنا لَيسَت مُعمَاةً مِنَ النِّهايَةِ إلَى النِّهايَةِ.";
"room_participants_security_information_room_not_encrypted" = "الرَّسائِلُ فِي هَذِهِ الغُرفَة لَيسَت مُعمَاةً مِنَ النِّهايَةِ إلَى النِّهايَةِ.";
"encrypted_room_message_reply_to_placeholder" = "إرسَالُ رَدٍّ مُعمَى…";
"encrypted_room_message_placeholder" = "إرسَالُ رِسَالَةٍ مُعمَاة…";
"room_do_not_have_permission_to_post" = "لَيسَ لَديكَ إذنٌ بِالنَّشرِ فِي هَذِهِ الغُرفَة";
"room_message_editing" = "التَّحرِير";
"room_message_replying_to" = "الرَّدُّ عَلَى %@";
"room_message_unable_open_link_error_message" = "يَتَعَذَّرُ فَتحُ الرَّابِط.";
"room_message_reply_to_placeholder" = "إرسَالُ رَدّ (غَيرُ مُعَمَى)…";
"room_message_placeholder" = "إرسَالُ رِسَالَة (غَيرُ مُعَمَاة)…";
"room_many_users_are_typing" = "إنَّ %@، %@ وَآخَرُونَ يَكتُبُون…";
"room_two_users_are_typing" = "إنَّ %@ وَ %@ يَكتُبَان…";
"room_one_user_is_typing" = "إنَّ %@ يَكتُب…";
"room_new_messages_notification" = "عَدَدُ %d رَسَائِلَ جَدِيدَة";
"room_new_message_notification" = "عَدَدُ %d رِسَالَةً جَدِيدَة";
"room_accessiblity_scroll_to_bottom" = "التَّمرِيرُ إلَى الأَسفَل";
"room_jump_to_first_unread" = "القَفزُ إلَى غَيرِ المَقرُوء";

// Chat
"room_slide_to_end_group_call" = "مَرِّرِ لِإنهَاءِ المُكالَمَةِ لِلجَّميع";
"room_member_power_level_short_custom" = "مُتَخَصِّص";
"room_member_power_level_short_moderator" = "مُشرِف";
"room_member_power_level_short_admin" = "مُدير";
"room_member_power_level_custom_in" = "مُتَخَصِّصٌ (%@) في %@";
"room_member_power_level_moderator_in" = "مُشرِفٌ فِي %@";
"room_member_power_level_admin_in" = "مُديرٌ فِي %@";
"room_participants_security_loading" = "التَّحمِيلُ جَارٍ…";
"room_participants_action_security_status_loading" = "التَّحمِيلُ جَارٍ…";
"room_participants_action_security_status_warning" = "تَحذِير";
"room_participants_action_security_status_complete_security" = "الأمَانُ الكَامِل";
"room_participants_action_security_status_verify" = "تَأكِيدُ التَّحَقُّق";
"room_participants_action_security_status_verified" = "مُتَحَقَّقٌ مِنه";
"room_participants_action_mention" = "ذِكْر";
"room_participants_action_start_video_call" = "بَدْءُ مُكالَمَةٍ مَرئيَّة";
"room_participants_action_start_voice_call" = "بَدْءُ مُكالَمَةٍ صَوتيَّة";
"room_participants_action_start_new_chat" = "بَدْءُ مُحادَثَةٍ جَدِيدَة";
"room_participants_action_set_admin" = "جَعْلَهُ مُدِير";
"room_participants_action_set_moderator" = "جَعْلَهُ مُشرِف";
"room_participants_action_set_default_power_level" = "إعَادَةُ الضَّبطِ إلَى مُستَخدِمٍ عَادِيّ";
"room_participants_action_unignore" = "إِظْهَارُ جَمِيعِ الرَّسائِلِ مِن هَذَا المُستَخدِم";
"room_participants_action_ignore" = "إخفَاءُ جَمِيعِ الرَّسائِلِ مِن هَذَا المُستَخدِم";
"room_recents_unknown_room_error_message" = "يَتَعَذَّر العُثُور عَلَى هَذِهِ الغُرفَة. تأكَّد مِن وجودِهَا";
"room_creation_dm_error" = "يَتَعَذَّرُ عَلينَا إنشَاء المُحادَثَة المُباشِرَة الخَّاصَةِ بِك. يُرجَى التَّحَقُقُ مِنَ المُستَخدِمِيَنَ اللَّذِينَ تُريدُ دَعوَتَهُم ثُمَّ المُحاوَلَةُ مَرةً أُخرَى.";
15 changes: 14 additions & 1 deletion Riot/Assets/de.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
"group_rooms_filter_rooms" = "Filtere Community-Räume";
"e2e_room_key_request_message_new_device" = "Du hast die neue Sitzung '%@' hinzugefügt, welche Verschlüsselungs-Schlüssel anfordert.";
"room_do_not_have_permission_to_post" = "Du hast keine Berechtigung Nachrichten in diesem Raum zu senden";
"room_event_action_kick_prompt_reason" = "Grund für den Rauswurf des Benutzers";
"room_event_action_kick_prompt_reason" = "Grund für das Entfernen des Benutzers";
"room_event_action_ban_prompt_reason" = "Grund für die Verbannung des Benutzers";
"room_action_send_photo_or_video" = "Foto oder Video senden";
"room_action_send_sticker" = "Aufkleber senden";
Expand Down Expand Up @@ -1389,3 +1389,16 @@
"room_recents_unknown_room_error_message" = "Raum kann nicht gefunden werden. Überprüfe bitte, dass er existiert";
"room_creation_dm_error" = "Fehler beim Erstellen der Direktnachricht. Bitte überprüfe die eingeladenen Leute und versuche es erneut.";
"settings_ui_theme_picker_message_invert_colours" = "\"Auto\" verwendet die Farbinvertierungseinstellung deines Geräts";
"key_verification_verify_qr_code_scan_code_other_device_action" = "Mit diesem Gerät scannen";
"room_notifs_settings_encrypted_room_notice" = "Am Handy sind Benachrichtigungen bei Erwähnungen und Schlüsselwörtern in verschlüsselten Räumen nicht verfügbar.";
"room_notifs_settings_account_settings" = "Kontoeinstellungen";
"room_notifs_settings_manage_notifications" = "Benachrichtigungen kannst du in %@ verwalten";
"room_notifs_settings_cancel_action" = "Abbrechen";
"room_notifs_settings_done_action" = "Fertig";
"room_notifs_settings_none" = "Nichts";
"room_notifs_settings_mentions_and_keywords" = "Nur Erwähnungen und Schlüsselwörtern";
"room_notifs_settings_all_messages" = "Allen Nachrichten";

// Room Notification Settings
"room_notifs_settings_notify_me_for" = "Benachrichtige mich bei";
"room_details_notifs" = "Benachrichtigungen";
13 changes: 13 additions & 0 deletions Riot/Assets/et.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -1349,3 +1349,16 @@
"settings_ui_theme_picker_message_invert_colours" = "Automaatne valik kasutab sinu seadme pööratud värvide seadistust";
"room_recents_unknown_room_error_message" = "Ei leia sellist jututuba. Palun kontrolli, et ta ikka olemas on";
"room_creation_dm_error" = "Otsevestluse loomine ei õnnestunud. Palun kontrolli, et kasutajanimed oleks õiged ja proovi uuesti.";
"key_verification_verify_qr_code_scan_code_other_device_action" = "Skaneeri selle seadmega";
"room_notifs_settings_encrypted_room_notice" = "Teavitused mainimiste ja võtmesõnade esinemise puhul pole mobiilirakenduses krüptitud jututoas saadaval.";
"room_notifs_settings_account_settings" = "Kasutajakonto seadistused";
"room_notifs_settings_manage_notifications" = "Sa võid hallata teavitusi %@ jututoas";
"room_notifs_settings_cancel_action" = "Katkesta";
"room_notifs_settings_done_action" = "Valmis";
"room_notifs_settings_none" = "mitte ühelgi juhul";
"room_notifs_settings_mentions_and_keywords" = "mainimiste ja võtmesõnade leidumise puhul";
"room_notifs_settings_all_messages" = "kõikide sõnumite puhul";

// Room Notification Settings
"room_notifs_settings_notify_me_for" = "Teavita mind";
"room_details_notifs" = "Teavitused";
13 changes: 13 additions & 0 deletions Riot/Assets/fr.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -1426,3 +1426,16 @@
"settings_ui_theme_picker_message_invert_colours" = "« Auto » utilise le paramètre « Inverser les couleurs » de l’appreil";
"room_recents_unknown_room_error_message" = "Aucun résultat dans ce salon. Assurez vous de son existence";
"room_creation_dm_error" = "Nous n’avons pas pu créer votre message direct. Merci de vérifier les utilisateurs que vous voulez inviter et réessayer.";
"key_verification_verify_qr_code_scan_code_other_device_action" = "Scanner avec cet appareil";
"room_notifs_settings_encrypted_room_notice" = "Veuillez noter que les mentions et mots-clés ne sont pas disponibles dans les salons chiffrés sur mobile.";
"room_notifs_settings_account_settings" = "Paramètres du compte";
"room_notifs_settings_manage_notifications" = "Vous pouvez gérer les notifications dans %@";
"room_notifs_settings_cancel_action" = "Annuler";
"room_notifs_settings_done_action" = "Terminé";
"room_notifs_settings_none" = "Aucun";
"room_notifs_settings_mentions_and_keywords" = "Seulement les mentions et les mots-clés";
"room_notifs_settings_all_messages" = "Tous les messages";

// Room Notification Settings
"room_notifs_settings_notify_me_for" = "Me notifier pour";
"room_details_notifs" = "Notifications";
13 changes: 13 additions & 0 deletions Riot/Assets/it.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -1383,3 +1383,16 @@
"settings_ui_theme_picker_message_invert_colours" = "\"Automatico\" usa l'impostazione \"Inverti Colori\" del tuo dispositivo";
"room_recents_unknown_room_error_message" = "Impossibile trovare questa stanza. Assicurati che esista";
"room_creation_dm_error" = "Impossibile creare il messaggio diretto. Ricontrolla gli utenti che vuoi invitare e riprova.";
"key_verification_verify_qr_code_scan_code_other_device_action" = "Scansiona con questo dispositivo";
"room_notifs_settings_encrypted_room_notice" = "Nota che le notifiche per menzioni e parole chiave non sono disponibili nelle stanze cifrate su mobile.";
"room_notifs_settings_account_settings" = "impostazioni dell'account";
"room_notifs_settings_manage_notifications" = "Puoi gestire le notifiche nelle %@";
"room_notifs_settings_cancel_action" = "Annulla";
"room_notifs_settings_done_action" = "Fatto";
"room_notifs_settings_none" = "Niente";
"room_notifs_settings_mentions_and_keywords" = "Solo menzioni e parole chiave";
"room_notifs_settings_all_messages" = "Tutti i messaggi";

// Room Notification Settings
"room_notifs_settings_notify_me_for" = "Inviami notifiche per";
"room_details_notifs" = "Notifiche";
Loading

0 comments on commit 45dfecd

Please sign in to comment.