Skip to content

Commit

Permalink
Prepare v14.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@af-mega
af-mega committed Apr 3, 2024
1 parent 6f1d8e2 commit 89cac8d
Show file tree
Hide file tree
Showing 26 changed files with 760 additions and 218 deletions.
10 changes: 5 additions & 5 deletions MEGA.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8010,11 +8010,11 @@
5D52C744250C4EED00286A43 /* Mocks */ = {
isa = PBXGroup;
children = (
949B86E12BBC202700CB8ADF /* Utils */,
5D33D66A250D9BC900D74666 /* Client */,
5D52C748250C4F2800286A43 /* Functions */,
949704B52AB427A700B2CA3A /* Router */,
B6FD6510268D7EA500988A17 /* UseCase */,
949B86E12BBC202700CB8ADF /* Utils */,
C4D6750D2BB2CAE3000A1F79 /* ViewControllers */,
32A9DECC28D198E300ABC3F6 /* ViewModel */,
C47E7BDA25D1550200DB6FF5 /* AudioPlayerItem.swift */,
Expand Down Expand Up @@ -15964,7 +15964,6 @@
83B5E87927F6F8F50073C870 /* CancellableTransferViewModelTests.swift in Sources */,
B67B189925CAAEBA0022D6C0 /* CGSize.swift in Sources */,
B6FB5F8429A3254A0023BA6A /* ChangeTypeEntityMapperTests.swift in Sources */,
949B86E62BBC205D00CB8ADF /* MockImageLoader.swift in Sources */,
6DE5563629F61ED40015A950 /* ChatContentViewModelTests.swift in Sources */,
9949C3662A72424C000C299B /* ChatRoomAvatarInitialsGeneratorTest.swift in Sources */,
99778D982AE74EC700537EA9 /* ChatRoomAvatarViewModelTests.swift in Sources */,
Expand Down Expand Up @@ -16065,6 +16064,7 @@
BF8895B62630F3A4002A18CA /* MockChatRoomUseCase.swift in Sources */,
C4575F31265FA3D500D527DC /* MockDispatchQueue.swift in Sources */,
5BBC13E226CE635B0010115B /* MockFavouritesRouter.swift in Sources */,
949B86E62BBC205D00CB8ADF /* MockImageLoader.swift in Sources */,
8394EB8D2643E5080064F741 /* MockLocalVideoUseCase.swift in Sources */,
2FE5438D264E2BF400FF4955 /* MockMeetingCreatingUseCase.swift in Sources */,
B5663EE029F8F3DB0080FFDA /* MockMEGAPurchase.swift in Sources */,
Expand Down Expand Up @@ -16406,7 +16406,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 14.1;
MARKETING_VERSION = 14.2;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "";
Expand Down Expand Up @@ -16466,7 +16466,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 14.1;
MARKETING_VERSION = 14.2;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "-DNDEBUG";
OTHER_LDFLAGS = "-ObjC";
Expand Down Expand Up @@ -17522,7 +17522,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MARKETING_VERSION = 14.1;
MARKETING_VERSION = 14.2;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CFLAGS = "-DNDEBUG";
OTHER_LDFLAGS = "-ObjC";
Expand Down
2 changes: 1 addition & 1 deletion Modules/DataSource/MEGASDK/Sources/MEGASDK
Submodule MEGASDK updated from 60af2a to 55960c
18 changes: 9 additions & 9 deletions Modules/Presentation/MEGAL10n/Sources/MEGAL10n/Resources/Base.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
/* Button title which triggers the action to join meeting as Guest */
"general.joinMeetingAsGuest"="Join meeting as guest";
/* Message shown when the user writes a wrong email or password on login */
"invalidMailOrPassword"="Invalid email address or password. Please try again.";
"invalidMailOrPassword"="Invalid email address or password. Try again.";
/* Error message when to many attempts to login */
"tooManyAttemptsLogin"="You have attempted to log in too many times. Please wait until %@ and try again.";
/* Text shown just after creating an account to remenber the user what to do to complete the account creation proccess */
Expand Down Expand Up @@ -139,7 +139,7 @@
/* Error text shown when you have not written the same password */
"passwordsDoNotMatch"="Passwords do not match";
/* Error text shown when you don't have selected the checkbox to agree with the Terms of Service */
"termsCheckboxUnselected"="You need to agree with the Terms of Service to register an account on MEGA.";
"termsCheckboxUnselected"="You have to accept our Terms of Service";
/* 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 */
"termsForLosingPasswordCheckboxUnselected"="You need to agree that you understand the danger of losing your password";
/* Error text shown when the users tries to create an account with an email already in use */
Expand Down Expand Up @@ -465,7 +465,7 @@
/* Title for the action that allows you to rename a file or folder */
"rename"="Rename";
/* Hint text to suggest that the user have to write the new name for the file or folder */
"renameNodeMessage"="Enter the new name";
"renameNodeMessage"="Enter a new name";
/* 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: " * / : < > ? \ | */
"general.error.charactersNotAllowed"="The following characters are not allowed: %@";
/* Alert title to ask if user want to rename the file. %@ is a place holder. */
Expand Down Expand Up @@ -553,7 +553,7 @@
/* Used in create album popup album name validation */
"cameraUploads.albums.create.alert.enterDifferentName"="Enter a different name.";
/* Used in create album popup album name validation */
"cameraUploads.albums.create.alert.enterNewName"="Enter a new name.";
"cameraUploads.albums.create.alert.enterNewName"="Enter a new name";
/* Used in add content album view. */
"cameraUploads.albums.create.addItemsTo"="Add items to “%@”";
/* Used in empty album view. */
Expand Down Expand Up @@ -3987,7 +3987,7 @@
/* Calls: Free plan limit warning alert title for max users reached in free plan call */
"calls.freePlanLimitWarning.usersLimitAlert.title"="Cannot join";
/* Calls: Free plan limit warning alert message for max users reached in free plan call */
"calls.freePlanLimitWarning.usersLimitAlert.message"="This call can only support 100 participants. Ask the organiser to upgrade to Pro to remove this restriction.";
"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.";
/* Calls: Free plan limit warning alert button for max users reached in free plan call */
"calls.freePlanLimitWarning.usersLimitAlert.button"="OK, got it";
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
Expand All @@ -4007,13 +4007,13 @@
/* Calls: Text for countdown in call UI for free plan limit warning for duration limit reached in free plan call */
"calls.freePlanLimitWarning.durationLimitCountdown.title"="This free call will end in %@";
/* Meetings: Warning banner shown for hosts when showing list of contracts after trying to add participants to a call */
"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]";
"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]";
/* Meetings: Warning banner shown for non-hosts when showing list of contracts after trying to add participants to a call */
"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.";
"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.";
/* Calls: Text for dialog title presented when call is finished because of free account call duration limit */
"calls.freePlanLimitWarning.upgradeToProDialog.title"="Upgrade to Pro to get unlimited calls";
/* Calls: Text for dialog message presented when call is finished because of free account call duration limit */
"calls.freePlanLimitWarning.upgradeToProDialog.message"="Your call reached the 60 minute limit and has ended. Pro users have unlimited calls and up to 1000 participants.";
"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.";
/* Calls: Text for dialog button presented when call is finished because of free account call duration limit */
"calls.freePlanLimitWarning.upgradeToProDialog.button"="Upgrade now";
/* Hidden files and folders onboarding title */
Expand All @@ -4029,4 +4029,4 @@
/* Hidden files and folders onboarding content out of sight title */
"onboarding.hiddenFilesAndFolders.outOfSight.content.title"="Out of sight";
/* Hidden files and folders onboarding content out of sight message */
"onboarding.hiddenFilesAndFolders.outOfSight.content.message"="You decide when hidden files are visible. There is a new setting to show hidden items temporarily.";
"onboarding.hiddenFilesAndFolders.outOfSight.content.message"="You decide when hidden files are visible. There is a new setting to show hidden items temporarily.";
52 changes: 42 additions & 10 deletions Modules/Presentation/MEGAL10n/Sources/MEGAL10n/Resources/ar.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
/* Button title which triggers the action to join meeting as Guest */
"general.joinMeetingAsGuest"="انضم إلى الاجتماع كضيف";
/* Message shown when the user writes a wrong email or password on login */
"invalidMailOrPassword"="البريد الإلكتروني أو كلمة المرور غير صالحين. حاول مرة أخرى.";
"invalidMailOrPassword"="Invalid email address or password. Try again.";
/* Error message when to many attempts to login */
"tooManyAttemptsLogin"="لقد حاولت تسجيل الدخول مرات كثيرة. الرجاء الانتظار حتى %@ ثم المحاولة ثانية.";
/* Text shown just after creating an account to remenber the user what to do to complete the account creation proccess */
Expand Down Expand Up @@ -139,7 +139,7 @@
/* Error text shown when you have not written the same password */
"passwordsDoNotMatch"="كلمات المرور غير متطابقة";
/* Error text shown when you don't have selected the checkbox to agree with the Terms of Service */
"termsCheckboxUnselected"="تحتاج إلى الموافقة علي شروط الخدمة لتسجيل حساب على ميغا MEGA.";
"termsCheckboxUnselected"="يجب عليك أن تقبل شروط الخدمة";
/* 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 */
"termsForLosingPasswordCheckboxUnselected"="عليك أن توافق على أنك تفهم خطر فقدان كلمة المرور الخاصة بك";
/* Error text shown when the users tries to create an account with an email already in use */
Expand Down Expand Up @@ -465,7 +465,7 @@
/* Title for the action that allows you to rename a file or folder */
"rename"="تغيير الاسم";
/* Hint text to suggest that the user have to write the new name for the file or folder */
"renameNodeMessage"="أدخل الاسم الجديد";
"renameNodeMessage"="أدخل اسمًا جديدًا";
/* 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: " * / : < > ? \ | */
"general.error.charactersNotAllowed"="المحارف التالية غير مسموح بها: %@";
/* Alert title to ask if user want to rename the file. %@ is a place holder. */
Expand Down Expand Up @@ -553,7 +553,7 @@
/* Used in create album popup album name validation */
"cameraUploads.albums.create.alert.enterDifferentName"="أدخل اسمًا مختلفًا.";
/* Used in create album popup album name validation */
"cameraUploads.albums.create.alert.enterNewName"="أدخل اسمًا جديدًا.";
"cameraUploads.albums.create.alert.enterNewName"="أدخل اسمًا جديدًا";
/* Used in add content album view. */
"cameraUploads.albums.create.addItemsTo"="إضافة عناصر إلى ”%@“";
/* Used in empty album view. */
Expand Down Expand Up @@ -3974,27 +3974,59 @@
"calls.sfuOutdated.updateAppAlert.button.skip"="تخطى";
/* 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. */
"meetings.scheduleMeeting.create.freePlanLimitWarning.longerThan60Minutes"="Your current plan can only support 60 minutes per meeting. Need more time? [A]Upgrade now[/A]";
/* Notifications: text for notification type display name */
"notifications.notificationType.promo.title"="عرض لفترة محدودة";
/* Notifications: tag to show the user that there are promotions available in the notifications page and section. */
"notifications.tag.promo.title"="ترويج";
/* 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. */
"notifications.expiration.message"="تنتهي الصلاحية في %1$s الساعة %2$s";
/* 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. */
"notifications.expiration.message"="Expires on [date] at [time]";
/* Title for action that allows user to hide files or folders */
"general.menuAction.hide.title"="إخفاء";
/* Title for action that allows user to unhide files or folders */
"general.menuAction.unhide.title"="إلغاء الإخفاء";
/* Calls: Free plan limit warning alert title for max users reached in free plan call */
"calls.freePlanLimitWarning.usersLimitAlert.title"="لا يمكن الانضمام";
/* Calls: Free plan limit warning alert message for max users reached in free plan call */
"calls.freePlanLimitWarning.usersLimitAlert.message"="يمكن لهذه المكالمة دعم 100 مشارك فقط. اطلب من المنظم الترقية إلى برو Pro لإزالة هذا القيد.";
"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.";
/* Calls: Free plan limit warning alert button for max users reached in free plan call */
"calls.freePlanLimitWarning.usersLimitAlert.button"="حسنًا، فهمت ذلك";
/* Meetings: A warning message shown in the call UI when free-plan user has more than 100 participants */
"meetings.waitingRoom.warning.limit100Participants"="يمكن لـ 100 مشارك الانضمام إلى المكالمة. لن يتمكن أي مشارك إضافي إلا من إرسال المحادثات وقراءتها. هل تحتاج إلى إضافة المزيد من المشاركين؟ [A]قم بالترقية الآن[/A]";
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
"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.";
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
"meetings.waitingRoom.banner.limit100Participants.organizer-host"="Only 100 participants can join the call. Need more? [A]Upgrade now[/A]";
/* Meetings: An warning shown in the banner in the waiting room tab when free-plan user has more than 100 participants */
"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.";
/* Meetings: An warning shown in the banner in the in-call tab when free-plan user has more than 100 participants */
"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]";
/* Calls: Free plan limit warning alert message for duration limit reached in free plan call */
"calls.freePlanLimitWarning.durationLimitAlert.message"="هل تحتاج إلى مزيد من الوقت؟ تحتوي باقات برو Pro على مكالمات غير محدودة المدة.";
/* Calls: Free plan limit warning alert upgrade button for duration limit reached in free plan call */
"calls.freePlanLimitWarning.durationLimitAlert.upgrade"="الترقية";
/* Calls: Free plan limit warning alert not now button for duration limit reached in free plan call */
"calls.freePlanLimitWarning.durationLimitAlert.notNow"="ليس الآن";
/* Calls: Text for countdown in call UI for free plan limit warning for duration limit reached in free plan call */
"calls.freePlanLimitWarning.durationLimitCountdown.title"="ستنتهي هذه المكالمة المجانية في %@";
"calls.freePlanLimitWarning.durationLimitCountdown.title"="ستنتهي هذه المكالمة المجانية في %@";
/* Meetings: Warning banner shown for hosts when showing list of contracts after trying to add participants to a call */
"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]";
/* Meetings: Warning banner shown for non-hosts when showing list of contracts after trying to add participants to a call */
"meetings.contact-picker.warning.over-limit.non-host"="يمكن لـ 100 مشارك فقط الانضمام إلى المكالمة. لن يتمكن أي مشارك إضافي إلا من إرسال المحادثات وقراءتها. اطلب من المنظم إزالة هذا التقييد.";
/* Calls: Text for dialog title presented when call is finished because of free account call duration limit */
"calls.freePlanLimitWarning.upgradeToProDialog.title"="Upgrade to Pro to get unlimited calls";
/* Calls: Text for dialog message presented when call is finished because of free account call duration limit */
"calls.freePlanLimitWarning.upgradeToProDialog.message"="وصلت مكالمتك إلى حد 60 دقيقة وانتهت. يتمتع مستخدمو برو Pro بمدة مكالمات غير محدودة ويمكنهم دعوة ما يصل إلى 1000 مشارك.";
/* Calls: Text for dialog button presented when call is finished because of free account call duration limit */
"calls.freePlanLimitWarning.upgradeToProDialog.button"="رق حسابك الآن";
/* Hidden files and folders onboarding title */
"onboarding.hiddenFilesAndFolders.title"="Hidden files and folders";
/* Hidden files and folders onboarding content hide important title */
"onboarding.hiddenFilesAndFolders.hideImportant.content.title"="Hide important files and folders";
/* Hidden files and folders onboarding content hide important message */
"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.";
/* Hidden files and folders onboarding content exclude from timeline title */
"onboarding.hiddenFilesAndFolders.excludeTimeline.content.title"="Exclude from Timeline";
/* Hidden files and folders onboarding content exclude from timeline section message */
"onboarding.hiddenFilesAndFolders.excludeTimeline.content.message"="Hidden items are only accessible through the Cloud drive and will not appear in your Photos, Albums or Recents.";
/* Hidden files and folders onboarding content out of sight title */
"onboarding.hiddenFilesAndFolders.outOfSight.content.title"="Out of sight";
/* Hidden files and folders onboarding content out of sight message */
"onboarding.hiddenFilesAndFolders.outOfSight.content.message"="You decide when hidden files are visible. There is a new setting to show hidden items temporarily.";
Loading

0 comments on commit 89cac8d

Please sign in to comment.