Compare commits

..

No commits in common. "b545efb929eb1455eeb81651528794f401acee08" and "0a9d6b222645fb8bbc45eb7aaf02209c4aed32ed" have entirely different histories.

7 changed files with 2004 additions and 5660 deletions

View file

@ -1,7 +1,7 @@
name: Update Translations
permissions:
contents: write
contents: read
pull-requests: write
on:

View file

@ -1,7 +1,7 @@
name: Update Translation Source
permissions:
contents: write
contents: read
pull-requests: write
on:

View file

@ -90,7 +90,7 @@ project("Cockatrice" VERSION 3.1.0)
# Set release name if not provided via env/cmake var
if(NOT DEFINED GIT_TAG_RELEASENAME)
set(GIT_TAG_RELEASENAME "Reality Check")
set(GIT_TAG_RELEASENAME "Graduation Day")
endif()
# Use c++20 for all targets

View file

@ -102,7 +102,6 @@ There are various places where useful information for different needs are mainta
- [Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) `Community supported`
- [Official Webpage](https://cockatrice.github.io/)
- [Official README](https://github.com/Cockatrice/Cockatrice/blob/master/README.md) `This file`
- [Official CONTRIBUTING](https://github.com/Cockatrice/Cockatrice/blob/master/.github/CONTRIBUTING.md)
Cockatrice tries to use the [Google Developer Documentation Style Guide](https://developers.google.com/style/) to ensure consistent documentation. We encourage you to improve the documentation by suggesting edits based on this guide.
@ -160,12 +159,6 @@ The following flags (with their non-default values) can be passed to `cmake`:
| `-DUPDATE_TRANSLATIONS=1` | Configure `make` to update the translation .ts files for new strings in the source code<br> **Note:** `make clean` will remove the .ts files |
| `-DTEST=1` | Enable regression tests<br> **Note:** `make test` to run tests, *googletest* will be downloaded if not available |
> [!TIP]
> Build code documentation ([Doxygen](https://www.doxygen.nl)) according to our [configuration](https://github.com/Cockatrice/Cockatrice/blob/master/Doxyfile) into `/docs`:
> ```bash
> doxygen Doxyfile
> ```
# Run

File diff suppressed because it is too large Load diff

View file

@ -1,14 +1,3 @@
## Building Doxygen Documentation
We use [Doxygen](https://www.doxygen.nl) for our code documentation.
After installing the tool, you can build a HTML webpage into `/docs` folder according to our [configuration](https://github.com/Cockatrice/Cockatrice/blob/master/Doxyfile):
```bash
doxygen Doxyfile
```
Open the `index.html` file in the `/docs/html/` folder to view and use it.
There is also an online version we host at the Cockatrice webpage: [cockatrice.github.io/docs](https://cockatrice.github.io/docs)
## Doxygen Documentation Theme
Required changes to the `Doxyfile` config from the [theme docs](https://jothepro.github.io/doxygen-awesome-css/index.html#autotoc_md16) to make [doxygen-awesome-css](https://github.com/jothepro/doxygen-awesome-css) work:

View file

@ -4,22 +4,22 @@
<context>
<name>IntroPage</name>
<message>
<location filename="src/pages.cpp" line="239"/>
<location filename="src/pages.cpp" line="127"/>
<source>Introduction</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="240"/>
<location filename="src/pages.cpp" line="128"/>
<source>This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="242"/>
<location filename="src/pages.cpp" line="130"/>
<source>Interface language:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="243"/>
<location filename="src/pages.cpp" line="131"/>
<source>Version:</source>
<translation type="unfinished"></translation>
</message>
@ -27,206 +27,192 @@
<context>
<name>LoadSetsPage</name>
<message>
<location filename="src/pages.cpp" line="317"/>
<location filename="src/pages.cpp" line="200"/>
<source>Source selection</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="318"/>
<location filename="src/pages.cpp" line="201"/>
<source>Please specify a compatible source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="322"/>
<location filename="src/pages.cpp" line="205"/>
<source>Download URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="323"/>
<location filename="src/pages.cpp" line="206"/>
<source>Local file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="324"/>
<location filename="src/pages.cpp" line="207"/>
<source>Restore default URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="325"/>
<location filename="src/pages.cpp" line="208"/>
<source>Choose file...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="335"/>
<location filename="src/pages.cpp" line="218"/>
<source>Load sets file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="345"/>
<location filename="src/pages.cpp" line="228"/>
<source>Sets file (%1)</source>
<oldsource>Sets JSON file (%1)</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="375"/>
<location filename="src/pages.cpp" line="394"/>
<location filename="src/pages.cpp" line="469"/>
<location filename="src/pages.cpp" line="604"/>
<location filename="src/pages.cpp" line="644"/>
<location filename="src/pages.cpp" line="258"/>
<location filename="src/pages.cpp" line="277"/>
<location filename="src/pages.cpp" line="282"/>
<location filename="src/pages.cpp" line="354"/>
<location filename="src/pages.cpp" line="485"/>
<location filename="src/pages.cpp" line="498"/>
<location filename="src/pages.cpp" line="519"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="375"/>
<location filename="src/pages.cpp" line="258"/>
<source>The provided URL is not valid.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="394"/>
<location filename="src/pages.cpp" line="262"/>
<source>Downloading (0MB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="277"/>
<source>Please choose a file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="576"/>
<location filename="src/pages.cpp" line="282"/>
<source>Cannot open file &apos;%1&apos;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="469"/>
<location filename="src/pages.cpp" line="345"/>
<source>Downloading (%1MB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="354"/>
<source>Network error: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="524"/>
<location filename="src/pages.cpp" line="392"/>
<source>Parsing file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="100"/>
<location filename="src/pages.cpp" line="414"/>
<source>Xz extraction failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="108"/>
<location filename="src/pages.cpp" line="421"/>
<source>Sorry, this version of Oracle does not support xz compressed files.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="120"/>
<location filename="src/pages.cpp" line="441"/>
<source>Failed to open Zip archive: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="126"/>
<location filename="src/pages.cpp" line="446"/>
<source>Zip extraction failed: the Zip archive doesn&apos;t contain exactly one file.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="137"/>
<location filename="src/pages.cpp" line="454"/>
<source>Zip extraction failed: %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="144"/>
<location filename="src/pages.cpp" line="462"/>
<source>Sorry, this version of Oracle does not support zipped files.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="164"/>
<location filename="src/pages.cpp" line="485"/>
<source>Failed to interpret downloaded data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="379"/>
<source>Downloading (0 MB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="460"/>
<source>Downloading (%1 MB)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="509"/>
<source>Parsing file (%1%)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="524"/>
<source>Extracting file...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="604"/>
<location filename="src/pages.cpp" line="498"/>
<source>Do you want to download the uncompressed file instead?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="635"/>
<location filename="src/pages.cpp" line="657"/>
<location filename="src/pages.cpp" line="520"/>
<source>The file was retrieved successfully, but it does not contain any sets data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="666"/>
<source>Parsing file (100%)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LoadSpoilersPage</name>
<message>
<location filename="src/pages.cpp" line="952"/>
<location filename="src/pages.cpp" line="716"/>
<source>Save spoiler database</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="957"/>
<location filename="src/pages.cpp" line="721"/>
<source>XML; spoiler database (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="962"/>
<location filename="src/pages.cpp" line="726"/>
<source>spoiler</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="967"/>
<location filename="src/pages.cpp" line="731"/>
<source>Spoilers import</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="968"/>
<location filename="src/pages.cpp" line="732"/>
<source>Please specify a compatible source for spoiler data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="970"/>
<location filename="src/pages.cpp" line="734"/>
<source>Download URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="971"/>
<location filename="src/pages.cpp" line="735"/>
<source>Local file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="972"/>
<location filename="src/pages.cpp" line="736"/>
<source>Restore default URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="973"/>
<location filename="src/pages.cpp" line="737"/>
<source>Choose file...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="975"/>
<location filename="src/pages.cpp" line="739"/>
<source>The spoiler database will be saved at the following location:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="977"/>
<location filename="src/pages.cpp" line="741"/>
<source>Save to a custom path (not recommended)</source>
<translation type="unfinished"></translation>
</message>
@ -234,57 +220,57 @@
<context>
<name>LoadTokensPage</name>
<message>
<location filename="src/pages.cpp" line="907"/>
<location filename="src/pages.cpp" line="671"/>
<source>Save token database</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="912"/>
<location filename="src/pages.cpp" line="676"/>
<source>XML; token database (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="917"/>
<location filename="src/pages.cpp" line="681"/>
<source>tokens</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="922"/>
<location filename="src/pages.cpp" line="686"/>
<source>Tokens import</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="923"/>
<location filename="src/pages.cpp" line="687"/>
<source>Please specify a compatible source for token data.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="925"/>
<location filename="src/pages.cpp" line="689"/>
<source>Download URL:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="926"/>
<location filename="src/pages.cpp" line="690"/>
<source>Local file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="927"/>
<location filename="src/pages.cpp" line="691"/>
<source>Restore default URL</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="928"/>
<location filename="src/pages.cpp" line="692"/>
<source>Choose file...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="930"/>
<location filename="src/pages.cpp" line="694"/>
<source>The token database will be saved at the following location:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="932"/>
<location filename="src/pages.cpp" line="696"/>
<source>Save to a custom path (not recommended)</source>
<translation type="unfinished"></translation>
</message>
@ -292,7 +278,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="770"/>
<location filename="src/oracleimporter.cpp" line="542"/>
<source>Dummy set containing tokens</source>
<translation type="unfinished"></translation>
</message>
@ -300,7 +286,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="106"/>
<location filename="src/oraclewizard.cpp" line="101"/>
<source>Oracle Importer</source>
<translation type="unfinished"></translation>
</message>
@ -308,22 +294,22 @@
<context>
<name>OutroPage</name>
<message>
<location filename="src/pages.cpp" line="248"/>
<location filename="src/pages.cpp" line="136"/>
<source>Finished</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="249"/>
<location filename="src/pages.cpp" line="137"/>
<source>The wizard has finished.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="250"/>
<location filename="src/pages.cpp" line="138"/>
<source>You can now start using Cockatrice with the newly updated cards.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="251"/>
<location filename="src/pages.cpp" line="139"/>
<source>If the card databases don&apos;t reload automatically, restart the Cockatrice client.</source>
<translation type="unfinished"></translation>
</message>
@ -331,76 +317,73 @@
<context>
<name>SaveSetsPage</name>
<message>
<location filename="src/pages.cpp" line="789"/>
<location filename="src/pages.cpp" line="874"/>
<location filename="src/pages.cpp" line="563"/>
<location filename="src/pages.cpp" line="638"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="780"/>
<location filename="src/pages.cpp" line="789"/>
<location filename="src/pages.cpp" line="563"/>
<source>No set has been imported.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="795"/>
<location filename="src/pages.cpp" line="574"/>
<source>Sets imported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="797"/>
<source>A Cockatrice card database file of %1 MB has been downloaded.</source>
<location filename="src/pages.cpp" line="576"/>
<source>A cockatrice database file of %1 MB has been downloaded.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="800"/>
<location filename="src/pages.cpp" line="579"/>
<source>The following sets have been found:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="803"/>
<location filename="src/pages.cpp" line="582"/>
<source>Press &quot;Save&quot; to store the imported cards in the Cockatrice database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="804"/>
<location filename="src/pages.cpp" line="583"/>
<source>The card database will be saved at the following location:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="806"/>
<location filename="src/pages.cpp" line="585"/>
<source>Save to a custom path (not recommended)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="808"/>
<location filename="src/pages.cpp" line="587"/>
<source>&amp;Save</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="820"/>
<location filename="src/pages.cpp" line="823"/>
<location filename="src/pages.cpp" line="593"/>
<source>Import finished: %1 cards.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="828"/>
<location filename="src/pages.cpp" line="831"/>
<location filename="src/pages.cpp" line="596"/>
<source>%1: %2 cards imported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="841"/>
<location filename="src/pages.cpp" line="605"/>
<source>Save card database</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="842"/>
<location filename="src/pages.cpp" line="606"/>
<source>XML; card database (*.xml)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/pages.cpp" line="874"/>
<location filename="src/pages.cpp" line="638"/>
<source>The file could not be saved to %1</source>
<translation type="unfinished"></translation>
</message>
@ -433,8 +416,7 @@
</message>
<message>
<location filename="src/pagetemplates.cpp" line="115"/>
<source>Downloading (0 MB)</source>
<oldsource>Downloading (0MB)</oldsource>
<source>Downloading (0MB)</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -607,7 +589,7 @@
<context>
<name>i18n</name>
<message>
<location filename="src/oraclewizard.cpp" line="24"/>
<location filename="src/oraclewizard.cpp" line="22"/>
<source>English</source>
<translation type="unfinished"></translation>
</message>
@ -615,12 +597,12 @@
<context>
<name>main</name>
<message>
<location filename="src/main.cpp" line="48"/>
<location filename="src/main.cpp" line="62"/>
<source>Only run in spoiler mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/main.cpp" line="49"/>
<location filename="src/main.cpp" line="63"/>
<source>Run in no-confirm background mode</source>
<translation type="unfinished"></translation>
</message>