From 4d0250964628d8f3fe691a0051097b857d16105a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Liz=C3=A9?= Date: Tue, 7 Jan 2025 12:46:04 +0100 Subject: [PATCH 1/3] Update translations --- src/MEGASync/gui/translations/MEGASyncStrings_ar.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_de.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_es.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_fr.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_ko.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_nl.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_ro.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_th.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_vi.ts | 6 +++--- src/MEGASync/gui/translations/MEGASyncStrings_zh_CN.ts | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_ar.ts b/src/MEGASync/gui/translations/MEGASyncStrings_ar.ts index 277f7dbf5..1280d7ffc 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_ar.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_ar.ts @@ -4857,7 +4857,7 @@ Enter a different name Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - سيتم نسخ المجلدات المحددة تلقائيًا إلى ميغا MEGA عند تشغيل تطبيق الحاسوب المكتبي. + سيتم نسخ المجلدات المحددة تلقائيًا إلى ميغا MEGA كمجلدات للقراءة فقط عند تشغيل تطبيق الحاسوب المكتبي. يمكن إجراء التغييرات فقط على النسخ الاحتياطية على جهازك المحلي. Select a local folder @@ -5087,12 +5087,12 @@ Enter a different name Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - قم بمزامنة سواقة ميغا MEGA السحابية بالكامل مع جهازك المحلي. + قم بمزامنة سواقة ميغا MEGA السحابية بالكامل في اتجاهين مع جهاز محلي. سيتم تحديث المجلدات بالتعديلات التي يتم إجراؤها محليًا أو في ميغا MEGA. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - قم بمزامنة المجلدات المحددة في سواقة ميغا MEGA السحابية الخاص بك مع جهازك المحلي. + قم بمزامنة المجلدات المحددة في سواقة ميغا MEGA السحابية الخاصة بك مع جهازك المحلي. سيتم تحديث المجلدات بالتعديلات التي يتم إجراؤها محليًا أو في ميغا MEGA. View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_de.ts b/src/MEGASync/gui/translations/MEGASyncStrings_de.ts index 01f1895f4..c3cd4067d 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_de.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_de.ts @@ -4853,7 +4853,7 @@ Bitte geben Sie einen anderen Namen ein. Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - Die ausgewählten Ordner werden automatisch auf MEGA gesichert, wenn die Desktop-App ausgeführt wird. + Die ausgewählten Ordner werden automatisch als schreibgeschützte Ordner auf MEGA gesichert, wenn die Desktop-App ausgeführt wird. Änderungen können nur an Backups auf Ihrem lokalen Gerät vorgenommen werden. Select a local folder @@ -5083,12 +5083,12 @@ Bitte geben Sie einen anderen Namen ein. Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - Synchronisieren Sie Ihr gesamtes MEGA Cloud Drive mit Ihrem lokalen Gerät. + Bidirektionale Synchronisierung Ihrer gesamte MEGA-Cloud mit einem lokalen Gerät. Die Ordner werden bei lokalen oder auf MEGA vorgenommenen Änderungen auf dem neuesten Stand gehalten. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - Synchronisieren Sie ausgewählte Ordner in Ihrem MEGA Cloud Drive mit Ihrem lokalen Gerät. + Synchronisierung ausgewählter Ordner in Ihrem MEGA Cloud Drive mit Ihrem lokalen Gerät. Die Ordner werden bei lokalen oder auf MEGA vorgenommenen Änderungen auf dem neuesten Stand gehalten. View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_es.ts b/src/MEGASync/gui/translations/MEGASyncStrings_es.ts index e91a4c85d..0691ed1a3 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_es.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_es.ts @@ -5062,7 +5062,7 @@ Introduzca un nombre diferente. Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - Se hará el backup en MEGA de las carpetas seleccionadas de forma automática cuando se ejecute la aplicación de escritorio. + Se hará el backup en MEGA de las carpetas seleccionadas de forma automática como carpetas de solo lectura cuando la aplicación de escritorio esté en funcionamiento. Los cambios solo se podrán hacer en los backups en tu dispositivo local. Selective sync @@ -5107,7 +5107,7 @@ Introduzca un nombre diferente. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - Sincroniza las carpetas seleccionadas de tu nube de MEGA con tu dispositivo. + Sincroniza las carpetas seleccionadas de tu nube de MEGA con tu dispositivo local. Las carpetas se mantendrán actualizadas con las ediciones realizadas localmente o en MEGA. Sync set up @@ -5122,7 +5122,7 @@ Introduzca un nombre diferente. Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - Sincroniza toda tu nube de MEGA con tu dispositivo. + Sincroniza bidireccionalmente toda tu nube de MEGA con un dispositivo local. Las carpetas se mantendrán actualizadas con las ediciones realizadas localmente o en MEGA. Sync your files between your computers with MEGA cloud, any change from one side will apply to another side. diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_fr.ts b/src/MEGASync/gui/translations/MEGASyncStrings_fr.ts index ee2205560..e1b7c9dde 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_fr.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_fr.ts @@ -5063,7 +5063,7 @@ Saisissez un nom différent. Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - Les dossiers sélectionnés seront sauvegardés automatiquement sur MEGA lors de l’exécution de l’appli pour ordinateur. + Les dossiers sélectionnés sont automatiquement sauvegardés dans MEGA en tant que dossiers en lecture seule lorsque l’application pour ordinateur est en cours d’exécution. Les modifications ne peuvent être apportées qu’aux sauvegardes de votre appareil local. Selective sync @@ -5108,7 +5108,7 @@ Saisissez un nom différent. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - Synchronisez certains dossiers de votre Disque nuagique MEGA avec votre appareil local. + Synchronisez les dossiers sélectionnés sur votre disque nuagique MEGA avec votre appareil local. Les dossiers resteront à jour avec les modifications apportées localement ou dans MEGA. Sync set up @@ -5123,7 +5123,7 @@ Saisissez un nom différent. Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - Synchronisez l’intégralité de votre disque nuagique MEGA avec votre appareil local. + Synchronisez l’intégralité de votre MEGA Cloud dans les deux sens avec un appareil local. Les dossiers resteront à jour avec les modifications apportées localement ou dans MEGA. Sync your files between your computers with MEGA cloud, any change from one side will apply to another side. diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_ko.ts b/src/MEGASync/gui/translations/MEGASyncStrings_ko.ts index 99d5e3573..568ecd1ae 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_ko.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_ko.ts @@ -4854,7 +4854,7 @@ Enter a different name Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - 데스크톱 앱이 실행 중일 때 선택된 폴더가 자동으로 MEGA에 백업됩니다. + 데스크톱 앱이 실행 중일 때 선택된 폴더가 자동으로 MEGA에 읽기 전용 폴더로 백업됩니다. 백업에 대한 변경은 로컬 장치에서만 할 수 있습니다. Select a local folder @@ -5084,12 +5084,12 @@ Enter a different name Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - MEGA 클라우드 드라이브 전체를 로컬 장치와 동기화 + 양방향 동기화는 MEGA 클라우드 전체를 로컬 장치와 동기화합니다. 폴더는 로컬에서 또는 MEGA에서 수정할 수 있는 상태로 최신 상태를 유지합니다. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - MEGA 클라우드 드라이브의 선택한 폴더를 로컬 장치와 동기화 + MEGA 클라우드 드라이브의 선택한 폴더를 로컬 장치와 동기화합니다. 폴더는 로컬 또는 MEGA에서 수정할 수 있는 상태로 최신 상태를 유지합니다. View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_nl.ts b/src/MEGASync/gui/translations/MEGASyncStrings_nl.ts index 908cb1326..746ef4e2f 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_nl.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_nl.ts @@ -4854,7 +4854,7 @@ Voer een andere naam in. Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - Van geselecteerde mappen wordt automatisch een back-up gemaakt naar MEGA wanneer de desktop-applicatie actief is. + Geselecteerde mappen zullen automatisch een back-up maken naar MEGA als mappen die alleen kunnen worden gelezen wanneer de desktop-applicatie actief is. Wijzigingen kunnen alleen worden aangebracht in de backup op uw lokale apparaat. Select a local folder @@ -5084,12 +5084,12 @@ Voer een andere naam in. Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - Synchroniseer uw volledige MEGA Cloud-schijf met uw lokale apparaat. + Uw volledige MEGA Cloud in twee richtingen synchroniseren met een lokaal apparaat. Mappen blijven up-to-date met wijzigingen die lokaal of in MEGA zijn gemaakt. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - Synchroniseer geselecteerde mappen op uw MEGA Cloud-schijf met uw lokale apparaat. + Synchroniseer geselecteerde mappen op uw MEGA Cloud-schijf met uw lokale apparaat. Mappen blijven up-to-date met wijzigingen die lokaal of in MEGA zijn gemaakt. View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_ro.ts b/src/MEGASync/gui/translations/MEGASyncStrings_ro.ts index 51d1d310c..e9d88eb24 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_ro.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_ro.ts @@ -4854,7 +4854,7 @@ Introdu un alt nume. Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - Folderele selectate vor backup automat la MEGA atunci când aplicația desktop rulează. + Folderele selectate vor face automat o copie de rezervă la MEGA ca foldere numai citire atunci când aplicația desktop rulează. Modificările pot fi făcute numai la backup-urile de pe dispozitivul dvs. local. Select a local folder @@ -5084,12 +5084,12 @@ Introdu un alt nume. Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - Sincronizați întreaga unitate MEGA Cloud cu dispozitivul dvs. local. + Sincronizați în două sensuri întregul MEGA Cloud cu un dispozitiv local. Dosarele vor rămâne la curent cu modificările făcute local sau în MEGA. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - Sincronizați folderele selectate din unitatea MEGA Cloud cu dispozitivul dvs. local. + Sincronizați folderele selectate din unitatea MEGA Cloud cu dispozitivul local. Dosarele vor rămâne la curent cu modificările făcute local sau în MEGA. View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_th.ts b/src/MEGASync/gui/translations/MEGASyncStrings_th.ts index 49cda4faa..bb93e1a47 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_th.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_th.ts @@ -4849,7 +4849,7 @@ Enter a different name Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - โฟลเดอร์ที่เลือกไว้จะสำรองข้อมูลไปยัง MEGA โดยอัตโนมัติเมื่อแอปเดสก์ท็อปทำงานอยู่ + โฟลเดอร์ที่เลือกจะถูกสำรองข้อมูลไปยัง MEGA โดยอัตโนมัติในรูปแบบอ่านอย่างเดียวเมื่อแอปเดสก์ท็อปทำงาน การเปลี่ยนแปลงสามารถทำได้กับการสำรองข้อมูลบนอุปกรณ์ในเครื่องของคุณเท่านั้น Select a local folder @@ -5079,12 +5079,12 @@ Enter a different name Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - ซิงค์ไฟล์ทั้งหมดใน MEGA คลาวด์ของคุณกับอุปกรณ์ของคุณ + ซิงค์ข้อมูลสองทางระหว่างพื้นที่เก็บข้อมูล MEGA คลาวด์กับอุปกรณ์ของคุณ โฟลเดอร์จะอัปเดตอัตโนมัติเมื่อมีการแก้ไขทั้งในเครื่องและใน MEGA Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - ซิงค์โฟลเดอร์ที่เลือกไว้ในคลาวด์ MEGA ของคุณกับอุปกรณ์ของคุณ + ซิงค์โฟลเดอร์ที่คุณเลือกจากพื้นที่เก็บข้อมูล MEGA คลาวด์มายังอุปกรณ์ของคุณ โฟลเดอร์จะอัปเดตอัตโนมัติเมื่อมีการแก้ไขทั้งในเครื่องและใน MEGA View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_vi.ts b/src/MEGASync/gui/translations/MEGASyncStrings_vi.ts index ac20d58b4..053b4aea8 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_vi.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_vi.ts @@ -4851,7 +4851,7 @@ Nhập một tên khác. Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - Các thư mục đã chọn sẽ tự động sao lưu lên MEGA khi ứng dụng cho máy tính đang chạy. + Các thư mục đã chọn sẽ tự động sao lưu lên MEGA dưới dạng chỉ-được-đọc khi ứng dụng cho máy tính đang chạy. Các thay đổi bên trong chỉ có thể ghi vào sao lưu tại thiết bị cục bộ của bạn. Select a local folder @@ -5081,12 +5081,12 @@ Nhập một tên khác. Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - Đồng bộ hóa toàn bộ Ổ Mây MEGA của bạn với thiết bị cục bộ của bạn. + Đồng bộ hai chiều toàn bộ Ổ Mây MEGA của bạn với thiết bị cục bộ. Các thư mục sẽ được cập nhật với các chỉnh sửa được thực hiện tại cục bộ hoặc trên MEGA. Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - Đồng bộ hóa các thư mục đã chọn ra trong Ổ Mây MEGA của bạn với thiết bị cục bộ của bạn. + Đồng bộ các thư mục được chọn trên Ổ Mây MEGA của bạn với thiết bị cục bộ. Các thư mục sẽ được cập nhật với các chỉnh sửa được thực hiện tại cục bộ hoặc trên MEGA. View in Settings diff --git a/src/MEGASync/gui/translations/MEGASyncStrings_zh_CN.ts b/src/MEGASync/gui/translations/MEGASyncStrings_zh_CN.ts index 6231db8e1..56628bbd3 100644 --- a/src/MEGASync/gui/translations/MEGASyncStrings_zh_CN.ts +++ b/src/MEGASync/gui/translations/MEGASyncStrings_zh_CN.ts @@ -4852,7 +4852,7 @@ Enter a different name Selected folders will automatically back up to the cloud when the desktop app is running. Descriptive text in backups CON-466 - 当桌面应用程序运行时，所选文件夹将自动备份到MEGA。 + 当桌面应用程序运行时，所选文件夹将自动以只读文件夹的形式备份到MEGA。只能对本地设备上的备份进行更改。 Select a local folder @@ -5082,12 +5082,12 @@ Enter a different name Sync your entire MEGA Cloud drive with your local device. Button description for the full sync action. CON-833 - 将您的整个MEGA云盘与本地设备同步。 + 将您的整个MEGA云盘与本地设备双向同步。对本地或MEGA编辑的文件夹将保持最新状态。 Sync selected folders in your MEGA Cloud drive with your local device. Button description for the selective sync action. CON-833 - 将您MEGA云盘中的选定文件夹与您的本地设备同步。 + 将您的MEGA云盘中的选定文件夹与本地设备同步。对本地或MEGA编辑的文件夹将保持最新状态。 View in Settings From 0fbcb35bcccd7a84a05d0fdf7a4529e41413e925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Liz=C3=A9?= Date: Tue, 7 Jan 2025 12:56:07 +0100 Subject: [PATCH 2/3] Bump year to 2025 --- installer_win.nsi | 2 +- src/MEGASync/control/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer_win.nsi b/installer_win.nsi index ec7810554..aa6c2bc8a 100644 --- a/installer_win.nsi +++ b/installer_win.nsi @@ -23,7 +23,7 @@ BrandingText "MEGA Limited" VIAddVersionKey "CompanyName" "MEGA Limited" VIAddVersionKey "FileDescription" "MEGAsync" -VIAddVersionKey "LegalCopyright" "MEGA Limited 2024" +VIAddVersionKey "LegalCopyright" "MEGA Limited 2025" VIAddVersionKey "ProductName" "MEGAsync" !define PRODUCT_PUBLISHER "Mega Limited" diff --git a/src/MEGASync/control/Version.h b/src/MEGASync/control/Version.h index 33aec6754..84148fd96 100644 --- a/src/MEGASync/control/Version.h +++ b/src/MEGASync/control/Version.h @@ -12,7 +12,7 @@ #define VER_COMPANYNAME_STR "Mega Limited\0" #define VER_FILEDESCRIPTION_STR "MEGAsync\0" #define VER_INTERNALNAME_STR "MEGAsync.exe\0" -#define VER_LEGALCOPYRIGHT_STR "Mega Limited 2024\0" +#define VER_LEGALCOPYRIGHT_STR "Mega Limited 2025\0" #define VER_LEGALTRADEMARKS1_STR "All Rights Reserved" #define VER_ORIGINALFILENAME_STR "MEGAsync.exe\0" #define VER_PRODUCTNAME_STR "MEGAsync\0" From 9f7fd742f2794d901bdbdf7b5291d6cc2f1c60b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Liz=C3=A9?= Date: Tue, 7 Jan 2025 12:56:30 +0100 Subject: [PATCH 3/3] Bump version to v5.7.1 RC1 and sdk to v8.0.2-rc.1 --- src/MEGASync/control/Version.h | 12 ++++++------ src/MEGASync/mega | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/MEGASync/control/Version.h b/src/MEGASync/control/Version.h index 84148fd96..9df4cecd9 100644 --- a/src/MEGASync/control/Version.h +++ b/src/MEGASync/control/Version.h @@ -1,13 +1,13 @@ #ifndef VERSION_H #define VERSION_H -#define VER_FILEVERSION 5, 7, 0, 0 -#define VER_FILEVERSION_CODE 50700 -#define VER_PRODUCTVERSION 5, 7, 0, 0 +#define VER_FILEVERSION 5, 7, 1, 0 +#define VER_FILEVERSION_CODE 50701 +#define VER_PRODUCTVERSION 5, 7, 1, 0 // Update scripts relying on this value if you move it -#define VER_PRODUCTVERSION_STR "5.7.0.0\0" +#define VER_PRODUCTVERSION_STR "5.7.1.0\0" -#define VER_BUILD_ID 3 +#define VER_BUILD_ID 0 #define VER_COMPANYNAME_STR "Mega Limited\0" #define VER_FILEDESCRIPTION_STR "MEGAsync\0" @@ -18,7 +18,7 @@ #define VER_PRODUCTNAME_STR "MEGAsync\0" /* SDK commit hash, 7 chars */ -#define VER_SDK_ID "81f2d1c" +#define VER_SDK_ID "d6a5d20" /* Update scrips relying on this value if you move it Format: 1 item by line, starting from line following the #define diff --git a/src/MEGASync/mega b/src/MEGASync/mega index 81f2d1cde..d6a5d2078 160000 --- a/src/MEGASync/mega +++ b/src/MEGASync/mega @@ -1 +1 @@ -Subproject commit 81f2d1cde975859ff264c66b808cfa855f79ae82 +Subproject commit d6a5d2078d1e51394dab205a48bff58d2b130d6b