diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 6a7ba4bd..68a50123 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -22,86 +22,86 @@
AppearanceSettingsPage
-
+ Zone background pictures
-
+ Hand background:
-
+ Stack background:
-
+ Table background:
-
+ Player info background:
-
+ Card back:
-
+ 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:
-
-
-
-
-
+
+
+
+
+ Choose path
@@ -193,12 +193,12 @@ This is only saved for moderators and cannot be seen by the banned person.
CardDatabase
-
+ New sets found
-
+ %1 new set(s) have been found in the card database. Do you want to enable them?
@@ -231,6 +231,24 @@ This is only saved for moderators and cannot be seen by the banned person.
+
+ CardFrame
+
+
+ Image
+
+
+
+
+ Description
+
+
+
+
+ Both
+
+
+CardInfoText
@@ -561,12 +579,12 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckEditorSettingsPage
-
+ Nothing is here... yet
-
+ General
@@ -1072,22 +1090,86 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
+
+ DlgRegister
+
+
+ &Host:
+
+
+
+
+ &Port:
+
+
+
+
+ Player &name:
+
+
+
+
+ P&assword:
+
+
+
+
+ Email:
+
+
+
+
+ Gender:
+
+
+
+
+
+ Undefined
+
+
+
+
+ Male
+
+
+
+
+ Female
+
+
+
+
+ Country:
+
+
+
+
+ Real name:
+
+
+
+
+ Register to server
+
+
+DlgSettings
-
-
-
+
+
+ Error
-
+ Unknown Error loading card database
-
+ Your card database is invalid.
Cockatrice may not function correctly with an invalid database
@@ -1098,7 +1180,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
@@ -1109,21 +1191,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?
-
+ Your card database did not finish loading
Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -1132,7 +1214,7 @@ 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
@@ -1141,47 +1223,47 @@ Would you like to change your database location setting?
-
+ 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
@@ -1399,97 +1481,107 @@ Would you like to change your database location setting?
GeneralSettingsPage
-
+ Reset/Clear Downloaded Pictures
-
-
-
-
-
+
+
+
+
+ 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
-
- Download high-quality card pictures
+
+ Download card pictures from a custom URL
-
+
+ Custom Card Download URL:
+
+
+
+
+ Linking FAQ
+
+
+
+ Paths
-
+ Decks directory:
-
+ Replays directory:
-
+ Pictures directory:
-
+ Card database:
-
+ Token database:
-
+ Picture cache size:
-
+ EnglishEnglish
@@ -1497,55 +1589,56 @@ Would you like to change your database location setting?
MainWindow
-
+ There are too many concurrent connections from your address.
-
+ Scheduled server shutdown.
-
+ Banned by moderator
-
+ Expected end time: %1
-
+ This ban lasts indefinitely.
-
-
+
+
+ Invalid username.
You may only use A-Z, a-z, 0-9, _, ., and - in your username.
-
+ Connection closed
-
+ The server has terminated your connection.
Reason: %1
-
+ Scheduled server shutdown
-
+ The server is going to be restarted in %n minute(s).
All running games will be lost.
Reason for shutdown: %1
@@ -1555,302 +1648,393 @@ Reason for shutdown: %1
-
+ Number of players
-
+ Please enter the number of players.
-
-
+
+ Player %1
-
+ Load replay
-
+ About Cockatrice
-
+ Version %1
-
+ Translators:
-
+ Project Manager:
-
+
+
+ Success
+
+
+
+
+ Registration accepted.
+Will now login.
+
+
+
+
+ Account activation accepted.
+Will now login.
+
+
+
+ Past Project Managers:
-
+ Developers:
-
+ Our Developers
-
+ Help Develop!
-
+ Recognition Page
-
+ Help Translate!
-
+ Support:
-
+ Report an Issue
-
+ Suggest an Improvement
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error
-
+ Server timeout
-
+ Incorrect username or password. Please check your authentication information and try again.
-
+ There is already an active session using this user name.
Please close that session first and re-login.
-
+
+ You are banned until %1.
-
+
+ You are banned indefinitely.
-
- This server requires user registration.
+
+ This server requires user registration. Do you want to register now?
-
+
+ Account activation
+
+
+
+
+ Your account has not been activated yet.
+ You need to provide the activation token received in the activation email
+
+
+
+
+ Unknown login error: %1
-
+
+
+
+
+
+ Registration denied
+
+
+
+
+ Registration is currently disabled on this server
+
+
+
+
+ There is already an existing account with the same user name.
+
+
+
+
+ It's mandatory to specify a valid email address when registering.
+
+
+
+
+ Too many registration attempts from your IP address.
+
+
+
+
+ Password too short.
+
+
+
+
+ Registration failed for a technical problem on the server.
+
+
+
+
+ Account activation failed
+
+
+
+ Socket error: %1
-
+ You are trying to connect to an obsolete server. Please downgrade your Cockatrice version or connect to a suitable server.
Local version is %1, remote version is %2.
-
+ Your Cockatrice client is obsolete. Please update your Cockatrice version.
Local version is %1, remote version is %2.
-
+ Connecting to %1...
-
+
+ Registering to %1 as %2...
+
+
+
+ Disconnected
-
+ Connected, logging in at %1
-
+ Logged in as %1 at %2
-
+ &Connect...
-
+ &Disconnect
-
+ Start &local game...
-
+ &Watch replay...
-
+ &Deck editor
-
+ &Full screen
-
+
+ &Register to server...
+
+
+
+ &Settings...
-
-
+
+ &Exit
-
+ A&ctions
-
+ &Cockatrice
-
+ &About Cockatrice
-
+ &Help
-
- Check card updates...
+
+ Check for card updates...
-
-
+
+ A card database update is already running.
+
+
+
+
+ Unable to run the card database updater:
+
+
+
+
+ The card database updater exited with an error: %1
+
+
+
+
+ Update completed successfully. Cockatrice will now reload the card database.
+
+
+
+
+ Information
-
- A card update is already ongoing.
-
-
-
-
- Unable to run the card updater:
-
-
-
-
+ failed to start.
-
+ crashed.
-
+ timed out.
-
+ write error.
-
+ read error.
-
+ unknown error.
-
-
- The card updater exited with an error: %1
-
-
-
-
- Card update completed successfully. Will now reload card database.
-
- MessageLogWidget
@@ -2089,62 +2273,62 @@ Local version is %1, remote version is %2.
-
+ the bottom card of %1's library
-
+ the bottom card of his library
-
+ the bottom card of her library
-
+ from the bottom of %1's library
-
+ from the bottom of his library
-
+ from the bottom of her library
-
+ the top card of %1's library
-
+ the top card of his library
-
+ the top card of her library
-
+ from the top of %1's library
-
+ from the top of his library
-
+ from the top of her library
@@ -2565,310 +2749,310 @@ Local version is %1, remote version is %2.
-
+ %1 taps her permanents.female
-
+ %1 untaps her permanents.female
-
+ %1 taps his permanents.male
-
+ %1 untaps his permanents.male
-
+ %1 taps %2.female
-
+ %1 untaps %2.female
-
+ %1 taps %2.male
-
+ %1 untaps %2.male
-
+ %1 sets counter %2 to %3 (%4%5).female
-
+ %1 sets counter %2 to %3 (%4%5).male
-
+ %1 sets %2 to not untap normally.female
-
+ %1 sets %2 to not untap normally.male
-
+ %1 sets %2 to untap normally.female
-
+ %1 sets %2 to untap normally.male
-
+ %1 sets PT of %2 to %3.female
-
+ %1 sets PT of %2 to %3.male
-
+ %1 sets annotation of %2 to %3.female
-
+ %1 sets annotation of %2 to %3.male
+
+
+ %1 is looking at %2.
+ female
+
+ %1 is looking at %2.
- female
+ male
+
+ %1 is looking at the top %n card(s) %2.
+ female
+
+ %1 is looking at the top card %2.
+ %1 is looking at the top %n cards %2.
+
+
+
+ %1 is looking at the top %n card(s) %2.
+ male
+
+ %1 is looking at the top card %2.
+ %1 is looking at the top %n cards %2.
+
+
-
- %1 is looking at %2.
- male
-
-
-
- %1 is looking at the top %n card(s) %2.
+
+ %1 stops looking at %2.female
-
- %1 is looking at the top card %2.
- %1 is looking at the top %n cards %2.
-
-
-
- %1 is looking at the top %n card(s) %2.
- male
-
- %1 is looking at the top card %2.
- %1 is looking at the top %n cards %2.
-
+ %1 stops looking at %2.
- female
-
-
-
-
- %1 stops looking at %2.male
-
+ %1 reveals %2 to %3.p1 female, p2 female
-
+ %1 reveals %2 to %3.p1 female, p2 male
-
+ %1 reveals %2 to %3.p1 male, p2 female
-
+ %1 reveals %2 to %3.p1 male, p2 male
+
+
+ %1 reveals %2.
+ female
+
+ %1 reveals %2.
- female
-
-
-
-
- %1 reveals %2.male
-
+ %1 randomly reveals %2%3 to %4.p1 female, p2 female
-
+ %1 randomly reveals %2%3 to %4.p1 female, p2 male
-
+ %1 randomly reveals %2%3 to %4.p1 male, p2 female
-
+ %1 randomly reveals %2%3 to %4.p1 male, p2 male
-
+ %1 randomly reveals %2%3.female
-
+ %1 randomly reveals %2%3.male
-
+ %1 peeks at face down card #%2.female
-
+ %1 peeks at face down card #%2.male
-
+ %1 peeks at face down card #%2: %3.female
-
+ %1 peeks at face down card #%2: %3.male
-
+ %1 reveals %2%3 to %4.p1 female, p2 female
-
+ %1 reveals %2%3 to %4.p1 female, p2 male
-
+ %1 reveals %2%3 to %4.p1 male, p2 female
-
+ %1 reveals %2%3 to %4.p1 male, p2 male
-
+ %1 reveals %2%3.female
-
+ %1 reveals %2%3.male
-
+ %1 is now keeping the top card %2 revealed.
-
+ %1 is not revealing the top card %2 any longer.
-
+ It is now %1's turn.female
-
+ It is now %1's turn.male
-
+ a card
@@ -2940,12 +3124,12 @@ Local version is %1, remote version is %2.
-
+ ending phase
-
+ untap step
@@ -3055,64 +3239,64 @@ Local version is %1, remote version is %2.
-
+ %1 is looking at the top %2 card(s) %3.female
-
+ %1 is looking at the top %2 card(s) %3.male
-
+ upkeep step
-
+ draw step
-
+ first main phase
-
+ beginning of combat step
-
+ declare attackers step
-
+ declare blockers step
-
+ combat damage step
-
+ end of combat step
-
+ second main phase
-
+ It is now the %1.
@@ -3120,62 +3304,62 @@ Local version is %1, remote version is %2.
MessagesSettingsPage
-
+ Chat settings
-
+ Enable chat mentions
-
+ In-game message macros
-
+ Ignore unregistered users in main chat
-
+ 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.
-
+ (Color is hexadecimal)
-
+ Add message
-
+ Message:
@@ -3618,7 +3802,7 @@ Local version is %1, remote version is %2.
-
+ Number:
@@ -3643,65 +3827,70 @@ Local version is %1, remote version is %2.
-
+ Set power/toughness
-
+ Please enter the new PT:
-
+ Set annotation
-
+ Please enter the new annotation:
-
+ Set counters
+
+
+ Cr&eate related card
+
+ QMenuBar
-
+ Services
-
+ Hide %1
-
+ Hide Others
-
+ Show All
-
+ Preferences...
-
+ Quit %1
-
+ About %1
@@ -3709,7 +3898,7 @@ Local version is %1, remote version is %2.
QObject
-
+ Cockatrice replays (*.cor)
@@ -3849,7 +4038,7 @@ Local version is %1, remote version is %2.
-
+ Shut down server
@@ -3857,37 +4046,37 @@ Local version is %1, remote version is %2.
SoundSettingsPage
-
+ Choose path
-
+ Enable &sounds
-
+ Path to sounds directory:
-
+ Test system sound engine
-
+ Sound settings
-
+ Master volume requires QT5
-
+ Master volume
@@ -3895,37 +4084,37 @@ Local version is %1, remote version is %2.
TabAdmin
-
+ Update server &message
-
+ &Shut down server
-
+ Server administration functions
-
+ &Unlock functions
-
+ &Lock functions
-
+ Unlock administration functions
-
+ Do you really want to unlock the administration functions?
@@ -3938,179 +4127,184 @@ Local version is %1, remote version is %2.
TabDeckEditor
-
+ &Print deck...
-
+ &Close
-
+ &Edit sets...
-
-
- &Clear search
-
-
-
-
- Deck &name:
-
-
-
-
- &Comments:
-
-
-
-
- Hash:
-
-
-
-
- &New deck
-
-
-
-
- &Load deck...
-
-
-
-
- &Save deck
-
-
-
-
- Save deck &as...
-
-
-
-
- Load deck from cl&ipboard...
-
-
-
-
- Save deck to clip&board
-
-
- &Analyze deck on deckstats.net
+ Filters
- Open custom image folder
+ &Clear all filters
+
+
+
+
+ Delete selected
+
+
+
+
+ Deck &name:
- Add card to &maindeck
+ &Comments:
- Add card to &sideboard
+ Hash:
-
- &Deck Editor
-
-
-
-
- C&ard Database
-
-
-
-
- Welcome
-
-
-
-
- Hi! Its seems like it's the first time you run this version of Cockatrice.
-All the sets in the card database have been enabled.
-Read more about changing the set order or disabling specific sets in the the "Edit Sets" window.
-
-
-
-
- Show card text only
-
-
-
-
- &Remove row
-
-
-
-
- &Increment number
+
+ &New deck
- &Decrement number
+ &Load deck...
+
+
+
+
+ &Save deck
+
+
+
+
+ Save deck &as...
+
+
+
+
+ Load deck from cl&ipboard...
+
+
+
+
+ Save deck to clip&board
+
+
+
+
+ &Analyze deck on deckstats.net
- Edit &tokens...
+ Open custom image folder
+
+
+
+
+ Add card to &maindeck
+ Add card to &sideboard
+
+
+
+
+ &Deck Editor
+
+
+
+
+ C&ard Database
+
+
+
+
+ Welcome
+
+
+
+
+ Hi! It seems like you're running this version of Cockatrice for the first time.
+All the sets in the card database have been enabled.
+Read more about changing the set order or disabling specific sets and consequent effects in the "Edit Sets" window.
+
+
+
+
+ &Remove row
+
+
+
+
+ &Increment number
+
+
+
+
+ &Decrement number
+
+
+
+
+ Edit &tokens...
+
+
+
+ Deck: %1
-
+ Are you sure?
-
+ The decklist has been modified.
Do you want to save the changes?
-
+ Load deck
-
-
-
+
+
+ Error
-
+ The deck could not be saved.
-
-
+
+ The deck could not be saved.
Please check that the directory is writable and try again.
-
+ Save deck
@@ -4207,93 +4401,88 @@ Please enter a name:
TabGame
-
+ &Phases
-
+ &Game
-
+ Next &phase
-
+ Next &turn
-
+ &Remove all local arrows
-
+ Game &information
-
+ &Concede
-
+ &Leave game
-
+ C&lose replay
-
+ &Say:
-
+ Concede
-
+ Are you sure you want to concede this game?
-
+ Leave game
-
+ Are you sure you want to leave this game?
-
+ You are flooding the game. Please wait a couple of seconds.
-
+ You have been kicked out of the game.
-
- Replay %1: %2
-
-
-
-
- Game %1: %2
+
+ REPLAY
@@ -4617,37 +4806,37 @@ Please enter a name:
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
-
+ Animation settings
-
+ &Tap/untap animation
@@ -4692,27 +4881,44 @@ Please enter a name:
Move selected set up
+
+
+ Move selected set to the top
+
+ Move selected set down
-
-
- Move selected set to top
-
-
- Move selected set to bottom
+ Move selected set to the bottom
- 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 still be used for loading images.
+ 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 still be used for loading images