Merge pull request #5251 from Chocobo1/text

Improve wordings

src/base/scanfoldersmodel.cpp

@@ -153,10 +153,10 @@ QVariant ScanFoldersModel::headerData(int section, Qt::Orientation orientation,
 
     switch (section) {
     case WATCH:
-        title = tr("Watched Folder");
+        title = tr("Monitored Folder");
         break;
     case DOWNLOAD:
-        title = tr("Save Files to");
+        title = tr("Override Save Location");
         break;
     }
 

src/gui/options.ui

@@ -1248,7 +1248,7 @@
                    <item>
                     <widget class="QPushButton" name="addScanFolderButton">
                      <property name="text">
-                      <string>Add folder...</string>
+                      <string>Add entry</string>
                      </property>
                     </widget>
                    </item>
@@ -1258,7 +1258,7 @@
                       <bool>false</bool>
                      </property>
                      <property name="text">
-                      <string>Remove folder</string>
+                      <string>Remove entry</string>
                      </property>
                     </widget>
                    </item>

src/gui/options_imp.cpp

@@ -1317,7 +1317,7 @@ void options_imp::on_addScanFolderButton_clicked()
     const QString dir = QFileDialog::getExistingDirectory(this, tr("Add directory to scan"),
                                                           Utils::Fs::toNativePath(Utils::Fs::folderName(pref->getScanDirsLastPath())));
     if (!dir.isEmpty()) {
-        const ScanFoldersModel::PathStatus status = ScanFoldersModel::instance()->addPath(dir, ScanFoldersModel::DOWNLOAD_IN_WATCH_FOLDER, QString(), false);
+        const ScanFoldersModel::PathStatus status = ScanFoldersModel::instance()->addPath(dir, ScanFoldersModel::DEFAULT_LOCATION, QString(), false);
         QString error;
         switch (status) {
         case ScanFoldersModel::AlreadyInList:

src/gui/properties/peerlistwidget.cpp

@@ -236,7 +236,7 @@ void PeerListWidget::showPeerListMenu(const QPoint&)
     QAction *banAct = 0;
     QAction *copyPeerAct = 0;
     if (!selectionModel()->selectedRows().isEmpty()) {
-        copyPeerAct = menu.addAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy selected"));
+        copyPeerAct = menu.addAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy IP:port"));
         menu.addSeparator();
         banAct = menu.addAction(GuiIconProvider::instance()->getIcon("user-group-delete"), tr("Ban peer permanently"));
         emptyMenu = false;

src/gui/scanfoldersdelegate.cpp

@@ -63,8 +63,8 @@ QWidget *ScanFoldersDelegate::createEditor(QWidget *parent, const QStyleOptionVi
     QComboBox* editor = new QComboBox(parent);
 
     editor->setFocusPolicy(Qt::StrongFocus);
-    editor->addItem(tr("Watch Folder"));
+    editor->addItem(tr("Same as monitored folder"));
-    editor->addItem(tr("Default Folder"));
+    editor->addItem(tr("Default save location"));
     editor->addItem(tr("Browse..."));
     if (index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION) {
         editor->insertSeparator(3);
@@ -99,7 +99,7 @@ void ScanFoldersDelegate::setModelData(QWidget *editor, QAbstractItemModel *mode
         model->setData(
                     index,
                     QFileDialog::getExistingDirectory(
-                        0, tr("Choose save path"),
+                        0, tr("Select save location"),
                         index.data(Qt::UserRole).toInt() == ScanFoldersModel::CUSTOM_LOCATION ?
                             index.data().toString() :
                             BitTorrent::Session::instance()->defaultSavePath()),