Merge pull request #1488 from ctrlaltca/translations

Translations update

.gitignore

@@ -4,5 +4,4 @@ build*
 .directory
 mysql.cnf
 .DS_Store
-.idea/
-.tx/
+.idea/
\ No newline at end of file

.tx/config

+[main]
+host = https://www.transifex.com
+
+[cockatrice.cockatrice]
+file_filter = cockatrice/translations/cockatrice_<lang>.ts
+source_file = cockatrice/translations/cockatrice_en.ts
+source_lang = en
+
+[cockatrice.oracle]
+file_filter = oracle/translations/oracle_<lang>.ts
+source_file = oracle/translations/oracle_en.ts
+source_lang = en
+

cockatrice/src/userlist.cpp

@@ -125,19 +125,19 @@ void BanDialog::okClicked()
 
     if (nameBanCheckBox->isChecked())
         if (nameBanEdit->text() == ""){
-            QMessageBox::critical(this, tr("Error"), tr("You must have at value in the name ban when selecting the name ban checkbox."));
+            QMessageBox::critical(this, tr("Error"), tr("You must have a value in the name ban when selecting the name ban checkbox."));
             return;
         }
 
     if (ipBanCheckBox->isChecked())
         if (ipBanEdit->text() == ""){
-            QMessageBox::critical(this, tr("Error"), tr("You must have at value in the ip ban when selecting the ip ban checkbox."));
+            QMessageBox::critical(this, tr("Error"), tr("You must have a value in the ip ban when selecting the ip ban checkbox."));
             return;
         }
 
     if (idBanCheckBox->isChecked())
         if (idBanCheckBox->text() == ""){
-            QMessageBox::critical(this, tr("Error"), tr("You must have at value in the clientid ban when selecting the clientid ban checkbox."));
+            QMessageBox::critical(this, tr("Error"), tr("You must have a value in the clientid ban when selecting the clientid ban checkbox."));
             return;
         }
 

cockatrice/src/window_main.cpp

@@ -815,5 +815,5 @@ void MainWindow::refreshShortcuts()
 
 void MainWindow::notifyUserAboutUpdate()
 {
-    QMessageBox::information(this, tr("Information"), tr("Your client appears to be missing features that the server supports.\nThis usually means that your client version is out of date,pleae check to see if there is a new client available for download."));
+    QMessageBox::information(this, tr("Information"), tr("Your client appears to be missing features that the server supports.\nThis usually means that your client version is out of date, please check to see if there is a new client available for download."));
 }