From b452c0d3f7f00bd6de41c2dbcfe523b4534b8be9 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 22 Sep 2017 07:20:39 +0200
Subject: [PATCH] Rename root titles.

---
 src/services/inoreader/gui/formeditinoreaderaccount.ui | 2 +-
 src/services/owncloud/owncloudserviceroot.cpp          | 2 +-
 src/services/standard/standardserviceroot.cpp          | 2 +-
 src/services/tt-rss/ttrssserviceroot.cpp               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/inoreader/gui/formeditinoreaderaccount.ui b/src/services/inoreader/gui/formeditinoreaderaccount.ui
index 879a6e9f9..3493f9386 100755
--- a/src/services/inoreader/gui/formeditinoreaderaccount.ui
+++ b/src/services/inoreader/gui/formeditinoreaderaccount.ui
@@ -29,7 +29,7 @@
      <item row="0" column="0">
       <widget class="QPushButton" name="m_btnTestSetup">
        <property name="text">
-        <string>&amp;Test login</string>
+        <string>&amp;Login</string>
        </property>
       </widget>
      </item>
diff --git a/src/services/owncloud/owncloudserviceroot.cpp b/src/services/owncloud/owncloudserviceroot.cpp
index e73642e8b..9bd54c8a5 100755
--- a/src/services/owncloud/owncloudserviceroot.cpp
+++ b/src/services/owncloud/owncloudserviceroot.cpp
@@ -186,7 +186,7 @@ void OwnCloudServiceRoot::updateTitle() {
     host = m_network->url();
   }
 
-  setTitle(m_network->authUsername() + QL1S("@") + host + QSL(" (Nextcloud News)"));
+  setTitle(m_network->authUsername() + QSL(" (Nextcloud News)"));
 }
 
 void OwnCloudServiceRoot::saveAccountDataToDatabase() {
diff --git a/src/services/standard/standardserviceroot.cpp b/src/services/standard/standardserviceroot.cpp
index 643b42149..73f82760c 100755
--- a/src/services/standard/standardserviceroot.cpp
+++ b/src/services/standard/standardserviceroot.cpp
@@ -46,7 +46,7 @@ StandardServiceRoot::StandardServiceRoot(RootItem* parent)
   : ServiceRoot(parent),
   m_actionExportFeeds(nullptr), m_actionImportFeeds(nullptr), m_serviceMenu(QList<QAction*>()),
   m_feedContextMenu(QList<QAction*>()), m_actionFeedFetchMetadata(nullptr) {
-  setTitle(qApp->system()->loggedInUser() + QL1S("@") + QL1S(APP_LOW_NAME));
+  setTitle(qApp->system()->loggedInUser() + tr(" (%1 classic account)").arg(APP_NAME));
   setIcon(StandardServiceEntryPoint().icon());
   setDescription(tr("This is obligatory service account for standard RSS/RDF/ATOM feeds."));
 }
diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp
index 34414c5eb..354d6db50 100755
--- a/src/services/tt-rss/ttrssserviceroot.cpp
+++ b/src/services/tt-rss/ttrssserviceroot.cpp
@@ -281,7 +281,7 @@ void TtRssServiceRoot::updateTitle() {
     host = m_network->url();
   }
 
-  setTitle(m_network->username() + QL1S("@") + host + QSL(" (Tiny Tiny RSS)"));
+  setTitle(m_network->username() + QSL(" (Tiny Tiny RSS)"));
 }
 
 RootItem* TtRssServiceRoot::obtainNewTreeForSyncIn() const {