diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp index 2409d4a0d..326e0dda1 100644 --- a/cockatrice/src/window_main.cpp +++ b/cockatrice/src/window_main.cpp @@ -301,14 +301,15 @@ void MainWindow::actAbout() tr("Version") + QString(" %1").arg(VERSION_STRING) + "

" + tr("Cockatrice Webpage") + "
" + "
" + tr("Project Manager:") + "
Zach Halpern

" + "" + tr("Past Project Managers:") + - "
Gavin Bisesi
Max-Wilhelm Bruker
Marcus Schütz

" + "" + tr("Developers:") + "
" + - "" + tr("Our Developers") + "
" + "" + tr("Help Develop!") + "

" + "" + tr("Translators:") + - "
" + "" + tr("Our Translators") + - "
" + "" + tr("Help Translate!") + "

" + - "" + tr("Support:") + "
" + "" + tr("Report an Issue") + - "
" + "" + tr("Troubleshooting") + "
" + - "" + tr("F.A.Q.") + "
"), + "
Gavin Bisesi
Max-Wilhelm Bruker
Marcus Schütz

" + "" + tr("Developers:") + + "
" + "" + tr("Our Developers") + "
" + + "" + tr("Help Develop!") + "

" + "" + + tr("Translators:") + "
" + "" + + tr("Our Translators") + "
" + "" + + tr("Help Translate!") + "

" + "" + tr("Support:") + "
" + "" + tr("Report an Issue") + "
" + "" + tr("Troubleshooting") + "
" + "" + tr("F.A.Q.") + "
"), QMessageBox::Ok, this); mb.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64)); mb.setTextInteractionFlags(Qt::TextBrowserInteraction); @@ -705,15 +706,33 @@ void MainWindow::createActions() aExit->setMenuRole(QAction::QuitRole); aAbout->setMenuRole(QAction::AboutRole); - char const *foo; // avoid "warning: expression result unused" under clang - foo = QT_TRANSLATE_NOOP("QMenuBar", "Services"); - foo = QT_TRANSLATE_NOOP("QMenuBar", "Hide %1"); - foo = QT_TRANSLATE_NOOP("QMenuBar", "Hide Others"); - foo = QT_TRANSLATE_NOOP("QMenuBar", "Show All"); - foo = QT_TRANSLATE_NOOP("QMenuBar", "Preferences..."); - foo = QT_TRANSLATE_NOOP("QMenuBar", "Quit %1"); - foo = QT_TRANSLATE_NOOP("QMenuBar", "About %1"); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "Services")); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "Hide %1")); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "Hide Others")); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "Show All")); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "Preferences...")); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "Quit %1")); + Q_UNUSED(QT_TRANSLATE_NOOP("QMenuBar", "About %1")); #endif + // translate Qt's dialogs "default button text"; list taken from QPlatformTheme::defaultStandardButtonText() + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "OK")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Save")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Save All")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Open")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "&Yes")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Yes to &All")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "&No")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "N&o to All")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Abort")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Retry")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Ignore")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Close")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Cancel")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Discard")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Help")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Apply")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Reset")); + Q_UNUSED(QT_TRANSLATE_NOOP("QPlatformTheme", "Restore Defaults")); } void MainWindow::createMenus() diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts index bc74d9a10..3c35f2d44 100644 --- a/cockatrice/translations/cockatrice_en.ts +++ b/cockatrice/translations/cockatrice_en.ts @@ -22,62 +22,62 @@ AppearanceSettingsPage - + Theme settings - + Current theme: - + 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: - + Maximum font size for information displayed on cards: @@ -192,22 +192,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. @@ -215,32 +215,32 @@ This is only saved for moderators and cannot be seen by the banned person. CardDatabaseModel - + Name - + Sets - + Mana cost - + Card type - + P/T - + Color(s) @@ -330,17 +330,17 @@ This is only saved for moderators and cannot be seen by the banned person. CardFrame - + Image - + Description - + Both @@ -348,17 +348,17 @@ This is only saved for moderators and cannot be seen by the banned person. CardInfoText - + Related cards: - + Unknown card: - + Name: @@ -502,120 +502,120 @@ 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 - + Updating... - + Choose path - + URL Download Priority - + Spoilers - + Download Spoilers Automatically - + Spoiler Location: - + Download card pictures on the fly - + How to add a custom URL - + Delete Downloaded Images - + Reset Download URLs - + Last Updated - + Spoilers download automatically on launch - + Press the button to manually update without relaunching - + Do not close settings until manual update complete @@ -1540,12 +1540,12 @@ Make sure to enable the 'Token' set in the "Manage sets" dia DlgSettings - + Unknown Error loading card database - + Your card database is invalid. Cockatrice may not function correctly with an invalid database @@ -1556,7 +1556,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 @@ -1567,7 +1567,7 @@ 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 @@ -1576,21 +1576,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 http://github.com/Cockatrice/Cockatrice/issues @@ -1599,59 +1599,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 @@ -2043,76 +2043,81 @@ You may have to build from source yourself. GeneralSettingsPage - - - - - + + + + + Choose path - + Personal settings - + Language: - + Paths (editing disabled in portable mode) - + Paths - + Decks directory: - + Replays directory: - + Pictures directory: - + Card database: - + Token database: - + Picture cache size: - + Update channel - + 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 @@ -2121,7 +2126,7 @@ You may have to build from source yourself. MainWindow - + The server has reached its maximum user capacity, please check back later. @@ -2152,7 +2157,7 @@ You may have to build from source yourself. - + Invalid username. @@ -2262,12 +2267,12 @@ Will now login. - + Translators: - + Help Translate! @@ -2277,199 +2282,199 @@ Will now login. - + Report an Issue - + Troubleshooting - + F.A.Q. - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Error - + Server timeout - + Failed Login - + 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 - + 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 - + 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. - + Your client seems to be missing features this server requires for connection. @@ -2479,365 +2484,376 @@ This usually means that your client version is out of date, and the server sent - + Our Translators - + To update your client, go to 'Help -> Check for Client Updates'. - + Your account has not been activated yet. You need to provide the activation token received in the activation email. - + The email address provider used during registration has been blacklisted for use on this server. - + 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 forgot password to %1 as %2... - + &Connect... - + &Disconnect - + Start &local game... - + &Watch replay... - + &Deck editor - + &Full screen - + &Register to server... - + &Settings... - - + + &Exit - + A&ctions - + &Cockatrice - + C&ard Database - + Open custom image folder - + Open custom sets folder - + Add custom sets/cards - + Edit &tokens... - + &About Cockatrice - + &Tip of the Day - + Check for Client Updates - + View &debug log - + &Help - + Check for card updates... - + + New Version + + + + + Congratulations on updating to Cockatrice %1! +Oracle will now launch to update your 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 - + %1 new set(s) found in the card database Set code(s): %2 Do you want to enable it/them? - + View sets - + Welcome - - - + + + 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 - + Update completed successfully. Cockatrice will now reload the card database. - + You can only import XML databases at this time. - - - + + + Forgot Password - + Your password has been reset successfully, you now may 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. - - - - - + + + + + Load sets/cards - + &Manage sets... - + 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. - + 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. @@ -2845,18 +2861,18 @@ To update your client, go to Help -> Check for Updates. - + Selected file cannot be found. - + The new sets/cards have been added successfully. Cockatrice will now reload the card database. - + Sets/cards failed to import. @@ -2945,7 +2961,6 @@ Cockatrice will now reload the card database. - a card @@ -3013,68 +3028,77 @@ Cockatrice will now reload the card database. %1 is not watching the game any more (%2). + + + %1 card(s) + a card for singular, %1 cards for plural + + + + + - + Untap - + Upkeep - + Draw - + First Main - + Beginning of Combat - + Declare Attackers - + Declare Blockers - + Combat Damage - + End of Combat - + Second Main - + End/Cleanup - + Unknown Phase - + %1's turn. @@ -3109,12 +3133,12 @@ Cockatrice will now reload the card database. - + %1 has locked their sideboard. - + %1 has unlocked their sideboard. @@ -3134,17 +3158,17 @@ Cockatrice will now reload the card database. - + %1 places %2 %3 on %4 (now %5). - + %1 removes %2 %3 from %4 (now %5). - + red counter(s) @@ -3152,7 +3176,7 @@ Cockatrice will now reload the card database. - + yellow counter(s) @@ -3160,7 +3184,7 @@ Cockatrice will now reload the card database. - + green counter(s) @@ -3168,27 +3192,27 @@ Cockatrice will now reload the card database. - + %1 shuffles %2. - + Heads - + Tails - + %1 flipped a coin. It landed as %2. - + %1 rolls a %2 with a %3-sided die. @@ -3201,12 +3225,12 @@ Cockatrice will now reload the card database. - + %1 undoes their last draw. - + %1 undoes their last draw (%2). @@ -3286,7 +3310,7 @@ Cockatrice will now reload the card database. - + %1 unattaches %2. @@ -3336,47 +3360,47 @@ Cockatrice will now reload the card database. - + %1 taps their permanents. - + %1 untaps their permanents. - + %1 taps %2. - + %1 untaps %2. - + %1 sets counter %2 to %3 (%4%5). - + %1 sets %2 to not untap normally. - + %1 sets %2 to untap normally. - + %1 sets PT of %2 to %3. - + %1 sets annotation of %2 to %3. @@ -3386,47 +3410,47 @@ Cockatrice will now reload the card database. - + %1 stops looking at %2. - + %1 reveals %2 to %3. - + %1 reveals %2. - + %1 randomly reveals %2%3 to %4. - + %1 randomly reveals %2%3. - + %1 peeks at face down card #%2. - + %1 peeks at face down card #%2: %3. - + %1 reveals %2%3 to %4. - + %1 reveals %2%3. @@ -3434,105 +3458,105 @@ Cockatrice will now reload the card database. MessagesSettingsPage - + Word1 Word2 Word3 - + Add New URL - + Edit URL - + Remove URL - + Add message - - + + Message: - + Edit message - + 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 - - + + 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 @@ -3646,7 +3670,7 @@ Cockatrice will now reload the card database. Player - + Reveal top cards of library @@ -4002,7 +4026,7 @@ Cockatrice will now reload the card database. - + C&reate another %1 token @@ -4012,32 +4036,32 @@ Cockatrice will now reload the card database. - + Token: - + Place card X cards from top of library - + How many cards from the top of the deck should this card be placed: - + View related cards - + Attach to - + All tokens @@ -4088,7 +4112,7 @@ Cockatrice will now reload the card database. - + Number: @@ -4113,27 +4137,27 @@ Cockatrice will now reload the card database. - + Set power/toughness - + Please enter the new PT: - + Set annotation - + Please enter the new annotation: - + Set counters @@ -4215,6 +4239,99 @@ Cockatrice will now reload the card database. + + QPlatformTheme + + + Cancel + + + + + Discard + + + + + Help + + + + + Apply + + + + + &Yes + + + + + Save + + + + + Save All + + + + + Open + + + + + Yes to &All + + + + + &No + + + + + N&o to All + + + + + Abort + + + + + Retry + + + + + Ignore + + + + + Close + + + + + Reset + + + + + Restore Defaults + + + + + OK + + + RemoteDeckList_TreeModel @@ -4404,27 +4521,27 @@ Please check your shortcut settings! SoundSettingsPage - + Enable &sounds - + Current sounds theme: - + Test system sound engine - + Sound settings - + Master volume @@ -5840,42 +5957,42 @@ Please refrain from engaging in this activity or further actions may be taken ag 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 diff --git a/oracle/translations/oracle_en.ts b/oracle/translations/oracle_en.ts index 3a793e74d..2152cffba 100644 --- a/oracle/translations/oracle_en.ts +++ b/oracle/translations/oracle_en.ts @@ -253,7 +253,7 @@ OracleImporter - + Dummy set containing tokens