Merge branch 'release/0.16.2/master'

matrix-org · Sep 24, 2021 · 263bd1e · 263bd1e
2 parents e054ca0 + 73ebfcc
commit 263bd1e
Show file tree

Hide file tree

Showing 57 changed files with 853 additions and 519 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,27 @@
+## Changes in 0.16.2 (2021-09-24)
+
+✨ Features
+
+- Added device de/rehydration supporting flows. ([#4255](https://github.com/vector-im/element-ios/issues/4255))
+- Support for space link. ([#4498](https://github.com/vector-im/element-ios/issues/4498))
+- Add suggested rooms and support for suggested room selection to the list of recent cell data ([#4501](https://github.com/vector-im/element-ios/issues/4501))
+- moved space filtering to MatrixKit. ([#4509](https://github.com/vector-im/element-ios/issues/4509))
+- Tweaked `MXKRoomMemberDetailsViewController` so we can hide leave option ([#4682](https://github.com/vector-im/element-ios/issues/4682))
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.20.2](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.20.2)).
+
+🐛 Bugfixes
+
+- MXKAppSettings: Return matrix.to when firstURLDetectionIgnoredHosts is nil, and store an empty array when setting nil. ([#4826](https://github.com/vector-im/element-ios/issues/4826))
+
+⚠️ API Changes
+
+- Dropped support for iOS versions 11 and lower. ([#4693](https://github.com/vector-im/element-ios/issues/4693))
+- Exposed more room joining result types in the completion handler. ([#4830](https://github.com/vector-im/element-ios/issues/4830))
+
+
 ## Changes in 0.16.1 (2021-09-16)
 
 🙌 Improvements

diff --git a/MatrixKit.podspec b/MatrixKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixKit"
-  s.version      = "0.16.1"
+  s.version      = "0.16.2"
   s.summary      = "The Matrix reusable UI library for iOS based on MatrixSDK."
 
   s.description  = <<-DESC
@@ -15,15 +15,15 @@ Pod::Spec.new do |s|
   s.author             = { "matrix.org" => "support@matrix.org" }
   s.social_media_url   = "http://twitter.com/matrixdotorg"
 
-  s.platform     = :ios, "9.0"
+  s.platform     = :ios, "12.1"
 
   s.source       = { :git => "https://github.com/matrix-org/matrix-ios-kit.git", :tag => "v#{s.version}" }
 
   s.requires_arc  = true
 
   s.swift_version = '5.0'
 
-  s.dependency 'MatrixSDK', "= 0.20.1"
+  s.dependency 'MatrixSDK', "= 0.20.2"
   s.dependency 'HPGrowingTextView', '~> 1.1'
   s.dependency 'libPhoneNumber-iOS', '~> 0.9.13'
   s.dependency 'DTCoreText', '~> 1.6.25'

diff --git a/MatrixKit.xcodeproj/project.pbxproj b/MatrixKit.xcodeproj/project.pbxproj
@@ -47,6 +47,7 @@
 		32FBDAF81E4484C40033C519 /* MXKEncryptionKeysImportView.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBDAF71E4484C40033C519 /* MXKEncryptionKeysImportView.m */; };
 		32FBDAFB1E44B0FC0033C519 /* MXKEncryptionKeysExportView.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBDAFA1E44B0FC0033C519 /* MXKEncryptionKeysExportView.m */; };
 		3A1293A825801D9400F3474B /* MXKPreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A1293A625801D9400F3474B /* MXKPreviewViewController.m */; };
+		3AF85F9726FCD75700A9E67B /* MXKActivityHandlingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AF85F9626FCC35D00A9E67B /* MXKActivityHandlingViewController.m */; };
 		4F236C27EC459185548BEF4F /* Pods_MatrixKitSamplePods_MatrixKitTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B455B95A7B9ECAD75BA21E12 /* Pods_MatrixKitSamplePods_MatrixKitTests.framework */; };
 		550A36BD1DE484DB005C1647 /* EncryptedAttachmentsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 550A36BC1DE484DB005C1647 /* EncryptedAttachmentsTest.m */; };
 		71352D551C0ED240001D50B0 /* MXKRoomSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71352D531C0ED240001D50B0 /* MXKRoomSettingsViewController.m */; };
@@ -194,7 +195,6 @@
 		F09A66671FD812CA004B13B5 /* MXKGroupCellData.m in Sources */ = {isa = PBXBuildFile; fileRef = F09A66661FD812CA004B13B5 /* MXKGroupCellData.m */; };
 		F09E288E1AC1FEDA00C51E44 /* MXKImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = F09E288B1AC1FEDA00C51E44 /* MXKImageView.m */; };
 		F09E288F1AC1FEDA00C51E44 /* MXKPieChartView.m in Sources */ = {isa = PBXBuildFile; fileRef = F09E288D1AC1FEDA00C51E44 /* MXKPieChartView.m */; };
-		F0A8955E1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.m in Sources */ = {isa = PBXBuildFile; fileRef = F0A8955D1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.m */; };
 		F0AD3CC21B288C05002E0899 /* MXKInterleavedRecentsDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = F0AD3CBF1B288C05002E0899 /* MXKInterleavedRecentsDataSource.m */; };
 		F0AD3CC71B289441002E0899 /* MXKInterleavedRecentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F0AD3CC51B289441002E0899 /* MXKInterleavedRecentTableViewCell.m */; };
 		F0AD3CC81B289441002E0899 /* MXKInterleavedRecentTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F0AD3CC61B289441002E0899 /* MXKInterleavedRecentTableViewCell.xib */; };
@@ -352,6 +352,9 @@
 		392A579537BBF28A9436C420 /* Pods-MatrixKitSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MatrixKitSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-MatrixKitSample/Pods-MatrixKitSample.release.xcconfig"; sourceTree = "<group>"; };
 		3A1293A625801D9400F3474B /* MXKPreviewViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKPreviewViewController.m; sourceTree = "<group>"; };
 		3A1293A725801D9400F3474B /* MXKPreviewViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKPreviewViewController.h; sourceTree = "<group>"; };
+		3AF85F9426FCC0B100A9E67B /* MXKViewControllerActivityHandling.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXKViewControllerActivityHandling.h; sourceTree = "<group>"; };
+		3AF85F9526FCC35D00A9E67B /* MXKActivityHandlingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MXKActivityHandlingViewController.h; sourceTree = "<group>"; };
+		3AF85F9626FCC35D00A9E67B /* MXKActivityHandlingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MXKActivityHandlingViewController.m; sourceTree = "<group>"; };
 		550A36BC1DE484DB005C1647 /* EncryptedAttachmentsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EncryptedAttachmentsTest.m; sourceTree = "<group>"; };
 		5537B7A941FDD5CF92368345 /* Pods-MatrixKitSamplePods-MatrixKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MatrixKitSamplePods-MatrixKitTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-MatrixKitSamplePods-MatrixKitTests/Pods-MatrixKitSamplePods-MatrixKitTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5891CE7965783A3890D40ED9 /* Pods_MatrixKitSamplePods_MatrixKitSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MatrixKitSamplePods_MatrixKitSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -605,8 +608,6 @@
 		F09E288B1AC1FEDA00C51E44 /* MXKImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKImageView.m; sourceTree = "<group>"; };
 		F09E288C1AC1FEDA00C51E44 /* MXKPieChartView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKPieChartView.h; sourceTree = "<group>"; };
 		F09E288D1AC1FEDA00C51E44 /* MXKPieChartView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKPieChartView.m; sourceTree = "<group>"; };
-		F0A8955C1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+MatrixKit.h"; sourceTree = "<group>"; };
-		F0A8955D1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+MatrixKit.m"; sourceTree = "<group>"; };
 		F0AD3CBE1B288C05002E0899 /* MXKInterleavedRecentsDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKInterleavedRecentsDataSource.h; sourceTree = "<group>"; };
 		F0AD3CBF1B288C05002E0899 /* MXKInterleavedRecentsDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MXKInterleavedRecentsDataSource.m; sourceTree = "<group>"; };
 		F0AD3CC41B289441002E0899 /* MXKInterleavedRecentTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXKInterleavedRecentTableViewCell.h; sourceTree = "<group>"; };
@@ -863,6 +864,9 @@
 				F0026B651C91EED1001D2C04 /* MXKWebViewViewController.m */,
 				3A1293A725801D9400F3474B /* MXKPreviewViewController.h */,
 				3A1293A625801D9400F3474B /* MXKPreviewViewController.m */,
+				3AF85F9426FCC0B100A9E67B /* MXKViewControllerActivityHandling.h */,
+				3AF85F9526FCC35D00A9E67B /* MXKActivityHandlingViewController.h */,
+				3AF85F9626FCC35D00A9E67B /* MXKActivityHandlingViewController.m */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -1314,8 +1318,6 @@
 		F07E18111ABC563900DE3766 /* Categories */ = {
 			isa = PBXGroup;
 			children = (
-				F0A8955C1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.h */,
-				F0A8955D1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.m */,
 				F04F78331F17A1B60039485E /* UIAlertController+MatrixKit.h */,
 				F04F78341F17A1B60039485E /* UIAlertController+MatrixKit.m */,
 				32D9F4E021D54A08008007F2 /* UIViewController+MatrixKit.h */,
@@ -1880,6 +1882,7 @@
 				F06E76811AF0FEB100980E5A /* MXKAuthenticationViewController.m in Sources */,
 				F0F148C61AB31240005F5D4A /* MXKTools.m in Sources */,
 				3230A3721ACA835400CC57F5 /* MXKSampleJSQMessageMediaData.m in Sources */,
+				3AF85F9726FCD75700A9E67B /* MXKActivityHandlingViewController.m in Sources */,
 				F0868E0D1B18FC01004CBE80 /* MXKRoomCreationView.m in Sources */,
 				CE14CA671E80122600E329A3 /* MXKAttachmentInteractionController.m in Sources */,
 				B125D10C22D7414400570CA4 /* MXKVideoThumbnailGenerator.swift in Sources */,
@@ -1966,7 +1969,6 @@
 				F0B0ECC41B14B16C005EB20D /* MXKRoomTitleView.m in Sources */,
 				F09A66641FD8061D004B13B5 /* MXKSessionGroupsDataSource.m in Sources */,
 				B12C56F22396D75500FAC6DE /* UITextView+MatrixKit.m in Sources */,
-				F0A8955E1F7A55DF00BD6C2A /* UIScrollView+MatrixKit.m in Sources */,
 				F095E50F1B25899F009606CE /* MXKContactManager.m in Sources */,
 				F09617C31DE881D800093E9D /* MXKEncryptionInfoView.m in Sources */,
 				F0CE56EB1AA8BB5E003BE77A /* MXKSampleMainTableViewController.m in Sources */,
@@ -2072,7 +2074,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 5537B7A941FDD5CF92368345 /* Pods-MatrixKitSamplePods-MatrixKitTests.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_MODULES = YES;
@@ -2082,7 +2083,6 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = MatrixKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.matrix.MatrixKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2097,7 +2097,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 1099FE41E4156DB223718DB2 /* Pods-MatrixKitSamplePods-MatrixKitTests.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ENABLE_MODULES = YES;
@@ -2107,7 +2106,6 @@
 				DEVELOPMENT_TEAM = 7J4U792NQT;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = MatrixKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = org.matrix.MatrixKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2164,7 +2162,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -2212,7 +2210,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2230,7 +2228,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = 7J4U792NQT;
 				INFOPLIST_FILE = "$(SRCROOT)/Samples/MatrixKitSample/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.matrix.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_MODULE_NAME = MatrixKit;
@@ -2251,7 +2248,6 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEVELOPMENT_TEAM = 7J4U792NQT;
 				INFOPLIST_FILE = "$(SRCROOT)/Samples/MatrixKitSample/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.matrix.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_MODULE_NAME = MatrixKit;

diff --git a/MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings b/MatrixKit/Assets/MatrixKitAssets.bundle/de.lproj/MatrixKit.strings
@@ -225,10 +225,10 @@
 "room_member_power_level_prompt" = "Du kannst diese Änderung nicht rückgangig machen, weil du dem Benutzer die gleiche Berechtigungsstufe gibst, die du selbst hast.\nBist du sicher?";
 // Attachment
 "attachment_size_prompt" = "Möchtest du senden als:";
-"attachment_original" = "Originalgröße: %@";
-"attachment_small" = "Klein: %@";
-"attachment_medium" = "Mittel: %@";
-"attachment_large" = "Groß: %@";
+"attachment_original" = "Originalgröße (%@)";
+"attachment_small" = "Klein (~%@)";
+"attachment_medium" = "Mittel (~%@)";
+"attachment_large" = "Groß (~%@)";
 "attachment_cancel_download" = "Herunterladen abbrechen?";
 "attachment_cancel_upload" = "Hochladen abbrechen?";
 "attachment_multiselection_size_prompt" = "Bilder senden als:";
@@ -492,3 +492,8 @@
 "call_consulting_with_user" = "Bei %@ anfragen";
 "microphone_access_not_granted_for_voice_message" = "%@ fehlt die Berechtigung, für Sprachnachrichten auf das Mikrofon zuzugreifen";
 "message_reply_to_sender_sent_a_voice_message" = "hat eine Sprachnachricht gesendet.";
+"attachment_size_prompt_title" = "Größe zum Senden";
+"attachment_large_with_resolution" = "Groß %@ (~%@)";
+"attachment_medium_with_resolution" = "Mittel %@ (~%@)";
+"attachment_small_with_resolution" = "Klein %@ (~%@)";
+"attachment_size_prompt_message" = "Du kannst dies in den Einstellungen ausschalten.";
diff --git a/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings b/MatrixKit/Assets/MatrixKitAssets.bundle/en.lproj/MatrixKit.strings
@@ -240,7 +240,7 @@
 // Room
 "room_please_select" = "Please select a room";
 "room_error_join_failed_title" = "Failed to join room";
-"room_error_join_failed_empty_room" = "It is not currently possible to re-join an empty room.";
+"room_error_join_failed_empty_room" = "It is not currently possible to join an empty room.";
 "room_error_name_edition_not_authorized" = "You are not authorized to edit this room name";
 "room_error_topic_edition_not_authorized" = "You are not authorized to edit this room topic";
 "room_error_cannot_load_timeline" = "Failed to load timeline";

diff --git a/MatrixKit/Assets/MatrixKitAssets.bundle/et.lproj/MatrixKit.strings b/MatrixKit/Assets/MatrixKitAssets.bundle/et.lproj/MatrixKit.strings
@@ -37,10 +37,10 @@
 "room_member_power_level_prompt" = "Sa ei saa seda muudatust hiljem tagasi pöörata, sest annad teisele kasutajale samad õigused, mis sinul on.\nKas sa oled ikka kindel?";
 // Attachment
 "attachment_size_prompt" = "Kas sa soovid faili saata:";
-"attachment_original" = "Tegelikus suuruses: %@";
-"attachment_small" = "Väiksena: %@";
-"attachment_medium" = "Keskmisena: %@";
-"attachment_large" = "Suurena: %@";
+"attachment_original" = "Tegelikus suuruses (%@)";
+"attachment_small" = "Väiksena (%@)";
+"attachment_medium" = "Keskmisena (%@)";
+"attachment_large" = "Suurena (%@)";
 "attachment_cancel_download" = "Kas katkestame allalaadimise?";
 "attachment_cancel_upload" = "Kas katkestame üleslaadimise?";
 "attachment_multiselection_size_prompt" = "Kas sa soovid pilte saata:";
@@ -464,3 +464,8 @@
 "e2e_passphrase_too_short" = "Salafraas on liiga lühike (pikkus peaks olema vähemalt %d tähemärki)";
 "microphone_access_not_granted_for_voice_message" = "Häälsõnumite salvestamiseks on vajalik ligipääs mikrofonile, kuid %@'l pole selleks õigusi";
 "message_reply_to_sender_sent_a_voice_message" = "saatis häälsõnumi.";
+"attachment_large_with_resolution" = "Suurena %@ (~%@)";
+"attachment_medium_with_resolution" = "Keskmisena %@ (~%@)";
+"attachment_small_with_resolution" = "Väiksena %@ (~%@)";
+"attachment_size_prompt_message" = "Seadistustest saad määrata, et see funktsionaalsus pole kasutusel.";
+"attachment_size_prompt_title" = "Saatmiseks kinnita meedia suurus";
diff --git a/MatrixKit/Assets/MatrixKitAssets.bundle/hu.lproj/MatrixKit.strings b/MatrixKit/Assets/MatrixKitAssets.bundle/hu.lproj/MatrixKit.strings
@@ -197,10 +197,10 @@
 "room_member_power_level_prompt" = "Valószínűleg nem fogod tudni visszavonni ezt a műveletet, mivel ugyanarra a szintre emeled a felhasználót mint amin te magad vagy.\nBiztos vagy benne?";
 // Attachment
 "attachment_size_prompt" = "Hogy szeretnéd elküldeni:";
-"attachment_original" = "Jelenlegi méret: %@";
-"attachment_small" = "Kicsi: %@";
-"attachment_medium" = "Közepes: %@";
-"attachment_large" = "Nagy: %@";
+"attachment_original" = "Jelenlegi méret (%@)";
+"attachment_small" = "Kicsi (~%@)";
+"attachment_medium" = "Közepes (~%@)";
+"attachment_large" = "Nagy (~%@)";
 "attachment_cancel_download" = "Megszakítod a letöltést?";
 "attachment_cancel_upload" = "Megszakítod a feltöltést?";
 "attachment_multiselection_size_prompt" = "Hogy szeretnéd elküldeni a képet:";
@@ -465,3 +465,8 @@
 "e2e_passphrase_too_short" = "A jelmondat túl rövid (legalább %d karakter hosszúnak kell lennie)";
 "microphone_access_not_granted_for_voice_message" = "Ha hangüzenetekhez a mikrofonhoz szükséges a hozzáférés, de %@ nem rendelkezik a használatához szükséges engedéllyel";
 "message_reply_to_sender_sent_a_voice_message" = "hang üzenet elküldve.";
+"attachment_large_with_resolution" = "Nagy %@ (~%@)";
+"attachment_medium_with_resolution" = "Közepes %@ (~%@)";
+"attachment_small_with_resolution" = "Kicsi %@ (~%@)";
+"attachment_size_prompt_message" = "Ezt a beállításokban kikapcsolhatod.";
+"attachment_size_prompt_title" = "Méret megerősítése küldéshez";
diff --git a/MatrixKit/Assets/MatrixKitAssets.bundle/it.lproj/MatrixKit.strings b/MatrixKit/Assets/MatrixKitAssets.bundle/it.lproj/MatrixKit.strings
@@ -208,10 +208,10 @@
 "room_member_power_level_prompt" = "Non potrai annullare questa modifica perché stai innalzando i permessi dell'utente al tuo stesso livello di accesso.\nSei sicuro?";
 // Attachment
 "attachment_size_prompt" = "Vuoi inviare come:";
-"attachment_original" = "Originale: %@";
-"attachment_small" = "Piccolo: %@";
-"attachment_medium" = "Medio: %@";
-"attachment_large" = "Grande: %@";
+"attachment_original" = "Dim. effettiva (%@)";
+"attachment_small" = "Piccolo (~%@)";
+"attachment_medium" = "Medio (~%@)";
+"attachment_large" = "Grande (~%@)";
 "attachment_cancel_download" = "Interrompi scaricamento?";
 "attachment_cancel_upload" = "Interrompi caricamento?";
 "attachment_multiselection_size_prompt" = "Vuoi inviare le immagini come:";
@@ -465,3 +465,8 @@
 "e2e_passphrase_too_short" = "Password troppo corta (deve avere almeno %d caratteri)";
 "microphone_access_not_granted_for_voice_message" = "I messaggi vocali hanno bisogno dell'accesso al microfono, ma %@ non ha il permesso di usarlo";
 "message_reply_to_sender_sent_a_voice_message" = "inviato un messaggio vocale.";
+"attachment_large_with_resolution" = "Grande %@ (~%@)";
+"attachment_medium_with_resolution" = "Medio %@ (~%@)";
+"attachment_small_with_resolution" = "Piccolo %@ (~%@)";
+"attachment_size_prompt_message" = "Puoi disattivarlo nelle impostazioni.";
+"attachment_size_prompt_title" = "Conferma dimensione da inviare";