nextcloud
/
desktop
mirror of https://github.com/nextcloud/desktop
0
0
Fork 0
Code Issues Releases Wiki Activity

Make client language gender-neutral and more clear 

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
Claudio Cambra 2022-06-23 11:13:18 +02:00
parent f27aa4f14b
commit b7c2e16aa9
16 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/cmd.cpp
View File

@ -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);

2
src/gui/UserStatusSelectorDialog.qml
View File

@ -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()

2
src/gui/application.cpp
View File

@ -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()));

2
src/gui/authenticationdialog.cpp
View File

@ -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);

2
src/gui/creds/httpcredentialsgui.cpp
View File

@ -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),

6
src/gui/creds/oauth.cpp
View File

@ -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());

6
src/gui/creds/webflowcredentials.cpp
View File

@ -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);

8
src/gui/folderman.cpp
View File

@ -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.");

2
src/gui/tray/UserLine.qml
View File

@ -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")
}
}

4
src/gui/tray/Window.qml
View File

@ -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")
}
}

10
src/gui/userstatusselectormodel.cpp
View File

@ -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;
}

2
src/gui/wizard/owncloudadvancedsetuppage.ui
View File

@ -90,7 +90,7 @@
</font>
</property>
<property name="text">
<string>User name</string>
<string>Username</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

2
src/libsync/clientsideencryption.cpp
View File

@ -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()));

12
src/libsync/syncresult.cpp
View File

@ -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;

2
src/libsync/theme.h
View File

@ -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
*/

10
test/testsetuserstatusdialog.cpp
View File

@ -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()