updated Spanish; adjusted details for release

cockatrice/CMakeLists.txt

@@ -169,20 +169,20 @@ endif (APPLE)
 
 set(cockatrice_RESOURCES cockatrice.qrc)
 set(cockatrice_TS
-        translations/cockatrice_cs.ts
+#        translations/cockatrice_cs.ts
         translations/cockatrice_de.ts
         translations/cockatrice_en.ts
         translations/cockatrice_es.ts
-        translations/cockatrice_fr.ts
+#        translations/cockatrice_fr.ts
         translations/cockatrice_it.ts
         translations/cockatrice_ja.ts
-        translations/cockatrice_pl.ts
-        translations/cockatrice_pt-br.ts
+#        translations/cockatrice_pl.ts
+#        translations/cockatrice_pt-br.ts
         translations/cockatrice_pt.ts
-        translations/cockatrice_ru.ts
-        translations/cockatrice_sk.ts
+#        translations/cockatrice_ru.ts
+#        translations/cockatrice_sk.ts
 	translations/cockatrice_sv.ts
-	translations/cockatrice_zh_CN.ts
+#	translations/cockatrice_zh_CN.ts
 )
 
 if(WIN32)

cockatrice/src/cardinfowidget.cpp

@@ -94,12 +94,14 @@ void CardInfoWidget::minimizeClicked(int newMinimized)
 
 bool CardInfoWidget::shouldShowPowTough()
 {
-	return (!info->getPowTough().isEmpty() && (minimized != 0));
+//	return (!info->getPowTough().isEmpty() && (minimized != 0));
+	return (minimized != 0);
 }
 
 bool CardInfoWidget::shouldShowLoyalty()
 {
-	return ((info->getLoyalty() > 0) && (minimized != 0));
+//	return ((info->getLoyalty() > 0) && (minimized != 0));
+	return (minimized != 0);
 }
 
 void CardInfoWidget::setMinimized(int _minimized)
@@ -153,7 +155,7 @@ void CardInfoWidget::setCard(CardInfo *card)
 	manacostLabel2->setText(card->getManaCost());
 	cardtypeLabel2->setText(card->getCardType());
 	powtoughLabel2->setText(card->getPowTough());
-	loyaltyLabel2->setText(QString::number(card->getLoyalty()));
+	loyaltyLabel2->setText(card->getLoyalty() > 0 ? QString::number(card->getLoyalty()) : QString());
 	textLabel->setText(card->getText());
 
 	powtoughLabel1->setVisible(shouldShowPowTough());

cockatrice/src/player.cpp

@@ -644,7 +644,7 @@ void Player::retranslateUi()
 	aFlip->setText(tr("&Flip"));
 	aPeek->setText(tr("&Peek at card face"));
 	aClone->setText(tr("&Clone"));
-	aClone->setShortcut(tr("Ctrl+H"));
+	aClone->setShortcut(tr("Ctrl+J"));
 	aAttach->setText(tr("Attac&h to card..."));
 	aAttach->setShortcut(tr("Ctrl+A"));
 	aUnattach->setText(tr("Unattac&h"));

cockatrice/src/window_main.cpp

@@ -224,7 +224,7 @@ void MainWindow::actAbout()
 		+ tr("French:") + " Yannick Hammer, Arnaud Faes<br>"
 		+ tr("Japanese:") + " Nagase Task<br>"
 		+ tr("Russian:") + " Alexander Davidov<br>"
-		+ tr("Czech:") + " Ondřej Trhoň<br>"
+//		+ tr("Czech:") + " Ondřej Trhoň<br>"
 //		+ tr("Slovak:") + " Ganjalf Rendy<br>"
 		+ tr("Italian:") + " Luigi Sciolla<br>"
 		+ tr("Swedish:") + " Jessica Dahl<br>"

nsis/cockatrice.nsi

@@ -43,7 +43,6 @@ Section "Application" SecApplication
 	File C:\MinGW\qt\bin\QtSvg4.dll
 	File C:\MinGW\qt\bin\QtXml4.dll
 	File C:\MinGW\qt\bin\QtMultimedia4.dll
-	File C:\MinGW\qt\bin\QtScript4.dll
 
 	SetOutPath "$INSTDIR\zonebg"
 	File /r ..\zonebg\*.*
@@ -108,7 +107,6 @@ Section Uninstall
         Delete "$INSTDIR\QtSvg4.dll"
         Delete "$INSTDIR\QtXml4.dll"
 	Delete "$INSTDIR\QtMultimedia4.dll"
-	Delete "$INSTDIR\QtScript4.dll"
         RMDir "$INSTDIR"
 
 	RMDir /r "$SMPROGRAMS\Cockatrice"

prepareMacRelease.sh

 #!/bin/sh
 
-FRAMEWORKS="Core Gui Multimedia Network Svg Xml Script"
+FRAMEWORKS="Core Gui Multimedia Network Svg Xml"
 DATE=`date '+%Y%m%d'`
 #QTDIR="/Users/brukie/QtSDK/Desktop/Qt/474/gcc"
 QTLIB="/Users/brukie/qt_leopard/lib"