diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index 36014c73..7a36f718 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -558,46 +558,25 @@ This is only saved for moderators and cannot be seen by the banned person.
ChatView
-
+ mentioned you.
-
+ Click to view
-
- DBPriceUpdater
-
-
-
-
- Error
-
-
-
-
-
- A problem has occured while fetching card prices.
-
-
-
-
- A problem has occured while fetching card prices:
-
-
-DeckEditorSettingsPage
-
- Enable &price tag feature from deckbrew.com
+
+ Nothing is here... yet
-
+ General
@@ -1105,19 +1084,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
@@ -1128,7 +1107,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
@@ -1139,75 +1118,75 @@ Would you like to change your database location setting?
-
- Your card database did not finish loading
-
-Please file a ticket at http://github.com/Daenyth/Cockatrice/issues with your cards.xml attached
-
-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
+
+ Your card database did not finish loading
-Please file a ticket at http://github.com/Daenyth/Cockatrice/issues
+Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
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
+
+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
+
+ User Interface
-
- Deck editor
+
+ Deck Editor
-
- Chat Settings
+
+ Chat
@@ -1650,9 +1629,9 @@ Reason for shutdown: %1
-
-
-
+
+
+ Error
@@ -1693,105 +1672,105 @@ Please close that session first and re-login.
-
+ 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
@@ -1799,17 +1778,17 @@ Local version is %1, remote version is %2.
MessageLogWidget
-
+ The game has been closed.
-
+ %1 is now watching the game.
-
+ %1 is not watching the game any more.
@@ -1821,396 +1800,394 @@ Local version is %1, remote version is %2.
-
+ You have joined game #%1.female
-
+ You have joined game #%1.male
-
+ You are watching a replay of game #%1.female
-
+ You are watching a replay of game #%1.male
-
+ %1 has joined the game.female
-
+ %1 has joined the game.male
-
+ %1 has left the game.female
-
+ %1 has left the game.male
-
+ You have been kicked out of the game.
-
+ %1 has loaded a deck (%2).
-
+ %1 has loaded a deck with %2 sideboard cards (%3).
-
+ %1 is ready to start the game.female
-
+ %1 is ready to start the game.male
-
+ %1 is not ready to start the game any more.female
-
+ %1 is not ready to start the game any more.male
-
+ %1 has locked her sideboard.female
-
+ %1 has locked his sideboard.male
-
+ %1 has unlocked her sideboard.female
-
+ %1 has unlocked his sideboard.male
-
+ %1 has conceded the game.female
-
+ %1 has conceded the game.male
-
+ %1 has restored connection to the game.female
-
+ %1 has restored connection to the game.male
-
+ %1 has lost connection to the game.female
-
+ %1 has lost connection to the game.male
-
-
- %1 shuffles %2.
- female
-
- %1 shuffles %2.
+ female
+
+
+
+
+ %1 shuffles %2.male
-
+ %1 rolls a %2 with a %3-sided die.female
-
+ %1 rolls a %2 with a %3-sided die.male
- %1 draws %n card(s).female
-
+ %1 draws a card.%1 draws %n cards.
- %1 draws %n card(s).male
-
+ %1 draws a card.%1 draws %n cards.
-
+ %1 undoes his last draw.
-
+ %1 undoes her last draw.
-
+ %1 undoes his last draw (%2).
-
+ %1 undoes her last draw (%2).
-
+ from table
-
+ from graveyard
-
+ from exile
-
+ from hand
-
+ 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
-
+ from %1's library
-
+ from library
-
+ from sideboard
-
+ from the stack
-
+ %1 gives %2 control over %3.
-
+ %1 puts %2 into play tapped%3.
-
+ %1 puts %2 into play%3.
-
+ %1 puts %2%3 into graveyard.
-
+ %1 exiles %2%3.
-
+ %1 moves %2%3 to hand.
-
+ %1 puts %2%3 into his library.
-
+ %1 puts %2%3 into her library.
-
+ %1 puts %2%3 on bottom of his library.
-
+ %1 puts %2%3 on bottom of her library.
-
+ %1 puts %2%3 on top of his library.
-
+ %1 puts %2%3 on top of her library.
-
+ %1 puts %2%3 into his library at position %4.
-
+ %1 puts %2%3 into her library at position %4.
-
+ %1 moves %2%3 to sideboard.
-
+ %1 plays %2%3.
-
+ %1 takes a mulligan to %n.female
@@ -2219,7 +2196,7 @@ Local version is %1, remote version is %2.
-
+ %1 takes a mulligan to %n.male
@@ -2228,624 +2205,618 @@ Local version is %1, remote version is %2.
-
+ %1 flips %2 face-down.female
-
+ %1 flips %2 face-down.male
-
+ %1 flips %2 face-up.female
-
+ %1 flips %2 face-up.male
-
+ %1 destroys %2.female
-
+ %1 destroys %2.male
-
+ %1 unattaches %2.female
-
+ %1 unattaches %2.male
-
+ %1 creates token: %2%3.female
-
+ %1 creates token: %2%3.male
-
+ %1 points from her %2 to herself.female
-
+ %1 points from his %2 to himself.male
-
+ %1 points from her %2 to %3.p1 female, p2 female
-
+ %1 points from her %2 to %3.p1 female, p2 male
-
+ %1 points from his %2 to %3.p1 male, p2 female
-
+ %1 points from his %2 to %3.p1 male, p2 male
-
+ %1 points from %2's %3 to herself.card owner female, target female
-
+ %1 points from %2's %3 to herself.card owner male, target female
-
+ %1 points from %2's %3 to himself.card owner female, target male
-
+ %1 points from %2's %3 to himself.card owner male, target male
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 female
-
+ %1 points from %2's %3 to %4.p1 female, p2 female, p3 male
-
+ %1 points from %2's %3 to %4.p1 female, p2 male, p3 female
-
+ %1 points from %2's %3 to %4.p1 female, p2 male, p3 male
-
+ %1 points from %2's %3 to %4.p1 male, p2 female, p3 female
-
+ %1 points from %2's %3 to %4.p1 male, p2 female, p3 male
-
+ %1 points from %2's %3 to %4.p1 male, p2 male, p3 female
-
+ %1 points from %2's %3 to %4.p1 male, p2 male, p3 male
-
+ %1 points from her %2 to her %3.female
-
+ %1 points from his %2 to his %3.male
-
+ %1 points from her %2 to %3's %4.p1 female, p2 female
-
+ %1 points from her %2 to %3's %4.p1 female, p2 male
-
+ %1 points from his %2 to %3's %4.p1 male, p2 female
-
+ %1 points from his %2 to %3's %4.p1 male, p2 male
-
+ %1 points from %2's %3 to her own %4.card owner female, target female
-
+ %1 points from %2's %3 to her own %4.card owner male, target female
-
+ %1 points from %2's %3 to his own %4.card owner female, target male
-
+ %1 points from %2's %3 to his own %4.card owner male, target male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 female, p2 male, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 female, p3 male
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 female
-
+ %1 points from %2's %3 to %4's %5.p1 male, p2 male, p3 male
- %1 places %n %2 counter(s) on %3 (now %4).female
-
+ %1 places a %2 counter on %3 (now %4).%1 places %n %2 counters on %3 (now %4).
- %1 places %n %2 counter(s) on %3 (now %4).male
-
+ %1 places a %2 counter on %3 (now %4).%1 places %n %2 counters on %3 (now %4).
- %1 removes %n %2 counter(s) from %3 (now %4).female
-
+ %1 removes a %2 counter from %3 (now %4).%1 removes %n %2 counters from %3 (now %4).
- %1 removes %n %2 counter(s) from %3 (now %4).male
-
+ %1 removes a %2 counter from %3 (now %4).%1 removes %n %2 counters from %3 (now %4).
-
+ %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.
- 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 stops looking at %2.
- female
+
+ %1 is looking at %2.
+ 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 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 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
@@ -2864,7 +2835,7 @@ Local version is %1, remote version is %2.
-
+ red
@@ -2872,7 +2843,7 @@ Local version is %1, remote version is %2.
-
+ yellow
@@ -2880,7 +2851,7 @@ Local version is %1, remote version is %2.
-
+ green
@@ -2888,17 +2859,17 @@ Local version is %1, remote version is %2.
-
+ The game has started.
-
+ %1 draws his initial hand.
-
+ %1 draws her initial hand.
@@ -2917,86 +2888,134 @@ Local version is %1, remote version is %2.
-
+ ending phase
-
+ untap step
-
+
+ %1 draws %2 card(s).
+ female
+
+
+
+
+ %1 draws %2 card(s).
+ male
+
+
+
+ %1 attaches %2 to %3's %4.p1 female, p2 female
-
+ %1 attaches %2 to %3's %4.p1 female, p2 male
-
+ %1 attaches %2 to %3's %4.p1 male, p2 female
-
+ %1 attaches %2 to %3's %4.p1 male, p2 male
-
- upkeep step
+
+ %1 places %2 %3 counter(s) on %4 (now %5).
+ female
-
- draw step
+
+ %1 places %2 %3 counter(s) on %4 (now %5).
+ male
+
+
+
+
+ %1 removes %2 %3 counter(s) from %4 (now %5).
+ female
+
+
+
+
+ %1 removes %2 %3 counter(s) from %4 (now %5).
+ male
+
+
+
+
+ %1 is looking at the top %2 card(s) %3.
+ female
+
+
+
+
+ %1 is looking at the top %2 card(s) %3.
+ male
- first main phase
+ upkeep step
- beginning of combat step
+ draw step
- declare attackers step
+ first main phase
- declare blockers step
+ beginning of combat step
- combat damage step
+ declare attackers step
- end of combat step
+ declare blockers step
+ combat damage step
+
+
+
+
+ end of combat step
+
+
+
+ second main phase
-
+ It is now the %1.
@@ -3004,72 +3023,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:
@@ -3681,37 +3700,37 @@ Local version is %1, remote version is %2.
QMenuBar
-
+ Services
-
+ Hide %1
-
+ Hide Others
-
+ Show All
-
+ Preferences...
-
+ Quit %1
-
+ About %1
@@ -3943,192 +3962,182 @@ Local version is %1, remote version is %2.
TabDeckEditor
-
+ &Print deck...
-
+ &Close
-
+ Ctrl+Q
-
+ &Edit sets...
-
+ &Clear search
-
+ Deck &name:
-
+ &Comments:
-
+ Hash:
-
- &Update prices
-
-
-
-
- Ctrl+U
-
-
-
-
+ &New deck
-
+ &Load deck...
-
+ &Save deck
-
+ Save deck &as...
-
+ Load deck from cl&ipboard...
-
+ Save deck to clip&board
-
+ &Analyze deck on deckstats.net
-
+ Add card to &maindeck
-
+ Add card to &sideboard
-
+ Show card text only
-
+ &Remove row
-
+ Del
-
+ &Increment number
-
+ +
-
+ &Decrement number
-
+ -
-
+ &Deck editor
-
+ C&ard database
-
+ 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