From ac62ce983959dc05ff297d21f2e12b4ef1122ec4 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sun, 25 Mar 2012 17:07:26 +0200 Subject: [PATCH 1/3] removed debugging line --- cockatrice/src/tab_game.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp index 2065ed44..4040e8f3 100644 --- a/cockatrice/src/tab_game.cpp +++ b/cockatrice/src/tab_game.cpp @@ -327,7 +327,6 @@ void TabGame::actConcede() if (QMessageBox::question(this, tr("Concede"), tr("Are you sure you want to concede this game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) return; -sleep(5); sendGameCommand(new Command_Concede); } From 0165ea61ff1150d7ae1a647f376eddac326f9a35 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Tue, 27 Mar 2012 10:55:57 +0200 Subject: [PATCH 2/3] Swedish translation done --- cockatrice/cockatrice.qrc | 3 +- cockatrice/translations/cockatrice_sv.ts | 1520 +++++++++++----------- 2 files changed, 767 insertions(+), 756 deletions(-) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 6866e778..fd1824fc 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -55,7 +55,8 @@ +--> translations/cockatrice_sv.qm + resources/countries/ar.svg resources/countries/at.svg resources/countries/au.svg diff --git a/cockatrice/translations/cockatrice_sv.ts b/cockatrice/translations/cockatrice_sv.ts index 5b1d153b..dd442b54 100644 --- a/cockatrice/translations/cockatrice_sv.ts +++ b/cockatrice/translations/cockatrice_sv.ts @@ -6,32 +6,32 @@ &Set counter... - + &Placera polett... Ctrl+L - + F11 - + F12 - + Set counter - + Placera polett New value for counter '%1': - + Nytt värde för '%1': @@ -39,82 +39,82 @@ Zone background pictures - + Zonbakgrundsbilder Path to hand background: - + Sökväg till handbakgrund: Path to stack background: - + Sökväg till stapelbakgrund: Path to table background: - + Sökväg till bordbakgrund: Path to player info background: - + Sökväg till spelarinfobakgrund: Path to picture of card back: - + Sökväg till kortbaksidans bild: Card rendering - + Kortrendering Display card names on cards having a picture - + Visa kortnamn på kort som har bilder Hand layout - + Handlayout Display hand horizontally (wastes space) - + Visa hand horisontellt (slösar plats) Table grid layout - + Bordets rutnätlayout Invert vertical coordinate - + Invertera vertikal koordinat Minimum player count for multi-column layout: - + Minst antal spelare för multi-kolumnlayout: Zone view layout - + Zonvylayout Sort by name - + Sortera efter namn Sort by type - + Sortera efter typ @@ -123,7 +123,7 @@ Choose path - + Välj sökväg @@ -131,78 +131,79 @@ ban &user name - + bannlys användar&namn ban &IP address - + bannlys &IP address Ban type - + Typ av bannlysning &permanent ban - + &permanent bannlysning &temporary ban - + &temporär bannlysning &Days: - + &Dagar: &Hours: - + &Timmar: &Minutes: - + &Minuter: Duration of the ban - + Bannlysningens längd Please enter the reason for the ban. This is only saved for moderators and cannot be seen by the banned person. - + Vänligen ange anledningen till bannlysningen. +Detta sparas endast för moderatorer och kan inte ses av den bannlysta personen. &OK - + &OK &Cancel - + &Avbryt Ban user from server - + Bannlys användaren från servern Error - + Fel You have to select a name-based or IP-based ban, or both. - + Du måste väja en namnbaserad eller IP-baserad bannlysning, eller både och. @@ -210,27 +211,27 @@ This is only saved for moderators and cannot be seen by the banned person. Name - + Namn Sets - + Utgåvor Mana cost - + Manakostnad Card type - + Korttyp P/T - + P/T @@ -238,42 +239,42 @@ This is only saved for moderators and cannot be seen by the banned person. Show card only - + Visa endast kort Show text only - + Visa endast text Show full info - + Vissa full info Name: - + Namn: Mana cost: - + Manakostnad: Card type: - + Korttyp: P / T: - + P / T: Loyalty: - + Lojalitet: @@ -281,202 +282,202 @@ This is only saved for moderators and cannot be seen by the banned person. &Play - + &Spela &Hide - + &Göm &Tap - + &Tappa &Untap - + Tappa &upp Toggle &normal untapping - + Växla &normal upptappning &Flip - + &Vänd &Clone - + &Klona Ctrl+H - + &Attach to card... - + &Fäst på kort... Ctrl+A - + Unattac&h - + Se&parera &Draw arrow... - + &Rita pil... &Power / toughness - + Po&wer / toughness &Increase power - + &Öka power Ctrl++ - + &Decrease power - + &Minska power Ctrl+- - + I&ncrease toughness - + Öka toug&hness Alt++ - + D&ecrease toughness - + Minska t&oughness Alt+- - + In&crease power and toughness - + Öka power o&ch toughness Ctrl+Alt++ - + Dec&rease power and toughness - + M&inska power och toughness Ctrl+Alt+- - + Set &power and toughness... - + An&ge power och toughness... Ctrl+P - + &Set annotation... - + Ang&e annotering... red - + röd yellow - + gul green - + grön &Add counter (%1) - + P&lacera polett (%1) &Remove counter (%1) - + Ta &bort polett (%1) &Set counters (%1)... - + Pl&acera poletter (%1)... &top of library - + &överst i leken &bottom of library - + &underst i leken &graveyard - + kyrkog&ård Ctrl+Del - + &exile - + e&xil &Move to - + Fl&ytta till @@ -485,361 +486,361 @@ This is only saved for moderators and cannot be seen by the banned person. her hand nominative, female owner - + sin hand %1's hand nominative, female owner - + %1's hand his hand nominative, male owner - + sin hand %1's hand nominative, male owner - + %1's hand of her hand genitive, female owner - + av sin hand of %1's hand genitive, female owner - + av %1's hand of his hand genitive, male owner - + av sin hand of %1's hand genitive, male owner - + av %1's hand her hand accusative, female owner - + sin hand %1's hand accusative, female owner - + %1's hand his hand accusative, male owner - + sin hand %1's hand accusative, male owner - + %1's hand her library nominative, female owner - + hennes lek %1's library nominative, female owner - + %1's lek his library nominative, male owner - + hans lek %1's library nominative, male owner - + %1's lek of her library genitive, female owner - + av sin lek of %1's library genitive, female owner - + av %1's lek of his library genitive, male owner - + av sin lek of %1's library genitive, male owner - + av %1's lek her library accusative, female owner - + hennes lek %1's library accusative, female owner - + %1's lek his library accusative, male owner - + hans lek %1's library accusative, male owner - + %1's lek her graveyard nominative, female owner - + hennes kyrkogård %1's graveyard nominative, female owner - + %1's kyrkogård his graveyard nominative, male owner - + hans kyrkogård %1's graveyard nominative, male owner - + %1's kyrkogård of her graveyard genitive, female owner - + av sin kyrkogård of %1's graveyard genitive, female owner - + av %1's kyrkogård of his graveyard genitive, male owner - + av sin kyrkogård of %1's graveyard genitive, male owner - + av %1's kyrkogård her graveyard accusative, female owner - + hennes kyrkogård %1's graveyard accusative, female owner - + %1's kyrkogård his graveyard accusative, male owner - + hans kyrkogård %1's graveyard accusative, male owner - + %1's kyrkogård her exile nominative, female owner - + hennes exil %1's exile nominative, female owner - + %1's exil his exile nominative, male owner - + hans exil %1's exile nominative, male owner - + %1's exil of her exile genitive, female owner - + sin exil of %1's exile genitive, female owner - + %1's exil of his exile genitive, male owner - + sin exil of %1's exile genitive, male owner - + %1's exil her exile accusative, female owner - + hennes exil %1's exile accusative, female owner - + %1's exil his exile accusative, male owner - + hans exil %1's exile accusative, male owner - + %1's exil her sideboard nominative, female owner - + hennes sidbräda %1's sideboard nominative, female owner - + %1's sidbräda his sideboard nominative, male owner - + hans sidbräda %1's sideboard nominative, male owner - + %1's sidbräda of her sideboard genitive, female owner - + av sin sidbräda of %1's sideboard genitive, female owner - + av %1's sidbräda of his sideboard genitive, male owner - + av sin sidbräda of %1's sideboard genitive, male owner - + av %1's sidbräda her sideboard accusative, female owner - + hennes sidbräda %1's sideboard accusative, female owner - + %1's sidbräda his sideboard accusative, male owner - + hans sidbräda %1's sideboard accusative, male owner - + %1's sidbräda @@ -847,12 +848,12 @@ This is only saved for moderators and cannot be seen by the banned person. Enable &price tag feature (using data from blacklotusproject.com) - + Aktivera &prislappsfunktionen (använder data från blacklotusproject.com) General - + Allmänt @@ -860,17 +861,17 @@ This is only saved for moderators and cannot be seen by the banned person. Number - + Nummer Card - + Kort Price - + Pris @@ -878,22 +879,22 @@ This is only saved for moderators and cannot be seen by the banned person. Load &local deck - + &Ladda lokal lek Load d&eck from server - + Ladda lek från &servern Ready to s&tart - + Redo att &börja Load deck - + Ladda lek @@ -901,37 +902,37 @@ This is only saved for moderators and cannot be seen by the banned person. Card name: - + Kortnamn: Card text: - + Korttext: Card type (OR): - + Korttyp (ELLER): Color (OR): - + Färg (ELLER): O&K - + &OK &Cancel - + &Avbryt Card search - + Kortsökning @@ -939,37 +940,37 @@ This is only saved for moderators and cannot be seen by the banned person. &Host: - + &Värd: &Port: - + &Port: Player &name: - + Spelar&namn: P&assword: - + &Lösenord: &OK - + &OK &Cancel - + &Avbryt Connect to server - + Anslut till server @@ -977,87 +978,87 @@ This is only saved for moderators and cannot be seen by the banned person. &Description: - + &Beskrivning: P&layers: - + &Spelare: Game type - + Speltyp &Password: - + &Lösenord: Only &buddies can join - + Endast &vänner kan ansluta Only &registered users can join - + Endast &registerade användare kan ansluta Joining restrictions - + Anslutingsbegränsningar &Spectators allowed - + &Åskådare tillåtna Spectators &need a password to join - + Åskådare &behöver ett lösenord för att ansluta Spectators can &chat - + Åskådare kan &chatta Spectators see &everything - + Åskådare kan s&e allt Spectators - + Åskådare &OK - + &OK &Cancel - + &Avbryt Create game - + Skapa spel Error - + Fel Server error. - + Serverfel. @@ -1065,82 +1066,82 @@ This is only saved for moderators and cannot be seen by the banned person. &Name: - + &Namn: Token - + Kort C&olor: - + &Färg: white - + vit blue - + blå black - + svart red - + röd green - + grön multicolor - + multifärgad colorless - + färglös &P/T: - + &P/T: &Annotation: - + &Annotering: &Destroy token when it leaves the table - + &Förstör kort när det lämnar bordet &OK - + &OK &Cancel - + &Avbryt Create token - + Skapa kort @@ -1148,32 +1149,32 @@ This is only saved for moderators and cannot be seen by the banned person. &Refresh - + &Uppdatera &OK - + &OK &Cancel - + &Avbryt Load deck from clipboard - + Ladda lek från urklipp Error - + Fel Invalid deck list. - + Ogiltig leklista. @@ -1181,17 +1182,17 @@ This is only saved for moderators and cannot be seen by the banned person. O&K - + &OK &Cancel - + &Avbryt Load deck - + Ladda lek @@ -1201,57 +1202,57 @@ This is only saved for moderators and cannot be seen by the banned person. Error - + Fel Your card database is invalid. Would you like to go back and set the correct path? - + Din kortdatabas är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? The path to your deck directory is invalid. Would you like to go back and set the correct path? - + Sökvägen till din lekkatalog är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? The path to your card pictures directory is invalid. Would you like to go back and set the correct path? - + Sökvägen till din kortbildsdatabas är ogiltig. Vill du gå tillbaka och ange den korrekta sökvägen? Settings - + Inställningar General - + Allmänt Appearance - + Utseende User interface - + Användargränssnitt Deck editor - + Lekredigeraren Messages - + Meddelanden &Close - + &Stäng @@ -1266,82 +1267,82 @@ This is only saved for moderators and cannot be seen by the banned person. Error - + Fel Please join the appropriate room first. - + Vänligen anslut till det lämpliga rummet först. Wrong password. - + Fel lösenord. Spectators are not allowed in this game. - + Åskådare är ej tillåtna i detta spelet. The game is already full. - + Spelet är redan fullt. The game does not exist any more. - + Det här spelet finns inte längre. This game is only open to registered users. - + Det här spelet är bara öppet för registrerade användare. This game is only open to its creator's buddies. - + Det här spelet är bara öppet för skaparens vänner. You are being ignored by the creator of this game. - + Spelets skapare ignorerar dig. Join game - + Anslut till spel Password: - + Lösenord: Games - + Spel Show u&navailable games - + Visa &otillgängliga spel C&reate - + &Skapa &Join - + &Anslut J&oin as spectator - + &Anslut som &åskådare @@ -1349,7 +1350,7 @@ This is only saved for moderators and cannot be seen by the banned person. Esc - + @@ -1357,72 +1358,72 @@ This is only saved for moderators and cannot be seen by the banned person. yes - + ja yes, free for spectators - + ja, fritt för åskådare no - + nej buddies only - + endast vänner reg. users only - + endast reg. användare not allowed - + ej tillåtna Description - + Beskrivning Room - + Rum Creator - + Skapare Game type - + Speltyp Password - + Lösenord Restrictions - + Begränsningar Players - + Spelare Spectators - + Åskådare @@ -1431,49 +1432,49 @@ This is only saved for moderators and cannot be seen by the banned person. English - + Svenska Choose path - + Välj sökväg Personal settings - + Personliga inställningar Language: - + Språk: Download card pictures on the fly - + Ladda ner kortbilder på direkten Paths - + Sökvägar Decks directory: - + Lekkatalog: Pictures directory: - + Bildkatalog: Path to card database: - + Sökväg till kortdatabas: @@ -1481,124 +1482,129 @@ This is only saved for moderators and cannot be seen by the banned person. There are too many concurrent connections from your address. - + Din adress har för många uppkopplingar samtidigt. Banned by moderator. - + Bannlyst av moderator. Scheduled server shutdown. - + Schemalagd serverstängning. Unknown reason. - + Okänd anledning. Connection closed - + Uppkoppling avslutad The server has terminated your connection. Reason: %1 - + Servern har avslutat din uppkoppling. +Anledning: %1 Scheduled server shutdown - + Schemalagd serverstängning The server is going to be restarted in %n minute(s). All running games will be lost. Reason for shutdown: %1 - - - + + Servern kommer att starts om om %n minut. +Alla pågående spel kommer att gå förlorade. +Anledning till nedstängning: %1 + Servern kommer att starts om om %n minuter. +Alla pågående spel kommer att gå förlorade. +Anledning till nedstängning: %1 Number of players - + Antal spelare Please enter the number of players. - + Vänligen ange antal spelare. Player %1 - + Spelare %1 About Cockatrice - + Om Cockatrice Version %1 - + Version %1 Authors: - + Upphovsmän: Translators: - + Översättare: Spanish: - + Spanska: Portugese (Portugal): - + Portugesiska (Portugal): Portugese (Brazil): - + Portugesiska (Brasilien): French: - + Franska: Japanese: - + Japanska: Russian: - + Ryska: Czech: - + Tjeckiska: Italian: - + Italienska: @@ -1608,120 +1614,123 @@ Reason for shutdown: %1 Error - + Fel Server timeout - + Server timeout Invalid login data. - + Ogiltig inloggningsdata. There is already an active session using this user name. Please close that session first and re-login. - + Det finns redan en aktiv session med det användarnamnet. +Vänligen stäng den sessionen först och försök igen. Socket error: %1 - + Socketfel: %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. - + Du försöker koppla upp dig till en föråldrad server. Vänligen nergradera din version av Cockatrice eller koppla upp dig till en lämplig server. +Lokal version är %1, avlägsen version är %2. Your Cockatrice client is obsolete. Please update your Cockatrice version. Local version is %1, remote version is %2. - + Din version av Cockatrice är föråldrad. Vänligen uppdatera din version av Cockatrice. +Lokal version är %1, avlägsen version är %2. Connecting to %1... - + Ansluter till %1... Disconnected - + Frånkopplad Logged in at %1 - + Inloggad hos %1 &Connect... - + &Anslut... &Disconnect - + &Frånkoppla Start &local game... - + Starta &lokalt spel... &Deck editor - + Lek&redigeraren &Full screen - + &Fullskärmsläge Ctrl+F - + &Settings... - + &Inställningar... &Exit - + A&vsluta &Cockatrice - + &Cockatrice &About Cockatrice - + &Om Cockatrice &Help - + &Hjälp Are you sure? - + Är du säker? There are still open games. Are you sure you want to quit? - + Du har fortfarande öppna spel. Är du säker på att du vill avsluta? @@ -1730,1064 +1739,1064 @@ Local version is %1, remote version is %2. You have joined game #%1. female - + Du har gått med i spel #%1. You have joined game #%1. male - + Du har gått med i spel #%1. %1 has joined the game. female - + %1 har gått med i spelet. %1 has joined the game. male - + %1 har gått med i spelet. %1 has left the game. female - + %1 har lämnat spelet. %1 has left the game. male - + %1 har lämnat spelet. The game has been closed. - + Spelet har stängts. %1 is now watching the game. - + %1 kollar nu på spelet. %1 is not watching the game any more. - + %1 kollar inte längre på spelet. %1 has loaded a deck (%2). female - + %1 har laddat en lek (%2). %1 has loaded a deck (%2). male - + %1 har laddat en lek (%2). %1 is ready to start the game. female - + %1 är redo att börja spelet. %1 is ready to start the game. male - + %1 är redo att börja spelet. %1 is not ready to start the game any more. female - + %1 är inte längre redo att börja spelet. %1 is not ready to start the game any more. male - + %1 är inte längre redo att börja spelet. %1 has conceded the game. female - + %1 har gett upp spelet. %1 has conceded the game. male - + %1 har gett upp spelet. The game has started. - + Spelet har börjat. %1 has restored connection to the game. female - + %1 har återställt uppkopplingen med spelet. %1 has restored connection to the game. male - + %1 har återställt uppkopplingen med spelet. %1 has lost connection to the game. female - + %1 har förlorat uppkopplingen med spelet. %1 has lost connection to the game. male - + %1 har förlorat uppkopplingen med spelet. %1 shuffles %2. female - + %1 blandar %2. %1 shuffles %2. male - + %1 blandar %2. %1 rolls a %2 with a %3-sided die. female - + %1 rullar en %2a med en %3-sidig tärning. %1 rolls a %2 with a %3-sided die. male - + %1 rullar en %2a med en %3-sidig tärning. %1 draws %n card(s). female - - - + + %1 drar %n kort. + %1 drar %n kort. %1 draws %n card(s). male - - - + + %1 drar %n kort. + %1 drar %n kort. %1 undoes her last draw. - + %1 ångrar hennes sista drag. %1 undoes his last draw. - + %1 ångrar hans sista drag. %1 undoes her last draw (%2). - + %1 ångrar hennes sista drag (%2). %1 undoes his last draw (%2). - + %1 ångrar hans sista drag (%2). from table - + från bordet from graveyard - + från kyrkogården from exile - + från exil from hand - + från sin hand the bottom card of her library - + det sista kortet i hennes lek the bottom card of his library - + det sista kortet i hans lek from the bottom of her library - + från botten av hennes lek from the bottom of his library - + från botten av hans lek the top card of her library - + det översta kortet av hennes lek the top card of his library - + det översta kortet av hans lek from the top of her library - + från toppen av hennes lek from the top of his library - + från botten av hans lek from library - + från leken from sideboard - + från sidbrädan from the stack - + från stapeln a card - + ett kort %1 gives %2 control over %3. - + %1 ger kontroll över %3 till %2. %1 puts %2 into play tapped%3. - + %1 sätter %2 i spell tappad%3. %1 puts %2 into play%3. - + %1 sätter %2 i spel%3. %1 puts %2%3 into graveyard. - + %1 placerar %2%3 i kyrkogården. %1 exiles %2%3. - + %1 sätter %2%3 i exil. %1 moves %2%3 to hand. - + %1 flyttar %2%3 till sin hand. %1 puts %2%3 into her library. - + %1 placerar %2%3 i sin lek. %1 puts %2%3 into his library. - + %1 placerar %2%3 i sin lek. %1 puts %2%3 on bottom of her library. - + %1 placerar %2%3 underst i hennes lek. %1 puts %2%3 on bottom of his library. - + %1 placerar %2%3 underst i hans lek. %1 puts %2%3 on top of her library. - + %1 placerar %2%3 överst i hennes lek. %1 puts %2%3 on top of his library. - + %1 placerar %2%3 överst i hans lek. %1 puts %2%3 into her library at position %4. - + %1 placerar %2%3 på plats %4 i hennes lek. %1 puts %2%3 into his library at position %4. - + %1 placerar %2%3 på plats %4 i hans lek. %1 moves %2%3 to sideboard. - + %1 flyttar %2%3 till sidbrädan. %1 plays %2%3. - + %1 spelar %2%3. %1 takes a mulligan to %n. female - - - + + %1 tar en mulligan till %n. + %1 tar en mulligan till %n. %1 takes a mulligan to %n. male - - - + + %1 tar en mulligan till %n. + %1 tar en mulligan till %n. %1 draws her initial hand. - + %1 drar sin första hand. %1 draws his initial hand. - + %1 drar sin första hand. %1 flips %2 face-down. female - + %1 vänder %2 nedåt. %1 flips %2 face-down. male - + %1 vänder %2 nedåt. %1 flips %2 face-up. female - + %1 vänder %2 uppåt. %1 flips %2 face-up. male - + %1 vänder %2 uppåt. %1 destroys %2. female - + %1 förstör %2. %1 destroys %2. male - + %1 förstör %2. %1 attaches %2 to %3's %4. p1 female, p2 female - + %1 fäster %2 på %3's %4. %1 attaches %2 to %3's %4. p1 female, p2 male - + %1 fäster %2 på %3's %4. %1 attaches %2 to %3's %4. p1 male, p2 female - + %1 fäster %2 på %3's %4. %1 attaches %2 to %3's %4. p1 male, p2 male - + %1 fäster %2 på %3's %4. %1 unattaches %2. female - + %1 separerar %2. %1 unattaches %2. male - + %1 separerar %2. %1 creates token: %2%3. female - + %1 skapar kort: %2%3. %1 creates token: %2%3. male - + %1 skapar kort: %2%3. %1 points from her %2 to herself. female - + %1 pekar från hennes %2 till sig själv. %1 points from his %2 to himself. male - + %1 pekar från hans %2 till sig själv. %1 points from her %2 to %3. p1 female, p2 female - + %1 pekar från hennes %2 till %3. %1 points from her %2 to %3. p1 female, p2 male - + %1 pekar från hennes %2 till %3. %1 points from his %2 to %3. p1 male, p2 female - + %1 pekar från hans %2 till %3. %1 points from his %2 to %3. p1 male, p2 male - + %1 pekar från hans %2 till %3. %1 points from %2's %3 to herself. card owner female, target female - + %1 pekar från %2's %3 till sig själv. %1 points from %2's %3 to herself. card owner male, target female - + %1 pekar från %2's %3 till sig själv. %1 points from %2's %3 to himself. card owner female, target male - + %1 pekar från %2's %3 till sig själv. %1 points from %2's %3 to himself. card owner male, target male - + %1 pekar från %2's %3 till sig själv. %1 points from %2's %3 to %4. p1 female, p2 female, p3 female - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 female, p2 female, p3 male - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 female, p2 male, p3 female - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 female, p2 male, p3 male - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 male, p2 female, p3 female - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 male, p2 female, p3 male - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 male, p2 male, p3 female - + %1 pekar från %2's %3 till %4. %1 points from %2's %3 to %4. p1 male, p2 male, p3 male - + %1 pekar från %2's %3 till %4. %1 points from her %2 to her %3. female - + %1 pekar från hennes %2 till sin %3. %1 points from his %2 to his %3. male - + %1 pekar från hans %2 till sin %3. %1 points from her %2 to %3's %4. p1 female, p2 female - + %1 pekar från hennes %2 till %3's %4. %1 points from her %2 to %3's %4. p1 female, p2 male - + %1 pekar från hennes %2 till %3's %4. %1 points from his %2 to %3's %4. p1 male, p2 female - + %1 pekar från hans %2 till %3's %4. %1 points from his %2 to %3's %4. p1 male, p2 male - + %1 pekar från hans %2 till %3's %4. %1 points from %2's %3 to her own %4. card owner female, target female - + %1 pekar från %2's %3 till sin %4. %1 points from %2's %3 to her own %4. card owner male, target female - + %1 pekar från %2's %3 till sin %4. %1 points from %2's %3 to his own %4. card owner female, target male - + %1 pekar från %2's %3 till sin %4. %1 points from %2's %3 to his own %4. card owner male, target male - + %1 pekar från %2's %3 till sin %4. %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 female - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 female, p2 female, p3 male - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 female - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 female, p2 male, p3 male - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 female - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 male, p2 female, p3 male - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 female - + %1 pekar från %2's %3 till %4's %5. %1 points from %2's %3 to %4's %5. p1 male, p2 male, p3 male - + %1 pekar från %2's %3 till %4's %5. %1 places %n %2 counter(s) on %3 (now %4). female - - - + + %1 placerar %n %2 polett på %3 (%4 totalt). + %1 placerar %n %2 poletter på %3 (%4 totalt). %1 places %n %2 counter(s) on %3 (now %4). male - - - + + %1 placerar %n %2 polett på %3 (%4 totalt). + %1 placerar %n %2 poletter på %3 (%4 totalt). %1 removes %n %2 counter(s) from %3 (now %4). female - - - + + %1 tar bort %n %2 polett från %3 (%4 totalt). + %1 tar bort %n %2 poletter från %3 (%4 totalt). %1 removes %n %2 counter(s) from %3 (now %4). male - - - + + %1 tar bort %n %2 polett från %3 (%4 totalt). + %1 tar bort %n %2 poletter från %3 (%4 totalt). red - - - + + röd + röda yellow - - - + + gul + gula green - - - + + grön + gröna %1 taps her permanents. female - + %1 tappar sina permanents. %1 untaps her permanents. female - + %1 tappar upp sina permanents. %1 taps his permanents. male - + %1 tappar sina permanents. %1 untaps his permanents. male - + %1 tappar upp sina permanents. %1 taps %2. female - + %1 tappar %2. %1 untaps %2. female - + %1 tappar upp %2. %1 taps %2. male - + %1 tappar %2. %1 untaps %2. male - + %1 tappar upp %2. %1 sets counter %2 to %3 (%4%5). female - + %1 ändrar antalet %2 poletter till %3 (%4%5). %1 sets counter %2 to %3 (%4%5). male - + %1 ändrar antalet %2 poletter till %3 (%4%5). %1 sets %2 to not untap normally. female - + %1 har inaktiverat normal upptappning för %2. %1 sets %2 to not untap normally. male - + %1 har inaktiverat normal upptappning för %2. %1 sets %2 to untap normally. female - + %1 har aktiverat normal upptappning för %2. %1 sets %2 to untap normally. male - + %1 har aktiverat normal upptappning för %2. %1 sets PT of %2 to %3. female - + %1 ställer %2's PT till %3. %1 sets PT of %2 to %3. male - + %1 ställer %2's PT till %3. %1 sets annotation of %2 to %3. female - + %1 ställer %2's annotering till %3. %1 sets annotation of %2 to %3. male - + %1 ställer %2's annotering till %3. %1 is looking at the top %2 cards %3. female - + %1 tittar på de %2 översta korten %3. %1 is looking at the top %2 cards %3. male - + %1 tittar på de %2 översta korten %3. %1 is looking at %2. female - + %1 tittar på %2. %1 is looking at %2. male - + %1 tittar på %2. %1 stops looking at %2. female - + %1 slutar titta på %2. %1 stops looking at %2. male - + %1 slutar titta på %2. %1 reveals %2 to %3. p1 female, p2 female - + %1 visar %2 för %3. %1 reveals %2 to %3. p1 female, p2 male - + %1 visar %2 för %3. %1 reveals %2 to %3. p1 male, p2 female - + %1 visar %2 för %3. %1 reveals %2 to %3. p1 male, p2 male - + %1 visar %2 för %3. %1 reveals %2. female - + %1 visar %2. %1 reveals %2. male - + %1 visar %2. %1 randomly reveals %2%3 to %4. p1 female, p2 female - + %1 visar slumpmässigt %2%3 till %4. %1 randomly reveals %2%3 to %4. p1 female, p2 male - + %1 visar slumpmässigt %2%3 till %4. %1 randomly reveals %2%3 to %4. p1 male, p2 female - + %1 visar slumpmässigt %2%3 till %4. %1 randomly reveals %2%3 to %4. p1 male, p2 male - + %1 visar slumpmässigt %2%3 till %4. %1 randomly reveals %2%3. female - + %1 visar slumpmässigt %2%3. %1 randomly reveals %2%3. male - + %1 visar slumpmässigt %2%3. %1 reveals %2%3 to %4. p1 female, p2 female - + %1 visar %2%3 till %4. %1 reveals %2%3 to %4. p1 female, p2 male - + %1 visar %2%3 till %4. %1 reveals %2%3 to %4. p1 male, p2 female - + %1 visar %2%3 till %4. %1 reveals %2%3 to %4. p1 male, p2 male - + %1 visar %2%3 till %4. %1 reveals %2%3. female - + %1 visar %2%3. %1 reveals %2%3. male - + %1 visar %2%3. It is now %1's turn. female - + Det är nu %1's tur. It is now %1's turn. male - + Det är nu %1's tur. untap step - + upptappningssteget upkeep step - + underhållssteget draw step - + dragsteget first main phase - + första huvudfasen beginning of combat step - + början av stridssteget declare attackers step - + attacksteget declare blockers step - + blockeringssteget combat damage step - + skadesteget end of combat step - + slutet av stridssteget second main phase - + andra huvudfasen ending phase - + slutfasen It is now the %1. - + Det är nu %1. @@ -2795,22 +2804,22 @@ Local version is %1, remote version is %2. Add message - + Lägg till meddelande Message: - + Meddelande: &Add - + &Lägg till &Remove - + &Ta bort @@ -2818,57 +2827,57 @@ Local version is %1, remote version is %2. Untap step - + Uptappningssteget Upkeep step - + Underhållssteget Draw step - + Dragsteget First main phase - + Första huvudfasen Beginning of combat step - + Början av stridssteget Declare attackers step - + Attacksteget Declare blockers step - + Blockeringssteget Combat damage step - + Skadesteget End of combat step - + Slutet av stridssteget Second main phase - + Andra huvudfasen End of turn step - + Slutsteget @@ -2876,269 +2885,269 @@ Local version is %1, remote version is %2. &View graveyard - + &Titta på kyrkogård &View exile - + &Titta på exil Player "%1" - + Spelare "%1" &Graveyard - + &Kyrkogård &Exile - + &Exil Move to &top of library - + Placera &överst i leken Move to &bottom of library - + Placera &underst i leken Move to &graveyard - + Flytta till &kyrkogården Move to &exile - + Placera i &exil Move to &hand - + Placera i &hand &View library - + &Titta på leken View &top cards of library... - + Titta på de &översta korten i leken... Reveal &library to - + Visa &leken för Reveal t&op card to - + &Visa översta kortet för &View sideboard - + &Titta på sidbrädan &Draw card - + &Dra kort D&raw cards... - + D&ra kort... &Undo last draw - + &Ångra senaste drag Take &mulligan - + &Mulligan &Shuffle - + &Blanda Move top cards to &graveyard... - + Flytta översta korten till &kyrkogården... Move top cards to &exile... - + Flytta översta korten till &exil... Put top card on &bottom - + Placera översta kortet &underst &Hand - + &Hand &Reveal to - + &Visa för Reveal r&andom card to - + Visa slumpm&ässigt kort för &Sideboard - + S&idbräda &Library - + &Lek &Counters - + &Poletter &Untap all permanents - + Tappa upp alla perma&nenta kort R&oll die... - + Rulla t&ärning... &Create token... - + &Skapa kort... C&reate another token - + S&kapa ett till kort S&ay - + S&äg C&ard - + K&ort &All players - + A&lla spelare Ctrl+F3 - + F3 - + Ctrl+W - + F4 - + Ctrl+D - + Ctrl+E - + Ctrl+Shift+D - + Ctrl+M - + Ctrl+S - + Ctrl+U - + Ctrl+I - + Ctrl+T - + Ctrl+G - + View top cards of library - + Titta på de översta korten i leken Number of cards: - + Antal kort: Draw cards - + Dra kort @@ -3146,52 +3155,52 @@ Local version is %1, remote version is %2. Number: - + Antal: Move top cards to grave - + Flytta översta korten till kyrkogården Move top cards to exile - + Flytta översta korten till exil Roll die - + Rulla tärning Number of sides: - + Antal sidor: Set power/toughness - + Ange power/toughness Please enter the new PT: - + Vänligen ange ny PT: Set annotation - + Ange annotering Please enter the new annotation: - + Vänligen ange den nya annoteringen: Set counters - + Placera poletter @@ -3199,37 +3208,37 @@ Local version is %1, remote version is %2. User &details - + &Användardetaljer Direct &chat - + Direkt &chatt Add to &buddy list - + Lägg till som &vän Remove from &buddy list - + Ta bort som &vän Add to &ignore list - + &Ignorera Remove from &ignore list - + Sluta &ignorera Kick from &game - + &Sparka från spelet @@ -3237,27 +3246,27 @@ Local version is %1, remote version is %2. Maindeck - + Huvudlek Sideboard - + Sidbräda Cockatrice decks (*.cod) - + Cockatricelekar (*.cod) Plain text decks (*.dec *.mwDeck) - + Klartextlekar (*.dec *.mwDeck) All files (*.*) - + Alla filer (*.*) @@ -3265,17 +3274,17 @@ Local version is %1, remote version is %2. Name - + Namn ID - + ID Upload time - + Uppladdningstidpunkt @@ -3283,32 +3292,32 @@ Local version is %1, remote version is %2. Rooms - + Rum Joi&n - + &Anslut Room - + Rum Description - + Beskrivning Players - + Spelare Games - + Spel @@ -3316,12 +3325,12 @@ Local version is %1, remote version is %2. Short name - + Kort namn Long name - + Långt namna @@ -3329,27 +3338,27 @@ Local version is %1, remote version is %2. &Reason for shutdown: - + Anledning till &nedstängning: &Time until shutdown (minutes): - + &Tid till nedstängning (minuter): &OK - + &OK &Cancel - + &Avbryt Shut down server - + Stäng ned server @@ -3357,42 +3366,42 @@ Local version is %1, remote version is %2. Update server &message - + &Uppdatera servermeddelande &Shut down server - + &Stäng ned server Server administration functions - + Serveradministrationsfunktioner &Unlock functions - + &Lås upp funktioner &Lock functions - + Lås &funktioner Unlock administration functions - + Lås upp administrationsfunktioner Do you really want to unlock the administration functions? - + Vill du verkligen låsa upp administrationsfunktionerna? Administration - + Administration @@ -3400,65 +3409,65 @@ Local version is %1, remote version is %2. Local file system - + Lokalt filsystem Server deck storage - + Serverns leklagring Open in deck editor - + Öppna i lekredigeraren Upload deck - + Ladda upp lek Download deck - + Ladda ner lek New folder - + Ny mapp Delete - + Radera Enter deck name - + Ange leknamn This decklist does not have a name. Please enter a name: - + Denna leklista har inget namn. Vänligen ange ett namn: Unnamed deck - + Namnlös lek Name of new folder: - + Namn på den nya mappen: Deck storage - + Leklagring @@ -3466,137 +3475,137 @@ Please enter a name: F5 - + F6 - + F7 - + F8 - + F9 - + F10 - + &Phases - + &Faser &Game - + &Spel Next &phase - + Nästa &fas Ctrl+Space - + Next &turn - + Nästa &tur Ctrl+Return - + Ctrl+Enter - + &Remove all local arrows - + Ta &bort alla lokala pilar Ctrl+R - + &Concede - + &Ge upp F2 - + &Leave game - + &Lämna spel Ctrl+Q - + &Say: - + S&äg: Concede - + Ge upp Are you sure you want to concede this game? - + Är du säker på att du vill ge upp detta spel? Leave game - + Lämna spel Are you sure you want to leave this game? - + Är du säker på att du vill lämna detta spel? Kicked - + Utsparkad You have been kicked out of the game. - + Du har blivit utsparkad från spelet. Game %1: %2 - + Spel %1: %2 @@ -3604,32 +3613,32 @@ Please enter a name: Personal &talk - + Personligt &samtal &Leave - + &Lämna This user is ignoring you. - + Denna användaren ignorerar dig. %1 has left the server. - + %1 har lämnat servern. %1 has joined the server. - + %1 har anslutit sig till servern. Talking to %1 - + Pratar med %1 @@ -3637,27 +3646,27 @@ Please enter a name: &Say: - + &Säg: Chat - + Chatt &Room - + &Rum &Leave room - + &Lämna rum You are flooding the chat. Please wait a couple of seconds. - + Du översvämmar chatten. Var vänlig vänta ett par sekunder. @@ -3665,7 +3674,7 @@ Please enter a name: Server - + Server @@ -3673,7 +3682,7 @@ Please enter a name: User lists - + Användarlistor @@ -3681,47 +3690,47 @@ Please enter a name: User information - + Användarinformation Real name: - + Riktiga namn: Gender: - + Kön: Location: - + Plats: User level: - + Användarnivå: Administrator - + Administratör Moderator - + Moderator Registered user - + Registrerad användare Unregistered user - + Oregistrerad användare @@ -3729,37 +3738,37 @@ Please enter a name: General interface settings - + Allmänna gränssnittsinställningar &Double-click cards to play them (instead of single-click) - + &Dubbelklicka på kort för att spela dem (istället för enkelklick) Animation settings - + Animationsinställningar &Tap/untap animation - + &Tappnings/Upptappningsanimation Enable &sounds - + Aktivera &ljud Path to sounds directory: - + Sökväg till ljudkatalog: Choose path - + Välj sökväg @@ -3767,67 +3776,67 @@ Please enter a name: Users online: %1 - + Användare online: %1 Users in this room: %1 - + Användare i detta rum: %1 Buddies online: %1 / %2 - + Vänner online: %1 / %2 Ignored users online: %1 / %2 - + Ignorerade användare online: %1 / %2 %1's games - + %1's spel User &details - + Användar&detaljer Direct &chat - + Direct&chatt Show this user's &games - + Visa denna användarens &spel Add to &buddy list - + Lägg till som &vän Remove from &buddy list - + Ta bort som &vän Add to &ignore list - + &Ignorera Remove from &ignore list - + Sluta &ignorera Ban from &server - + &Bannlys från servern @@ -3835,201 +3844,202 @@ Please enter a name: &Search... - + &Sök... &Clear search - + &Rensa sökning &Search for: - + S&ök efter: Deck &name: - + &Leknamn: &Comments: - + &Kommentarer: Hash: - + Hash: &Update prices - + &Uppdatera priser Ctrl+U - + Deck editor [*] - + Lekredigerare [*] &New deck - + &Ny lek &Load deck... - + &Ladda lek... &Save deck - + S&para lek Save deck &as... - + Spa&ra lek som... Load deck from cl&ipboard... - + Ladda lek &från urklipp... Save deck to clip&board - + Spara lek som u&tklipp &Print deck... - + Skri&v ut lek... &Close - + Stän&g Ctrl+Q - + &Edit sets... - + Redigera utg&åvor... &Deck - + L&ek &Card database - + K&ortdatabas Add card to &maindeck - + Lägg till kort till &huvudlek Return - + Retur Enter - + Add card to &sideboard - + Lägg till kort i sidbr&äda Ctrl+Return - + Ctrl+Enter - + &Remove row - + Ta bort ra&d Del - + &Increment number - + &Öka antal + - + &Decrement number - + &Minska antal - - + Are you sure? - + Är du säker? The decklist has been modified. Do you want to save the changes? - + Denna leklista har modifierats. Vill du spara ändringarna? Load deck - + Ladda lek Error - + Fel The deck could not be saved. Please check that the directory is writable and try again. - + Leken kunde inte sparas. +Vänligen se till att katalogen är skrivbar och försök igen. Save deck - + Spara lek @@ -4037,7 +4047,7 @@ Please check that the directory is writable and try again. Edit sets - + Redigera utgåvor @@ -4045,17 +4055,17 @@ Please check that the directory is writable and try again. sort by name - + sortera efter namn sort by type - + sortera efter typ shuffle when closing - + blanda när du stänger From b289ab0d9f5b26f62f8d00ae05bddfe92734bf24 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sat, 31 Mar 2012 18:07:31 +0200 Subject: [PATCH 3/3] fixed server crash condition --- common/server_game.cpp | 12 +++++++++--- common/server_game.h | 2 +- common/server_protocolhandler.cpp | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/server_game.cpp b/common/server_game.cpp index 734db1cb..71ad8fb7 100644 --- a/common/server_game.cpp +++ b/common/server_game.cpp @@ -266,7 +266,7 @@ void Server_Game::removePlayer(Server_Player *player) QMutexLocker locker(&gameMutex); players.remove(player->getPlayerId()); - removeArrowsToPlayer(player); + removeArrowsRelatedToPlayer(player); sendGameEvent(new Event_Leave(player->getPlayerId())); bool playerActive = activePlayer == player->getPlayerId(); @@ -299,11 +299,13 @@ void Server_Game::removePlayer(Server_Player *player) room->broadcastGameListUpdate(this); } -void Server_Game::removeArrowsToPlayer(Server_Player *player) +void Server_Game::removeArrowsRelatedToPlayer(Server_Player *player) { QMutexLocker locker(&gameMutex); // Remove all arrows of other players pointing to the player being removed or to one of his cards. + // Also remove all arrows starting at one of his cards. This is necessary since players can create + // arrows that start at another person's cards. QMapIterator playerIterator(players); while (playerIterator.hasNext()) { Server_Player *p = playerIterator.next().value(); @@ -315,7 +317,11 @@ void Server_Game::removeArrowsToPlayer(Server_Player *player) if (targetCard) { if (targetCard->getZone()->getPlayer() == player) toDelete.append(a); - } else if ((static_cast(a->getTargetItem()) == player) || (a->getStartCard()->getZone()->getPlayer() == player)) + } else if (static_cast(a->getTargetItem()) == player) + toDelete.append(a); + + // Don't use else here! It has to happen regardless of whether targetCard == 0. + if (a->getStartCard()->getZone()->getPlayer() == player) toDelete.append(a); } for (int i = 0; i < toDelete.size(); ++i) { diff --git a/common/server_game.h b/common/server_game.h index 0b1ecc8e..20704245 100644 --- a/common/server_game.h +++ b/common/server_game.h @@ -82,7 +82,7 @@ public: bool containsUser(const QString &userName) const; Server_Player *addPlayer(Server_ProtocolHandler *handler, bool spectator, bool broadcastUpdate = true); void removePlayer(Server_Player *player); - void removeArrowsToPlayer(Server_Player *player); + void removeArrowsRelatedToPlayer(Server_Player *player); bool kickPlayer(int playerId); void startGameIfReady(); void stopGameIfFinished(); diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp index 8a7336f8..3a1b11b7 100644 --- a/common/server_protocolhandler.cpp +++ b/common/server_protocolhandler.cpp @@ -632,7 +632,7 @@ ResponseCode Server_ProtocolHandler::cmdConcede(Command_Concede * /*cmd*/, Comma return RespContextError; player->setConceded(true); - game->removeArrowsToPlayer(player); + game->removeArrowsRelatedToPlayer(player); player->clearZones(); game->sendGameEvent(new Event_PlayerPropertiesChanged(player->getPlayerId(), player->getProperties()), new Context_Concede); game->stopGameIfFinished();