Merge branch 'develop' into CP-2203

mudita · Oct 12, 2023 · 2b08050 · 2b08050
2 parents 0cbb920 + c83528e
commit 2b08050
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,12 +14,15 @@ straightforward as possible.
 
 ### Fixed
 
-- Fixed issue with breaking connection when deleting large number of contacts
-- Improved search results preview when searching for contact in Contacts tab and Messages tab
-- Added normalization of news' texts
+- Fixed issue with breaking connection when deleting a large number of contacts
+- Improved search results preview when searching for contacts in Contacts and Messages section
 - Fixed issues with creating device backup and changing device
-- Fixed Mudita Center not stopping files upload after disconnecting the device
-- Added possibility to stop file upload if user selected more files than can be uploaded to Mudita Harmony
+- Fixed an issue in which Mudita Center did not stop file transfer when the device was disconnected
+- Added possibility to stop file upload if the user selected more files than can be uploaded to Mudita Harmony
+- Added the possibility to upload only supported files in scenarios when selected files included unsupported ones instead of terminating the flow
+- The formatting of headlines in News section articles has been improved
+- Changed connection error flow to be more user-friendly
+- Changed text in contacts import flow for a more intuitive one
 
 ## [2.2.2] - 2023-09-28
 

diff --git a/packages/app/package-lock.json b/packages/app/package-lock.json
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mudita/mudita-center-app",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Mudita Center",
   "main": "./dist/main.js",
   "productName": "Mudita Center",

diff --git a/packages/app/src/__deprecated__/renderer/locales/default/en-US.json b/packages/app/src/__deprecated__/renderer/locales/default/en-US.json
@@ -262,8 +262,8 @@
   "module.connecting.criticalBatteryLevelModalHeaderTitle": "MuditaOS",
   "module.connecting.criticalBatteryLevelModalTitle": "The battery in your Pure is flat.",
   "module.connecting.errorConnectingDescription": "If you still have problems connecting to your device, have a look at our <link>help pages.</link>",
-  "module.connecting.errorConnectingModalHeaderTitle": "Error",
   "module.connecting.errorConnectingModalHeaderSubTitle": "We couldn't connect to your device",
+  "module.connecting.errorConnectingModalHeaderTitle": "Error",
   "module.connecting.errorConnectingModalSecondaryButton": "Cancel",
   "module.connecting.errorConnectingModalTitle": "Make sure your device is plugged in using a USB C cable and restart Mudita Center or your computer to try again",
   "module.connecting.errorSyncModalButton": "Try again",
@@ -395,7 +395,7 @@
   "module.contacts.synchronizingModalBody": "This might take a few minutes, please wait.",
   "module.contacts.synchronizingModalTitle": "Synchronising contacts…",
   "module.contacts.syncModalHelpText": "For Apple Devices, you'll need to <link>create a vCard (VFC file)</link>, then import it.",
-  "module.contacts.syncModalText": "To start importing contacts to and from your Google or Outlook accounts, simply log in to your account.",
+  "module.contacts.syncModalText": "To start importing contacts from your Google or Outlook accounts, simply log in to your account.",
   "module.contacts.syncModalTitle": "Import contacts",
   "module.contacts.unblock": "Unblock",
   "module.contacts.unblockTooltipDescription": "Unblock contact",
@@ -421,10 +421,11 @@
   "module.filesManager.duplicatedFilesUploadModalPendingFilesTextInfo": "Of the {uploadFilesCount} files you selected, {duplicatedFilesCount} {duplicatedFilesCount, plural, one {file}  other {files}} with that name\nalready exist on your device. Change the name and try again.",
   "module.filesManager.duplicatedFilesUploadModalTextInfo": "The file with this name already exists on the device. Change the name and try again.",
   "module.filesManager.duplicatedFilesUploadModalTitle": "Upload files",
+  "module.filesManager.invalidFiledModalButton": "Ok",
   "module.filesManager.invalidFiledModalFilesInfo": "We found some files which wouldn't work on your device. To avoid problems we only uploaded the files that will work.",
+  "module.filesManager.invalidFiledModalHeadline": "Some files wouldn't work",
   "module.filesManager.invalidFiledModalHelpInfo": "To find out more about which files work on your device, visit our {link}.",
   "module.filesManager.invalidFiledModalTitle": "Upload files",
-  "module.filesManager.invalidFiledModalHeadline": "Some files wouldn't work",
   "module.filesManager.invalidFiledModalUploadInfo": "To avoid problems we only uploaded the files that will work.",
   "module.filesManager.invalidFiledModalButton": "Ok",
   "module.filesManager.panelSearchPlaceholder": "Search music files",

diff --git a/packages/app/src/help/default-help.json b/packages/app/src/help/default-help.json
@@ -2770,5 +2770,5 @@
       }
     }
   },
-  "nextSyncToken": "w7Ese3kdwpMbMhhgw7QAUsKiw6bCiw_ClnfDrRLCuFDDkMO5YcKMJQ_CvcKUecOnMHjCjsOGw5HDu1Fdwrs7E8KjYGgHwqDCtMOvdsOJwocvKyxbRmUuQ27CgsKFwr1PUw9ywqjCu8OSwq4wf8Kowo7Du8O8wrfCkcKWw4BTRjonwpvDrx0hJAnDiAPDjCXDmFsxwpvDi2TDs0LCgMKqw49_w7Ee"
+  "nextSyncToken": "w7Ese3kdwpMbMhhgw7QAUsKiw6bCiw_ClnfDrRLCuFDDkMO5YcKMJQ_CvcKUecOnMHjCjsOGw5HDu1Fdwrs7E8KjYGgHJcK7wqwmwp0pSsKWw5fCmsK1wrPCsMKsHsKSYSAkw43ClnBRwoUvwppOUjw6w7TDucK-AcOWwrtew73CgMOoRlfCqX4NRCrDn2B_w5JQcMODDwRbwr7DkjPDmcKqKHM"
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2770,5 +2770,5 @@ @@
           }
         }
       },
-      "nextSyncToken": "w7Ese3kdwpMbMhhgw7QAUsKiw6bCiw_ClnfDrRLCuFDDkMO5YcKMJQ_CvcKUecOnMHjCjsOGw5HDu1Fdwrs7E8KjYGgHwqDCtMOvdsOJwocvKyxbRmUuQ27CgsKFwr1PUw9ywqjCu8OSwq4wf8Kowo7Du8O8wrfCkcKWw4BTRjonwpvDrx0hJAnDiAPDjCXDmFsxwpvDi2TDs0LCgMKqw49_w7Ee"
+      "nextSyncToken": "w7Ese3kdwpMbMhhgw7QAUsKiw6bCiw_ClnfDrRLCuFDDkMO5YcKMJQ_CvcKUecOnMHjCjsOGw5HDu1Fdwrs7E8KjYGgHJcK7wqwmwp0pSsKWw5fCmsK1wrPCsMKsHsKSYSAkw43ClnBRwoUvwppOUjw6w7TDucK-AcOWwrtew73CgMOoRlfCqX4NRCrDn2B_w5JQcMODDwRbwr7DkjPDmcKqKHM"
     }