diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts index b7471b43..0457d2f2 100644 --- a/cockatrice/translations/cockatrice_es.ts +++ b/cockatrice/translations/cockatrice_es.ts @@ -16,7 +16,7 @@ Path to stack background: - + Ruta a la imagen de fondo de la pila: @@ -51,12 +51,12 @@ Economical layout - + Disposición Económica Invert vertical coordinate - + Invertir coordenada vertical Economic layout @@ -337,37 +337,37 @@ his hand nominative - su mano + su mano %1's hand nominative - mano &de %1 + mano de %1 of his hand genitive - de su mano + de su mano of %1's hand genitive - de la mano &de %1 + de la mano de %1 his hand accusative - su mano + su mano %1's hand accusative - mano &de %1 + mano de %1 his hand @@ -383,37 +383,37 @@ his library nominative - su biblioteca + su biblioteca %1's library nominative - biblioteca &de %1 + biblioteca de %1 of his library genitive - de su biblioteca + de su biblioteca of %1's library genitive - de la biblioteca &de %1 + de la biblioteca de %1 his library accusative - su biblioteca + su biblioteca %1's library accusative - biblioteca &de %1 + biblioteca de %1 his library @@ -429,37 +429,37 @@ his graveyard nominative - su cementerio + su cementerio %1's graveyard nominative - cementerio &de %1 + cementerio de %1 of his graveyard genitive - de su cementerio + de su cementerio of %1's graveyard genitive - del cementerio &de %1 + del cementerio de %1 his graveyard accusative - su cementerio + su cementerio %1's graveyard accusative - cementerio &de %1 + cementerio de %1 his graveyard @@ -475,37 +475,37 @@ his exile nominative - su exilio + su exilio %1's exile nominative - el exilio de %1 + el exilio de %1 of his exile genitive - de su exilio + de su exilio of %1's exile genitive - del exilio de %1 + del exilio de %1 his exile accusative - su exilio + su exilio %1's exile accusative - el exilio de %1 + el exilio de %1 his exile @@ -521,37 +521,37 @@ his sideboard nominative - su reserva + su reserva %1's sideboard nominative - la reserva de %1 + la reserva de %1 of his sideboard genitive - de su reserva + de su reserva of %1's sideboard genitive - de la reserva &de %1 + de la reserva de %1 his sideboard accusative - su reserva + su reserva %1's sideboard accusative - la reserva de %1 + la reserva de %1 his sideboard @@ -971,17 +971,17 @@ Your card database is invalid. Would you like to go back and set the correct path? - + Tu base de datos de cartas es invalida. ¿Deseas volver y seleccionar la ruta correcta? The path to your deck directory is invalid. Would you like to go back and set the correct path? - + La ruta a tu directorio de mazos es invalida. ¿Deseas volver y seleccionar la ruta correcta? The path to your card pictures directory is invalid. Would you like to go back and set the correct path? - + La ruta a tu directorio de imagenes de las cartas es invalida.¿Deseas volver y seleccionar la ruta correcta? @@ -1208,12 +1208,12 @@ About Cockatrice - + Acerca de Cockatrice <font size="8"><b>Cockatrice</b></font><br>Version %1<br><br><br><b>Authors:</b><br>Max-Wilhelm Bruker<br>Marcus Schütz<br>Marius van Zundert<br><br><b>Translators:</b><br>Spanish: Gocho<br>Portugese: Milton Gonçalves<br> - + @@ -1306,12 +1306,12 @@ &About Cockatrice - + &Acerca de Cockatrice &Help - + A&yuda @@ -1424,7 +1424,7 @@ from the stack - + de la pila @@ -1474,7 +1474,7 @@ %1 plays %2%3. - + %1 juega %2%3. @@ -1651,12 +1651,12 @@ %1 reveals %2 to %3. - + %1 revela %2 a %3. %1 reveals %2. - + %1 revela %2. @@ -1676,22 +1676,22 @@ %1 randomly reveals %2%3 to %4. - + %1 revela aleatoriamente %2%3 a %4. %1 randomly reveals %2%3. - + %1 revela aleatoriamente %2%3. %1 reveals %2%3 to %4. - + %1 revela %2%3 a %4. %1 reveals %2%3. - + %1 revela %2%3. @@ -1875,7 +1875,7 @@ Move to &graveyard - + Mover al &cementerio @@ -1885,17 +1885,17 @@ Reveal &library to - + Revelar &biblioteca a Reveal t&op card to - + Revelar la carta &superior de la biblioteca a Move top cards to &graveyard... - + Mover cartas de la parte s&uperior de la biblioteca al cementerio... @@ -2090,12 +2090,12 @@ &Reveal to - + &Revelar a Reveal r&andom card to - + Revelar carta &aleatoriamente a @@ -2105,7 +2105,7 @@ &All players - + &Todos los jugadores @@ -2488,12 +2488,12 @@ Por favor, introduzca un nombre: Location: - + Localización: User level: - + Nivel de usuario: @@ -2511,12 +2511,12 @@ Por favor, introduzca un nombre: Animation settings - + Opciones de animación &Tap/untap animation - + Animación de &girar/enderezar @@ -2642,7 +2642,7 @@ Por favor, introduzca un nombre: Add card to &sideboard - Añadir mazos a la &reserva + Añadir carta a la &reserva @@ -2698,8 +2698,8 @@ Por favor, introduzca un nombre: The decklist has been modified. Do you want to save the changes? - La lista del mazo ha sido modificada -¿Desea guardar los cambios? + La lista del mazo ha sido modificada +¿Deseas guardar los cambios? diff --git a/doc/protocol.txt b/doc/protocol.txt deleted file mode 100644 index 2e88f62f..00000000 --- a/doc/protocol.txt +++ /dev/null @@ -1,157 +0,0 @@ -1. Abstract - -The Cockatrice protocol is a client/server protocol intended for communication between -a card game client and a suitable server. It is designed with the goal in mind to make -playing card games, such as Magic the Gathering, over a network easy while eliminating -the possibility of unfair play. Because of that, the server stores all hidden information -and transmits pieces of it to clients only when necessary. - -2. Protocol structure - -All communication is done over a TCP/IP connection. The protocol is text based. -Strings are encoded in UTF-8 and have UNIX-style line endings (\n). - -There are four distinct types of messages: - - Command (section 3) - - Response (section 4) - - Event (section 5) - - List (section 6) - -3. Commands - -A command can only be sent from client to server and has the following structure: - {ID}|{command}|{parameter1}|{parameter2}... -"ID" is an arbitrary number to be chosen uniquely for each command. -"command" is a command identifier (see section 3). -It depends on the command identifier what has to be passed as parameters. - -3.1 ping - -Flags: - none -Parameters: - none -Valid response codes: - ok - -No effect. - -3.2 login - -Flags: - none -Parameters: - User name (string) - Password (string) -Valid response codes: - ok - password - -If the supplied credentials are correct, "ok" is returned and the connection state -is set to authenticated. (The server is not required to actually check the validity -of the credentials.) -Otherwise, "password" is returned. - -3.3 list_games - -Flags: - login needed -Parameters: - none -Valid response codes: - ok - -If the connection state is unauthenticated, "login_needed" is returned. -Otherwise, "ok" is returned and for each game currently, a list_games event XXX is -sent to the client. The "accepts game list changes" flag of the connection is set. - -3.4 create_game - -Flags: - login needed -Parameters: - Description (string) - Password (string) - Number of players (int) -Valid response codes: - ok - -A game with the given parameters is created. The client is set as creator of the -game and joins it automatically. The "accepts game list changes" flag of the connection -is unset. - -3.5 join_game - -Flags: - login needed -Parameters: - Game ID (int) - Password (string) -Valid response codes: - ok - password - -If the password for the given game is correct, the client leaves the current game -(if any) and joins the given game. The "accepts game list changes" flag of the connection -is unset. - -3.6 leave_game - -Flags: - login needed - game needed -Parameters: - none -Valid response codes: - ok - -The client leaves the current game. - -3.7 list_players - -Flags: - login needed - game needed -Parameters: - none - - -3.8 say -3.9 submit_deck -3.10 ready_start -3.11 shuffle -3.12 draw_cards -3.13 reveal_card -3.14 move_card -3.15 create_token -3.16 set_card_attr -3.17 inc_counter -3.18 add_counter -3.19 set_counter -3.20 del_counter -3.21 list_counters -3.22 list_zones -3.23 dump_zone -3.24 roll_dice -3.25 set_active_player -3.26 set_active_phase - -4. Responses - -After processing any command, the server sends a response to the client, indicating -whether the command was understood and valid. -A response can only be sent from server to client and has the following structure: - resp|{ID}|{resp-code} - -{ID} is the identifier belonging to the command in question. -{resp-code} contains information about the processing of the command. It can have the -following values: - ok (Success) - login_needed (Error: Command requires login) - syntax (Error: Invalid command or parameters) - context (Error: Command cannot be applied here) - password (Error: Wrong login data) - -The response code "syntax" is valid as a response to any command and is -hence not explicitly listed in section 3. The response code "login_needed" applies -to all commands with the "login needed" flag. \ No newline at end of file diff --git a/nsis/cockatrice.nsi b/nsis/cockatrice.nsi deleted file mode 100644 index 6e182a60..00000000 --- a/nsis/cockatrice.nsi +++ /dev/null @@ -1,110 +0,0 @@ -!include "MUI2.nsh" -!include "FileFunc.nsh" - -Name "Cockatrice" -OutFile "cockatrice_win32.exe" -SetCompressor lzma -InstallDir "$PROGRAMFILES\Cockatrice" - -!define MUI_ABORTWARNING -!define MUI_WELCOMEFINISHPAGE_BITMAP "leftimage.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "leftimage.bmp" -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "headerimage.bmp" -!define MUI_HEADERIMAGE_UNBITMAP "headerimage.bmp" -!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue." -!define MUI_FINISHPAGE_RUN "$INSTDIR/oracle.exe" -!define MUI_FINISHPAGE_RUN_TEXT "Run card database downloader now" -!define MUI_FINISHPAGE_RUN_PARAMETERS "-dlsets" - -!insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_COMPONENTS -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES -!insertmacro MUI_PAGE_FINISH - -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" - -Section "Application" SecApplication - SetOutPath "$INSTDIR" - File ..\cockatrice\release\cockatrice.exe - File ..\oracle\release\oracle.exe - File data\libgcc_s_dw2-1.dll - File data\mingwm10.dll - File data\QtCore4.dll - File data\QtGui4.dll - File data\QtNetwork4.dll - File data\QtSvg4.dll - File data\QtXml4.dll - - SetOutPath "$INSTDIR\zonebg" - File /r ..\zonebg\*.* - - SetOutPath "$INSTDIR\plugins" - File /r data\plugins\*.* - - SetOutPath "$INSTDIR\pics" - SetOutPath "$INSTDIR\decks" - - WriteUninstaller "$INSTDIR\uninstall.exe" - ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 - IntFmt $0 "0x%08X" $0 - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayName" "Cockatrice" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "InstallLocation" "$INSTDIR" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "DisplayIcon" "$INSTDIR\cockatrice.exe" - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" "EstimatedSize" "$0" -SectionEnd - -Section "Update configuration" SecUpdateConfig - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "carddatabase" "$INSTDIR\cards.xml" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "decks" "$INSTDIR\decks" - WriteRegStr HKCU "Software\Cockatrice\Cockatrice\paths" "pics" "$INSTDIR\pics" - -SectionEnd - -Section "Start menu item" SecStartMenu - createDirectory "$SMPROGRAMS\Cockatrice" - createShortCut "$SMPROGRAMS\Cockatrice\Cockatrice.lnk" "$INSTDIR\cockatrice.exe" - createShortCut "$SMPROGRAMS\Cockatrice\Oracle.lnk" "$INSTDIR\oracle.exe" -SectionEnd - -Section Uninstall - RMDir /r "$INSTDIR\zonebg" - RMDir /r "$INSTDIR\plugins" - RMDir "$INSTDIR\decks" - RMDir /r "$INSTDIR\pics\downloadedPics" - RMDir "$INSTDIR\pics" - Delete "$INSTDIR\uninstall.exe" - Delete "$INSTDIR\cockatrice.exe" - Delete "$INSTDIR\oracle.exe" - Delete "$INSTDIR\cards.xml" - Delete "$INSTDIR\libgcc_s_dw2-1.dll" - Delete "$INSTDIR\mingwm10.dll" - Delete "$INSTDIR\QtCore4.dll" - Delete "$INSTDIR\QtGui4.dll" - Delete "$INSTDIR\QtNetwork4.dll" - Delete "$INSTDIR\QtSvg4.dll" - Delete "$INSTDIR\QtXml4.dll" - RMDir "$INSTDIR" - - RMDir /r "$SMPROGRAMS\Cockatrice" - - DeleteRegKey HKCU "Software\Cockatrice" - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" -SectionEnd - -LangString DESC_SecApplication ${LANG_ENGLISH} "Cockatrice program files" -LangString DESC_SecUpdateConfig ${LANG_ENGLISH} "Update the paths in the application settings according to the installation paths." -LangString DESC_SecStartMenu ${LANG_ENGLISH} "Create start menu items for Cockatrice and Oracle." -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${SecApplication} $(DESC_SecApplication) - !insertmacro MUI_DESCRIPTION_TEXT ${SecUpdateConfig} $(DESC_SecUpdateConfig) - !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(DESC_SecStartMenu) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - diff --git a/nsis/headerimage.bmp b/nsis/headerimage.bmp deleted file mode 100644 index 73c88d6d..00000000 Binary files a/nsis/headerimage.bmp and /dev/null differ diff --git a/nsis/leftimage.bmp b/nsis/leftimage.bmp deleted file mode 100644 index e89fdd95..00000000 Binary files a/nsis/leftimage.bmp and /dev/null differ