Changing/Normalizing Variable Names

Removing Set Translation
Updating Translation Files

cockatrice/src/carddatabasemodel.cpp

@@ -145,14 +145,15 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex
             return false;
 
     if (!cardSet.isEmpty()) {
-        bool blnGood = false;
-        for(int intLoop = 0; intLoop < info->getSets().count(); intLoop++) {
-            if (info->getSets().at(intLoop)->getShortName() == cardSet) {
-                blnGood = true;
+    	int iCount = info->getSets().count();
+        bool isValidSet = false;
+        for(int iLoop = 0; iLoop < iCount; iLoop++) {
+            if (info->getSets().at(iLoop)->getShortName() == cardSet) {
+            	isValidSet = true;
                 break;
             }
         }
-        if (!blnGood) {
+        if (!isValidSet) {
             return false;
         }
     }

cockatrice/src/dlg_cardsearch.cpp

@@ -36,9 +36,10 @@ DlgCardSearch::DlgCardSearch(QWidget *parent)
     cboSetList->addItem("");
     SetList setList = db->getSetList();
     setList.sortByName();
-    for (int intLoop = 0; intLoop < setList.size(); ++intLoop) {
+    int iCount = setList.size();
+    for (int iLoop = 0; iLoop < iCount; ++iLoop) {
         //Adding Translated Set Name, Just In Case
-        cboSetList->addItem(tr("%1").arg(setList.at(intLoop)->getLongName()), setList.at(intLoop)->getShortName());
+        cboSetList->addItem(setList.at(iLoop)->getLongName(), setList.at(iLoop)->getShortName());
     }
     
     QLabel *cardTypesLabel = new QLabel(tr("Card type (OR):"));

cockatrice/translations/cockatrice_cs.ts

@@ -1081,37 +1081,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Jméno karty:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Text karty:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Typ karty (NEBO):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Barva (NEBO):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>O&amp;K</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Hledat kartu</translation>
     </message>

cockatrice/translations/cockatrice_de.ts

@@ -1424,37 +1424,42 @@ Dies wird nur für Moderatoren gespeichert und kann von der gebannten Person nic
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Kartenname:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Kartentext:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Kartentyp (ODER):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Farbe (ODER):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>O&amp;K</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Kartensuche</translation>
     </message>

cockatrice/translations/cockatrice_en.ts

@@ -628,37 +628,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation type="unfinished"></translation>
     </message>

cockatrice/translations/cockatrice_es.ts

@@ -1340,37 +1340,42 @@ Se almacenará unicamente para moderadores y no podrá ser visto por la persona
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Nombre de la carta:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Texto de la carta:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Tipo de la carta (OR):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Color (OR):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>&amp;Aceptar</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Buscar carta</translation>
     </message>

cockatrice/translations/cockatrice_fr.ts

@@ -1198,37 +1198,42 @@ Cette information ne sera consultable que par les modérateurs.</translation>
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Nom de la carte:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Texte de la carte:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Type de la carte (OR):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Couleur (OR):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>O&amp;K</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Recherche de carte</translation>
     </message>

cockatrice/translations/cockatrice_gd.ts

@@ -657,33 +657,38 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Ainm a&apos; cairt:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translatorcomment>Not sure if this should be Teacsa cairt.</translatorcomment>
         <translation>Cairt teacsa:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>&amp;Ceart ma-thà</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Sguir dheth</translation>
     </message>

cockatrice/translations/cockatrice_it.ts

@@ -977,37 +977,42 @@ Questo è solo visibile ai moderatori e non alla persona bannata.</translation>
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Nome carta:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Testo carta:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Tipo carta (OR):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Colore (OR):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>O&amp;K</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Cerca carta</translation>
     </message>

cockatrice/translations/cockatrice_ja.ts

@@ -798,37 +798,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>カード名:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>カードテキスト:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>カードタイプ（含む）:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>色（含む）:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>カード検索</translation>
     </message>

cockatrice/translations/cockatrice_pl.ts

@@ -708,37 +708,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Tekst:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Typ karty (LUB):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Kolor (LUB):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>)&amp;K</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Wyszukiwanie karty</translation>
     </message>

cockatrice/translations/cockatrice_pt-br.ts

@@ -1147,37 +1147,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Nome do card:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Texto do card:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Tipo do card (OU):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Cor (OU):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Buscar card</translation>
     </message>

cockatrice/translations/cockatrice_pt.ts

@@ -1206,37 +1206,42 @@ Isto apenas é guardado para os moderadores e não é visível para a pessoa ban
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Nome da carta:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Texto da carta:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Tipo de carta (OU):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Cor (OU):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Pesquisar cartas</translation>
     </message>

cockatrice/translations/cockatrice_ru.ts

@@ -1109,37 +1109,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Название:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Текст:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Тип (Oracle):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Цвет (Oracle):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>О&amp;к</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Поиск</translation>
     </message>

cockatrice/translations/cockatrice_sk.ts

@@ -628,37 +628,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation type="unfinished"></translation>
     </message>

cockatrice/translations/cockatrice_sv.ts

@@ -941,37 +941,42 @@ Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen.
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation>Kortnamn:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation>Korttext:</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation>Korttyp (ELLER):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation>Färg (ELLER):</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation>Kortsökning</translation>
     </message>

cockatrice/translations/cockatrice_zh_CN.ts

@@ -628,37 +628,42 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DlgCardSearch</name>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="15"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="16"/>
         <source>Card name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="18"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="19"/>
         <source>Card text:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="21"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="23"/>
+        <source>Card Set (AND):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/dlg_cardsearch.cpp" line="33"/>
         <source>Card type (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="31"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="43"/>
         <source>Color (OR):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="41"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="53"/>
         <source>O&amp;K</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="44"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="56"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/dlg_cardsearch.cpp" line="66"/>
+        <location filename="../src/dlg_cardsearch.cpp" line="80"/>
         <source>Card search</source>
         <translation type="unfinished"></translation>
     </message>