diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts
index edc735b6d..6d351363c 100644
--- a/cockatrice/translations/cockatrice_en.ts
+++ b/cockatrice/translations/cockatrice_en.ts
@@ -22,89 +22,60 @@
AppearanceSettingsPage
-
- Zone background pictures
+
+ Theme settings
-
- Hand background:
+
+ Current theme:
-
- 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
-
- BanDialog
@@ -186,6 +157,9 @@ This is only saved for moderators and cannot be seen by the banned person.
+
+
+ Error
@@ -194,16 +168,31 @@ This is only saved for moderators and cannot be seen by the banned person.You have to select a name-based, IP-based, clientId based, or some combination of the three to place a ban.
+
+
+ You must have a value in the name ban when selecting the name ban checkbox.
+
+
+
+
+ You must have a value in the ip ban when selecting the ip ban checkbox.
+
+
+
+
+ You must have a value in the clientid ban when selecting the clientid ban checkbox.
+
+ CardDatabase
-
+ New sets found
-
+ %1 new set(s) have been found in the card database. Do you want to enable them?
@@ -594,12 +583,12 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckEditorSettingsPage
-
+ Nothing is here... yet
-
+ General
@@ -720,52 +709,52 @@ This is only saved for moderators and cannot be seen by the banned person.
DlgConnect
-
+ Previous Host
-
+ New Host
-
+ &Host:
-
+ Enter host name
-
+ &Port:
-
+ Player &name:
-
+ P&assword:
-
+ &Save password
-
+ A&uto connect at start
-
+ Connect to server
@@ -999,32 +988,32 @@ To remove your current avatar, confirm without choosing a new image.
DlgEditPassword
-
+ Old password:
-
+ New password:
-
+ Confirm new password:
-
+ Change password
-
+ Error
-
+ The new passwords don't match.
@@ -1127,47 +1116,47 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
DlgEditUser
-
+ Email:
-
+ Pronouns:
-
+ Neutral
-
+ Masculine
-
+ Feminine
-
+ Country:
-
+ Undefined
-
+ Real name:
-
+ Edit user profile
@@ -1175,47 +1164,47 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
DlgFilterGames
-
+ Show &unavailable games
-
+ Show &password protected games
-
+ Game &description:
-
+ &Creator name:
-
+ &Game types
-
+ at &least:
-
+ at &most:
-
+ Maximum player count
-
+ Filter games
@@ -1256,93 +1245,93 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
DlgRegister
-
+ &Host:
-
+ &Port:
-
+ Player &name:
-
+ P&assword:
-
+ Password (again):
-
+ Email:
-
+ Email (again):
-
+ Pronouns:
-
+ Neutral
-
+ Masculine
-
+ Feminine
-
+ Undefined
-
-
+
+ Registration Warning
-
+ Your passwords do not match, please try again.
-
+ Your email addresses do not match, please try again.
-
+ Country:
-
+ Real name:
-
+ Register to server
@@ -1350,19 +1339,19 @@ Make sure to enable the 'token set' in the 'Edit sets...' di
DlgSettings
-
-
-
+
+
+ Error
-
+ Unknown Error loading card database
-
+ Your card database is invalid.
Cockatrice may not function correctly with an invalid database
@@ -1373,7 +1362,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
@@ -1384,21 +1373,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
@@ -1407,7 +1396,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
@@ -1416,52 +1405,52 @@ 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
-
+ Shortcuts
@@ -1679,107 +1668,112 @@ 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 card pictures from a custom URL
-
+ Custom Card Download URL:
-
+ Linking FAQ
-
- Paths
-
-
-
-
- Decks directory:
-
-
-
-
- Replays directory:
+
+ Notify when new client features are available
- Pictures directory:
+ Paths
- Card database:
+ Decks directory:
- Token database:
+ Replays directory:
+ Pictures directory:
+
+
+
+
+ Card database:
+
+
+
+
+ Token database:
+
+
+
+ Picture cache size:
-
+ EnglishEnglish
@@ -1787,48 +1781,48 @@ 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.
-
+ 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
@@ -1838,478 +1832,495 @@ Reason for shutdown: %1
-
+ Number of players
-
+ Please enter the number of players.
-
-
+
+ Player %1
-
+ Load replay
-
+ About Cockatrice
-
+ Version %1
-
+ Translators:
-
+ Project Manager:
-
+ The server has reached its maximum user capacity, please check back later.
-
-
+
+ Invalid username.
-
+ You have been logged out due to logging in at another location.
-
-
+
+ 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
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error
-
+ Server timeout
-
+
+ Failed Login
+
+
+
+
+ Your client does not support features that the server requires, please update your client and try again.
+
+
+
+ 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. Do you want to register now?
-
+ This server requires client ID's. Your client is either failing to generate an ID or you are running a modified client.
Please close and reopen your client to try again.
-
+ An internal error has occurred, please try closing and reopening your client and try again. If the error persists try updating your client to the most recent build and if need be contact your software provider.
-
+ Account activation
-
+ Unknown login error: %1
-
-
+
+
This usually means that your client version is out of date, and the server sent a reply your client doesn't understand.
-
+ Your username must respect these rules:
-
+ is %1 - %2 characters long
-
+ can %1 contain lowercase characters
-
-
-
+
+
+ NOT
-
+ can %1 contain uppercase characters
-
+ can %1 contain numeric characters
-
+ can contain the following punctuation: %1
-
+ first character can %1 be a punctuation mark
-
+ You may only use A-Z, a-z, 0-9, _, ., and - in your username.
-
-
-
-
-
+
+
+
+
+ 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.
-
+ Unknown registration error: %1
-
+ 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
-
+ &Connect...
-
+ &Disconnect
-
+ Start &local game...
-
+ &Watch replay...
-
+ &Deck editor
-
+ &Full screen
-
+ &Register to server...
-
+ &Settings...
-
-
+
+ &Exit
-
+ A&ctions
-
+ &Cockatrice
-
+ &About Cockatrice
-
+ &Help
-
+ 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.
-
-
+
+ Your client appears to be missing features that the server supports.
+This usually means that your client version is out of date, please check to see if there is a new client available for download.
+
+
+
+
+
+ Information
-
+ Troubleshooting
-
+ F.A.Q.
-
+ Your account has not been activated yet.
You need to provide the activation token received in the activation email
-
+ failed to start.
-
+ crashed.
-
+ timed out.
-
+ write error.
-
+ read error.
-
+ unknown error.
@@ -3582,74 +3593,74 @@ You need to provide the activation token received in the activation email
MessagesSettingsPage
-
+ 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
-
+ Enable desktop notifications for private messages
-
+ Separate words with a space, alphanumeric characters only
-
-
+
+ Invert text color
-
+ Enable desktop notification for mentions.
-
-
+
+ (Color is hexadecimal)
-
+ Add message
-
+ Message:
@@ -3715,435 +3726,435 @@ You need to provide the activation token received in the activation email
Player
-
+ &View library
-
+ Move top cards to &graveyard...
-
+ View &top cards of library...
-
+ &View graveyard
-
+ &View sideboard
-
+ Player "%1"
-
-
-
-
-
- &Hand
-
-
-
-
- &Reveal hand to...
-
-
-
-
- Reveal r&andom card to...
-
-
-
-
- &Library
-
-
-
-
-
-
-
- &Graveyard
-
-
-
-
- &Sideboard
-
-
-
-
- Red
-
-
-
-
- Yellow
-
-
-
-
- Green
-
-
-
-
- View top cards of library
-
-
-
-
- Number of cards:
-
-
-
-
- &Draw card
-
-
-
-
- Reveal top cards of library
-
-
-
-
- Number of cards: (max. %1)
-
-
-
-
- &View exile
-
-
-
-
-
-
-
- &Exile
-
-
-
-
- Reveal t&op cards to...
-
-
-
-
- D&raw cards...
-
-
-
-
- Take &mulligan
-
-
-
-
- &Shuffle
-
-
-
-
- &Counters
-
-
-
-
- &Untap all permanents
-
-
-
-
- R&oll die...
-
-
-
-
- &Create token...
-
-
-
-
- C&reate another token
-
-
-
-
- S&ay
-
-
-
-
- &Move hand to...
-
-
-
-
-
-
-
- &Top of library
-
-
-
-
- &Bottom of library
-
-
-
-
- &Move graveyard to...
-
-
-
-
- &Move exile to...
-
-
-
-
- Reveal &library to...
-
-
-
-
- &Always reveal top card
-
-
-
-
- O&pen deck in deck editor
-
-
-
-
- &Undo last draw
+
+
+ &Hand
- Play top card &face down
+ &Reveal hand to...
-
- Move top cards to &exile...
+
+ Reveal r&andom card to...
- Put top card on &bottom
+ &Library
-
- Put bottom card &in graveyard
+
+
+
+
+ &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...
-
-
-
-
- Unattac&h
-
-
-
-
- &Draw arrow...
-
-
-
-
- &Increase power
-
-
-
-
- &Decrease power
-
-
-
-
- I&ncrease toughness
+
+ &Sideboard
- D&ecrease toughness
+ Red
- In&crease power and toughness
+ Yellow
+ Green
+
+
+
+
+ View top cards of library
+
+
+
+
+ Number of cards:
+
+
+
+
+ &Draw card
+
+
+
+
+ Reveal top cards of library
+
+
+
+
+ Number of cards: (max. %1)
+
+
+
+
+ &View exile
+
+
+
+
+
+
+
+ &Exile
+
+
+
+
+ Reveal t&op cards to...
+
+
+
+
+ D&raw cards...
+
+
+
+
+ Take &mulligan
+
+
+
+
+ &Shuffle
+
+
+
+
+ &Counters
+
+
+
+
+ &Untap all permanents
+
+
+
+
+ R&oll die...
+
+
+
+
+ &Create token...
+
+
+
+
+ C&reate another token
+
+
+
+
+ S&ay
+
+
+
+
+ &Move hand to...
+
+
+
+
+
+
+
+ &Top of library
+
+
+
+
+
+
+
+ &Bottom of library
+
+
+
+
+ &Move graveyard to...
+
+
+
+
+ &Move exile to...
+
+
+
+
+ Reveal &library to...
+
+
+
+
+ &Always reveal top card
+
+
+
+
+ O&pen deck in deck editor
+
+
+
+
+ &Undo last draw
+
+
+
+
+ Play top card &face down
+
+
+
+
+ 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...
+
+
+
+
+ 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...
-
+ &Add counter (%1)
-
+ &Remove counter (%1)
-
+ &Set counters (%1)...
-
+ 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
-
+ Cr&eate related card
@@ -4151,37 +4162,37 @@ You need to provide the activation token received in the activation email
QMenuBar
-
+ Services
-
+ Hide %1
-
+ Hide Others
-
+ Show All
-
+ Preferences...
-
+ Quit %1
-
+ About %1
@@ -4189,7 +4200,7 @@ You need to provide the activation token received in the activation email
QObject
-
+ Cockatrice replays (*.cor)
@@ -4366,37 +4377,37 @@ You need to provide the activation token received in the activation email
SoundSettingsPage
-
+ Choose path
-
+ Enable &sounds
-
+ Path to sounds directory:
-
+ Test system sound engine
-
+ Sound settings
-
+ Master volume requires QT5
-
+ Master volume
@@ -4452,219 +4463,219 @@ You need to provide the activation token received in the activation email
TabDeckEditor
-
+ &Print deck...
-
+ &Close
-
+ &Edit sets...
-
+ Filters
-
+ &Clear all filters
-
+ Delete selected
-
+ 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
-
+ Open custom image folder
-
+ Open custom sets folder
-
+ Add card to &maindeck
-
+ Add card to &sideboard
-
+ &Deck Editor
-
+ C&ard Database
-
+ Show/Hide card information
-
+ Show/Hide deck
-
+ Show/Hide filters
-
+ Reset layout
-
+ Card Info
-
+ Deck
-
+ 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
@@ -5313,42 +5324,42 @@ 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
-
+ Annotate card text on tokens
-
+ Animation settings
-
+ &Tap/untap animation
@@ -5356,22 +5367,22 @@ Please enter a name:
UserList
-
+ Users connected to server: %1
-
+ Users in this room: %1
-
+ Buddies online: %1 / %2
-
+ Ignored users online: %1 / %2
diff --git a/oracle/translations/oracle_en.ts b/oracle/translations/oracle_en.ts
index 2dd40a6eb..edb2cf377 100644
--- a/oracle/translations/oracle_en.ts
+++ b/oracle/translations/oracle_en.ts
@@ -16,7 +16,8 @@
- This wizard will import the list of sets and cards that will be used by Cockatrice.<br/>You will need to specify an url or a filename that will be used as a source, and then choose the wanted sets from the list of the available ones.
+ This wizard will import the list of sets, cards, and tokens that will be used by Cockatrice.
+You will need to specify a URL or a filename that will be used as a source.
@@ -26,22 +27,10 @@
Source selection
-
- Please specify a source for the list of sets and cards. You can specify an url address that will be download or use an existing file from your computer.
-
-
-
- Download url:
-
- Local file:
-
- Restore default url
-
- Choose file...
@@ -62,10 +51,6 @@
Error
-
- The provided url is not valid.
-
- Downloading (0MB)
@@ -114,6 +99,22 @@
The file was retrieved successfully, but it does not contain any sets data.
+
+ Please specify a source for the list of sets and cards. You can specify a URL address that will be downloaded or use an existing file from your computer.
+
+
+
+ Download URL:
+
+
+
+ Restore default URL
+
+
+
+ The provided URL is not valid.
+
+ LoadTokensPage
@@ -121,26 +122,10 @@
Tokens source selection
-
- Please specify a source for the list of tokens. You can specify an url address that will be download or use an existing file from your computer.
-
-
-
- Download url:
-
-
-
- Restore default url
-
- Error
-
- The provided url is not valid.
-
- Downloading (0MB)
@@ -153,6 +138,22 @@
Network error: %1.
+
+ Please specify a source for the list of tokens. You can specify a URL address that will be downloaded or use an existing file from your computer.
+
+
+
+ Download URL:
+
+
+
+ Restore default URL
+
+
+
+ The provided URL is not valid.
+
+ OracleImporter