diff --git a/app/qml/dialogs/MMMissingAuthDialog.qml b/app/qml/dialogs/MMMissingAuthDialog.qml index 9724aea44..cdcf081f2 100644 --- a/app/qml/dialogs/MMMissingAuthDialog.qml +++ b/app/qml/dialogs/MMMissingAuthDialog.qml @@ -18,7 +18,7 @@ MMDrawerDialog { imageSource: __style.signInImage title: qsTr( "Sign in to your account" ) - description: qsTr( "You need to be signed in to your Mergin Maps account in order to synchronize the project." ) + description: qsTr( "You need to be signed in to your Mergin Maps account in order to synchronise the project." ) primaryButton.text: qsTr( "Yes, I want to sign in" ) secondaryButton.text: qsTr( "No, thanks" ) diff --git a/app/qml/dialogs/MMNoPermissionsDialog.qml b/app/qml/dialogs/MMNoPermissionsDialog.qml index 39bbb8039..f0c16fe42 100644 --- a/app/qml/dialogs/MMNoPermissionsDialog.qml +++ b/app/qml/dialogs/MMNoPermissionsDialog.qml @@ -16,7 +16,7 @@ MMDrawerDialog { imageSource: __style.noPermissionsImage title: qsTr( "No rights to access the project" ) - description: qsTr( "You are not allowed to synchronize your changes in this project. Contact the project owner to assign you the correct permission. If you are the project owner, log in to the dashboard." ) + description: qsTr( "You are not allowed to synchronise your changes in this project. Contact the project owner to assign you the correct permission. If you are the project owner, log in to the dashboard." ) primaryButton.text: qsTr( "Ok, I understand" ) onPrimaryButtonClicked: { diff --git a/app/qml/dialogs/MMRemoveProjectDialog.qml b/app/qml/dialogs/MMRemoveProjectDialog.qml index f3ce42ed6..d17517c2f 100644 --- a/app/qml/dialogs/MMRemoveProjectDialog.qml +++ b/app/qml/dialogs/MMRemoveProjectDialog.qml @@ -22,7 +22,7 @@ MMDrawerDialog { imageSource: __style.negativeMMSymbolImage title: qsTr( "Remove project" ) - description: qsTr( "Any unsynchronized changes will be lost in project \n %1" ).arg( relatedProjectId ) + description: qsTr( "Any unsynchronised changes will be lost in project \n %1" ).arg( relatedProjectId ) primaryButton.text: qsTr("Remove") secondaryButton.text: qsTr("Cancel") diff --git a/app/qml/dialogs/MMSyncFailedDialog.qml b/app/qml/dialogs/MMSyncFailedDialog.qml index c47703093..bddd1b649 100644 --- a/app/qml/dialogs/MMSyncFailedDialog.qml +++ b/app/qml/dialogs/MMSyncFailedDialog.qml @@ -24,7 +24,7 @@ MMComponents.MMDrawerDialog { property string detailedText - title: qsTr( "Failed to synchronize your changes" ) + title: qsTr( "Failed to synchronise your changes" ) imageSource: __style.syncFailedImage description: qsTr( "Your changes could not be sent to the server, make sure you have a data connection and have permission to edit this project." ) diff --git a/app/qml/main.qml b/app/qml/main.qml index 71eb4b212..bd8ff9ed2 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -799,7 +799,7 @@ ApplicationWindow { if ( success ) { - __notificationModel.addSuccess( qsTr( "Successfully synchronized" ) ) + __notificationModel.addSuccess( qsTr( "Successfully synchronised" ) ) // refresh canvas map.refreshMap() @@ -838,7 +838,7 @@ ApplicationWindow { if ( willRetry ) { // TODO: open sync failed dialogue when clicked on the notification - __notificationModel.addError( qsTr( "There was an issue during synchronization, we will try again. Click to learn more" ) ) + __notificationModel.addError( qsTr( "There was an issue during synchronisation, we will try again. Click to learn more" ) ) } else { diff --git a/app/qml/project/MMProjectList.qml b/app/qml/project/MMProjectList.qml index d6a67af6c..ddc017e9a 100644 --- a/app/qml/project/MMProjectList.qml +++ b/app/qml/project/MMProjectList.qml @@ -159,7 +159,7 @@ Item { onSyncRequested: { if ( model.ProjectRemoteError ) { - __notificationModel.addError( qsTr( "Could not synchronize project, please make sure you are logged in and have sufficient rights." ) ) + __notificationModel.addError( qsTr( "Could not synchronise project, please make sure you are logged in and have sufficient rights." ) ) } else if ( !model.ProjectIsMergin ) { controllerModel.migrateProject( projectId ) diff --git a/app/qml/project/components/MMProjectDelegate.qml b/app/qml/project/components/MMProjectDelegate.qml index 02a3e1f6f..6eeb8d8eb 100644 --- a/app/qml/project/components/MMProjectDelegate.qml +++ b/app/qml/project/components/MMProjectDelegate.qml @@ -288,7 +288,7 @@ Control { "callback": () => root.syncRequested() }, "sync": { - "name": qsTr("Synchronize project"), + "name": qsTr("Synchronise project"), "iconSource": __style.syncGreenIcon, "callback": () => root.syncRequested() }, diff --git a/app/synchronizationmanager.h b/app/synchronizationmanager.h index a0259d31d..bad22e6d0 100644 --- a/app/synchronizationmanager.h +++ b/app/synchronizationmanager.h @@ -47,10 +47,10 @@ class SynchronizationManager : public QObject Q_INVOKABLE void migrateProjectToMergin( const QString &projectName ); - //! Returns sync progress of specified project in range <0, 1>. Returns -1 if this project is not being synchronized. + //! Returns sync progress of specified project in range <0, 1>. Returns -1 if this project is not being synchronised. qreal syncProgress( const QString &projectFullName ) const; - //! Returns true if specified project is being synchronized, false otherwise. + //! Returns true if specified project is being synchronised, false otherwise. Q_INVOKABLE bool hasPendingSync( const QString &projectFullName ) const; QList pendingProjects() const;