jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-02 03:23:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into tooomm-qt5

Browse source
This commit is contained in:
tooomm 2026-05-10 16:03:54 +02:00
commit e0b3edc9b8
488 changed files with 28527 additions and 76214 deletions
Download patch file Download diff file Expand all files Collapse all files

2
oracle/src/oracleimporter.cpp
View file

@ -366,8 +366,6 @@ int OracleImporter::importCardsFromSet(const CardSetPtr &currentSet, const QList
auto found_iter = splitCards.find(name + numProperty);
if (found_iter == splitCards.end()) {
splitCards.insert(name + numProperty, {{split}, name});
} else if (layout == "adventure" || layout == "prepare") {
found_iter->first.insert(0, split);
} else {
found_iter->first.append(split);
}

4
oracle/translations/oracle_de.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Platzhalter Edition mit Spielsteinen</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle Importer</translation>
</message>

4
oracle/translations/oracle_el.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Εικονικό σετ που περιέχει tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Εισαγωγέας Oracle</translation>
</message>

4
oracle/translations/oracle_en_US.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Dummy set containing tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle Importer</translation>
</message>

4
oracle/translations/oracle_es.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Set dedicado para tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Importador de Oracle</translation>
</message>

4
oracle/translations/oracle_et.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Nukk-komplekt mis sisaldab märgistusi</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle sissetooja</translation>
</message>

4
oracle/translations/oracle_fi.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Tokeneja sisältävä mallisetti</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle-lataaja</translation>
</message>

4
oracle/translations/oracle_fr.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Fausse édition contenant les jetons</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Importateur Oracle</translation>
</message>

4
oracle/translations/oracle_it.ts
View file

@ -277,7 +277,7 @@ e pedine che verranno usate da Cockatrice.</translation>
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Set finto contenente i token</translation>
</message>
@ -285,7 +285,7 @@ e pedine che verranno usate da Cockatrice.</translation>
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle Importer</translation>
</message>

4
oracle/translations/oracle_ja.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>ダミーセットを含むトークン</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle Importer - オラクル・インポーター</translation>
</message>

4
oracle/translations/oracle_ko.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>토큰 정보가 들어있는 더미 확장판</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>오라클</translation>
</message>

4
oracle/translations/oracle_nb.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Dummy sett som inneholder tokens</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle importerer</translation>
</message>

4
oracle/translations/oracle_nl.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Token voorbeeldset</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle importer</translation>
</message>

4
oracle/translations/oracle_pl.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Dodatek-atrapa, zawierający tokeny.</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle – kreator importu</translation>
</message>

4
oracle/translations/oracle_pt.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Set básico contendo fichas</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Importar Oracle</translation>
</message>

4
oracle/translations/oracle_pt_BR.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Esta expansão contém fichas.</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Importador Oracle</translation>
</message>

4
oracle/translations/oracle_ru.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>Пример сета с фишками</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Импортер Oracle</translation>
</message>

4
oracle/translations/oracle_sr.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation type="unfinished"/>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation type="unfinished"/>
</message>

4
oracle/translations/oracle_tr.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation type="unfinished"/>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation type="unfinished"/>
</message>

4
oracle/translations/oracle_yue.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>包含衍生物的虚拟牌組</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle導入器</translation>
</message>

4
oracle/translations/oracle_zh-Hans.ts
View file

@ -276,7 +276,7 @@
<context>
<name>OracleImporter</name>
<message>
<location filename="src/oracleimporter.cpp" line="541"/>
<location filename="src/oracleimporter.cpp" line="540"/>
<source>Dummy set containing tokens</source>
<translation>包含衍生物的虚拟牌组</translation>
</message>
@ -284,7 +284,7 @@
<context>
<name>OracleWizard</name>
<message>
<location filename="src/oraclewizard.cpp" line="70"/>
<location filename="src/oraclewizard.cpp" line="97"/>
<source>Oracle Importer</source>
<translation>Oracle导入器</translation>
</message>