Skip to content

Commit 89cac8d

Browse files
committed
Prepare v14.2
1 parent 6f1d8e2 commit 89cac8d

File tree

26 files changed

+760
-218
lines changed

26 files changed

+760
-218
lines changed

MEGA.xcodeproj/project.pbxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -8010,11 +8010,11 @@
80108010
5D52C744250C4EED00286A43 /* Mocks */ = {
80118011
isa = PBXGroup;
80128012
children = (
8013-
949B86E12BBC202700CB8ADF /* Utils */,
80148013
5D33D66A250D9BC900D74666 /* Client */,
80158014
5D52C748250C4F2800286A43 /* Functions */,
80168015
949704B52AB427A700B2CA3A /* Router */,
80178016
B6FD6510268D7EA500988A17 /* UseCase */,
8017+
949B86E12BBC202700CB8ADF /* Utils */,
80188018
C4D6750D2BB2CAE3000A1F79 /* ViewControllers */,
80198019
32A9DECC28D198E300ABC3F6 /* ViewModel */,
80208020
C47E7BDA25D1550200DB6FF5 /* AudioPlayerItem.swift */,
@@ -15964,7 +15964,6 @@
1596415964
83B5E87927F6F8F50073C870 /* CancellableTransferViewModelTests.swift in Sources */,
1596515965
B67B189925CAAEBA0022D6C0 /* CGSize.swift in Sources */,
1596615966
B6FB5F8429A3254A0023BA6A /* ChangeTypeEntityMapperTests.swift in Sources */,
15967-
949B86E62BBC205D00CB8ADF /* MockImageLoader.swift in Sources */,
1596815967
6DE5563629F61ED40015A950 /* ChatContentViewModelTests.swift in Sources */,
1596915968
9949C3662A72424C000C299B /* ChatRoomAvatarInitialsGeneratorTest.swift in Sources */,
1597015969
99778D982AE74EC700537EA9 /* ChatRoomAvatarViewModelTests.swift in Sources */,
@@ -16065,6 +16064,7 @@
1606516064
BF8895B62630F3A4002A18CA /* MockChatRoomUseCase.swift in Sources */,
1606616065
C4575F31265FA3D500D527DC /* MockDispatchQueue.swift in Sources */,
1606716066
5BBC13E226CE635B0010115B /* MockFavouritesRouter.swift in Sources */,
16067+
949B86E62BBC205D00CB8ADF /* MockImageLoader.swift in Sources */,
1606816068
8394EB8D2643E5080064F741 /* MockLocalVideoUseCase.swift in Sources */,
1606916069
2FE5438D264E2BF400FF4955 /* MockMeetingCreatingUseCase.swift in Sources */,
1607016070
B5663EE029F8F3DB0080FFDA /* MockMEGAPurchase.swift in Sources */,
@@ -16406,7 +16406,7 @@
1640616406
GCC_WARN_UNUSED_FUNCTION = YES;
1640716407
GCC_WARN_UNUSED_VARIABLE = YES;
1640816408
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
16409-
MARKETING_VERSION = 14.1;
16409+
MARKETING_VERSION = 14.2;
1641016410
MTL_ENABLE_DEBUG_INFO = YES;
1641116411
ONLY_ACTIVE_ARCH = YES;
1641216412
OTHER_CFLAGS = "";
@@ -16466,7 +16466,7 @@
1646616466
GCC_WARN_UNUSED_FUNCTION = YES;
1646716467
GCC_WARN_UNUSED_VARIABLE = YES;
1646816468
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
16469-
MARKETING_VERSION = 14.1;
16469+
MARKETING_VERSION = 14.2;
1647016470
MTL_ENABLE_DEBUG_INFO = NO;
1647116471
OTHER_CFLAGS = "-DNDEBUG";
1647216472
OTHER_LDFLAGS = "-ObjC";
@@ -17522,7 +17522,7 @@
1752217522
GCC_WARN_UNUSED_FUNCTION = YES;
1752317523
GCC_WARN_UNUSED_VARIABLE = YES;
1752417524
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
17525-
MARKETING_VERSION = 14.1;
17525+
MARKETING_VERSION = 14.2;
1752617526
MTL_ENABLE_DEBUG_INFO = NO;
1752717527
OTHER_CFLAGS = "-DNDEBUG";
1752817528
OTHER_LDFLAGS = "-ObjC";
Submodule MEGASDK updated from 60af2a0 to 55960cc

Modules/Presentation/MEGAL10n/Sources/MEGAL10n/Resources/Base.lproj/Localizable.strings

+9-9
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
/* Button title which triggers the action to join meeting as Guest */
9292
"general.joinMeetingAsGuest"="Join meeting as guest";
9393
/* Message shown when the user writes a wrong email or password on login */
94-
"invalidMailOrPassword"="Invalid email address or password. Please try again.";
94+
"invalidMailOrPassword"="Invalid email address or password. Try again.";
9595
/* Error message when to many attempts to login */
9696
"tooManyAttemptsLogin"="You have attempted to log in too many times. Please wait until %@ and try again.";
9797
/* Text shown just after creating an account to remenber the user what to do to complete the account creation proccess */
@@ -139,7 +139,7 @@
139139
/* Error text shown when you have not written the same password */
140140
"passwordsDoNotMatch"="Passwords do not match";
141141
/* Error text shown when you don't have selected the checkbox to agree with the Terms of Service */
142-
"termsCheckboxUnselected"="You need to agree with the Terms of Service to register an account on MEGA.";
142+
"termsCheckboxUnselected"="You have to accept our Terms of Service";
143143
/* This error is shown in the account creation page. User has to agree to the terms and conditions. If the user does not agree to the losing password results in data loss condition then this error is shown */
144144
"termsForLosingPasswordCheckboxUnselected"="You need to agree that you understand the danger of losing your password";
145145
/* Error text shown when the users tries to create an account with an email already in use */
@@ -465,7 +465,7 @@
465465
/* Title for the action that allows you to rename a file or folder */
466466
"rename"="Rename";
467467
/* Hint text to suggest that the user have to write the new name for the file or folder */
468-
"renameNodeMessage"="Enter the new name";
468+
"renameNodeMessage"="Enter a new name";
469469
/* Error message shown when trying to rename or create a folder with characters that are not allowed. The %@ will be replaced with the list of invalid characters. For example: The following characters are not allowed: " * / : < > ? \ | */
470470
"general.error.charactersNotAllowed"="The following characters are not allowed: %@";
471471
/* Alert title to ask if user want to rename the file. %@ is a place holder. */
@@ -553,7 +553,7 @@
553553
/* Used in create album popup album name validation */
554554
"cameraUploads.albums.create.alert.enterDifferentName"="Enter a different name.";
555555
/* Used in create album popup album name validation */
556-
"cameraUploads.albums.create.alert.enterNewName"="Enter a new name.";
556+
"cameraUploads.albums.create.alert.enterNewName"="Enter a new name";
557557
/* Used in add content album view. */
558558
"cameraUploads.albums.create.addItemsTo"="Add items to “%@”";
559559
/* Used in empty album view. */
@@ -3987,7 +3987,7 @@
39873987
/* Calls: Free plan limit warning alert title for max users reached in free plan call */
39883988
"calls.freePlanLimitWarning.usersLimitAlert.title"="Cannot join";
39893989
/* Calls: Free plan limit warning alert message for max users reached in free plan call */
3990-
"calls.freePlanLimitWarning.usersLimitAlert.message"="This call can only support 100 participants. Ask the organiser to upgrade to Pro to remove this restriction.";
3990+
"calls.freePlanLimitWarning.usersLimitAlert.message"="Only 100 participants can join the call. Any additional participants will only be able to send and receive messages. The organiser can upgrade to Pro to remove these restrictions.";
39913991
/* Calls: Free plan limit warning alert button for max users reached in free plan call */
39923992
"calls.freePlanLimitWarning.usersLimitAlert.button"="OK, got it";
39933993
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
@@ -4007,13 +4007,13 @@
40074007
/* Calls: Text for countdown in call UI for free plan limit warning for duration limit reached in free plan call */
40084008
"calls.freePlanLimitWarning.durationLimitCountdown.title"="This free call will end in %@";
40094009
/* Meetings: Warning banner shown for hosts when showing list of contracts after trying to add participants to a call */
4010-
"meetings.contact-picker.warning.over-limit.host" = "Only 100 participants can join the call. Any additional participants will only be able to send and read chats. Need to add more participants? [A]Upgrade now.[/A]";
4010+
"meetings.contact-picker.warning.over-limit.host"="Only 100 participants can join the call. Any additional participants will only be able to send and read chats. Need to add more participants? [A]Upgrade now.[/A]";
40114011
/* Meetings: Warning banner shown for non-hosts when showing list of contracts after trying to add participants to a call */
4012-
"meetings.contact-picker.warning.over-limit.non-host" = "Only 100 participants can join the call. Any additional participants will only be able to send and read chats. Ask the organiser to remove this restriction.";
4012+
"meetings.contact-picker.warning.over-limit.non-host"="Only 100 participants can join the call. Any additional participants will only be able to send and read chats. Ask the organiser to remove this restriction.";
40134013
/* Calls: Text for dialog title presented when call is finished because of free account call duration limit */
40144014
"calls.freePlanLimitWarning.upgradeToProDialog.title"="Upgrade to Pro to get unlimited calls";
40154015
/* Calls: Text for dialog message presented when call is finished because of free account call duration limit */
4016-
"calls.freePlanLimitWarning.upgradeToProDialog.message"="Your call reached the 60 minute limit and has ended. Pro users have unlimited calls and up to 1000 participants.";
4016+
"calls.freePlanLimitWarning.upgradeToProDialog.message"="Your call reached the 60-minute limit and has ended. Pro users have unlimited call duration and can invite up to 1000 participants.";
40174017
/* Calls: Text for dialog button presented when call is finished because of free account call duration limit */
40184018
"calls.freePlanLimitWarning.upgradeToProDialog.button"="Upgrade now";
40194019
/* Hidden files and folders onboarding title */
@@ -4029,4 +4029,4 @@
40294029
/* Hidden files and folders onboarding content out of sight title */
40304030
"onboarding.hiddenFilesAndFolders.outOfSight.content.title"="Out of sight";
40314031
/* Hidden files and folders onboarding content out of sight message */
4032-
"onboarding.hiddenFilesAndFolders.outOfSight.content.message"="You decide when hidden files are visible. There is a new setting to show hidden items temporarily.";
4032+
"onboarding.hiddenFilesAndFolders.outOfSight.content.message"="You decide when hidden files are visible. There is a new setting to show hidden items temporarily.";

Modules/Presentation/MEGAL10n/Sources/MEGAL10n/Resources/ar.lproj/Localizable.strings

+42-10
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
/* Button title which triggers the action to join meeting as Guest */
9292
"general.joinMeetingAsGuest"="انضم إلى الاجتماع كضيف";
9393
/* Message shown when the user writes a wrong email or password on login */
94-
"invalidMailOrPassword"="البريد الإلكتروني أو كلمة المرور غير صالحين. حاول مرة أخرى.";
94+
"invalidMailOrPassword"="Invalid email address or password. Try again.";
9595
/* Error message when to many attempts to login */
9696
"tooManyAttemptsLogin"="لقد حاولت تسجيل الدخول مرات كثيرة. الرجاء الانتظار حتى %@ ثم المحاولة ثانية.";
9797
/* Text shown just after creating an account to remenber the user what to do to complete the account creation proccess */
@@ -139,7 +139,7 @@
139139
/* Error text shown when you have not written the same password */
140140
"passwordsDoNotMatch"="كلمات المرور غير متطابقة";
141141
/* Error text shown when you don't have selected the checkbox to agree with the Terms of Service */
142-
"termsCheckboxUnselected"="تحتاج إلى الموافقة علي شروط الخدمة لتسجيل حساب على ميغا MEGA.";
142+
"termsCheckboxUnselected"="يجب عليك أن تقبل شروط الخدمة";
143143
/* This error is shown in the account creation page. User has to agree to the terms and conditions. If the user does not agree to the losing password results in data loss condition then this error is shown */
144144
"termsForLosingPasswordCheckboxUnselected"="عليك أن توافق على أنك تفهم خطر فقدان كلمة المرور الخاصة بك";
145145
/* Error text shown when the users tries to create an account with an email already in use */
@@ -465,7 +465,7 @@
465465
/* Title for the action that allows you to rename a file or folder */
466466
"rename"="تغيير الاسم";
467467
/* Hint text to suggest that the user have to write the new name for the file or folder */
468-
"renameNodeMessage"="أدخل الاسم الجديد";
468+
"renameNodeMessage"="أدخل اسمًا جديدًا";
469469
/* Error message shown when trying to rename or create a folder with characters that are not allowed. The %@ will be replaced with the list of invalid characters. For example: The following characters are not allowed: " * / : < > ? \ | */
470470
"general.error.charactersNotAllowed"="المحارف التالية غير مسموح بها: %@";
471471
/* Alert title to ask if user want to rename the file. %@ is a place holder. */
@@ -553,7 +553,7 @@
553553
/* Used in create album popup album name validation */
554554
"cameraUploads.albums.create.alert.enterDifferentName"="أدخل اسمًا مختلفًا.";
555555
/* Used in create album popup album name validation */
556-
"cameraUploads.albums.create.alert.enterNewName"="أدخل اسمًا جديدًا.";
556+
"cameraUploads.albums.create.alert.enterNewName"="أدخل اسمًا جديدًا";
557557
/* Used in add content album view. */
558558
"cameraUploads.albums.create.addItemsTo"="إضافة عناصر إلى ”%@“";
559559
/* Used in empty album view. */
@@ -3974,27 +3974,59 @@
39743974
"calls.sfuOutdated.updateAppAlert.button.skip"="تخطى";
39753975
/* Meetings: free plan limitation text for scheduled meetings calls longer than 60 minutes. Text between tags is colour formatted, keep tags order in the string: [A] should appear before [/A] always. */
39763976
"meetings.scheduleMeeting.create.freePlanLimitWarning.longerThan60Minutes"="Your current plan can only support 60 minutes per meeting. Need more time? [A]Upgrade now[/A]";
3977+
/* Notifications: text for notification type display name */
3978+
"notifications.notificationType.promo.title"="عرض لفترة محدودة";
39773979
/* Notifications: tag to show the user that there are promotions available in the notifications page and section. */
39783980
"notifications.tag.promo.title"="ترويج";
3979-
/* Notifications: message showing the date and time at which a certain offer expires. %1$s will be replaced by date. %2$s will be replaced by time. */
3980-
"notifications.expiration.message"="تنتهي الصلاحية في %1$s الساعة %2$s";
3981+
/* Notifications: message showing the date and time at which a certain offer expires. [date] will be replaced by date. [time] will be replaced by time. */
3982+
"notifications.expiration.message"="Expires on [date] at [time]";
39813983
/* Title for action that allows user to hide files or folders */
39823984
"general.menuAction.hide.title"="إخفاء";
39833985
/* Title for action that allows user to unhide files or folders */
39843986
"general.menuAction.unhide.title"="إلغاء الإخفاء";
39853987
/* Calls: Free plan limit warning alert title for max users reached in free plan call */
39863988
"calls.freePlanLimitWarning.usersLimitAlert.title"="لا يمكن الانضمام";
39873989
/* Calls: Free plan limit warning alert message for max users reached in free plan call */
3988-
"calls.freePlanLimitWarning.usersLimitAlert.message"="يمكن لهذه المكالمة دعم 100 مشارك فقط. اطلب من المنظم الترقية إلى برو Pro لإزالة هذا القيد.";
3990+
"calls.freePlanLimitWarning.usersLimitAlert.message"="Only 100 participants can join the call. Any additional participants will only be able to send and receive messages. The organiser can upgrade to Pro to remove these restrictions.";
39893991
/* Calls: Free plan limit warning alert button for max users reached in free plan call */
39903992
"calls.freePlanLimitWarning.usersLimitAlert.button"="حسنًا، فهمت ذلك";
3991-
/* Meetings: A warning message shown in the call UI when free-plan user has more than 100 participants */
3992-
"meetings.waitingRoom.warning.limit100Participants"="يمكن لـ 100 مشارك الانضمام إلى المكالمة. لن يتمكن أي مشارك إضافي إلا من إرسال المحادثات وقراءتها. هل تحتاج إلى إضافة المزيد من المشاركين؟ [A]قم بالترقية الآن[/A]";
3993+
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
3994+
"meetings.waitingRoom.warning.limit100Participants"="Only 100 participants can join the call. Any additional participants will only be able to send and receive messages. The organiser can upgrade to Pro to remove these restrictions.";
3995+
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
3996+
"meetings.waitingRoom.banner.limit100Participants.organizer-host"="Only 100 participants can join the call. Need more? [A]Upgrade now[/A]";
3997+
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
3998+
"meetings.waitingRoom.banner.limit100Participants.non-organizer-host"="Only 100 participants can join the call. Ask the organiser to upgrade to Pro to remove these restrictions.";
3999+
/* Meetings: An warning shown in the banner in the in-call tab when free-plan user has more than 100 participants */
4000+
"meetings.inCall.banner.limit100Participants.organizer-host"="Only 100 participants can join the call. Any additional participants will only be able to send and read chats. Need more? [A]Upgrade now[/A]";
39934001
/* Calls: Free plan limit warning alert message for duration limit reached in free plan call */
39944002
"calls.freePlanLimitWarning.durationLimitAlert.message"="هل تحتاج إلى مزيد من الوقت؟ تحتوي باقات برو Pro على مكالمات غير محدودة المدة.";
39954003
/* Calls: Free plan limit warning alert upgrade button for duration limit reached in free plan call */
39964004
"calls.freePlanLimitWarning.durationLimitAlert.upgrade"="الترقية";
39974005
/* Calls: Free plan limit warning alert not now button for duration limit reached in free plan call */
39984006
"calls.freePlanLimitWarning.durationLimitAlert.notNow"="ليس الآن";
39994007
/* Calls: Text for countdown in call UI for free plan limit warning for duration limit reached in free plan call */
4000-
"calls.freePlanLimitWarning.durationLimitCountdown.title"="ستنتهي هذه المكالمة المجانية في %@";
4008+
"calls.freePlanLimitWarning.durationLimitCountdown.title"="ستنتهي هذه المكالمة المجانية في %@";
4009+
/* Meetings: Warning banner shown for hosts when showing list of contracts after trying to add participants to a call */
4010+
"meetings.contact-picker.warning.over-limit.host"="Only 100 participants can join the call. Any additional participants will only be able to send and read chats. Need to add more participants? [A]Upgrade now.[/A]";
4011+
/* Meetings: Warning banner shown for non-hosts when showing list of contracts after trying to add participants to a call */
4012+
"meetings.contact-picker.warning.over-limit.non-host"="يمكن لـ 100 مشارك فقط الانضمام إلى المكالمة. لن يتمكن أي مشارك إضافي إلا من إرسال المحادثات وقراءتها. اطلب من المنظم إزالة هذا التقييد.";
4013+
/* Calls: Text for dialog title presented when call is finished because of free account call duration limit */
4014+
"calls.freePlanLimitWarning.upgradeToProDialog.title"="Upgrade to Pro to get unlimited calls";
4015+
/* Calls: Text for dialog message presented when call is finished because of free account call duration limit */
4016+
"calls.freePlanLimitWarning.upgradeToProDialog.message"="وصلت مكالمتك إلى حد 60 دقيقة وانتهت. يتمتع مستخدمو برو Pro بمدة مكالمات غير محدودة ويمكنهم دعوة ما يصل إلى 1000 مشارك.";
4017+
/* Calls: Text for dialog button presented when call is finished because of free account call duration limit */
4018+
"calls.freePlanLimitWarning.upgradeToProDialog.button"="رق حسابك الآن";
4019+
/* Hidden files and folders onboarding title */
4020+
"onboarding.hiddenFilesAndFolders.title"="Hidden files and folders";
4021+
/* Hidden files and folders onboarding content hide important title */
4022+
"onboarding.hiddenFilesAndFolders.hideImportant.content.title"="Hide important files and folders";
4023+
/* Hidden files and folders onboarding content hide important message */
4024+
"onboarding.hiddenFilesAndFolders.hideImportant.content.message"="You can conceal sensitive files and folders for privacy. Only you can reveal them, either individually or by temporarily displaying hidden items from the settings.";
4025+
/* Hidden files and folders onboarding content exclude from timeline title */
4026+
"onboarding.hiddenFilesAndFolders.excludeTimeline.content.title"="Exclude from Timeline";
4027+
/* Hidden files and folders onboarding content exclude from timeline section message */
4028+
"onboarding.hiddenFilesAndFolders.excludeTimeline.content.message"="Hidden items are only accessible through the Cloud drive and will not appear in your Photos, Albums or Recents.";
4029+
/* Hidden files and folders onboarding content out of sight title */
4030+
"onboarding.hiddenFilesAndFolders.outOfSight.content.title"="Out of sight";
4031+
/* Hidden files and folders onboarding content out of sight message */
4032+
"onboarding.hiddenFilesAndFolders.outOfSight.content.message"="You decide when hidden files are visible. There is a new setting to show hidden items temporarily.";

0 commit comments

Comments
 (0)