diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 944e239f..cff28c97 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -24,7 +24,6 @@ resources/icon_settings.svg resources/hand.svg resources/pencil.svg - resources/icon_search.svg resources/icon_search_black.svg resources/icon_clearsearch.svg resources/icon_update.png diff --git a/cockatrice/resources/icon_clearsearch.svg b/cockatrice/resources/icon_clearsearch.svg index 79de4950..e9d5065d 100644 --- a/cockatrice/resources/icon_clearsearch.svg +++ b/cockatrice/resources/icon_clearsearch.svg @@ -14,8 +14,8 @@ height="64" id="svg2" version="1.1" - inkscape:version="0.47 r22583" - sodipodi:docname="loup2_icon.svg"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="icon_clearsearch.svg"> @@ -210,7 +210,7 @@ image/svg+xml - + @@ -218,88 +218,11 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-988.36218)"> - - - - - - - - - - + transform="translate(0,-988.36218)" /> - + + + diff --git a/cockatrice/resources/icon_search.svg b/cockatrice/resources/icon_search.svg deleted file mode 100644 index 6d755530..00000000 --- a/cockatrice/resources/icon_search.svg +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index 76218483..43471165 100644 --- a/cockatrice/src/gameselector.cpp +++ b/cockatrice/src/gameselector.cpp @@ -60,7 +60,7 @@ GameSelector::GameSelector(AbstractClient *_client, const TabSupervisor *_tabSup gameListView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); #endif filterButton = new QPushButton; - filterButton->setIcon(QIcon(":/resources/icon_search.svg")); + filterButton->setIcon(QIcon(":/resources/icon_search_black.svg")); connect(filterButton, SIGNAL(clicked()), this, SLOT(actSetFilter())); clearFilterButton = new QPushButton; clearFilterButton->setIcon(QIcon(":/resources/icon_clearsearch.svg")); diff --git a/cockatrice/translations/cockatrice_en.ts b/cockatrice/translations/cockatrice_en.ts index 8733bee3..9bfea790 100644 --- a/cockatrice/translations/cockatrice_en.ts +++ b/cockatrice/translations/cockatrice_en.ts @@ -1504,7 +1504,7 @@ Would you like to change your database location setting? - + Invalid username. You may only use A-Z, a-z, 0-9, _, ., and - in your username. @@ -1521,12 +1521,12 @@ 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 @@ -1536,236 +1536,236 @@ Reason for shutdown: %1 - + Number of players - + Please enter the number of players. - + Player %1 - + Load replay - + About Cockatrice - + Version %1 - - Authors: - - - - + Translators: - - - Spanish: - - - - - Portugese (Portugal): - - - - - Portugese (Brazil): - - - - - French: - - - Japanese: + Project Manager: - Korean: + Past Project Managers: - Russian: + Developers: - Italian: + Our Developers - Swedish: + Help Develop! + + + + + Recognition Page + + + + + Help Translate! + + + + + Support: + + + + + Report an Issue - - - - + Suggest an Improvement + + + + + + - + + - + + Error - + Server timeout - + 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 - + &Settings... - - + + &Exit - + A&ctions - + &Cockatrice - + &About Cockatrice - + &Help @@ -3037,16 +3037,6 @@ Local version is %1, remote version is %2. MessagesSettingsPage - - - &Add - - - - - &Remove - - Chat settings @@ -3098,12 +3088,12 @@ Local version is %1, remote version is %2. - + Add message - + Message: @@ -3169,414 +3159,419 @@ Local version is %1, remote version is %2. 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 - + &View exile - - - - + + + + &Exile - + 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... - + Reveal t&op card 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 @@ -3584,37 +3579,37 @@ Local version is %1, remote version is %2. QMenuBar - + Services - + Hide %1 - + Hide Others - + Show All - + Preferences... - + Quit %1 - + About %1 @@ -3622,7 +3617,7 @@ Local version is %1, remote version is %2. QObject - + Cockatrice replays (*.cor) @@ -3723,16 +3718,6 @@ Local version is %1, remote version is %2. SetsModel - - - Key - - - - - Is known - - Enabled @@ -4654,22 +4639,22 @@ Please enter a name: ZoneViewWidget - + sort by name - + sort by type - + shuffle when closing - + pile view