mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 22:15:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

GUI: Replace term "sign in" with "Log in" and friends.

Browse source 
Also with doc changes.
This commit is contained in:
Klaas Freitag 2015-09-10 17:16:22 +02:00
parent 1f55598010
commit 5f660bf080
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/navigating.rst
View file

@ -56,7 +56,7 @@ The Desktop Client menu provides the following options:
* Recent changes * Recent changes
* Settings * Settings
* Help * Help
* Sign out * Log out
* Quit ownCloud * Quit ownCloud
Using the Account Settings Window Using the Account Settings Window

2
doc/visualtour.rst
View file

@ -31,7 +31,7 @@ provides the following menu:
since the last restart of ownCloud Client. since the last restart of ownCloud Client.
* ``Settings...``: provides access to the settings menu. * ``Settings...``: provides access to the settings menu.
* ``Help``: Opens a browser to display this help. * ``Help``: Opens a browser to display this help.
* ``Sign out``: Signs the client of of the server. * ``Log out``: Signs the client of of the server.
* ``Quit ownCloud``: Quits ownCloud Client, ending a currently running * ``Quit ownCloud``: Quits ownCloud Client, ending a currently running
sync run. sync run.

16
src/gui/owncloudgui.cpp
View file

@ -319,11 +319,11 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
if (separateMenu) { if (separateMenu) {
if (accountState->isSignedOut()) { if (accountState->isSignedOut()) {
QAction* signin = menu->addAction(tr("Sign in...")); QAction* signin = menu->addAction(tr("Log in..."));
signin->setProperty(propertyAccountC, QVariant::fromValue(accountState)); signin->setProperty(propertyAccountC, QVariant::fromValue(accountState));
connect(signin, SIGNAL(triggered()), this, SLOT(slotLogin())); connect(signin, SIGNAL(triggered()), this, SLOT(slotLogin()));
} else { } else {
QAction* signout = menu->addAction(tr("Sign out")); QAction* signout = menu->addAction(tr("Log out"));
signout->setProperty(propertyAccountC, QVariant::fromValue(accountState)); signout->setProperty(propertyAccountC, QVariant::fromValue(accountState));
connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout())); connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout()));
} }
@ -444,17 +444,17 @@ void ownCloudGui::setupContextMenu()
_contextMenu->addSeparator(); _contextMenu->addSeparator();
if (atLeastOneSignedIn) { if (atLeastOneSignedIn) {
if (accountList.count() > 1) { if (accountList.count() > 1) {
_actionLogout->setText(tr("Sign out everywhere")); _actionLogout->setText(tr("Log out everywhere"));
} else { } else {
_actionLogout->setText(tr("Sign out")); _actionLogout->setText(tr("Log out"));
} }
_contextMenu->addAction(_actionLogout); _contextMenu->addAction(_actionLogout);
} }
if (atLeastOneSignedOut) { if (atLeastOneSignedOut) {
if (accountList.count() > 1) { if (accountList.count() > 1) {
_actionLogin->setText(tr("Sign in everywhere...")); _actionLogin->setText(tr("Log in everywhere..."));
} else { } else {
_actionLogin->setText(tr("Sign in...")); _actionLogin->setText(tr("Log in..."));
} }
_contextMenu->addAction(_actionLogin); _contextMenu->addAction(_actionLogin);
} }
@ -521,9 +521,9 @@ void ownCloudGui::setupActions()
_actionQuit = new QAction(tr("Quit %1").arg(Theme::instance()->appNameGUI()), this); _actionQuit = new QAction(tr("Quit %1").arg(Theme::instance()->appNameGUI()), this);
QObject::connect(_actionQuit, SIGNAL(triggered(bool)), _app, SLOT(quit())); QObject::connect(_actionQuit, SIGNAL(triggered(bool)), _app, SLOT(quit()));
_actionLogin = new QAction(tr("Sign in..."), this); _actionLogin = new QAction(tr("Log in..."), this);
connect(_actionLogin, SIGNAL(triggered()), this, SLOT(slotLogin())); connect(_actionLogin, SIGNAL(triggered()), this, SLOT(slotLogin()));
_actionLogout = new QAction(tr("Sign out"), this); _actionLogout = new QAction(tr("Log out"), this);
connect(_actionLogout, SIGNAL(triggered()), this, SLOT(slotLogout())); connect(_actionLogout, SIGNAL(triggered()), this, SLOT(slotLogout()));
if(_app->debugMode()) { if(_app->debugMode()) {