diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 5395a11e..0b989359 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -22,60 +22,65 @@
AppearanceSettingsPage
-
+ Theme settings
-
+ Current theme:
-
+ Card rendering
-
+ Display card names on cards having a picture
-
+ Scale cards on mouse over
-
+ Hand layout
-
+ Display hand horizontally (wastes space)
-
+ Enable left justification
-
+ Table grid layout
-
+ Invert vertical coordinate
-
+ Minimum player count for multi-column layout:
+
+
+ Maximum font size for information displayed on cards:
+
+ BanDialog
@@ -407,12 +412,12 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckEditorSettingsPage
-
+ Nothing is here... yet
-
+ General
@@ -495,22 +500,22 @@ This is only saved for moderators and cannot be seen by the banned person.
DevReleaseChannel
-
+ Development snapshots
-
+ No reply received from the release update server.
-
+ Invalid reply received from the release update server.
-
+ No reply received from the file update server.
@@ -518,92 +523,107 @@ This is only saved for moderators and cannot be seen by the banned person.
DlgConnect
-
- Previous Host
-
-
-
-
+ New Host
-
+ &Host:
-
- Enter host name
+
+ Known Hosts
-
+
+ Name:
+
+
+
+ &Port:
-
+ Player &name:
-
+ P&assword:
-
+ &Save password
-
+ A&uto connect
-
+ Automatically connect to the most recent login when Cockatrice opens
-
+
+ (<a href="%1">Public Servers</a>)
+
+
+
+ Forgot password
-
+ Connect
-
+ Cancel
-
+ Server
-
+ Login
-
+ Connect to server
-
+
+ Connection Warning
+
+
+
+
+ You need to name your new connection profile.
+
+
+
+ Connect Warning
-
+ The player name can't be empty.
@@ -704,92 +724,92 @@ This is only saved for moderators and cannot be seen by the banned person.
DlgCreateToken
-
+ &Name:
-
+ Token
-
+ C&olor:
-
+ white
-
+ blue
-
+ black
-
+ red
-
+ green
-
+ multicolor
-
+ colorless
-
+ &P/T:
-
+ &Annotation:
-
+ &Destroy token when it leaves the table
-
+ Token data
-
+ Show &all tokens
-
+ Show tokens from this &deck
-
+ Choose token from list
-
+ Create token
@@ -1309,12 +1329,12 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
DlgSettings
-
+ Unknown Error loading card database
-
+ Your card database is invalid.
Cockatrice may not function correctly with an invalid database
@@ -1325,7 +1345,7 @@ Would you like to change your database location setting?
-
+ Your card database version is too old.
This can cause problems loading card information or images
@@ -1336,7 +1356,7 @@ Would you like to change your database location setting?
-
+ Your card database did not finish loading
Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -1345,21 +1365,21 @@ Would you like to change your database location setting?
-
+ File Error loading your card database.
Would you like to change your database location setting?
-
+ Your card database was loaded but contains no cards.
Would you like to change your database location setting?
-
+ Unknown card database load status
Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues
@@ -1368,59 +1388,59 @@ Would you like to change your database location setting?
-
-
-
+
+
+ Error
-
+ The path to your deck directory is invalid. Would you like to go back and set the correct path?
-
+ The path to your card pictures directory is invalid. Would you like to go back and set the correct path?
-
+ Settings
-
+ General
-
+ Appearance
-
+ User Interface
-
+ Deck Editor
-
+ Chat
-
+ Sound
-
+ Shortcuts
@@ -1428,92 +1448,102 @@ Would you like to change your database location setting?
DlgUpdate
-
-
-
+
+
+ Error
-
-
+
+ Cockatrice Update
-
- Update Anyway
-
-
-
-
+ Current release channel:
-
+
+ Reinstall
+
+
+
+
+ Cancel Download
+
+
+
+ Open Download Page
-
+ Cockatrice was not built with SSL support, so you cannot download updates automatically! Please visit the download page to update manually.
-
+ Downloading update...
-
+ Checking for updates...
-
+ Finished checking for updates.
-
+ Your version of Cockatrice is up to date.
-
- A new version is available:<br/>%1<br/>published on %2 .<br/>More informations are available on the <a href="%3">release changelog</a><br/>Do you want to update now?
+
+ You are already running the latest %1 release - %2
+ A new version is available:<br/>%1<br/>published on %2 .<br/>More informations are available on the <a href="%3">release changelog</a><br/>Do you want to update now?
+
+
+
+ A new version is available:<br/>%1<br/>published on %2 .<br/>More informations are available on the <a href="%3">release changelog</a><br/>Unfortunately there are no packages available for your operating system. You may have to use a developer build or build from source yourself. Please visit the download page.
-
-
-
+
+
+ Update Error
-
+ An error occurred while checking for updates:
-
+ An error occurred while downloading an update:
-
+ Installing...
-
+ Unable to open the installer. You might be able to manually update by closing Cockatrice and running the installer at %1.
@@ -1529,100 +1559,100 @@ Would you like to change your database location setting?
GameSelector
-
-
-
-
-
-
-
+
+
+
+
+
+
+ Error
-
+ Please join the appropriate room first.
-
+ Wrong password.
-
+ Spectators are not allowed in this game.
-
+ The game is already full.
-
+ The game does not exist any more.
-
+ This game is only open to registered users.
-
+ This game is only open to its creator's buddies.
-
+ You are being ignored by the creator of this game.
-
+ Join game
-
+ Password:
-
+ Please join the respective room first.
-
+ Games
-
+ &Filter games
-
+ C&lear filter
-
+ C&reate
-
+ &Join
-
+ J&oin as spectator
@@ -1714,117 +1744,117 @@ Would you like to change your database location setting?
GeneralSettingsPage
-
-
-
-
-
+
+
+
+
+ Choose path
-
+ Success
-
+ Downloaded card pictures have been reset.
-
+ Error
-
+ One or more downloaded card pictures could not be cleared.
-
+ Personal settings
-
+ Language:
-
+ Download card pictures on the fly
-
+ Paths
-
+ Decks directory:
-
+ Replays directory:
-
+ Pictures directory:
-
+ Card database:
-
+ Token database:
-
+ Picture cache size:
-
+ Primary download URL:
-
+ Fallback download URL:
-
+ How to set a custom picture url
-
+ Reset/clear downloaded pictures
-
+ Update channel
-
+ Notify if a feature supported by the server is missing in my client
-
+ Reset
@@ -1983,11 +2013,6 @@ Will now login.
Translators:
-
-
- Recognition Page
-
- Help Translate!
@@ -2195,6 +2220,11 @@ This usually means that your client version is out of date, and the server sent
Your client seems to be missing features this server requires for connection.
+
+
+ Our Translators
+
+ Your account has not been activated yet.
@@ -2366,11 +2396,6 @@ Local version is %1, remote version is %2.&About Cockatrice
-
-
- &Update Cockatrice
-
- View &debug log
@@ -2502,14 +2527,6 @@ Read more about changing the set order or disabling specific sets and consequent
Cockatrice will now reload the card database.
-
-
- This server supports additional features that your client doesn't have.
-This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
-
-To update your client, go to Help -> Update Cockatrice.
-
- You can only import XML databases at this time.
@@ -2546,6 +2563,19 @@ To update your client, go to Help -> Update Cockatrice.
Load sets/cards
+
+
+ Check for Updates
+
+
+
+
+ This server supports additional features that your client doesn't have.
+This is most likely not a problem, but this message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
+
+To update your client, go to Help -> Check for Updates.
+
+ Selected file cannot be found.
@@ -3134,79 +3164,79 @@ Cockatrice will now reload the card database.
MessagesSettingsPage
-
+ Add message
-
+ Message:
-
+ Chat settings
-
+ Custom alert words
-
+ Enable chat mentions
-
+ Enable mention completer
-
+ In-game message macros
-
+ Ignore chat room messages sent by unregistered users
-
+ Ignore private messages sent by unregistered users
-
-
+
+ Invert text color
-
+ Enable desktop notifications for private messages
-
+ Enable desktop notification for mentions
-
+ Enable room message history on join
-
-
+
+ (Color is hexadecimal)
-
+ Separate words with a space, alphanumeric characters only
@@ -3272,441 +3302,443 @@ Cockatrice will now reload the card database.
Player
-
+ Reveal top cards of library
-
+ Number of cards: (max. %1)
-
+ &View graveyard
-
+ &View exile
-
+ Player "%1"
-
-
-
-
+
+
+
+ &Graveyard
-
-
-
-
+
+
+
+ &Exile
-
+ &Move hand to...
-
-
-
-
+
+
+
+ &Top of library
-
-
-
-
+
+
+
+ &Bottom of library
-
+ &Move graveyard to...
-
-
-
-
+
+
+
+ &Hand
-
+ &Move exile to...
-
+ &View library
-
+ View &top cards of library...
-
+ Reveal &library to...
-
+ Reveal t&op cards to...
-
+ &Always reveal top card
-
+ O&pen deck in deck editor
-
+ &View sideboard
-
+ &Draw card
-
+ D&raw cards...
-
+ &Undo last draw
-
+ Take &mulligan
-
+ &Shuffle
-
+ Play top card &face down
-
+ Move top cards to &graveyard...
-
+ Move top cards to &exile...
-
+ Put top card on &bottom
-
+ Put bottom card &in graveyard
-
+ &Reveal hand to...
-
+ Reveal r&andom card to...
-
+ &Sideboard
-
+ &Library
-
+ &Counters
-
+ &Untap all permanents
-
+ R&oll die...
-
+ &Create token...
-
+ C&reate another token
-
+ Cr&eate predefined token
-
+ S&ay
-
+ C&ard
-
+ &All players
-
+ &Play
-
+ &Hide
-
+ Play &Face Down
-
+ &Tap
-
+ &Untap
-
+ Toggle &normal untapping
-
+ &Flip
-
+ &Peek at card face
-
+ &Clone
-
+ Attac&h to card...
-
+ Unattac&h
-
+ &Draw arrow...
-
+ &Increase power
-
+ &Decrease power
-
+ I&ncrease toughness
-
+ D&ecrease toughness
-
+ In&crease power and toughness
-
+ Dec&rease power and toughness
-
+ Set &power and toughness...
-
+ &Set annotation...
-
+ Red
-
+ Yellow
-
+ Green
-
-
+
+
+
+ Token:
-
+ All tokens
-
+ View top cards of library
-
+ &Add counter (%1)
-
+ &Remove counter (%1)
-
+ &Set counters (%1)...
-
+ Number of cards:
-
+ Draw cards
-
-
-
-
+
+
+
+ Number:
-
+ Move top cards to grave
-
+ Move top cards to exile
-
+ Roll die
-
+ Number of sides:
-
+ Set power/toughness
-
+ Please enter the new PT:
-
+ Set annotation
-
+ Please enter the new annotation:
-
+ Set counters
@@ -3957,27 +3989,27 @@ Cockatrice will now reload the card database.
SoundSettingsPage
-
+ Enable &sounds
-
+ Current sounds theme:
-
+ Test system sound engine
-
+ Sound settings
-
+ Master volume
@@ -3985,35 +4017,30 @@ Cockatrice will now reload the card database.
StableReleaseChannel
-
+ Stable releases
-
+ No reply received from the release update server.
-
+ Invalid reply received from the release update server.
-
+ No reply received from the tag update server.
-
+ Invalid reply received from the tag update server.
-
-
- No reply received from the file update server.
-
- TabAdmin
@@ -4649,37 +4676,37 @@ The more information you put in, the more specific your results will be.
TabMessage
-
+ Private &chat
-
+ &Leave
-
+ %1 - Private chat
-
+ This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.
-
+ Private message from
-
+ %1 has left the server.
-
+ %1 has joined the server.
@@ -4757,47 +4784,47 @@ The more information you put in, the more specific your results will be.
TabRoom
-
+ &Say:
-
+ Chat
-
+ &Room
-
+ &Leave room
-
+ &Clear chat
-
+ Chat Settings...
-
+ mentioned you.
-
+ Click to view
-
+ You are flooding the chat. Please wait a couple of seconds.
@@ -4805,35 +4832,35 @@ The more information you put in, the more specific your results will be.
TabServer
-
+ Server
-
-
-
-
+
+
+
+ Error
-
+ Failed to join the room: it doesn't exists on the server.
-
+ The server thinks you are in the room but Cockatrice is unable to display it. Try restarting Cockatrice.
-
+ You do not have the required permission to join this room.
-
+ Failed to join the room due to an unknown error: %1.
@@ -4860,7 +4887,7 @@ The more information you put in, the more specific your results will be.The server has sent you a message that your client does not understand.
This message might mean there is a new version of Cockatrice available or this server is running a custom or pre-release version.
-To update your client, go to Help -> Update Cockatrice.
+To update your client, go to Help -> Check for Updates.
@@ -4936,7 +4963,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
UpdateDownloader
-
+ Could not open the file for reading.
@@ -5158,11 +5185,6 @@ Please refrain from engaging in this activity or further actions may be taken ag
Unregistered user
-
-
- %1
-
- Unknown
@@ -5262,42 +5284,42 @@ Please refrain from engaging in this activity or further actions may be taken ag
UserInterfaceSettingsPage
-
+ General interface settings
-
+ Enable notifications in taskbar
-
+ Notify in the taskbar for game events while you are spectating
-
+ &Double-click cards to play them (instead of single-click)
-
+ &Play all nonlands onto the stack (not the battlefield) by default
-
+ Annotate card text on tokens
-
+ Animation settings
-
+ &Tap/untap animation
@@ -5367,72 +5389,82 @@ Please refrain from engaging in this activity or further actions may be taken ag
WndSets
-
+ Move selected set to the top
-
+ Move selected set up
-
+ Move selected set down
-
+ Move selected set to the bottom
-
+ Enable all sets
-
+ Disable all sets
-
+
+ Enable selected set(s)
+
+
+
+
+ Disable selected set(s)
+
+
+
+ hints:
-
+ Enable the sets that you want to have available in the deck editor
-
+ Move sets around to change their order, or click on a column header to sort sets on that field
-
+ Sets order decides the source that will be used when loading images for a specific card
-
+ Disabled sets will be used for loading images only if all the enabled sets failed
-
+ Edit sets
-
+ Success
-
+ The sets database has been saved successfully.
@@ -5463,7 +5495,7 @@ Please refrain from engaging in this activity or further actions may be taken ag
i18n
-
+ English
diff --git a/cockatrice/translations/cockatrice_es.ts b/cockatrice/translations/cockatrice_es.ts
index cd0b3aa1..e51e4114 100644
--- a/cockatrice/translations/cockatrice_es.ts
+++ b/cockatrice/translations/cockatrice_es.ts
@@ -4,7 +4,7 @@
&Set counter...
- Establecer &contador...
+ &Establecer contador...
@@ -1845,7 +1845,7 @@ Por favor, abre una incidencia en http://github.com/Cockatrice/Cockatrice/issues
Notify if a feature supported by the server is missing in my client
-
+ Notificar si hace falta en mi cliente alguna característica soportada por el servidor
@@ -2555,7 +2555,7 @@ Para actualizar tu cliente, ve a Ayuda -> Actualizar Cockatrice.
You can only import XML databases at this time.
-
+ Solo puedes importar bases de datos en XML en este momento.
@@ -3670,17 +3670,17 @@ Cockatrice está recargando la base de datos de cartas.
&Add counter (%1)
-
+ &Añadir contador (%1)&Remove counter (%1)
-
+ &Eliminar contador (%1)&Set counters (%1)...
-
+ &Establecer contadores (%1)
@@ -4705,7 +4705,7 @@ Cuando más información introduzcas, más específicos serán los resultados.
This user is ignoring you, they cannot see your messages in main chat and you cannot join their games.
-
+ El usuario te esta ignorando, los usuarios no podrán ver tus mensajes en el chat principal y no podrás unirte a sus partidas.
@@ -4775,12 +4775,12 @@ Cuando más información introduzcas, más específicos serán los resultados.
Downloading Replays
-
+ Descargando RepeticionesYou cannot download replay folders at this time
-
+ No puedes descargar repeticiones de partidas por el momento
diff --git a/cockatrice/translations/cockatrice_zh-Hans.ts b/cockatrice/translations/cockatrice_zh-Hans.ts
index 4022cd04..ffe69408 100644
--- a/cockatrice/translations/cockatrice_zh-Hans.ts
+++ b/cockatrice/translations/cockatrice_zh-Hans.ts
@@ -1065,12 +1065,12 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
&Host:
-
+ 主机:&Port:
-
+ 端口:
@@ -1098,12 +1098,12 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
&Host:
-
+ 主机:&Port:
-
+ 端口:
@@ -1145,12 +1145,12 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
&Host:
-
+ 主机:&Port:
-
+ 端口:
diff --git a/oracle/translations/oracle_en.ts b/oracle/translations/oracle_en.ts
index c8ed595d..0c26ff74 100644
--- a/oracle/translations/oracle_en.ts
+++ b/oracle/translations/oracle_en.ts
@@ -471,7 +471,7 @@ You will need to specify a URL or a filename that will be used as a source.
i18n
-
+ English