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

Also with doc changes.

diff --git a/doc/navigating.rst b/doc/navigating.rst
index 35d2625c5fddf3ab4f8e9be4ac27ec0cadaea087..595f8c55a425d9629e6952c9f12eb6f11f521e6f 100644 (file)
--- a/doc/navigating.rst
+++ b/doc/navigating.rst
@@ -56,7 +56,7 @@ The Desktop Client menu provides the following options:
 * Recent changes
 * Settings
 * Help
-* Sign out
+* Log out
 * Quit ownCloud
 
 Using the Account Settings Window

diff --git a/doc/visualtour.rst b/doc/visualtour.rst
index f94c4c1c003e93186775e73acd154b6b1583b62a..98a3fc7b65c9be559b3186c8e30c36d0c030e02e 100644 (file)
--- a/doc/visualtour.rst
+++ b/doc/visualtour.rst
@@ -31,7 +31,7 @@ provides the following menu:
   since the last restart of ownCloud Client.
 * ``Settings...``: provides access to the settings menu.
 * ``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
   sync run.
 

diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index 0aa7d431941005b9548cd09f15266478637d794f..58514e0cce6ed8ca30125624f503b2bca3a544b4 100644 (file)
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -319,11 +319,11 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
 
     if (separateMenu) {
         if (accountState->isSignedOut()) {
-            QAction* signin = menu->addAction(tr("Sign in..."));
+            QAction* signin = menu->addAction(tr("Log in..."));
             signin->setProperty(propertyAccountC, QVariant::fromValue(accountState));
             connect(signin, SIGNAL(triggered()), this, SLOT(slotLogin()));
         } else {
-            QAction* signout = menu->addAction(tr("Sign out"));
+            QAction* signout = menu->addAction(tr("Log out"));
             signout->setProperty(propertyAccountC, QVariant::fromValue(accountState));
             connect(signout, SIGNAL(triggered()), this, SLOT(slotLogout()));
         }
@@ -444,17 +444,17 @@ void ownCloudGui::setupContextMenu()
     _contextMenu->addSeparator();
     if (atLeastOneSignedIn) {
         if (accountList.count() > 1) {
-            _actionLogout->setText(tr("Sign out everywhere"));
+            _actionLogout->setText(tr("Log out everywhere"));
         } else {
-            _actionLogout->setText(tr("Sign out"));
+            _actionLogout->setText(tr("Log out"));
         }
         _contextMenu->addAction(_actionLogout);
     }
     if (atLeastOneSignedOut) {
         if (accountList.count() > 1) {
-            _actionLogin->setText(tr("Sign in everywhere..."));
+            _actionLogin->setText(tr("Log in everywhere..."));
         } else {
-            _actionLogin->setText(tr("Sign in..."));
+            _actionLogin->setText(tr("Log in..."));
         }
         _contextMenu->addAction(_actionLogin);
     }
@@ -521,9 +521,9 @@ void ownCloudGui::setupActions()
     _actionQuit = new QAction(tr("Quit %1").arg(Theme::instance()->appNameGUI()), this);
     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()));
-    _actionLogout = new QAction(tr("Sign out"), this);
+    _actionLogout = new QAction(tr("Log out"), this);
     connect(_actionLogout, SIGNAL(triggered()), this, SLOT(slotLogout()));
 
     if(_app->debugMode()) {