From a342f63fdff830c6c81dd70898d0aa4e9d241d8c Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Tue, 19 Nov 2013 15:27:07 +0100
Subject: [PATCH] Changed wording: Replaced Protocol against Status.

---
 doc/visualtour.rst            | 10 +++++-----
 src/mirall/protocolwidget.cpp |  2 +-
 src/mirall/protocolwidget.ui  |  2 +-
 src/mirall/settingsdialog.cpp |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/visualtour.rst b/doc/visualtour.rst
index def0f4f08a..9a55cdb62d 100644
--- a/doc/visualtour.rst
+++ b/doc/visualtour.rst
@@ -25,7 +25,7 @@ Here is an explanation of the individual items in the menu:
 * Operation indicator: Shows the status of the current sync process, or
   ``Up to date`` if server and client are in sync.
 * **Recent Changes**: shows the last six files modified by sync operations,
-  and provides access to the Sync Protocol, which lists all changes
+  and provides access to the Sync status, which lists all changes
   since the last restart of ownCloud Client.
 * ``Settings...``: provides access to the settings menu.
 * ``Help``: Opens a browser to display this help.
@@ -120,12 +120,12 @@ certain DSL lines with very limited upstream capacity.
 ownCloud Client will pick up changes immediately, but ongoing operations
 will finish using the old settings.
 
-The Sync Protocol
-~~~~~~~~~~~~~~~~~
+The Sync Status Display
+~~~~~~~~~~~~~~~~~~~~~~~
 
-.. index:: sync protocol
+.. index:: sync status
 
-The ``Sync Protocol`` window, which can be invoked from either from the main
+The ``Sync Status`` window, which can be invoked from either from the main
 menu (``Recent Changes`` -> ``Details...``) or the ``Account Settings``
 (``Info`` button), will provide you with an in-depth summary of the recent
 sync activity. It will also show files that have not been synched (ignored
diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp
index 45a183865d..bd91551367 100644
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -237,7 +237,7 @@ void ProtocolWidget::copyToClipboard()
     }
 
     QApplication::clipboard()->setText(text);
-    emit guiLog(tr("Copied to clipboard"), tr("The sync protocol has been copied to the clipboard."));
+    emit guiLog(tr("Copied to clipboard"), tr("The sync status has been copied to the clipboard."));
 }
 
 void ProtocolWidget::cleanErrors( const QString& folder ) // FIXME: Use the folder to detect which errors can be deleted.
diff --git a/src/mirall/protocolwidget.ui b/src/mirall/protocolwidget.ui
index 87942425f2..76fd3296cc 100644
--- a/src/mirall/protocolwidget.ui
+++ b/src/mirall/protocolwidget.ui
@@ -24,7 +24,7 @@
         </font>
        </property>
        <property name="text">
-        <string>Detailed Sync Protocol</string>
+        <string>Detailed Sync Status</string>
        </property>
       </widget>
      </item>
diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp
index e1b324a8e3..712b92627b 100644
--- a/src/mirall/settingsdialog.cpp
+++ b/src/mirall/settingsdialog.cpp
@@ -54,7 +54,7 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
     addAccount(tr("Account"), _accountSettings);
 
     QIcon protocolIcon(QLatin1String(":/mirall/resources/settings.png"));
-    QListWidgetItem *protocol= new QListWidgetItem(protocolIcon, tr("Protocol"), _ui->labelWidget);
+    QListWidgetItem *protocol= new QListWidgetItem(protocolIcon, tr("Status"), _ui->labelWidget);
     protocol->setSizeHint(QSize(0, 32));
     _ui->labelWidget->addItem(protocol);
     ProtocolWidget *protocolWidget = new ProtocolWidget;