From 1652f45e7604fffde5e1c026a4d7cfbee24dc7f2 Mon Sep 17 00:00:00 2001
From: Jason Herskowitz <jherskowitz@globallistic.com>
Date: Sun, 21 Sep 2014 16:28:11 -0400
Subject: [PATCH] More copy and label changes

---
 data/images/account-settings.svg            | 17 -----------------
 data/images/plugins.svg                     |  9 +++++++++
 resources.qrc                               |  2 +-
 src/libtomahawk/utils/TomahawkUtilsGui.cpp  |  2 +-
 src/tomahawk/dialogs/SettingsDialog.cpp     |  4 ++--
 src/tomahawk/dialogs/Settings_Collection.ui |  2 +-
 6 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 data/images/account-settings.svg
 create mode 100644 data/images/plugins.svg

diff --git a/data/images/account-settings.svg b/data/images/account-settings.svg
deleted file mode 100644
index 83dbbe79f..000000000
--- a/data/images/account-settings.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="62px" height="62px" viewBox="0 0 62 62" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="account-settings" sketch:type="MSLayerGroup" transform="translate(1.000000, 1.000000)" fill="#000000">
-            <g id="Page-1" sketch:type="MSShapeGroup">
-                <g id="account-settings">
-                    <g id="Page-1">
-                        <path d="M51.0600062,15.0759327 L40.5857196,25.552555 L37.0910209,22.5074737 L47.7906208,11.8039501 L49.2134624,8.24707031 L53.5493811,5.02172353 L57.8461191,9.31341677 L54.625705,13.6433753 L51.0600062,15.0759327 L51.0600062,15.0759327 Z M57.345307,44.205397 C61.0555096,47.9156369 61.0542764,53.9534837 57.3428584,57.6662143 C55.5440824,59.4649897 53.152654,60.4543774 50.6106132,60.4543774 C48.0685724,60.4543774 45.6795929,59.4649898 43.8428582,57.6258061 L21.5938785,32.0829482 C19.524491,32.5115197 17.4085725,32.7368258 15.4457154,32.7368258 L15.4444909,32.7368258 C10.7657158,32.7368258 7.02612397,31.4694787 4.62734847,29.0719277 C0.596328,25.0384588 -1.14979445,19.289479 -0.0404066755,13.6886628 C0.0195933184,13.3825403 0.242450461,13.1388669 0.536328,13.0507036 C0.831430004,12.9613158 1.15102184,13.0409077 1.37143002,13.2600913 L8.67183806,20.5580505 L15.732246,22.0188669 L21.6955112,16.0580505 L20.2334702,8.99641758 L12.9330623,1.69478515 C12.7151031,1.47805047 12.6355113,1.15600963 12.7248991,0.862132078 C12.8155113,0.565805547 13.0591848,0.345397384 13.3628582,0.284172894 C14.4538787,0.068662702 15.5730623,-0.0427658706 16.6885727,-0.0427658706 C21.2436744,-0.0427658706 25.5269396,1.7315197 28.7448988,4.9531524 C33.6391845,9.844989 32.4281641,18.6380505 31.7571437,21.9172342 L37.2820418,26.7294791 L37.9702051,27.3294791 L57.345307,44.205397 L57.345307,44.205397 Z M52.2930535,52.6138991 C51.3648901,53.5432869 49.8624411,53.5432869 48.9342779,52.6151236 L48.9330534,52.6138991 C48.0061146,51.6857358 48.0061146,50.1808379 48.9330534,49.2538991 C49.8612167,48.3281848 51.3648901,48.3281848 52.2930534,49.2563481 L52.2942779,49.2563481 C53.2199968,50.1831553 53.2199968,51.6856664 52.2930535,52.6138991 L52.2930535,52.6138991 L52.2930535,52.6138991 Z M20.401219,36.7042013 L25.5342795,42.6809353 C26.3816264,43.5295067 26.3816264,44.9046087 25.5342795,45.7519556 L11.7244837,59.5605276 C10.8746879,60.40665 9.50081035,60.40665 8.65346344,59.5605276 L3.1016268,54.0062422 C2.2542799,53.1564463 2.2542799,51.7825687 3.1016268,50.9364463 L17.3314231,36.7042013 C18.1799945,35.8568543 19.553872,35.8568543 20.401219,36.7042013 L20.401219,36.7042013 L20.401219,36.7042013 Z" id="Shape"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/images/plugins.svg b/data/images/plugins.svg
new file mode 100644
index 000000000..209df26eb
--- /dev/null
+++ b/data/images/plugins.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="62px" height="63px" viewBox="0 0 62 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <title>plugins</title>
+    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M50.0505804,46.7449229 C50.6130804,47.8674229 51.9818304,48.4549229 53.9005803,48.4949228 C56.9405802,48.5611728 58.6543303,48.1724229 60.4830801,50.6924229 C62.4093301,53.3461727 61.5593301,57.3449229 59.2205801,59.1961728 C56.3443299,61.4674229 54.7330802,61.1261729 52.1830799,60.1299228 C50.3555799,59.4136728 49.2893299,58.8936728 48.94183,56.5049227 C48.59308,54.1199227 48.90058,49.3111725 44.9355801,49.7661729 C44.4205801,49.8236729 44.2793301,49.9086729 43.5105801,50.6236729 L31.3380802,61.9599232 C30.6293303,62.6186732 30.4480802,62.6149232 29.7618302,61.9286732 L20.2693304,52.4361734 C19.5293304,51.6961734 19.4305804,51.5836734 19.2955804,51.3186734 C18.6155803,49.9974234 19.3468304,48.7436735 19.9955804,47.8899234 C20.4980804,47.2261733 20.9318304,46.5861734 21.5480804,46.3374234 C22.5243304,45.9449234 23.9618304,46.5474234 25.2018305,46.3074234 C27.9193305,45.7824234 29.4643306,42.6361733 29.7793304,39.8236736 C30.2718304,35.4386738 25.6305804,32.3786738 21.4818304,33.8149234 C20.2530804,34.2411734 19.0043304,35.1161735 18.4280803,36.1086735 C16.7330804,39.0174234 17.3118303,46.2949237 13.2818302,45.0674233 C11.0518301,44.3886733 1.97683059,35.9661731 0.34182988,33.0786738 C-0.175670126,32.1649237 -0.140670129,31.9911737 0.689329876,31.3511738 C6.29807986,27.0224237 12.1668301,22.771174 13.0868302,17.0274243 C13.3930802,15.1161742 13.0993302,13.2999241 11.0193301,12.6711744 C10.0218301,12.3699244 8.81683014,12.6136744 7.65183009,12.3549244 C3.45308013,11.4224244 1.93308033,6.51242466 3.89808006,3.5211745 C5.61558001,0.906174493 8.09933014,-0.353825378 11.1480803,0.0861746194 C12.1243303,0.226174624 13.3393303,0.967424599 13.7543304,1.6736746 C14.8180804,3.49242465 14.8480804,7.1861744 16.0393303,9.29992439 C17.4693304,11.8349245 20.9468304,12.7236745 22.8705805,11.6299243 C23.8805805,11.0561744 28.8180803,4.87617449 31.7018305,1.42117457 C32.3730806,0.616174576 32.5505806,0.581174579 33.4743305,1.08367455 C36.6155805,2.7949245 43.3530804,8.79117442 43.4105804,13.0224241 C43.4443304,15.4324241 40.5543303,15.4824242 37.4030801,17.694924 C34.29933,19.8749239 33.40308,23.2274241 35.64808,26.238674 C36.77183,27.746174 38.5955801,28.5324241 40.44683,28.768674 C41.28808,28.873674 43.9230799,27.9149239 44.3418299,27.3486739 C47.63433,22.8961739 45.65683,17.3299235 50.9005802,18.5136741 C51.6805802,18.6899241 51.8430802,18.7974241 52.5268302,19.5936741 L61.3593302,29.8574247 C62.0430803,30.651173 62.0168302,30.797423 61.1055803,31.314923 C56.7855801,33.769923 47.5918304,41.8411724 50.0505804,46.7449229 Z" id="path2118" fill="#000000" sketch:type="MSShapeGroup"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/resources.qrc b/resources.qrc
index 4202fa2fb..40ecac143 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -50,7 +50,6 @@
         <file>data/images/sipplugin-online.svg</file>
         <file>data/images/sipplugin-offline.svg</file>
         <file>data/images/advanced-settings.svg</file>
-        <file>data/images/account-settings.svg</file>
         <file>data/images/music-settings.svg</file>
         <file>data/images/automatic-playlist.svg</file>
         <file>data/images/station.svg</file>
@@ -181,5 +180,6 @@
         <file>data/images/whatsnew.svg</file>
         <file>data/images/copy.svg</file>
         <file>data/icons/tomahawk-icon-1024x1024.png</file>
+        <file>data/images/plugins.svg</file>
     </qresource>
 </RCC>
diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
index 1fb184c6c..d3869e877 100644
--- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp
+++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp
@@ -716,7 +716,7 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
             pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/advanced-settings.svg", size );
             break;
         case AccountSettings:
-            pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/account-settings.svg", size );
+            pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/plugins.svg", size );
             break;
         case MusicSettings:
             pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/music-settings.svg", size );
diff --git a/src/tomahawk/dialogs/SettingsDialog.cpp b/src/tomahawk/dialogs/SettingsDialog.cpp
index e26f3c412..5ec3bb73c 100644
--- a/src/tomahawk/dialogs/SettingsDialog.cpp
+++ b/src/tomahawk/dialogs/SettingsDialog.cpp
@@ -130,7 +130,7 @@ SettingsDialog::SettingsDialog(QObject *parent )
     p->setFixedSize( 0, 0 );
 #endif
 
-    m_accountsWidgetUi->installFromFileBtn->setText( tr( "Add New PlugIn" ) );
+    m_accountsWidgetUi->installFromFileBtn->setText( tr( "Install Plug-In..." ) );
 
     // Accounts
     AccountDelegate* accountDelegate = new AccountDelegate( this );
@@ -236,7 +236,7 @@ SettingsDialog::SettingsDialog(QObject *parent )
 // #endif
 
     m_dialog->addTab( m_accountsWidget, TomahawkUtils::defaultPixmap( TomahawkUtils::AccountSettings ),
-                      tr( "PlugIns" ), tr( "Configure the accounts and services used by Tomahawk "
+                      tr( "Plug-Ins" ), tr( "Configure the accounts and services used by Tomahawk "
                                              "to search and retrieve music, find your friends and "
                                              "update your status." ) );
 
diff --git a/src/tomahawk/dialogs/Settings_Collection.ui b/src/tomahawk/dialogs/Settings_Collection.ui
index db221a237..cde8f33fe 100644
--- a/src/tomahawk/dialogs/Settings_Collection.ui
+++ b/src/tomahawk/dialogs/Settings_Collection.ui
@@ -35,7 +35,7 @@
    <item>
     <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Path to scan for music files:</string>
+      <string>Folderss to scan for music files:</string>
      </property>
     </widget>
    </item>