Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use UK english #3407

Merged
merged 1 commit into from
May 2, 2024
Merged

use UK english #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/qml/dialogs/MMMissingAuthDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" )

Expand Down
2 changes: 1 addition & 1 deletion app/qml/dialogs/MMNoPermissionsDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion app/qml/dialogs/MMRemoveProjectDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion app/qml/dialogs/MMSyncFailedDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." )
Expand Down
4 changes: 2 additions & 2 deletions app/qml/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ ApplicationWindow {

if ( success )
{
__notificationModel.addSuccess( qsTr( "Successfully synchronized" ) )
__notificationModel.addSuccess( qsTr( "Successfully synchronised" ) )

// refresh canvas
map.refreshMap()
Expand Down Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion app/qml/project/MMProjectList.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion app/qml/project/components/MMProjectDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ Control {
"callback": () => root.syncRequested()
},
"sync": {
"name": qsTr("Synchronize project"),
"name": qsTr("Synchronise project"),
"iconSource": __style.syncGreenIcon,
"callback": () => root.syncRequested()
},
Expand Down
4 changes: 2 additions & 2 deletions app/synchronizationmanager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<QString> pendingProjects() const;
Expand Down
Loading