From b7c2e16aa96c8e4fabc9549be941cc7a9bd3f911 Mon Sep 17 00:00:00 2001
From: Claudio Cambra
Date: Thu, 23 Jun 2022 11:13:18 +0200
Subject: [PATCH] Make client language gender-neutral and more clear
Signed-off-by: Claudio Cambra
---
src/cmd/cmd.cpp | 4 ++--
src/gui/UserStatusSelectorDialog.qml | 2 +-
src/gui/application.cpp | 2 +-
src/gui/authenticationdialog.cpp | 2 +-
src/gui/creds/httpcredentialsgui.cpp | 2 +-
src/gui/creds/oauth.cpp | 6 +++---
src/gui/creds/webflowcredentials.cpp | 6 +++---
src/gui/folderman.cpp | 8 ++++----
src/gui/tray/UserLine.qml | 2 +-
src/gui/tray/Window.qml | 4 ++--
src/gui/userstatusselectormodel.cpp | 10 +++++-----
src/gui/wizard/owncloudadvancedsetuppage.ui | 2 +-
src/libsync/clientsideencryption.cpp | 2 +-
src/libsync/syncresult.cpp | 12 ++++++------
src/libsync/theme.h | 2 +-
test/testsetuserstatusdialog.cpp | 10 +++++-----
16 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 0e2699051..098f5f412 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -125,7 +125,7 @@ private:
QString queryPassword(const QString &user)
{
EchoDisabler disabler;
- std::cout << "Password for user " << qPrintable(user) << ": ";
+ std::cout << "Password for account with username " << qPrintable(user) << ": ";
std::string s;
std::getline(std::cin, s);
return QString::fromStdString(s);
@@ -383,7 +383,7 @@ int main(int argc, char **argv)
if (options.interactive) {
if (user.isEmpty()) {
- std::cout << "Please enter user name: ";
+ std::cout << "Please enter username: ";
std::string s;
std::getline(std::cin, s);
user = QString::fromStdString(s);
diff --git a/src/gui/UserStatusSelectorDialog.qml b/src/gui/UserStatusSelectorDialog.qml
index 28d09254a..e4c509338 100644
--- a/src/gui/UserStatusSelectorDialog.qml
+++ b/src/gui/UserStatusSelectorDialog.qml
@@ -5,7 +5,7 @@ import com.nextcloud.desktopclient 1.0 as NC
Window {
id: dialog
- title: qsTr("Set user status")
+ title: qsTr("Set account status")
property NC.UserStatusSelectorModel model: NC.UserStatusSelectorModel {
onFinished: dialog.close()
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index 323d87c91..d0cbb500f 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -333,7 +333,7 @@ Application::Application(int &argc, char **argv)
nullptr,
tr("Error accessing the configuration file"),
tr("There was an error while accessing the configuration "
- "file at %1. Please make sure the file can be accessed by your user.")
+ "file at %1. Please make sure the file can be accessed by your system account.")
.arg(ConfigFile().configFile()),
tr("Quit %1").arg(Theme::instance()->appNameGUI()));
QTimer::singleShot(0, qApp, SLOT(quit()));
diff --git a/src/gui/authenticationdialog.cpp b/src/gui/authenticationdialog.cpp
index 1cc8e95ee..7b7de1abb 100644
--- a/src/gui/authenticationdialog.cpp
+++ b/src/gui/authenticationdialog.cpp
@@ -34,7 +34,7 @@ AuthenticationDialog::AuthenticationDialog(const QString &realm, const QString &
lay->addWidget(label);
auto *form = new QFormLayout;
- form->addRow(tr("&User:"), _user);
+ form->addRow(tr("&Username:"), _user);
form->addRow(tr("&Password:"), _password);
lay->addLayout(form);
_password->setEchoMode(QLineEdit::Password);
diff --git a/src/gui/creds/httpcredentialsgui.cpp b/src/gui/creds/httpcredentialsgui.cpp
index 7e574b8f7..915a6c224 100644
--- a/src/gui/creds/httpcredentialsgui.cpp
+++ b/src/gui/creds/httpcredentialsgui.cpp
@@ -96,7 +96,7 @@ void HttpCredentialsGui::showDialog()
{
QString msg = tr("Please enter %1 password:
"
"
"
- "User: %2
"
+ "Username: %2
"
"Account: %3
")
.arg(Utility::escape(Theme::instance()->appNameGUI()),
Utility::escape(_user),
diff --git a/src/gui/creds/oauth.cpp b/src/gui/creds/oauth.cpp
index aa528aa49..361e91507 100644
--- a/src/gui/creds/oauth.cpp
+++ b/src/gui/creds/oauth.cpp
@@ -137,10 +137,10 @@ void OAuth::start()
}
if (!_expectedUser.isNull() && user != _expectedUser) {
// Connected with the wrong user
- QString message = tr("Wrong user
"
- "You logged-in with user %1, but must login with user %2.
"
+ QString message = tr("
Wrong account
"
+ "You logged in with the account %1, but must log in with the account %2.
"
"Please log out of %3 in another tab, then click here "
- "and log in as user %2
")
+ "and log in with %2
")
.arg(user, _expectedUser, Theme::instance()->appNameGUI(),
authorisationLink().toString(QUrl::FullyEncoded));
httpReplyAndClose(socket, "200 OK", message.toUtf8().constData());
diff --git a/src/gui/creds/webflowcredentials.cpp b/src/gui/creds/webflowcredentials.cpp
index b40d4f993..2b7ea3eec 100644
--- a/src/gui/creds/webflowcredentials.cpp
+++ b/src/gui/creds/webflowcredentials.cpp
@@ -162,8 +162,8 @@ void WebFlowCredentials::askFromUser() {
_askDialog->setUrl(url);
}
- QString msg = tr("You have been logged out of %1 as user %2. Please login again.")
- .arg(_account->displayName(), _user);
+ QString msg = tr("You have been logged out of your account %1 at %2. Please login again.")
+ .arg(_user, _account->displayName());
_askDialog->setInfo(msg);
_askDialog->show();
@@ -186,7 +186,7 @@ void WebFlowCredentials::slotAskFromUserCredentialsProvided(const QString &user,
} else {
qCInfo(lcWebFlowCredentials()) << "Authed with the wrong user!";
- QString msg = tr("Please login with the user: %1")
+ QString msg = tr("Please login with the account: %1")
.arg(_user);
_askDialog->setError(msg);
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index a2c13597c..56eb9c092 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1497,7 +1497,7 @@ QString FolderMan::trayTooltipStatusString(
QString folderMessage;
switch (syncStatus) {
case SyncResult::Undefined:
- folderMessage = tr("Undefined State.");
+ folderMessage = tr("Undefined state.");
break;
case SyncResult::NotYetStarted:
folderMessage = tr("Waiting to start syncing.");
@@ -1513,16 +1513,16 @@ QString FolderMan::trayTooltipStatusString(
if (hasUnresolvedConflicts) {
folderMessage = tr("Sync finished with unresolved conflicts.");
} else {
- folderMessage = tr("Last Sync was successful.");
+ folderMessage = tr("Last sync was successful.");
}
break;
case SyncResult::Error:
break;
case SyncResult::SetupError:
- folderMessage = tr("Setup Error.");
+ folderMessage = tr("Setup error.");
break;
case SyncResult::SyncAbortRequested:
- folderMessage = tr("User Abort.");
+ folderMessage = tr("Sync request was cancelled.");
break;
case SyncResult::Paused:
folderMessage = tr("Sync is paused.");
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index d401457cc..02deaccf1 100644
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -87,7 +87,7 @@ MenuItem {
sourceSize.height: Style.accountAvatarStateIndicatorSize
Accessible.role: Accessible.Indicator
- Accessible.name: model.desktopNotificationsAllowed ? qsTr("Current user status is online") : qsTr("Current user status is do not disturb")
+ Accessible.name: model.desktopNotificationsAllowed ? qsTr("Current account status is online") : qsTr("Current account status is do not disturb")
}
}
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 50b099ec6..3b5d80ff3 100644
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -398,7 +398,7 @@ Window {
Layout.preferredWidth: Style.accountAvatarSize
Accessible.role: Accessible.Graphic
- Accessible.name: qsTr("Current user avatar")
+ Accessible.name: qsTr("Current account avatar")
Rectangle {
id: currentAccountStatusIndicatorBackground
@@ -437,7 +437,7 @@ Window {
sourceSize.height: Style.accountAvatarStateIndicatorSize
Accessible.role: Accessible.Indicator
- Accessible.name: UserModel.desktopNotificationsAllowed ? qsTr("Current user status is online") : qsTr("Current user status is do not disturb")
+ Accessible.name: UserModel.desktopNotificationsAllowed ? qsTr("Current account status is online") : qsTr("Current account status is do not disturb")
}
}
diff --git a/src/gui/userstatusselectormodel.cpp b/src/gui/userstatusselectormodel.cpp
index 973f184dc..b189b4584 100644
--- a/src/gui/userstatusselectormodel.cpp
+++ b/src/gui/userstatusselectormodel.cpp
@@ -142,23 +142,23 @@ void UserStatusSelectorModel::onError(UserStatusConnector::Error error)
return;
case UserStatusConnector::Error::CouldNotFetchUserStatus:
- setError(tr("Could not fetch user status. Make sure you are connected to the server."));
+ setError(tr("Could not fetch status. Make sure you are connected to the server."));
return;
case UserStatusConnector::Error::UserStatusNotSupported:
- setError(tr("User status feature is not supported. You will not be able to set your user status."));
+ setError(tr("Status feature is not supported. You will not be able to set your status."));
return;
case UserStatusConnector::Error::EmojisNotSupported:
- setError(tr("Emojis feature is not supported. Some user status functionality may not work."));
+ setError(tr("Emojis are not supported. Some status functionality may not work."));
return;
case UserStatusConnector::Error::CouldNotSetUserStatus:
- setError(tr("Could not set user status. Make sure you are connected to the server."));
+ setError(tr("Could not set status. Make sure you are connected to the server."));
return;
case UserStatusConnector::Error::CouldNotClearMessage:
- setError(tr("Could not clear user status message. Make sure you are connected to the server."));
+ setError(tr("Could not clear status message. Make sure you are connected to the server."));
return;
}
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.ui b/src/gui/wizard/owncloudadvancedsetuppage.ui
index 1f149ba6e..fe4acc5a3 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.ui
+++ b/src/gui/wizard/owncloudadvancedsetuppage.ui
@@ -90,7 +90,7 @@
- User name
+ Username
Qt::AlignCenter
diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 1deada948..19659caa2 100644
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -1240,7 +1240,7 @@ bool ClientSideEncryption::newMnemonicGenerated() const
void ClientSideEncryption::decryptPrivateKey(const AccountPtr &account, const QByteArray &key) {
QString msg = tr("Please enter your end to end encryption passphrase:
"
"
"
- "User: %2
"
+ "Username: %2
"
"Account: %3
")
.arg(Utility::escape(account->credentials()->user()),
Utility::escape(account->displayName()));
diff --git a/src/libsync/syncresult.cpp b/src/libsync/syncresult.cpp
index c058210a4..e7aa3ab54 100644
--- a/src/libsync/syncresult.cpp
+++ b/src/libsync/syncresult.cpp
@@ -39,10 +39,10 @@ QString SyncResult::statusString() const
re = QLatin1String("Undefined");
break;
case NotYetStarted:
- re = QLatin1String("Not yet Started");
+ re = QLatin1String("Not yet started");
break;
case SyncRunning:
- re = QLatin1String("Sync Running");
+ re = QLatin1String("Sync running");
break;
case Success:
re = QLatin1String("Success");
@@ -51,19 +51,19 @@ QString SyncResult::statusString() const
re = QLatin1String("Error");
break;
case SetupError:
- re = QLatin1String("SetupError");
+ re = QLatin1String("Setup error");
break;
case SyncPrepare:
- re = QLatin1String("SyncPrepare");
+ re = QLatin1String("Preparing to sync");
break;
case Problem:
re = QLatin1String("Success, some files were ignored.");
break;
case SyncAbortRequested:
- re = QLatin1String("Sync Request aborted by user");
+ re = QLatin1String("Sync request cancelled");
break;
case Paused:
- re = QLatin1String("Sync Paused");
+ re = QLatin1String("Sync paused");
break;
}
return re;
diff --git a/src/libsync/theme.h b/src/libsync/theme.h
index 180efbec2..d2c443dfa 100644
--- a/src/libsync/theme.h
+++ b/src/libsync/theme.h
@@ -397,7 +397,7 @@ public:
/**
* @brief How to handle the userID
*
- * @value UserIDUserName Wizard asks for user name as ID
+ * @value UserIDUserName Wizard asks for username as ID
* @value UserIDEmail Wizard asks for an email as ID
* @value UserIDCustom Specify string in \ref customUserID
*/
diff --git a/test/testsetuserstatusdialog.cpp b/test/testsetuserstatusdialog.cpp
index 82a077ac6..432a76196 100644
--- a/test/testsetuserstatusdialog.cpp
+++ b/test/testsetuserstatusdialog.cpp
@@ -671,7 +671,7 @@ private slots:
OCC::UserStatusSelectorModel model(fakeUserStatusJob);
QCOMPARE(model.errorMessage(),
- tr("Could not fetch user status. Make sure you are connected to the server."));
+ tr("Could not fetch status. Make sure you are connected to the server."));
}
void testError_userStatusNotSupported_emitError()
@@ -681,7 +681,7 @@ private slots:
OCC::UserStatusSelectorModel model(fakeUserStatusJob);
QCOMPARE(model.errorMessage(),
- tr("User status feature is not supported. You will not be able to set your user status."));
+ tr("Status feature is not supported. You will not be able to set your status."));
}
void testError_couldSetUserStatus_emitError()
@@ -692,7 +692,7 @@ private slots:
model.setUserStatus();
QCOMPARE(model.errorMessage(),
- tr("Could not set user status. Make sure you are connected to the server."));
+ tr("Could not set status. Make sure you are connected to the server."));
}
void testError_emojisNotSupported_emitError()
@@ -702,7 +702,7 @@ private slots:
OCC::UserStatusSelectorModel model(fakeUserStatusJob);
QCOMPARE(model.errorMessage(),
- tr("Emojis feature is not supported. Some user status functionality may not work."));
+ tr("Emojis are not supported. Some status functionality may not work."));
}
void testError_couldNotClearMessage_emitError()
@@ -713,7 +713,7 @@ private slots:
model.clearUserStatus();
QCOMPARE(model.errorMessage(),
- tr("Could not clear user status message. Make sure you are connected to the server."));
+ tr("Could not clear status message. Make sure you are connected to the server."));
}
void testError_setUserStatus_clearErrorMessage()