diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts
index 1f74e53c0..b449dd8cf 100644
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
@@ -22,6 +22,19 @@
+
+ AdminNotesDialog
+
+
+ Update Notes
+
+
+
+
+ Admin Notes for %1
+
+
+AllZonesCardAmountWidget
@@ -38,117 +51,117 @@
AppearanceSettingsPage
-
+ Error
-
+ Could not create themes directory at '%1'.
-
+ Theme settings
-
+ Current theme:
-
+ Open themes folder
-
+ Menu settings
-
+ Show keyboard shortcuts in right-click menus
-
+ Card rendering
-
+ Display card names on cards having a picture
-
+ Auto-Rotate cards with sideways layout
-
+ Override all card art with personal set preference (Pre-ProviderID change behavior) [Requires Client restart]
-
+ Bump sets that the deck contains cards from to the top in the printing selector
-
+ Scale cards on mouse over
-
+ Minimum overlap percentage of cards on the stack and in vertical hand
-
+ Maximum initial height for card view window:
-
+ rows
-
+ 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:
@@ -268,22 +281,22 @@ This is only saved for moderators and cannot be seen by the banned person.
BetaReleaseChannel
-
+ Beta Releases
-
+ No reply received from the release update server.
-
+ Invalid reply received from the release update server.
-
+ No reply received from the file update server.
@@ -591,166 +604,166 @@ This is only saved for moderators and cannot be seen by the banned person.
DeckEditorSettingsPage
-
-
+
+ Update Spoilers
-
-
+
+ Success
-
+ Download URLs have been reset.
-
+ Downloaded card pictures have been reset.
-
+ Error
-
+ One or more downloaded card pictures could not be cleared.
-
+ Add URL
-
-
+
+ URL:
-
-
+
+ Edit URL
-
+ Network Cache Size:
-
+ Redirect Cache TTL:
-
+ How long cached redirects for urls are valid for.
-
+ Picture Cache Size:
-
+ Add New URL
-
+ Remove URL
-
+ Day(s)
-
+ Updating...
-
+ Choose path
-
+ URL Download Priority
-
+ Spoilers
-
+ Download Spoilers Automatically
-
+ Spoiler Location:
-
+ Last Change
-
+ Spoilers download automatically on launch
-
+ Press the button to manually update without relaunching
-
+ Do not close settings until manual update is complete
-
+ Download card pictures on the fly
-
+ How to add a custom URL
-
+ Delete Downloaded Images
-
+ Reset Download URLs
-
+ On-disk cache for downloaded pictures
-
+ In-memory cache for pictures not currently on screen
@@ -848,138 +861,148 @@ This is only saved for moderators and cannot be seen by the banned person.
DlgConnect
-
+ Downloading...
-
+ Known Hosts
-
+
+ Delete the currently selected saved server
+
+
+
+ Refresh the server list with known public servers
-
+ New Host
-
+ Name:
-
+ &Host:
-
+ &Port:
-
+ Player &name:
-
+ P&assword:
-
+ &Save password
-
+ A&uto connect
-
+ Automatically connect to the most recent login when Cockatrice opens
-
+ If you have any trouble connecting or registering then contact the server staff for help!
-
-
+
+ Webpage
-
+ Reset Password
-
+
+ Forgot password?
+
+
+
+ &Connect
-
+ Server
-
+ Login
-
+ Server Contact
-
+ Connect to Server
-
+ Server URL
-
+ Communication Port
-
+ Unique Server Name
-
+ Connection Warning
-
+ You need to name your new connection profile.
-
+ Connect Warning
-
+ The player name can't be empty.
@@ -1887,12 +1910,12 @@ Your email will be used to verify your account.
DlgSettings
-
+ Unknown Error loading card database
-
+ Your card database is invalid.
Cockatrice may not function correctly with an invalid database
@@ -1903,7 +1926,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
@@ -1914,7 +1937,7 @@ Would you like to change your database location setting?
-
+ Your card database did not finish loading
Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -1923,21 +1946,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 https://github.com/Cockatrice/Cockatrice/issues
@@ -1946,59 +1969,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
-
+ Card Sources
-
+ Chat
-
+ Sound
-
+ Shortcuts
@@ -2024,164 +2047,164 @@ Would you like to change your database location setting?
DlgUpdate
-
+ Current release channel
-
+ Reinstall
-
+ Cancel Download
-
+ Open Download Page
-
+ Check for Client Updates
-
-
-
-
+
+
+
+ Error
-
+ Cockatrice was not built with SSL support, therefore you cannot download updates automatically!
Please visit the download page to update manually.
-
+ Downloading update...
-
+ Checking for updates...
-
+ Finished checking for updates
-
+ No Update Available
-
+ Cockatrice is up to date!
-
+ You are already running the latest version available in the chosen release channel.
-
+ Current version
-
+ Selected release channel
-
-
+
+ Update Available
-
-
-
- A new version of Cockatrice is available!
-
-
-
-
-
- New version
-
-
- Released
+ A new version of Cockatrice is available!
+
+
+
+
+
+ New version
- Changelog
+ Released
+
+ Changelog
+
+
+
+ Do you want to update now?
-
+ Unfortunately there are no download packages available for your operating system.
You may have to build from source yourself.
-
+ Please check the download page manually and visit the wiki for instructions on compiling.
-
-
-
+
+
+ Update Error
-
+ An error occurred while checking for updates:
-
+ An error occurred while downloading an update:
-
+ Installing...
-
+ Cockatrice is unable to open the installer.
-
+ Try to update manually by closing Cockatrice and running the installer.
-
+ Download location
@@ -2423,92 +2446,97 @@ You may have to build from source yourself.
GeneralSettingsPage
-
+ Reset all paths
-
+ All paths have been reset
-
-
-
-
-
-
+
+
+
+
+
+ Choose path
-
+ Personal settings
-
+ Language:
-
+ Paths (editing disabled in portable mode)
-
+ Paths
-
+ Decks directory:
-
+ Replays directory:
-
+ Pictures directory:
-
+ Card database:
-
+ Custom database directory:
-
+ Token database:
-
+ Update channel
-
+
+ Check for client updates on startup
+
+
+
+ Notify if a feature supported by the server is missing in my client
-
+ Automatically run Oracle when running a new version of Cockatrice
-
+ Show tips on startup
@@ -2516,60 +2544,60 @@ You may have to build from source yourself.
MainWindow
-
-
+
+ The server has reached its maximum user capacity, please check back later.
-
+ There are too many concurrent connections from your address.
-
+ Banned by moderator
-
+ Expected end time: %1
-
+ This ban lasts indefinitely.
-
+ Scheduled server shutdown.
-
-
+
+ Invalid username.
-
+ You have been logged out due to logging in at another location.
-
+ Connection closed
-
+ The server has terminated your connection.
Reason: %1
-
+ The server is going to be restarted in %n minute(s).
All running games will be lost.
Reason for shutdown: %1
@@ -2579,581 +2607,581 @@ Reason for shutdown: %1
-
+ Scheduled server shutdown
-
-
+
+ Success
-
+ Registration accepted.
Will now login.
-
+ Account activation accepted.
Will now login.
-
+ Number of players
-
+ Please enter the number of players.
-
-
+
+ Player %1
-
+ Load replay
-
+ About Cockatrice
-
+ Version
-
+ Cockatrice Webpage
-
+ Project Manager:
-
+ Past Project Managers:
-
+ Developers:
-
+ Our Developers
-
+ Help Develop!
-
+ Translators:
-
+ Our Translators
-
+ Help Translate!
-
+ Support:
-
+ Report an Issue
-
+ Troubleshooting
-
+ F.A.Q.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error
-
+ Server timeout
-
+ Failed Login
-
+ Your client seems to be missing features this server requires for connection.
-
+ To update your client, go to 'Help -> Check for Client Updates'.
-
+ 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 IDs. 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 close and reopen Cockatrice before trying again.
If the error persists, ensure you are running the latest version of the software and if needed contact the software developers.
-
+ Account activation
-
+ Your account has not been activated yet.
You need to provide the activation token received in the activation email.
-
+ Server Full
-
+ 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
-
+ no unacceptable language as specified by these server rules:note that the following lines will not be translated
-
+ can not contain any of the following words: %1
-
+ can not match any of the following expressions: %1
-
+ 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.
-
+ It appears you are attempting to register a new account on this server yet you already have an account registered with the email provided. This server restricts the number of accounts a user can register per address. Please contact the server operator for further assistance or to obtain your credential information.
-
+ 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
-
-
-
+
+
+ Requesting forgotten password to %1 as %2...
-
+ &Connect...
-
+ &Disconnect
-
+ Start &local game...
-
+ &Watch replay...
-
+ &Deck editor
-
+ &Full screen
-
+ &Register to server...
-
+ &Restore password...
-
+ &Settings...
-
+ &Exit
-
+ A&ctions
-
+ &Cockatrice
-
+ C&ard Database
-
+ &Manage sets...
-
+ Edit custom &tokens...
-
+ Open custom image folder
-
+ Open custom sets folder
-
+ Add custom sets/cards
-
+ Reload card database
-
+ &Help
-
+ &About Cockatrice
-
+ &Tip of the Day
-
+ Check for Client Updates
-
+ Check for Card Updates...
-
+ View &Debug Log
-
+ Show/Hide
-
+ New Version
-
+ Congratulations on updating to Cockatrice %1!
Oracle will now launch to update your card database.
-
+ Cockatrice installed
-
+ Congratulations on installing Cockatrice %1!
Oracle will now launch to install the initial card database.
-
+ Card database
-
+ Cockatrice is unable to load the card database.
Do you want to update your card database now?
If unsure or first time user, choose "Yes"
-
-
+
+ Yes
-
-
+
+ No
-
+ Open settings
-
+ New sets found
-
+ %n new set(s) found in the card database
Set code(s): %1
Do you want to enable it/them?
@@ -3163,75 +3191,75 @@ Do you want to enable it/them?
-
+ View sets
-
+ 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 "Manage Sets" dialog.
-
-
+
+ Information
-
+ A card database update is already running.
-
+ Unable to run the card database updater:
-
+ failed to start.
-
+ crashed.
-
+ timed out.
-
+ write error.
-
+ read error.
-
+ unknown error.
-
+ The card database updater exited with an error: %1
-
+ 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.
@@ -3239,54 +3267,54 @@ To update your client, go to Help -> Check for Updates.
-
-
-
-
-
+
+
+
+
+ Load sets/cards
-
+ Selected file cannot be found.
-
+ You can only import XML databases at this time.
-
+ The new sets/cards have been added successfully.
Cockatrice will now reload the card database.
-
+ Sets/cards failed to import.
-
-
-
+
+
+ Reset Password
-
+ Your password has been reset successfully, you can now log in using the new credentials.
-
+ Failed to reset user account password, please contact the server operator to reset your password.
-
+ Activation request received, please check your email for an activation token.
@@ -3891,110 +3919,110 @@ Cockatrice will now reload the card database.
MessagesSettingsPage
-
+ Word1 Word2 Word3
-
+ Add New Message
-
+ Edit Message
-
+ Remove Message
-
+ Add message
-
-
+
+ Message:
-
+ Edit message
-
+ Chat settings
-
+ Custom alert words
-
+ Enable chat mentions
-
+ Enable mention completer
-
+ In-game message macros
-
+ How to use 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
@@ -4932,37 +4960,37 @@ Cockatrice will now reload the card database.
QMenuBar
-
+ Services
-
+ Hide %1
-
+ Hide Others
-
+ Show All
-
+ Preferences...
-
+ Quit %1
-
+ About %1
@@ -4970,18 +4998,18 @@ Cockatrice will now reload the card database.
QObject
-
+ Cockatrice card database (*.xml)
-
+ All files (*.*)
-
+ Cockatrice replays (*.cor)
@@ -5009,92 +5037,92 @@ Cockatrice will now reload the card database.
QPlatformTheme
-
+ OK
-
+ Save
-
+ Save All
-
+ Open
-
+ &Yes
-
+ Yes to &All
-
+ &No
-
+ N&o to All
-
+ Abort
-
+ Retry
-
+ Ignore
-
+ Close
-
+ Cancel
-
+ Discard
-
+ Help
-
+ Apply
-
+ Reset
-
+ Restore Defaults
@@ -5252,53 +5280,53 @@ Cockatrice will now reload the card database.
ShortcutSettingsPage
-
-
+
+ Restore all default shortcuts
-
+ Do you really want to restore all default shortcuts?
-
+ Clear all default shortcuts
-
+ Do you really want to clear all shortcuts?
-
+ Section:
-
+ Action:
-
+ Shortcut:
-
+ How to set custom shortcuts
-
+ Clear all shortcuts
-
+ Search by shortcut name
@@ -5352,27 +5380,27 @@ Please check your shortcut settings!
SoundSettingsPage
-
+ Enable &sounds
-
+ Current sounds theme:
-
+ Test system sound engine
-
+ Sound settings
-
+ Master volume
@@ -5429,27 +5457,27 @@ Please check your shortcut settings!
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.
@@ -6744,173 +6772,184 @@ Please refrain from engaging in this activity or further actions may be taken ag
UserContextMenu
-
+ User &details
-
+ Private &chat
-
+ Show this user's &games
-
+ Add to &buddy list
-
+ Remove from &buddy list
-
+ Add to &ignore list
-
+ Remove from &ignore list
-
+ Kick from &game
-
+ Warn user
-
+ View user's war&n history
-
+ Ban from &server
-
+ View user's &ban history
-
+ &Promote user to moderator
-
+ Dem&ote user from moderator
-
+ Promote user to &judge
-
+ Demote user from judge
-
+
+ View admin notes
+
+
+
+ %1's games
-
-
-
+
+
+ Ban History
-
+ Ban Time;Moderator;Ban Length;Ban Reason;Visible Reason
-
+ User has never been banned.
-
+ Failed to collect ban information.
-
-
-
+
+
+ Warning History
-
+ Warning Time;Moderator;User Name;Reason
-
+ User has never been warned.
-
+ Failed to collect warning information.
-
-
+
+ Failed to get admin notes.
+
+
+
+
+ Success
-
+ Successfully promoted user.
-
+ Successfully demoted user.
-
-
+
+
+ Failed
-
+ Failed to promote user.
-
+ Failed to demote user.
-
+ Copy hash to clipboard
-
+ Remove this user's messages
@@ -7098,82 +7137,82 @@ Please refrain from engaging in this activity or further actions may be taken ag
UserInterfaceSettingsPage
-
+ General interface settings
-
+ &Double-click cards to play them (instead of single-click)
-
+ &Clicking plays all selected cards (instead of just the clicked card)
-
+ &Play all nonlands onto the stack (not the battlefield) by default
-
+ Annotate card text on tokens
-
+ Use tear-off menus, allowing right click menus to persist on screen
-
+ Notifications settings
-
+ Enable notifications in taskbar
-
+ Notify in the taskbar for game events while you are spectating
-
+ Notify in the taskbar when users in your buddy list connect
-
+ Animation settings
-
+ &Tap/untap animation
-
+ Deck editor settings
-
+ Open deck in new tab by default
-
+ Replay settings
-
+ Buffer time for backwards skip via shortcut:
@@ -7181,22 +7220,22 @@ Please refrain from engaging in this activity or further actions may be taken ag
UserList
-
+ Users connected to server: %1
-
+ Users in this room: %1
-
+ Buddies online: %1 / %2
-
+ Ignored users online: %1 / %2
diff --git a/oracle/oracle_en@source.ts b/oracle/oracle_en@source.ts
index 54fead67b..433176c57 100644
--- a/oracle/oracle_en@source.ts
+++ b/oracle/oracle_en@source.ts
@@ -247,7 +247,7 @@
OracleImporter
-
+ Dummy set containing tokens