Make client language gender-neutral and more clear

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 0e26990516f16634e356bf314fdad74da4d0c218..098f5f4124bb2a186c3ccd0aac71dae102d82325 100644 (file)
--- 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 28d09254aa08ebf098ca66e1cad8fd0ae2dd2764..e4c509338322cf9e832a68370feaf162124ce608 100644 (file)
--- 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 323d87c915d502ac5e1e1b247413facd061602be..d0cbb500f7fe04361a19328381b1719fe74bb5f6 100644 (file)
--- 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 1cc8e95ee4285771dedfb493556785bf71cbc3dd..7b7de1abbebb07d60bfeb08ef3554fd5f9a46a88 100644 (file)
--- 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 7e574b8f7e53fc864588c80d72eacf4b62e8c132..915a6c224fb7758bf5e0174c6b052358874dc02e 100644 (file)
--- 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:<br>"
                      "<br>"
-                     "User: %2<br>"
+                     "Username: %2<br>"
                      "Account: %3<br>")
                       .arg(Utility::escape(Theme::instance()->appNameGUI()),
                           Utility::escape(_user),

diff --git a/src/gui/creds/oauth.cpp b/src/gui/creds/oauth.cpp
index aa528aa49ce4d6bec09a417d72df7501c79bc7a4..361e91507cbe135a5c43299ee4d7e7911d647abc 100644 (file)
--- 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("<h1>Wrong user</h1>"
-                                             "<p>You logged-in with user <em>%1</em>, but must login with user <em>%2</em>.<br>"
+                        QString message = tr("<h1>Wrong account</h1>"
+                                             "<p>You logged in with the account <em>%1</em>, but must log in with the account <em>%2</em>.<br>"
                                              "Please log out of %3 in another tab, then <a href='%4'>click here</a> "
-                                             "and log in as user %2</p>")
+                                             "and log in with %2</p>")
                                               .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 b40d4f993e14bbeadb7ed85e683e1ac1f8fdced7..2b7ea3eec4a45cb6445d3c73f513bd7996845c22 100644 (file)
--- 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 a2c13597c0139f409908620618181a730d2ee849..56eb9c0927f6fb543e1d13d3da4c5ea928a65a78 100644 (file)
--- 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 d401457ccfc68699e585eec33cf9afa5a85de475..02deaccf1e142a58a6b770066b642e4dde0c1716 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -87,7 +87,7 @@ MenuItem {
                         sourceSize.height: Style.accountAvatarStateIndicatorSize\r
 \r
                         Accessible.role: Accessible.Indicator\r
-                        Accessible.name: model.desktopNotificationsAllowed ? qsTr("Current user status is online") : qsTr("Current user status is do not disturb")\r
+                        Accessible.name: model.desktopNotificationsAllowed ? qsTr("Current account status is online") : qsTr("Current account status is do not disturb")\r
                     }\r
                 }\r
 \r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index 50b099ec65c017f85c996be93331a513d4df9b1c..3b5d80ff38aeb021c3e175a4f058684a48b9efd9 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -398,7 +398,7 @@ Window {
                             Layout.preferredWidth: Style.accountAvatarSize\r
 \r
                             Accessible.role: Accessible.Graphic\r
-                            Accessible.name: qsTr("Current user avatar")\r
+                            Accessible.name: qsTr("Current account avatar")\r
 \r
                             Rectangle {\r
                                 id: currentAccountStatusIndicatorBackground\r
@@ -437,7 +437,7 @@ Window {
                                 sourceSize.height: Style.accountAvatarStateIndicatorSize\r
 \r
                                 Accessible.role: Accessible.Indicator\r
-                                Accessible.name: UserModel.desktopNotificationsAllowed ? qsTr("Current user status is online") : qsTr("Current user status is do not disturb")\r
+                                Accessible.name: UserModel.desktopNotificationsAllowed ? qsTr("Current account status is online") : qsTr("Current account status is do not disturb")\r
                             }\r
                         }\r
 \r

diff --git a/src/gui/userstatusselectormodel.cpp b/src/gui/userstatusselectormodel.cpp
index 973f184dc1a3d8ebdf6385f1b6df19226382d48a..b189b4584f3608614e3f8fb70813a0ffff78d48c 100644 (file)
--- 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 1f149ba6e26ab96ca74f9b8764d3fa044dd423d4..fe4acc5a34d177cd70869f7b2384b6ba4adafd54 100644 (file)
--- a/src/gui/wizard/owncloudadvancedsetuppage.ui
+++ b/src/gui/wizard/owncloudadvancedsetuppage.ui
@@ -90,7 +90,7 @@
           </font>
          </property>
          <property name="text">
-          <string>User name</string>
+          <string>Username</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 1deada948f94915ce099a982a7b7a63853fc854b..19659caa2f4b8a8658a851f24e852e8a3f33a4ae 100644 (file)
--- 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:<br>"
                      "<br>"
-                     "User: %2<br>"
+                     "Username: %2<br>"
                      "Account: %3<br>")
                       .arg(Utility::escape(account->credentials()->user()),
                            Utility::escape(account->displayName()));

diff --git a/src/libsync/syncresult.cpp b/src/libsync/syncresult.cpp
index c058210a494a1a363c04ac2c182a06a809c98f08..e7aa3ab548a9eb65fcd518d37806edef54f82377 100644 (file)
--- 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 180efbec2673fceeddf0cb34aa1d98647364ed9c..d2c443dfa13bfe2f01fbe853dcbc2a588c14328b 100644 (file)
--- 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 82a077ac6e1039b9841cb795f2c18b884aecd882..432a7619655a8bb25e9fe25641177391aab828d8 100644 (file)
--- 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()