Merge pull request #1110 from tooomm/text-works2

text works

cockatrice/src/tab_deck_editor.cpp

@@ -789,7 +789,7 @@ void TabDeckEditor::checkFirstRunDetected()
 {
     if(db->hasDetectedFirstRun())
     {
-        QMessageBox::information(this, tr("Welcome"), tr("Hi! Its seems like it's the first time you run this version of Cockatrice.\nAll the sets in the card database have been enabled.\nRead more about changing the set order or disabling specific sets in the the \"Edit Sets\" window."));
+        QMessageBox::information(this, tr("Welcome"), tr("Hi! It seems like you're running this version of Cockatrice for the first time.\nAll the sets in the card database have been enabled.\nRead more about changing the set order or disabling specific sets and consequent effects in the \"Edit Sets\" window."));
         actEditSets();
     }
 }
\ No newline at end of file

cockatrice/src/window_main.cpp

@@ -323,7 +323,7 @@ void MainWindow::retranslateUi()
 #endif
     aAbout->setText(tr("&About Cockatrice"));
     helpMenu->setTitle(tr("&Help"));
-    aCheckCardUpdates->setText(tr("Check card updates..."));
+    aCheckCardUpdates->setText(tr("Check for card updates..."));
     
     tabSupervisor->retranslateUi();
 }
@@ -530,7 +530,7 @@ void MainWindow::actCheckCardUpdates()
 {
     if(cardUpdateProcess)
     {
-        QMessageBox::information(this, tr("Information"), tr("A card update is already ongoing."));
+        QMessageBox::information(this, tr("Information"), tr("A card database update is already running."));
         return;
     }
 
@@ -564,7 +564,7 @@ void MainWindow::actCheckCardUpdates()
 
     if(updaterCmd.isEmpty())
     {
-        QMessageBox::warning(this, tr("Error"), tr("Unable to run the card updater: ") + dir.absoluteFilePath(binaryName));
+        QMessageBox::warning(this, tr("Error"), tr("Unable to run the card database updater: ") + dir.absoluteFilePath(binaryName));
         return;
     }
 
@@ -600,7 +600,7 @@ void MainWindow::cardUpdateError(QProcess::ProcessError err)
     cardUpdateProcess->deleteLater();
     cardUpdateProcess = 0;
 
-    QMessageBox::warning(this, tr("Error"), tr("The card updater exited with an error: %1").arg(error));
+    QMessageBox::warning(this, tr("Error"), tr("The card database updater exited with an error: %1").arg(error));
 }
 
 void MainWindow::cardUpdateFinished(int, QProcess::ExitStatus)
@@ -608,7 +608,7 @@ void MainWindow::cardUpdateFinished(int, QProcess::ExitStatus)
     cardUpdateProcess->deleteLater();
     cardUpdateProcess = 0;
 
-    QMessageBox::information(this, tr("Information"), tr("Card update completed successfully. Will now reload card database."));
+    QMessageBox::information(this, tr("Information"), tr("Update completed successfully. Cockatrice will now reload the card database."));
 
     // this will force a database reload
     settingsCache->setCardDatabasePath(settingsCache->getCardDatabasePath());

cockatrice/src/window_sets.cpp

@@ -25,7 +25,7 @@ WndSets::WndSets(QWidget *parent)
 
     aTop = new QAction(QString(), this);
     aTop->setIcon(QIcon(":/resources/arrow_top_green.svg"));
-    aTop->setToolTip(tr("Move selected set to top"));
+    aTop->setToolTip(tr("Move selected set to the top"));
     aTop->setEnabled(false);
     connect(aTop, SIGNAL(triggered()), this, SLOT(actTop()));
     setsEditToolBar->addAction(aTop);
@@ -46,7 +46,7 @@ WndSets::WndSets(QWidget *parent)
 
     aBottom = new QAction(QString(), this);
     aBottom->setIcon(QIcon(":/resources/arrow_bottom_green.svg"));
-    aBottom->setToolTip(tr("Move selected set to bottom"));
+    aBottom->setToolTip(tr("Move selected set to the bottom"));
     aBottom->setEnabled(false);
     connect(aBottom, SIGNAL(triggered()), this, SLOT(actBottom()));
     setsEditToolBar->addAction(aBottom);
@@ -92,7 +92,7 @@ WndSets::WndSets(QWidget *parent)
 
 
     QLabel *labNotes = new QLabel;
-    labNotes->setText(tr("Enable the sets that you want to have available in the deck editor.\nMove sets around to change their order, or click on a column header to sort sets on that field.\nSets order decides the source that will be used when loading images for a specific card.\nDisabled sets will still be used for loading images."));
+    labNotes->setText("<b>" + tr("hints:") + "</b>" + "<ul><li>" + tr("Enable the sets that you want to have available in the deck editor") + "</li><li>" + tr("Move sets around to change their order, or click on a column header to sort sets on that field") + "</li><li>" + tr("Sets order decides the source that will be used when loading images for a specific card") + "</li><li>" + tr("Disabled sets will still be used for loading images") + "</li></ul>");
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(actSave()));