diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 7a36f718..a1a23e1d 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -24,12 +24,12 @@
-
+ Set counter
-
+ New value for counter '%1':
@@ -37,81 +37,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)
- Table grid layout
-
-
-
-
- Invert vertical coordinate
+ Enable left justification
+ Table grid layout
+
+
+
+
+ Invert vertical coordinate
+
+
+
+ Minimum player count for multi-column layout:
-
-
-
-
-
+
+
+
+
+ Choose path
@@ -555,28 +560,15 @@ This is only saved for moderators and cannot be seen by the banned person.
-
- ChatView
-
-
- mentioned you.
-
-
-
-
- Click to view
-
-
-DeckEditorSettingsPage
-
+ Nothing is here... yet
-
+ General
@@ -616,42 +608,42 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckViewContainer
-
+ Load &local deck
-
+ Load d&eck from server
-
+ Ready to s&tart
-
+ S&ideboard unlocked
-
+ S&ideboard locked
-
+ Load deck
-
+ Error
-
+ The selected file could not be loaded.
@@ -1084,19 +1076,19 @@ This is only saved for moderators and cannot be seen by the banned person.
DlgSettings
-
-
-
+
+
+ Error
-
+ Unknown Error loading card database
-
+ Your card database is invalid.
Cockatrice may not function correctly with an invalid database
@@ -1107,7 +1099,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
@@ -1118,21 +1110,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
@@ -1141,7 +1133,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
@@ -1150,42 +1142,42 @@ 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
@@ -1381,97 +1373,97 @@ 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
-
+ Paths
-
+ Decks directory:
-
+ Replays directory:
-
+ Pictures directory:
-
+ Card database:
-
+ Token database:
-
+ Picture cache size:
-
+ EnglishEnglish
@@ -1505,7 +1497,7 @@ Would you like to change your database location setting?
-
+ Invalid username.
@@ -1623,15 +1615,15 @@ Reason for shutdown: %1
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ Error
@@ -1641,136 +1633,136 @@ Reason for shutdown: %1
-
+ 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.
-
+ Unknown login error: %1
-
+ 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...
-
+ Disconnected
-
+ Connected, logging in at %1
-
+ Logged in as %1 at %2
-
+ &Connect...
-
+ &Disconnect
-
+ Start &local game...
-
+ &Watch replay...
-
+ &Deck editor
-
+ &Full screen
-
+ Ctrl+F
-
+ &Settings...
-
-
+
+ &Exit
-
+ A&ctions
-
+ &Cockatrice
-
+ &About Cockatrice
-
+ &Help
@@ -2888,12 +2880,12 @@ Local version is %1, remote version is %2.
-
+ ending phase
-
+ untap step
@@ -2970,52 +2962,52 @@ Local version is %1, remote version is %2.
-
+ 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.
@@ -3023,72 +3015,72 @@ Local version is %1, remote version is %2.
MessagesSettingsPage
-
+ &Add
-
+ &Remove
-
+ 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:
@@ -3154,545 +3146,550 @@ Local version is %1, remote version is %2.
Player
-
+ &View library
-
+ Move top cards to &graveyard...
-
+ Ctrl+J
-
+ F3
-
+ View &top cards of library...
-
+ &View graveyard
-
+ F4
-
+ &View sideboard
-
+ Player "%1"
-
-
-
+
+
+ &Hand
-
+ &Reveal hand to...
-
+ Reveal r&andom card to...
-
+ &Library
-
-
-
-
- &Graveyard
-
-
-
-
- &Sideboard
-
-
-
-
- View top cards of library
-
-
-
-
- Number of cards:
-
-
-
-
- &Draw card
-
-
-
-
- &View exile
-
-
-
- &Exile
+
+ &Graveyard
-
- Ctrl+W
+
+ &Sideboard
-
- Ctrl+D
+
+ View top cards of library
+
+
+
+
+ Number of cards:
- D&raw cards...
+ &Draw card
+
+
+
+
+ &View exile
+
+
+
+
+
+
+ &Exile
+
+
+
+
+ Ctrl+W
+ Ctrl+D
+
+
+
+
+ D&raw cards...
+
+
+
+ Ctrl+E
-
+ Take &mulligan
-
+ Ctrl+M
-
+ &Shuffle
-
+ Ctrl+S
-
+ &Counters
-
+ &Untap all permanents
-
+ Ctrl+U
-
+ R&oll die...
-
+ Ctrl+I
-
+ &Create token...
-
+ Ctrl+T
-
+ C&reate another token
-
+ Ctrl+G
-
+ S&ay
-
-
- &Move hand to...
-
-
-
-
- &Top of library
+ &Move hand to...
+ &Top of library
+
+
+
+
+
+ &Bottom of library
-
+ &Move graveyard to...
-
+ &Move exile to...
-
+ Reveal &library to...
-
+ Reveal t&op card to...
-
+ &Always reveal top card
-
+ O&pen deck in deck editor
-
+ &Undo last draw
-
+ Move top cards to &exile...
-
+ Put top card on &bottom
-
+ Put bottom card &in graveyard
-
+ Cr&eate predefined token
-
+ C&ard
-
+ &All players
-
+ &Play
-
+ &Hide
-
+ Play &Face Down
-
+ &Tap
-
+ &Untap
-
+ Toggle &normal untapping
-
+ &Flip
-
+ &Peek at card face
-
+ &Clone
-
+ Attac&h to card...
-
+ Ctrl+A
-
+ Unattac&h
-
+ &Draw arrow...
-
+ &Increase power
-
+ Ctrl++
-
+ &Decrease power
-
+ Ctrl+-
-
+ I&ncrease toughness
-
+ Alt++
-
+ D&ecrease toughness
-
+ Alt+-
-
+ In&crease power and toughness
-
+ Ctrl+Alt++
-
+ Dec&rease power and toughness
-
+ Ctrl+Alt+-
-
+ Set &power and toughness...
-
+ Ctrl+P
-
+ &Set annotation...
-
+ red
-
+ yellow
-
+ green
-
+ &Add counter (%1)
-
+ &Remove counter (%1)
-
+ &Set counters (%1)...
-
+ &top of library
-
+ &bottom of library
-
+ &graveyard
-
+ Ctrl+Del
-
+ &exile
-
+ Ctrl+F3
-
+ Ctrl+Shift+D
-
+
+ Ctrl+N
+
+
+
+ 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
@@ -3700,37 +3697,37 @@ Local version is %1, remote version is %2.
QMenuBar
-
+ Services
-
+ Hide %1
-
+ Hide Others
-
+ Show All
-
+ Preferences...
-
+ Quit %1
-
+ About %1
@@ -4234,158 +4231,158 @@ Please enter a name:
TabGame
-
+ F5
-
+ F6
-
+ F7
-
+ F8
-
+ F9
-
+ F10
-
+ &Phases
-
+ &Game
-
+ Next &phase
-
+ Ctrl+Space
-
+ Tab
-
+ Next &turn
-
+ Ctrl+Return
-
+ Ctrl+Enter
-
+ &Remove all local arrows
-
+ Ctrl+R
-
+ Game &information
-
+ &Concede
-
+ F2
-
+ &Leave game
-
-
+
+ Ctrl+Q
-
+ 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
@@ -4413,7 +4410,7 @@ Please enter a name:
-
+ Private message from
@@ -4491,42 +4488,52 @@ Please enter a name:
TabRoom
-
+ F12
-
+ &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.
@@ -4566,7 +4573,7 @@ Please enter a name:
- User lists
+ Account
@@ -4705,62 +4712,62 @@ 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
-
+ Enable &sounds
-
+ Path to sounds directory:
-
+ Test system sound engine
-
+ Sound settings
-
+ Choose path