Skip to content
GitLab
Commit 97a1a96b authored by Milton Goncalves's avatar Milton Goncalves
Browse files

Merge branch 'translation' of... 

Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
parents 7324374d accb388e
Hide whitespace changes
Inline Side-by-side
cockatrice/translations/cockatrice_es.ts
View file @ 97a1a96b
......@@ -6,32 +6,32 @@
<message>
<location filename="../src/abstractcounter.cpp" line="56"/>
<source>&amp;Set counter...</source>
<translation type="unfinished">E&amp;stablecer contadores...</translation>
<translation>E&amp;stablecer contador...</translation>
</message>
<message>
<location filename="../src/abstractcounter.cpp" line="63"/>
<source>Ctrl+L</source>
<translation type="unfinished">Ctrl+L</translation>
<translation>Ctrl+L</translation>
</message>
<message>
<location filename="../src/abstractcounter.cpp" line="64"/>
<source>F11</source>
<translation type="unfinished">F11</translation>
<translation>F11</translation>
</message>
<message>
<location filename="../src/abstractcounter.cpp" line="65"/>
<source>F12</source>
<translation type="unfinished">F12</translation>
<translation>F12</translation>
</message>
<message>
<location filename="../src/abstractcounter.cpp" line="122"/>
<source>Set counter</source>
<translation type="unfinished">Establecer contador</translation>
<translation>Establecer contador</translation>
</message>
<message>
<location filename="../src/abstractcounter.cpp" line="122"/>
<source>New value for counter &apos;%1&apos;:</source>
<translation type="unfinished">Nuevo valor para el contador &apos;%1&apos;:</translation>
<translation>Nuevo valor para el contador &apos;%1&apos;:</translation>
</message>
</context>
<context>
......@@ -175,12 +175,12 @@
<message>
<location filename="../src/carditem.cpp" line="175"/>
<source>&amp;Play</source>
<translation type="unfinished"></translation>
<translation>&amp;Jugar</translation>
</message>
<message>
<location filename="../src/carditem.cpp" line="176"/>
<source>&amp;Hide</source>
<translation type="unfinished"></translation>
<translation>&amp;Ocultar</translation>
</message>
<message>
<location filename="../src/carditem.cpp" line="178"/>
......@@ -1103,7 +1103,7 @@
<message>
<location filename="../src/tab_room.cpp" line="114"/>
<source>Show &amp;full games</source>
<translation type="unfinished"></translation>
<translation>Ver partidas &amp;sin plazas libres</translation>
</message>
<message>
<source>&amp;Show full games</source>
......@@ -1248,42 +1248,42 @@
<message>
<location filename="../src/window_main.cpp" line="158"/>
<source>Version %1</source>
<translation type="unfinished"></translation>
<translation>Versión %1</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="159"/>
<source>Authors:</source>
<translation type="unfinished"></translation>
<translation>Autores:</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="160"/>
<source>Translators:</source>
<translation type="unfinished"></translation>
<translation>Traductores:</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="161"/>
<source>Spanish:</source>
<translation type="unfinished"></translation>
<translation>Español:</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="162"/>
<source>Portugese (Portugal):</source>
<translation type="unfinished"></translation>
<translation>Portugués (Portugal):</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="163"/>
<source>Portugese (Brazil):</source>
<translation type="unfinished"></translation>
<translation>Portugués (Brasil):</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="164"/>
<source>French:</source>
<translation type="unfinished"></translation>
<translation>Francés:</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="165"/>
<source>Japanese:</source>
<translation type="unfinished"></translation>
<translation>Japonés:</translation>
</message>
<message>
<location filename="../src/window_main.cpp" line="171"/>
......@@ -1499,7 +1499,7 @@
<message>
<location filename="../src/messagelogwidget.cpp" line="202"/>
<source>%1 gives %2 control over %3.</source>
<translation type="unfinished"></translation>
<translation>%1 entrega a %2 el control sobre %3.</translation>
</message>
<message>
<location filename="../src/messagelogwidget.cpp" line="208"/>
......@@ -2165,7 +2165,7 @@
<message>
<location filename="../src/player.cpp" line="416"/>
<source>Put top card on &amp;bottom</source>
<translation type="unfinished"></translation>
<translation>Poner carta superior en la parte &amp;inferior</translation>
</message>
<message>
<location filename="../src/player.cpp" line="419"/>
......@@ -2337,32 +2337,32 @@
<message>
<location filename="../src/tab_server.cpp" line="51"/>
<source>Rooms</source>
<translation type="unfinished"></translation>
<translation>Salas</translation>
</message>
<message>
<location filename="../src/tab_server.cpp" line="52"/>
<source>Joi&amp;n</source>
<translation type="unfinished">E&amp;ntrar</translation>
<translation>E&amp;ntrar</translation>
</message>
<message>
<location filename="../src/tab_server.cpp" line="55"/>
<source>Room</source>
<translation type="unfinished"></translation>
<translation>Sala</translation>
</message>
<message>
<location filename="../src/tab_server.cpp" line="56"/>
<source>Description</source>
<translation type="unfinished">Descripción</translation>
<translation>Descripción</translation>
</message>
<message>
<location filename="../src/tab_server.cpp" line="57"/>
<source>Players</source>
<translation type="unfinished">Jugadores</translation>
<translation>Jugadores</translation>
</message>
<message>
<location filename="../src/tab_server.cpp" line="58"/>
<source>Games</source>
<translation type="unfinished">Partidas</translation>
<translation>Partidas</translation>
</message>
</context>
<context>
......@@ -2390,37 +2390,37 @@
<message>
<location filename="../src/tab_admin.cpp" line="40"/>
<source>Update server &amp;message</source>
<translation type="unfinished"></translation>
<translation>Actualizar &amp;mensaje del servidor</translation>
</message>
<message>
<location filename="../src/tab_admin.cpp" line="41"/>
<source>Server administration functions</source>
<translation type="unfinished"></translation>
<translation>Funciones de administración del servidor</translation>
</message>
<message>
<location filename="../src/tab_admin.cpp" line="43"/>
<source>&amp;Unlock functions</source>
<translation type="unfinished"></translation>
<translation>&amp;Desbloquear funciones</translation>
</message>
<message>
<location filename="../src/tab_admin.cpp" line="44"/>
<source>&amp;Lock functions</source>
<translation type="unfinished"></translation>
<translation>&amp;Bloquear funciones</translation>
</message>
<message>
<location filename="../src/tab_admin.cpp" line="54"/>
<source>Unlock administration functions</source>
<translation type="unfinished"></translation>
<translation>Desbloquear funciones de administración</translation>
</message>
<message>
<location filename="../src/tab_admin.cpp" line="54"/>
<source>Do you really want to unlock the administration functions?</source>
<translation type="unfinished"></translation>
<translation>¿Realmente quieres desbloquear las funciones de administración?</translation>
</message>
<message>
<location filename="../src/tab_admin.h" line="26"/>
<source>Administration</source>
<translation type="unfinished"></translation>
<translation>Administración</translation>
</message>
</context>
<context>
......@@ -2626,32 +2626,32 @@ Por favor, introduzca un nombre:</translation>
<message>
<location filename="../src/tab_room.cpp" line="219"/>
<source>&amp;Say:</source>
<translation type="unfinished">&amp;Decir:</translation>
<translation>&amp;Decir:</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="220"/>
<source>Chat</source>
<translation type="unfinished"></translation>
<translation>Chat</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="221"/>
<source>&amp;Room</source>
<translation type="unfinished"></translation>
<translation>&amp;Sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="222"/>
<source>&amp;Leave room</source>
<translation type="unfinished"></translation>
<translation>&amp;Dejar sala</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="268"/>
<source>%1 has joined the room.</source>
<translation type="unfinished"></translation>
<translation>%1 se ha unido a la sala.</translation>
</message>
<message>
<location filename="../src/tab_room.cpp" line="274"/>
<source>%1 has left the room.</source>
<translation type="unfinished"></translation>
<translation>%1 ha dejado la sala.</translation>
</message>
</context>
<context>
......@@ -2667,12 +2667,12 @@ Por favor, introduzca un nombre:</translation>
<message>
<location filename="../src/userinfobox.cpp" line="38"/>
<source>User information</source>
<translation type="unfinished"></translation>
<translation>Información del usuario</translation>
</message>
<message>
<location filename="../src/userinfobox.cpp" line="45"/>
<source>Real name:</source>
<translation type="unfinished"></translation>
<translation>Nombre real:</translation>
</message>
<message>
<location filename="../src/userinfobox.cpp" line="46"/>
......@@ -2687,22 +2687,22 @@ Por favor, introduzca un nombre:</translation>
<message>
<location filename="../src/userinfobox.cpp" line="65"/>
<source>Administrator</source>
<translation type="unfinished"></translation>
<translation>Administrador</translation>
</message>
<message>
<location filename="../src/userinfobox.cpp" line="67"/>
<source>Judge</source>
<translation type="unfinished"></translation>
<translation>Juez</translation>
</message>
<message>
<location filename="../src/userinfobox.cpp" line="69"/>
<source>Registered user</source>
<translation type="unfinished"></translation>
<translation>Usuario registrado</translation>
</message>
<message>
<location filename="../src/userinfobox.cpp" line="71"/>
<source>Unregistered user</source>
<translation type="unfinished"></translation>
<translation>Usuario no registrado</translation>
</message>
</context>
<context>
......@@ -2738,17 +2738,17 @@ Por favor, introduzca un nombre:</translation>
<message>
<location filename="../src/userlist.cpp" line="65"/>
<source>Users in this room: %1</source>
<translation type="unfinished"></translation>
<translation>Usuarios en esta sala: %1</translation>
</message>
<message>
<location filename="../src/userlist.cpp" line="119"/>
<source>User &amp;details</source>
<translation type="unfinished"></translation>
<translation>&amp;Detalles del usuario</translation>
</message>
<message>
<location filename="../src/userlist.cpp" line="120"/>
<source>Direct &amp;chat</source>
<translation type="unfinished"></translation>
<translation>&amp;Chat privado</translation>
</message>
</context>
<context>
......@@ -2837,14 +2837,15 @@ Por favor, introduzca un nombre:</translation>
<location filename="../src/window_deckeditor.cpp" line="312"/>
<location filename="../src/window_deckeditor.cpp" line="336"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
<translation>Error</translation>
</message>
<message>
<location filename="../src/window_deckeditor.cpp" line="312"/>
<location filename="../src/window_deckeditor.cpp" line="336"/>
<source>The deck could not be saved.
Please check that the directory is writable and try again.</source>
<translation type="unfinished"></translation>
<translation>El mazo no puede guardarse
Por favor, compruebe que tiene permisos de escritura en el directorio e intentelo de nuevo.</translation>
</message>
<message>
<location filename="../src/window_deckeditor.cpp" line="318"/>
......@@ -2935,7 +2936,7 @@ Please check that the directory is writable and try again.</source>
<location filename="../src/window_deckeditor.cpp" line="254"/>
<source>The decklist has been modified.
Do you want to save the changes?</source>
<translation type="unfinished">La lista del mazo ha sido modificada
<translation>La lista del mazo ha sido modificada
¿Deseas guardar los cambios?</translation>
</message>
</context>
......
doc/protocol.txt deleted 100644 → 0
View file @ 7324374d
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
nsis/cockatrice.nsi deleted 100644 → 0
View file @ 7324374d
!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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment