1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

+ 1 new game

+ update russian translation


git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@14 efabe8c0-fbe8-4139-b769-b5e6d273206e
This commit is contained in:
skomoroh 2006-06-24 21:17:14 +00:00
parent 9bb2ed1b27
commit 819ed81f87
9 changed files with 1183 additions and 645 deletions

View file

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" "POT-Creation-Date: Sat Jun 24 16:07:12 2006\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -63,6 +63,9 @@ msgstr ""
msgid "Acme" msgid "Acme"
msgstr "" msgstr ""
msgid "Acquaintance"
msgstr ""
msgid "Agnes Bernauer" msgid "Agnes Bernauer"
msgstr "" msgstr ""
@ -87,6 +90,9 @@ msgstr ""
msgid "Alhambra" msgid "Alhambra"
msgstr "" msgstr ""
msgid "Ali Baba"
msgstr ""
msgid "All in a Row" msgid "All in a Row"
msgstr "" msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Aqab's" msgid "Aqab's"
msgstr "" msgstr ""
msgid "Arabella"
msgstr ""
msgid "Arachnida" msgid "Arachnida"
msgstr "" msgstr ""
@ -204,6 +213,15 @@ msgstr ""
msgid "Betsy Ross" msgid "Betsy Ross"
msgstr "" msgstr ""
msgid "Big Braid"
msgstr ""
msgid "Big Cell"
msgstr ""
msgid "Big Courtyard"
msgstr ""
msgid "Big Easy" msgid "Big Easy"
msgstr "" msgstr ""
@ -213,6 +231,9 @@ msgstr ""
msgid "Big Forty" msgid "Big Forty"
msgstr "" msgstr ""
msgid "Big Ground"
msgstr ""
msgid "Big Harp" msgid "Big Harp"
msgstr "" msgstr ""
@ -231,9 +252,15 @@ msgstr ""
msgid "Big Spider (2 suits)" msgid "Big Spider (2 suits)"
msgstr "" msgstr ""
msgid "Big Streets"
msgstr ""
msgid "Big Sumo" msgid "Big Sumo"
msgstr "" msgstr ""
msgid "Big York"
msgstr ""
msgid "Bim Bom" msgid "Bim Bom"
msgstr "" msgstr ""
@ -348,6 +375,9 @@ msgstr ""
msgid "Carlton" msgid "Carlton"
msgstr "" msgstr ""
msgid "Carnation"
msgstr ""
msgid "Carpet" msgid "Carpet"
msgstr "" msgstr ""
@ -360,9 +390,15 @@ msgstr ""
msgid "Casino Klondike" msgid "Casino Klondike"
msgstr "" msgstr ""
msgid "Cassim"
msgstr ""
msgid "Castle" msgid "Castle"
msgstr "" msgstr ""
msgid "Castle Mount"
msgstr ""
msgid "Castle of Indolence" msgid "Castle of Indolence"
msgstr "" msgstr ""
@ -462,6 +498,9 @@ msgstr ""
msgid "Corkscrew" msgid "Corkscrew"
msgstr "" msgstr ""
msgid "Corner Suite"
msgstr ""
msgid "Corners" msgid "Corners"
msgstr "" msgstr ""
@ -489,6 +528,9 @@ msgstr ""
msgid "Curds and Whey" msgid "Curds and Whey"
msgstr "" msgstr ""
msgid "Czarina"
msgstr ""
msgid "Danda" msgid "Danda"
msgstr "" msgstr ""
@ -507,6 +549,9 @@ msgstr ""
msgid "Deep Well" msgid "Deep Well"
msgstr "" msgstr ""
msgid "Demon"
msgstr ""
msgid "Der Katzenschwanz" msgid "Der Katzenschwanz"
msgstr "" msgstr ""
@ -555,6 +600,9 @@ msgstr ""
msgid "Die kleine Harfe" msgid "Die kleine Harfe"
msgstr "" msgstr ""
msgid "Dieppe"
msgstr ""
msgid "Diplomat" msgid "Diplomat"
msgstr "" msgstr ""
@ -624,9 +672,15 @@ msgstr ""
msgid "Double Rail" msgid "Double Rail"
msgstr "" msgstr ""
msgid "Double Russian Solitaire"
msgstr ""
msgid "Double Samuri" msgid "Double Samuri"
msgstr "" msgstr ""
msgid "Double Scorpion"
msgstr ""
msgid "Double Your Fun" msgid "Double Your Fun"
msgstr "" msgstr ""
@ -696,6 +750,9 @@ msgstr ""
msgid "Eight Times Eight" msgid "Eight Times Eight"
msgstr "" msgstr ""
msgid "Elba"
msgstr ""
msgid "Elevator" msgid "Elevator"
msgstr "" msgstr ""
@ -717,6 +774,9 @@ msgstr ""
msgid "Excuse" msgid "Excuse"
msgstr "" msgstr ""
msgid "Express"
msgstr ""
msgid "Eye" msgid "Eye"
msgstr "" msgstr ""
@ -906,6 +966,9 @@ msgstr ""
msgid "Genesis +" msgid "Genesis +"
msgstr "" msgstr ""
msgid "Geoffrey"
msgstr ""
msgid "German Patience" msgid "German Patience"
msgstr "" msgstr ""
@ -969,12 +1032,6 @@ msgstr ""
msgid "Ground for a Divorce" msgid "Ground for a Divorce"
msgstr "" msgstr ""
msgid "Ground for a Divorce (3 decks)"
msgstr ""
msgid "Ground for a Divorce (4 decks)"
msgstr ""
msgid "Gypsy" msgid "Gypsy"
msgstr "" msgstr ""
@ -990,6 +1047,9 @@ msgstr ""
msgid "Half Mahjongg Wall" msgid "Half Mahjongg Wall"
msgstr "" msgstr ""
msgid "Hanafuda Four Seasons"
msgstr ""
msgid "Hanoi Puzzle 4" msgid "Hanoi Puzzle 4"
msgstr "" msgstr ""
@ -1068,6 +1128,9 @@ msgstr ""
msgid "IloveU" msgid "IloveU"
msgstr "" msgstr ""
msgid "Imperial Guards"
msgstr ""
msgid "Imperial Trumps" msgid "Imperial Trumps"
msgstr "" msgstr ""
@ -1086,6 +1149,9 @@ msgstr ""
msgid "Inner Circle" msgid "Inner Circle"
msgstr "" msgstr ""
msgid "Inquisitor"
msgstr ""
msgid "Intelligence" msgid "Intelligence"
msgstr "" msgstr ""
@ -1197,6 +1263,9 @@ msgstr ""
msgid "Km" msgid "Km"
msgstr "" msgstr ""
msgid "Knotty Nines"
msgstr ""
msgid "Krebs" msgid "Krebs"
msgstr "" msgstr ""
@ -1257,6 +1326,9 @@ msgstr ""
msgid "Lady Betty" msgid "Lady Betty"
msgstr "" msgstr ""
msgid "Lady Jane"
msgstr ""
msgid "Lady Palk" msgid "Lady Palk"
msgstr "" msgstr ""
@ -1293,6 +1365,9 @@ msgstr ""
msgid "Lexington Harp" msgid "Lexington Harp"
msgstr "" msgstr ""
msgid "Lightweight"
msgstr ""
msgid "Lily" msgid "Lily"
msgstr "" msgstr ""
@ -1314,6 +1389,9 @@ msgstr ""
msgid "Little Gate" msgid "Little Gate"
msgstr "" msgstr ""
msgid "Little Napoleon"
msgstr ""
msgid "Long Braid" msgid "Long Braid"
msgstr "" msgstr ""
@ -1329,6 +1407,9 @@ msgstr ""
msgid "Lucas" msgid "Lucas"
msgstr "" msgstr ""
msgid "Madame"
msgstr ""
msgid "Mage's Game" msgid "Mage's Game"
msgstr "" msgstr ""
@ -1887,6 +1968,9 @@ msgstr ""
msgid "Maria Luisa" msgid "Maria Luisa"
msgstr "" msgstr ""
msgid "Marie Rose"
msgstr ""
msgid "Martha" msgid "Martha"
msgstr "" msgstr ""
@ -1932,6 +2016,9 @@ msgstr ""
msgid "Midshipman" msgid "Midshipman"
msgstr "" msgstr ""
msgid "Millie"
msgstr ""
msgid "Milligan Cell" msgid "Milligan Cell"
msgstr "" msgstr ""
@ -1989,6 +2076,9 @@ msgstr ""
msgid "Mount Olympus" msgid "Mount Olympus"
msgstr "" msgstr ""
msgid "Moving Left"
msgstr ""
msgid "Mrs. Mop" msgid "Mrs. Mop"
msgstr "" msgstr ""
@ -2007,6 +2097,9 @@ msgstr ""
msgid "Musical Patience" msgid "Musical Patience"
msgstr "" msgstr ""
msgid "Mystique"
msgstr ""
msgid "N for Namida" msgid "N for Namida"
msgstr "" msgstr ""
@ -2073,9 +2166,15 @@ msgstr ""
msgid "Number Ten" msgid "Number Ten"
msgstr "" msgstr ""
msgid "Number Twelve"
msgstr ""
msgid "Numerica" msgid "Numerica"
msgstr "" msgstr ""
msgid "Ocean Towers"
msgstr ""
msgid "Octagon" msgid "Octagon"
msgstr "" msgstr ""
@ -2208,6 +2307,9 @@ msgstr ""
msgid "Perseverance" msgid "Perseverance"
msgstr "" msgstr ""
msgid "Phantom Blockade"
msgstr ""
msgid "Phoenix" msgid "Phoenix"
msgstr "" msgstr ""
@ -2454,6 +2556,9 @@ msgstr ""
msgid "Sanibel" msgid "Sanibel"
msgstr "" msgstr ""
msgid "Saratoga"
msgstr ""
msgid "Scarab" msgid "Scarab"
msgstr "" msgstr ""
@ -2547,6 +2652,9 @@ msgstr ""
msgid "Sieben bis As" msgid "Sieben bis As"
msgstr "" msgstr ""
msgid "Signora"
msgstr ""
msgid "Simon Jester" msgid "Simon Jester"
msgstr "" msgstr ""
@ -2604,6 +2712,9 @@ msgstr ""
msgid "Somerset" msgid "Somerset"
msgstr "" msgstr ""
msgid "Souter"
msgstr ""
msgid "Space Bridge" msgid "Space Bridge"
msgstr "" msgstr ""
@ -2649,6 +2760,9 @@ msgstr ""
msgid "Spidike" msgid "Spidike"
msgstr "" msgstr ""
msgid "Spike"
msgstr ""
msgid "Squadron" msgid "Squadron"
msgstr "" msgstr ""
@ -2694,6 +2808,9 @@ msgstr ""
msgid "Steps" msgid "Steps"
msgstr "" msgstr ""
msgid "Steve"
msgstr ""
msgid "Stonehenge" msgid "Stonehenge"
msgstr "" msgstr ""
@ -2706,6 +2823,9 @@ msgstr ""
msgid "Straight Up" msgid "Straight Up"
msgstr "" msgstr ""
msgid "Strategerie"
msgstr ""
msgid "Strategy" msgid "Strategy"
msgstr "" msgstr ""
@ -2754,6 +2874,9 @@ msgstr ""
msgid "Surukh" msgid "Surukh"
msgstr "" msgstr ""
msgid "Sweet Sixteen"
msgstr ""
msgid "Taipei" msgid "Taipei"
msgstr "" msgstr ""
@ -2907,12 +3030,18 @@ msgstr ""
msgid "Triple Line" msgid "Triple Line"
msgstr "" msgstr ""
msgid "Triple York" msgid "Triple Russian Solitaire"
msgstr ""
msgid "Triple Scorpion"
msgstr "" msgstr ""
msgid "Triple Yukon" msgid "Triple Yukon"
msgstr "" msgstr ""
msgid "Trusty Twelve"
msgstr ""
msgid "Twenty" msgid "Twenty"
msgstr "" msgstr ""
@ -2958,12 +3087,21 @@ msgstr ""
msgid "Vertical" msgid "Vertical"
msgstr "" msgstr ""
msgid "Very Big Ground"
msgstr ""
msgid "Vi" msgid "Vi"
msgstr "" msgstr ""
msgid "Victory Arrow" msgid "Victory Arrow"
msgstr "" msgstr ""
msgid "Wake-Robin"
msgstr ""
msgid "Wake-Robin (3 decks)"
msgstr ""
msgid "Wall" msgid "Wall"
msgstr "" msgstr ""
@ -3009,6 +3147,9 @@ msgstr ""
msgid "Whitehead" msgid "Whitehead"
msgstr "" msgstr ""
msgid "Whitehorse"
msgstr ""
msgid "Wicked" msgid "Wicked"
msgstr "" msgstr ""
@ -3051,3 +3192,6 @@ msgstr ""
msgid "Zeus" msgid "Zeus"
msgstr "" msgstr ""
msgid "Zodiac"
msgstr ""

File diff suppressed because it is too large Load diff

View file

@ -5,8 +5,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PySol 0.0.1\n" "Project-Id-Version: PySol 0.0.1\n"
"POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" "POT-Creation-Date: Sat Jun 24 16:07:12 2006\n"
"PO-Revision-Date: 2006-06-18 11:28+0400\n" "PO-Revision-Date: 2006-06-24 18:11+0400\n"
"Last-Translator: Скоморох <skomoroh@gmail.com>\n" "Last-Translator: Скоморох <skomoroh@gmail.com>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -61,7 +61,10 @@ msgid "Achtmal Acht"
msgstr "" msgstr ""
msgid "Acme" msgid "Acme"
msgstr "" msgstr "Высшая точка"
msgid "Acquaintance"
msgstr "Знакомство"
msgid "Agnes Bernauer" msgid "Agnes Bernauer"
msgstr "Агнесса Берно" msgstr "Агнесса Берно"
@ -87,6 +90,9 @@ msgstr "Алжирский пасьянс (3 колоды)"
msgid "Alhambra" msgid "Alhambra"
msgstr "Алхамбра" msgstr "Алхамбра"
msgid "Ali Baba"
msgstr "Али Баба"
msgid "All in a Row" msgid "All in a Row"
msgstr "" msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Aqab's" msgid "Aqab's"
msgstr "" msgstr ""
msgid "Arabella"
msgstr "Арабелла"
msgid "Arachnida" msgid "Arachnida"
msgstr "" msgstr ""
@ -145,7 +154,7 @@ msgid "Auld Lang Syne"
msgstr "Старые добрые времена" msgstr "Старые добрые времена"
msgid "Aunt Mary" msgid "Aunt Mary"
msgstr "" msgstr "Тётя Мери"
msgid "Australian Patience" msgid "Australian Patience"
msgstr "Австралийский пасьянс" msgstr "Австралийский пасьянс"
@ -206,6 +215,15 @@ msgstr "Бельведер"
msgid "Betsy Ross" msgid "Betsy Ross"
msgstr "Бетси Росс" msgstr "Бетси Росс"
msgid "Big Braid"
msgstr "Большая коса"
msgid "Big Cell"
msgstr "Большая Ячейка"
msgid "Big Courtyard"
msgstr "Большой Внутренний двор"
#, fuzzy #, fuzzy
msgid "Big Easy" msgid "Big Easy"
msgstr "Большая арфа" msgstr "Большая арфа"
@ -217,6 +235,10 @@ msgstr "Большой Летящий Дракон"
msgid "Big Forty" msgid "Big Forty"
msgstr "Форт" msgstr "Форт"
#, fuzzy
msgid "Big Ground"
msgstr "Большая гора"
msgid "Big Harp" msgid "Big Harp"
msgstr "Большая арфа" msgstr "Большая арфа"
@ -235,10 +257,16 @@ msgstr "Большой Паук (1 масть)"
msgid "Big Spider (2 suits)" msgid "Big Spider (2 suits)"
msgstr "Большой Паук (2 масти)" msgstr "Большой Паук (2 масти)"
msgid "Big Streets"
msgstr "Большие Улицы"
#, fuzzy #, fuzzy
msgid "Big Sumo" msgid "Big Sumo"
msgstr "Большая дыра" msgstr "Большая дыра"
msgid "Big York"
msgstr "Большой Йорк"
msgid "Bim Bom" msgid "Bim Bom"
msgstr "Бим-Бом" msgstr "Бим-Бом"
@ -287,9 +315,8 @@ msgstr ""
msgid "Braid" msgid "Braid"
msgstr "Коса" msgstr "Коса"
#, fuzzy
msgid "Bridesmaids" msgid "Bridesmaids"
msgstr "Коса" msgstr "Подружки невесты"
msgid "Bridge" msgid "Bridge"
msgstr "Мост" msgstr "Мост"
@ -356,6 +383,9 @@ msgstr "Пленённые королевы"
msgid "Carlton" msgid "Carlton"
msgstr "Карлтон" msgstr "Карлтон"
msgid "Carnation"
msgstr "Гвоздика"
msgid "Carpet" msgid "Carpet"
msgstr "Ковёр" msgstr "Ковёр"
@ -368,9 +398,15 @@ msgstr "Карфаген"
msgid "Casino Klondike" msgid "Casino Klondike"
msgstr "Казино Клондайк" msgstr "Казино Клондайк"
msgid "Cassim"
msgstr ""
msgid "Castle" msgid "Castle"
msgstr "Замок" msgstr "Замок"
msgid "Castle Mount"
msgstr "Горный Замок"
msgid "Castle of Indolence" msgid "Castle of Indolence"
msgstr "Замок праздности" msgstr "Замок праздности"
@ -387,7 +423,7 @@ msgid "Cavalier"
msgstr "Рыцарь" msgstr "Рыцарь"
msgid "Cell 11" msgid "Cell 11"
msgstr "" msgstr "Ячейка 11"
msgid "Ceremonial" msgid "Ceremonial"
msgstr "Церемониал" msgstr "Церемониал"
@ -471,6 +507,10 @@ msgstr "Виток"
msgid "Corkscrew" msgid "Corkscrew"
msgstr "Штопор" msgstr "Штопор"
#, fuzzy
msgid "Corner Suite"
msgstr "Углы"
msgid "Corners" msgid "Corners"
msgstr "Углы" msgstr "Углы"
@ -498,6 +538,10 @@ msgstr "Купол"
msgid "Curds and Whey" msgid "Curds and Whey"
msgstr "Творог и сыворотка" msgstr "Творог и сыворотка"
#, fuzzy
msgid "Czarina"
msgstr "Мария"
#, fuzzy #, fuzzy
msgid "Danda" msgid "Danda"
msgstr "Алмаз" msgstr "Алмаз"
@ -518,6 +562,10 @@ msgstr "Глубокий"
msgid "Deep Well" msgid "Deep Well"
msgstr "Глубокий колодец" msgstr "Глубокий колодец"
#, fuzzy
msgid "Demon"
msgstr "Алмаз"
msgid "Der Katzenschwanz" msgid "Der Katzenschwanz"
msgstr "" msgstr ""
@ -569,6 +617,9 @@ msgstr ""
msgid "Die kleine Harfe" msgid "Die kleine Harfe"
msgstr "" msgstr ""
msgid "Dieppe"
msgstr ""
msgid "Diplomat" msgid "Diplomat"
msgstr "Дипломат" msgstr "Дипломат"
@ -639,10 +690,18 @@ msgstr "Двойной Маджонг Два квадрата"
msgid "Double Rail" msgid "Double Rail"
msgstr "Двойные рельсы" msgstr "Двойные рельсы"
#, fuzzy
msgid "Double Russian Solitaire"
msgstr "Русский солитер"
#, fuzzy #, fuzzy
msgid "Double Samuri" msgid "Double Samuri"
msgstr "Двойные рельсы" msgstr "Двойные рельсы"
#, fuzzy
msgid "Double Scorpion"
msgstr "Двойные рельсы"
#, fuzzy #, fuzzy
msgid "Double Your Fun" msgid "Double Your Fun"
msgstr "Двойной Юкон" msgstr "Двойной Юкон"
@ -713,6 +772,9 @@ msgstr "Восемь квадратов"
msgid "Eight Times Eight" msgid "Eight Times Eight"
msgstr "Восемь раз по восемь" msgstr "Восемь раз по восемь"
msgid "Elba"
msgstr "Ельба"
msgid "Elevator" msgid "Elevator"
msgstr "Лифт" msgstr "Лифт"
@ -735,6 +797,9 @@ msgstr "Мария"
msgid "Excuse" msgid "Excuse"
msgstr "" msgstr ""
msgid "Express"
msgstr "Экспресс"
msgid "Eye" msgid "Eye"
msgstr "Глаз" msgstr "Глаз"
@ -934,6 +999,9 @@ msgstr "Происхождение"
msgid "Genesis +" msgid "Genesis +"
msgstr "Происхождение +" msgstr "Происхождение +"
msgid "Geoffrey"
msgstr "Джефри"
msgid "German Patience" msgid "German Patience"
msgstr "Германский пасьянс" msgstr "Германский пасьянс"
@ -967,9 +1035,8 @@ msgstr "Полная мера"
msgid "Grampus" msgid "Grampus"
msgstr "Касатка" msgstr "Касатка"
#, fuzzy
msgid "Granada" msgid "Granada"
msgstr "Алмаз" msgstr "Гранада"
msgid "Grandfather" msgid "Grandfather"
msgstr "Дедушка" msgstr "Дедушка"
@ -998,12 +1065,6 @@ msgstr "Грифон"
msgid "Ground for a Divorce" msgid "Ground for a Divorce"
msgstr "Повод для разрыва" msgstr "Повод для разрыва"
msgid "Ground for a Divorce (3 decks)"
msgstr "Повод для разрыва (3 колоды)"
msgid "Ground for a Divorce (4 decks)"
msgstr "Повод для разрыва (4 колоды)"
msgid "Gypsy" msgid "Gypsy"
msgstr "Цыганский" msgstr "Цыганский"
@ -1020,6 +1081,10 @@ msgstr "Половинный Маджонг Улыбка"
msgid "Half Mahjongg Wall" msgid "Half Mahjongg Wall"
msgstr "Половинный Маджонг Стена" msgstr "Половинный Маджонг Стена"
#, fuzzy
msgid "Hanafuda Four Seasons"
msgstr "Четыре сезона"
msgid "Hanoi Puzzle 4" msgid "Hanoi Puzzle 4"
msgstr "Ханойская головоломка 4" msgstr "Ханойская головоломка 4"
@ -1101,6 +1166,10 @@ msgstr "Пять тузов"
msgid "IloveU" msgid "IloveU"
msgstr "" msgstr ""
#, fuzzy
msgid "Imperial Guards"
msgstr "Имперские козыри"
msgid "Imperial Trumps" msgid "Imperial Trumps"
msgstr "Имперские козыри" msgstr "Имперские козыри"
@ -1120,6 +1189,9 @@ msgstr "Индийский пасьянс"
msgid "Inner Circle" msgid "Inner Circle"
msgstr "Внутренний круг" msgstr "Внутренний круг"
msgid "Inquisitor"
msgstr "Инквизитор"
msgid "Intelligence" msgid "Intelligence"
msgstr "Смекалка" msgstr "Смекалка"
@ -1234,6 +1306,9 @@ msgstr "Клондайк по три"
msgid "Km" msgid "Km"
msgstr "" msgstr ""
msgid "Knotty Nines"
msgstr ""
msgid "Krebs" msgid "Krebs"
msgstr "" msgstr ""
@ -1307,6 +1382,10 @@ msgstr "Лабиринт"
msgid "Lady Betty" msgid "Lady Betty"
msgstr "Леди Бетти" msgstr "Леди Бетти"
#, fuzzy
msgid "Lady Jane"
msgstr "Леди Полк"
msgid "Lady Palk" msgid "Lady Palk"
msgstr "Леди Полк" msgstr "Леди Полк"
@ -1344,6 +1423,9 @@ msgstr "Короткая коса"
msgid "Lexington Harp" msgid "Lexington Harp"
msgstr "Лексингтонская арфа" msgstr "Лексингтонская арфа"
msgid "Lightweight"
msgstr "Лёгкий"
msgid "Lily" msgid "Lily"
msgstr "Лили" msgstr "Лили"
@ -1367,6 +1449,10 @@ msgstr "Малые ворота"
msgid "Little Gate" msgid "Little Gate"
msgstr "Малые ворота" msgstr "Малые ворота"
#, fuzzy
msgid "Little Napoleon"
msgstr "Свободный Наполеон"
msgid "Long Braid" msgid "Long Braid"
msgstr "Долгая коса" msgstr "Долгая коса"
@ -1382,6 +1468,9 @@ msgstr "Потеря"
msgid "Lucas" msgid "Lucas"
msgstr "Лукас" msgstr "Лукас"
msgid "Madame"
msgstr "Мадам"
#, fuzzy #, fuzzy
msgid "Mage's Game" msgid "Mage's Game"
msgstr "Бабушкина игра" msgstr "Бабушкина игра"
@ -1942,6 +2031,9 @@ msgstr "Мария"
msgid "Maria Luisa" msgid "Maria Luisa"
msgstr "Мария Луиза" msgstr "Мария Луиза"
msgid "Marie Rose"
msgstr "Мари Роз"
msgid "Martha" msgid "Martha"
msgstr "Марта" msgstr "Марта"
@ -1988,6 +2080,10 @@ msgstr ""
msgid "Midshipman" msgid "Midshipman"
msgstr "Гардемарин" msgstr "Гардемарин"
#, fuzzy
msgid "Millie"
msgstr "Ячейка Миллиган"
msgid "Milligan Cell" msgid "Milligan Cell"
msgstr "Ячейка Миллиган" msgstr "Ячейка Миллиган"
@ -2048,6 +2144,10 @@ msgstr "Мотылёк"
msgid "Mount Olympus" msgid "Mount Olympus"
msgstr "Гора Олимп" msgstr "Гора Олимп"
#, fuzzy
msgid "Moving Left"
msgstr "Движение влево"
msgid "Mrs. Mop" msgid "Mrs. Mop"
msgstr "Миссис Моп" msgstr "Миссис Моп"
@ -2068,6 +2168,9 @@ msgstr "Джунгли"
msgid "Musical Patience" msgid "Musical Patience"
msgstr "Музыкальный пасьянс" msgstr "Музыкальный пасьянс"
msgid "Mystique"
msgstr "Мистика"
#, fuzzy #, fuzzy
msgid "N for Namida" msgid "N for Namida"
msgstr "Маджонг N for Namida" msgstr "Маджонг N for Namida"
@ -2137,9 +2240,17 @@ msgstr "Северо-Западные Территории"
msgid "Number Ten" msgid "Number Ten"
msgstr "Номер десять" msgstr "Номер десять"
#, fuzzy
msgid "Number Twelve"
msgstr "Номер десять"
msgid "Numerica" msgid "Numerica"
msgstr "Числовой" msgstr "Числовой"
#, fuzzy
msgid "Ocean Towers"
msgstr "Морские башни"
msgid "Octagon" msgid "Octagon"
msgstr "Восьмиугольник" msgstr "Восьмиугольник"
@ -2274,6 +2385,10 @@ msgstr "Перпетуум-мобиле"
msgid "Perseverance" msgid "Perseverance"
msgstr "Настойчивость" msgstr "Настойчивость"
#, fuzzy
msgid "Phantom Blockade"
msgstr "Блокада"
msgid "Phoenix" msgid "Phoenix"
msgstr "Феникс" msgstr "Феникс"
@ -2525,6 +2640,10 @@ msgstr ""
msgid "Sanibel" msgid "Sanibel"
msgstr "Санибел" msgstr "Санибел"
#, fuzzy
msgid "Saratoga"
msgstr "Звёздные врата"
msgid "Scarab" msgid "Scarab"
msgstr "Скарабей" msgstr "Скарабей"
@ -2594,7 +2713,7 @@ msgid "Shield"
msgstr "Щит" msgstr "Щит"
msgid "Shifting" msgid "Shifting"
msgstr "" msgstr "Изменчивый"
msgid "Shisen-Sho (No Gra) 14x6" msgid "Shisen-Sho (No Gra) 14x6"
msgstr "" msgstr ""
@ -2620,6 +2739,9 @@ msgstr "Сиам"
msgid "Sieben bis As" msgid "Sieben bis As"
msgstr "" msgstr ""
msgid "Signora"
msgstr "Синьора"
msgid "Simon Jester" msgid "Simon Jester"
msgstr "Саймон Джестер" msgstr "Саймон Джестер"
@ -2681,6 +2803,10 @@ msgstr "Два квадрата"
msgid "Somerset" msgid "Somerset"
msgstr "Сомерсет" msgstr "Сомерсет"
#, fuzzy
msgid "Souter"
msgstr "Петух"
msgid "Space Bridge" msgid "Space Bridge"
msgstr "Космический мост" msgstr "Космический мост"
@ -2728,6 +2854,10 @@ msgstr "Паучок"
msgid "Spidike" msgid "Spidike"
msgstr "Паук" msgstr "Паук"
#, fuzzy
msgid "Spike"
msgstr "Паук"
msgid "Squadron" msgid "Squadron"
msgstr "Эскадрон" msgstr "Эскадрон"
@ -2774,9 +2904,11 @@ msgstr "Звёздные врата"
msgid "Step Pyramid" msgid "Step Pyramid"
msgstr "Семь пирамид" msgstr "Семь пирамид"
#, fuzzy
msgid "Steps" msgid "Steps"
msgstr "Улицы" msgstr "Шаги"
msgid "Steve"
msgstr "Стив"
msgid "Stonehenge" msgid "Stonehenge"
msgstr "Стоунхендж" msgstr "Стоунхендж"
@ -2790,6 +2922,10 @@ msgstr "Сокровищница"
msgid "Straight Up" msgid "Straight Up"
msgstr "" msgstr ""
#, fuzzy
msgid "Strategerie"
msgstr "Стратегия"
msgid "Strategy" msgid "Strategy"
msgstr "Стратегия" msgstr "Стратегия"
@ -2842,6 +2978,9 @@ msgstr "Сюрприз"
msgid "Surukh" msgid "Surukh"
msgstr "" msgstr ""
msgid "Sweet Sixteen"
msgstr ""
msgid "Taipei" msgid "Taipei"
msgstr "Тайпей" msgstr "Тайпей"
@ -3002,12 +3141,19 @@ msgstr "Тройной Клондайк по три"
msgid "Triple Line" msgid "Triple Line"
msgstr "Тройная линия" msgstr "Тройная линия"
msgid "Triple York" msgid "Triple Russian Solitaire"
msgstr "Тройной Йорк" msgstr "Тройной Русский солитер"
msgid "Triple Scorpion"
msgstr "Тройной Скорпион"
msgid "Triple Yukon" msgid "Triple Yukon"
msgstr "Тройной Юкон" msgstr "Тройной Юкон"
#, fuzzy
msgid "Trusty Twelve"
msgstr "Сорок разбойников"
msgid "Twenty" msgid "Twenty"
msgstr "Двенадцать" msgstr "Двенадцать"
@ -3036,7 +3182,7 @@ msgid "Union Square"
msgstr "Два квадрата" msgstr "Два квадрата"
msgid "Vagues" msgid "Vagues"
msgstr "" msgstr "Смутный"
msgid "Vajra" msgid "Vajra"
msgstr "" msgstr ""
@ -3058,6 +3204,9 @@ msgstr "Казино Клондайк"
msgid "Vertical" msgid "Vertical"
msgstr "Вертикаль" msgstr "Вертикаль"
msgid "Very Big Ground"
msgstr ""
msgid "Vi" msgid "Vi"
msgstr "" msgstr ""
@ -3065,6 +3214,14 @@ msgstr ""
msgid "Victory Arrow" msgid "Victory Arrow"
msgstr "Маджонг Victory Arrow" msgstr "Маджонг Victory Arrow"
#, fuzzy
msgid "Wake-Robin"
msgstr "Робин"
#, fuzzy
msgid "Wake-Robin (3 decks)"
msgstr "Церлин (3 колоды)"
msgid "Wall" msgid "Wall"
msgstr "Стена" msgstr "Стена"
@ -3112,6 +3269,10 @@ msgstr "Колесо фортуны"
msgid "Whitehead" msgid "Whitehead"
msgstr "" msgstr ""
#, fuzzy
msgid "Whitehorse"
msgstr "Риттенхаус"
msgid "Wicked" msgid "Wicked"
msgstr "Злой" msgstr "Злой"
@ -3156,6 +3317,19 @@ msgstr "Церлин (3 колоды)"
msgid "Zeus" msgid "Zeus"
msgstr "Зевс" msgstr "Зевс"
#, fuzzy
msgid "Zodiac"
msgstr "Скандинавский"
#~ msgid "Ground for a Divorce (3 decks)"
#~ msgstr "Повод для разрыва (3 колоды)"
#~ msgid "Ground for a Divorce (4 decks)"
#~ msgstr "Повод для разрыва (4 колоды)"
#~ msgid "Triple York"
#~ msgstr "Тройной Йорк"
#, fuzzy #, fuzzy
#~ msgid "Adelaide" #~ msgid "Adelaide"
#~ msgstr "Аделаида" #~ msgstr "Аделаида"

File diff suppressed because it is too large Load diff

View file

@ -258,22 +258,35 @@ class Cruel(CastlesInSpain):
# /*********************************************************************** # /***********************************************************************
# // Royal Family # // Royal Family
# // Indefatigable
# ************************************************************************/ # ************************************************************************/
class RoyalFamily(Cruel): class RoyalFamily(Cruel):
Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1)
Talon_Class = StackWrapper(Cruel_Talon, max_rounds=2) Talon_Class = StackWrapper(Cruel_Talon, max_rounds=2)
RowStack_Class = UD_AC_RowStack RowStack_Class = UD_AC_RowStack
def _shuffleHook(self, cards): def _shuffleHook(self, cards):
# move Kings to bottom of the Talon (i.e. last cards to be dealt) # move Kings to bottom of the Talon (i.e. last cards to be dealt)
return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 12, c.suit)) return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == KING, c.suit))
def shallHighlightMatch(self, stack1, card1, stack2, card2): def shallHighlightMatch(self, stack1, card1, stack2, card2):
return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 return card1.color != card2.color and abs(card1.rank-card2.rank) == 1
class Indefatigable(Cruel):
Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0)
Talon_Class = StackWrapper(Cruel_Talon, max_rounds=3)
RowStack_Class = UD_SS_RowStack
def _shuffleHook(self, cards):
# move Kings to bottom of the Talon (i.e. last cards to be dealt)
return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == ACE, c.suit))
def shallHighlightMatch(self, stack1, card1, stack2, card2):
return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1
# /*********************************************************************** # /***********************************************************************
# // Perseverance # // Perseverance
# ************************************************************************/ # ************************************************************************/
@ -341,4 +354,5 @@ registerGame(GameInfo(404, Perseverance, "Perseverance",
GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_BALANCED)) GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_BALANCED))
registerGame(GameInfo(369, RippleFan, "Ripple Fan", registerGame(GameInfo(369, RippleFan, "Ripple Fan",
GI.GT_BAKERS_DOZEN, 1, -1, GI.SL_MOSTLY_SKILL)) GI.GT_BAKERS_DOZEN, 1, -1, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(515, Indefatigable, "Indefatigable",
GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL))

View file

@ -692,9 +692,9 @@ registerGame(GameInfo(34, BeleagueredCastle, "Beleaguered Castle",
registerGame(GameInfo(145, Citadel, "Citadel", registerGame(GameInfo(145, Citadel, "Citadel",
GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(147, Fortress, "Fortress", registerGame(GameInfo(147, Fortress, "Fortress",
GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
registerGame(GameInfo(148, Chessboard, "Chessboard", registerGame(GameInfo(148, Chessboard, "Chessboard",
GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_SKILL))
registerGame(GameInfo(300, Stronghold, "Stronghold", registerGame(GameInfo(300, Stronghold, "Stronghold",
GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL))
registerGame(GameInfo(301, Fastness, "Fastness", registerGame(GameInfo(301, Fastness, "Fastness",

View file

@ -330,6 +330,11 @@ class Steve(Carlton):
def shallHighlightMatch(self, stack1, card1, stack2, card2): def shallHighlightMatch(self, stack1, card1, stack2, card2):
return abs(card1.rank-card2.rank) == 1 return abs(card1.rank-card2.rank) == 1
def getQuickPlayScore(self, ncards, from_stack, to_stack):
if to_stack.cards:
return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1
return 0
# /*********************************************************************** # /***********************************************************************
# // Lexington Harp # // Lexington Harp

View file

@ -1125,11 +1125,11 @@ registerGame(GameInfo(333, OpenJumbo, "Open Jumbo",
registerGame(GameInfo(297, Alternation, "Alternation", registerGame(GameInfo(297, Alternation, "Alternation",
GI.GT_KLONDIKE, 2, 0, GI.SL_MOSTLY_LUCK)) GI.GT_KLONDIKE, 2, 0, GI.SL_MOSTLY_LUCK))
registerGame(GameInfo(326, Lanes, "Lanes", registerGame(GameInfo(326, Lanes, "Lanes",
GI.GT_KLONDIKE, 1, 1, GI.SL_MOSTLY_SKILL)) GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED))
registerGame(GameInfo(327, ThirtySix, "Thirty Six", registerGame(GameInfo(327, ThirtySix, "Thirty Six",
GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_SKILL)) GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(350, Q_C_, "Q.C.", registerGame(GameInfo(350, Q_C_, "Q.C.",
GI.GT_KLONDIKE, 2, 1, GI.SL_MOSTLY_SKILL)) GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED))
registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory", registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory",
GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED)) GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED))
registerGame(GameInfo(362, Morehead, "Morehead", registerGame(GameInfo(362, Morehead, "Morehead",

View file

@ -72,6 +72,11 @@ class GameInfoDialog(MfxDialog):
if gi.si.game_flags & t: if gi.si.game_flags & t:
flags.append(attr) flags.append(attr)
# #
version = None
for t in GI.GAMES_BY_PYSOL_VERSION:
if gi.id in t[1]:
version = t[0]
break
sl = { sl = {
1: 'SL_LUCK', 1: 'SL_LUCK',
2: 'SL_MOSTLY_LUCK', 2: 'SL_MOSTLY_LUCK',
@ -85,6 +90,7 @@ class GameInfoDialog(MfxDialog):
('Short name:', gi.short_name), ('Short name:', gi.short_name),
('ID:', gi.id), ('ID:', gi.id),
('Alt names:', '\n'.join(gi.altnames)), ('Alt names:', '\n'.join(gi.altnames)),
('PySol version:', version),
('Decks:', gi.decks), ('Decks:', gi.decks),
('Cards:', gi.ncards), ('Cards:', gi.ncards),
('Redeals:', redeals), ('Redeals:', redeals),