From f18f136d2b84c55ba0000135bb052b4d54c05a70 Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 27 Aug 2015 14:43:34 +0200 Subject: [PATCH 1/3] text adjustments - removed some info text since oracle imports all cards now and no longer offers sets selection - added info about token - `
` --> `\n` - capitalized `URL` --> http://www.oxforddictionaries.com/definition/english/URL --- oracle/src/oraclewizard.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 0924bcc7..530e9322 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -171,11 +171,10 @@ void IntroPage::languageBoxChanged(int index) void IntroPage::retranslateUi() { setTitle(tr("Introduction")); - label->setText(tr("This wizard will import the list of sets and cards " - "that will be used by Cockatrice.
You will need to " - "specify an url or a filename that will be used as a " - "source, and then choose the wanted sets from the list " - "of the available ones.")); + label->setText(tr("This wizard will import the list of sets, cards and tokens " + "that will be used by Cockatrice." + "\nYou will need to specify an URL or a filename that " + "will be used as a source.")); languageLabel->setText(tr("Language:")); } @@ -226,12 +225,12 @@ void LoadSetsPage::retranslateUi() { setTitle(tr("Source selection")); setSubTitle(tr("Please specify a source for the list of sets and cards. " - "You can specify an url address that will be download or " + "You can specify an URL address that will be download or " "use an existing file from your computer.")); - urlRadioButton->setText(tr("Download url:")); + urlRadioButton->setText(tr("Download URL:")); fileRadioButton->setText(tr("Local file:")); - urlButton->setText(tr("Restore default url")); + urlButton->setText(tr("Restore default URL")); fileButton->setText(tr("Choose file...")); } @@ -272,7 +271,7 @@ bool LoadSetsPage::validatePage() QUrl url = QUrl::fromUserInput(urlLineEdit->text()); if(!url.isValid()) { - QMessageBox::critical(this, tr("Error"), tr("The provided url is not valid.")); + QMessageBox::critical(this, tr("Error"), tr("The provided URL is not valid.")); return false; } @@ -482,7 +481,7 @@ void SaveSetsPage::retranslateUi() { setTitle(tr("Sets imported")); setSubTitle(tr("The following sets has been imported. " - "Press \"Save\" to save the imported cards to the Cockatrice database.")); + "Press \"Save\" to save the imported cards to the Cockatrice database.")); defaultPathCheckBox->setText(tr("Save to the default path (recommended)")); } @@ -585,11 +584,11 @@ void LoadTokensPage::retranslateUi() { setTitle(tr("Tokens source selection")); setSubTitle(tr("Please specify a source for the list of tokens. " - "You can specify an url address that will be download or " - "use an existing file from your computer.")); + "You can specify an URL address that will be download or " + "use an existing file from your computer.")); - urlLabel->setText(tr("Download url:")); - urlButton->setText(tr("Restore default url")); + urlLabel->setText(tr("Download URL:")); + urlButton->setText(tr("Restore default URL")); } void LoadTokensPage::actRestoreDefaultUrl() @@ -606,7 +605,7 @@ bool LoadTokensPage::validatePage() QUrl url = QUrl::fromUserInput(urlLineEdit->text()); if(!url.isValid()) { - QMessageBox::critical(this, tr("Error"), tr("The provided url is not valid.")); + QMessageBox::critical(this, tr("Error"), tr("The provided URL is not valid.")); return false; } @@ -692,7 +691,7 @@ void SaveTokensPage::retranslateUi() { setTitle(tr("Tokens imported")); setSubTitle(tr("The tokens has been imported. " - "Press \"Save\" to save the imported tokens to the Cockatrice tokens database.")); + "Press \"Save\" to save the imported tokens to the Cockatrice tokens database.")); defaultPathCheckBox->setText(tr("Save to the default path (recommended)")); } From 17665aad604fac42c7218792305f731ad8205d21 Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 27 Aug 2015 14:55:19 +0200 Subject: [PATCH 2/3] fixed alignment nice alignment over strict tabbing --- oracle/src/oraclewizard.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 530e9322..e5bb8fea 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -172,9 +172,9 @@ void IntroPage::retranslateUi() { setTitle(tr("Introduction")); label->setText(tr("This wizard will import the list of sets, cards and tokens " - "that will be used by Cockatrice." - "\nYou will need to specify an URL or a filename that " - "will be used as a source.")); + "that will be used by Cockatrice." + "\nYou will need to specify an URL or a filename that " + "will be used as a source.")); languageLabel->setText(tr("Language:")); } @@ -481,7 +481,7 @@ void SaveSetsPage::retranslateUi() { setTitle(tr("Sets imported")); setSubTitle(tr("The following sets has been imported. " - "Press \"Save\" to save the imported cards to the Cockatrice database.")); + "Press \"Save\" to save the imported cards to the Cockatrice database.")); defaultPathCheckBox->setText(tr("Save to the default path (recommended)")); } @@ -584,8 +584,8 @@ void LoadTokensPage::retranslateUi() { setTitle(tr("Tokens source selection")); setSubTitle(tr("Please specify a source for the list of tokens. " - "You can specify an URL address that will be download or " - "use an existing file from your computer.")); + "You can specify an URL address that will be download or " + "use an existing file from your computer.")); urlLabel->setText(tr("Download URL:")); urlButton->setText(tr("Restore default URL")); @@ -691,7 +691,7 @@ void SaveTokensPage::retranslateUi() { setTitle(tr("Tokens imported")); setSubTitle(tr("The tokens has been imported. " - "Press \"Save\" to save the imported tokens to the Cockatrice tokens database.")); + "Press \"Save\" to save the imported tokens to the Cockatrice tokens database.")); defaultPathCheckBox->setText(tr("Save to the default path (recommended)")); } From 5d8d2f277cca8781fcc9db5e7a5de75ffcbe8f6f Mon Sep 17 00:00:00 2001 From: tooomm Date: Thu, 27 Aug 2015 15:55:22 +0200 Subject: [PATCH 3/3] oxford compliance @ZeldaZach grammar nazi :) :+1: --- oracle/src/oraclewizard.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index e5bb8fea..8351129c 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -171,9 +171,9 @@ void IntroPage::languageBoxChanged(int index) void IntroPage::retranslateUi() { setTitle(tr("Introduction")); - label->setText(tr("This wizard will import the list of sets, cards and tokens " + label->setText(tr("This wizard will import the list of sets, cards, and tokens " "that will be used by Cockatrice." - "\nYou will need to specify an URL or a filename that " + "\nYou will need to specify a URL or a filename that " "will be used as a source.")); languageLabel->setText(tr("Language:")); } @@ -225,7 +225,7 @@ void LoadSetsPage::retranslateUi() { setTitle(tr("Source selection")); setSubTitle(tr("Please specify a source for the list of sets and cards. " - "You can specify an URL address that will be download or " + "You can specify a URL address that will be downloaded or " "use an existing file from your computer.")); urlRadioButton->setText(tr("Download URL:")); @@ -584,7 +584,7 @@ void LoadTokensPage::retranslateUi() { setTitle(tr("Tokens source selection")); setSubTitle(tr("Please specify a source for the list of tokens. " - "You can specify an URL address that will be download or " + "You can specify a URL address that will be downloaded or " "use an existing file from your computer.")); urlLabel->setText(tr("Download URL:"));