diff -Nru palapeli-4.12.95/debian/changelog palapeli-4.12.97/debian/changelog --- palapeli-4.12.95/debian/changelog 2014-03-23 11:58:08.000000000 +0000 +++ palapeli-4.12.97/debian/changelog 2014-04-02 09:57:11.000000000 +0000 @@ -1,3 +1,9 @@ +palapeli (4:4.12.97-0ubuntu1) trusty; urgency=medium + + * New upstream release candidate + + -- Philip Muškovac Wed, 02 Apr 2014 11:57:11 +0200 + palapeli (4:4.12.95-0ubuntu1) trusty; urgency=medium * New upstream beta release diff -Nru palapeli-4.12.95/debian/control palapeli-4.12.97/debian/control --- palapeli-4.12.95/debian/control 2014-03-23 11:58:08.000000000 +0000 +++ palapeli-4.12.97/debian/control 2014-04-02 09:57:11.000000000 +0000 @@ -13,8 +13,8 @@ Maximiliano Curia Build-Depends: kde-sc-dev-latest (>= 4:4.10.2), cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14), - kdelibs5-dev (>= 4:4.12.95), - libkdegames-dev (>= 4:4.12.95), + kdelibs5-dev (>= 4:4.12.97), + libkdegames-dev (>= 4:4.12.97), shared-mime-info Standards-Version: 3.9.4 Homepage: http://games.kde.org/ diff -Nru palapeli-4.12.95/doc/index.docbook palapeli-4.12.97/doc/index.docbook --- palapeli-4.12.95/doc/index.docbook 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/doc/index.docbook 2014-03-25 18:50:02.000000000 +0000 @@ -635,7 +635,7 @@ to appear, using &Shift; and &LMB;. Avoid clicking on a piece that is already on the puzzle table: it will send the piece to the - the holder - not what you want. If you accidentally + holder - not what you want. If you accidentally do this with a large joined-up piece (&ie; part of your solution), there is a warning message and an opportunity to cancel. diff -Nru palapeli-4.12.95/libpala/libpala-slicerplugin.desktop palapeli-4.12.97/libpala/libpala-slicerplugin.desktop --- palapeli-4.12.95/libpala/libpala-slicerplugin.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/libpala/libpala-slicerplugin.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -20,6 +20,7 @@ Comment[it]=Estensione "ritaglio" per libpala, la libreria di base di Palapeli Comment[kk]=Palapeli-дің негізгі жиын файлына арналған libpala тілім плагині Comment[km]=កម្មវិធី​ជំនួយ​ឧបករណ៍​ចិត​សម្រាប់ libpala និង បណ្ណាល័យ​​មូលដ្ឋាន​​របស់​ Palapeli +Comment[ko]=Palapeli 기반 라이브러리 libpala용 절단기 플러그인 Comment[lv]=Slicer spraudnis priekš libpala, Palapeli pamatbibliotēkas Comment[nb]=Puslespillskjæringstillegg for libpala – grunnbiblioteket i Palapeli Comment[nds]=Sneedmoduul för "libpala", wat de Palapeli-Hööftbibliotheek is diff -Nru palapeli-4.12.95/mime/palapeli_servicemenu.desktop palapeli-4.12.97/mime/palapeli_servicemenu.desktop --- palapeli-4.12.95/mime/palapeli_servicemenu.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/mime/palapeli_servicemenu.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -28,6 +28,7 @@ Name[it]=Importa nella tua raccolta di puzzle per Palapeli Name[kk]=Palapeli басқатырғыш жиынына импорттау Name[km]=នាំ​ចូល​ទៅ​ក្នុង​សម្រាំង​ល្បែង​ផ្គុំ​រូប​ Palapeli របស់​អ្នក +Name[ko]=Palapeli 퍼즐 모음집으로 가져오기 Name[lv]=Importēt tavā Palapeli mīklu kolekcijā Name[nb]=Importer til Palapeli-puslespillsamlinga Name[nds]=Na Palapeli-Radelsammeln importeren diff -Nru palapeli-4.12.95/mime/palathumbcreator.desktop palapeli-4.12.97/mime/palathumbcreator.desktop --- palapeli-4.12.95/mime/palathumbcreator.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/mime/palathumbcreator.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -22,6 +22,7 @@ Name[it]=Puzzle per Palapeli Name[kk]=Palapeli басқатырғышы Name[km]=ល្បែង​ផ្គុំ​រូប​ Palapeli +Name[ko]=Palapeli 퍼즐 Name[lv]=Palapeli mīklas Name[mr]=पालापेली कोडी Name[nb]=Palapeli-puslespill diff -Nru palapeli-4.12.95/puzzles/castle-maintenon.desktop palapeli-4.12.97/puzzles/castle-maintenon.desktop --- palapeli-4.12.95/puzzles/castle-maintenon.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/puzzles/castle-maintenon.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[it]=Castello di Maintenon Name[kk]=Мейнтентон қорғаны Name[km]=ប្រាសាទ​របស់​ Maintenon +Name[ko]=망트농 성 Name[lv]=Meintenonas pils Name[nb]=Maintenon-slottet Name[nds]=Slott vun Maintenon @@ -59,6 +60,7 @@ Comment[it]=Dipartimento di Eure-et-Loir, Francia Comment[kk]=Эр және Луара департаменті, Франция Comment[km]=Eure-et-Loir département បារាំង​​ +Comment[ko]=외르에루아르 주, 프랑스 Comment[lv]=Eure-et-Loir departaments, Francija Comment[nb]=Eure-et-Loir département, Frankrike Comment[nds]=Eure-et-Loir département, Frankriek diff -Nru palapeli-4.12.95/puzzles/cincinnati-bridge.desktop palapeli-4.12.97/puzzles/cincinnati-bridge.desktop --- palapeli-4.12.95/puzzles/cincinnati-bridge.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/puzzles/cincinnati-bridge.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[it]=Ponte sospeso di Roebling Name[kk]=Роеблинг аспалы көпірі Name[km]=ស្ពាន Roebling Suspension +Name[ko]=뢰블링 현수교 Name[lv]=Roblinga iekārtais tilts Name[nb]=Roebling-hengebrua Name[nds]=Roebling-Brüch @@ -58,6 +59,7 @@ Comment[it]=in Cincinnati Comment[kk]=Цинцинатиде Comment[km]=ក្នុង​ទីក្រុង​ Cincinnati +Comment[ko]=신시내티에 있음 Comment[lt]=Cincinatyje Comment[lv]=atrodas Cincinati Comment[nb]=i Cincinnati diff -Nru palapeli-4.12.95/puzzles/citrus-fruits.desktop palapeli-4.12.97/puzzles/citrus-fruits.desktop --- palapeli-4.12.95/puzzles/citrus-fruits.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/puzzles/citrus-fruits.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[it]=Agrumi Name[kk]=Цитрус жемістері Name[km]=ផ្លែ​ក្រូច +Name[ko]=귤속 열매 Name[lt]=Citrusiniai vaisiai Name[lv]=Citrusaugļi Name[nb]=Sitrusfrukter diff -Nru palapeli-4.12.95/puzzles/european-honey-bee.desktop palapeli-4.12.97/puzzles/european-honey-bee.desktop --- palapeli-4.12.95/puzzles/european-honey-bee.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/puzzles/european-honey-bee.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[it]=Ape europea Name[kk]=Еуропалық бал арасы Name[km]=ឃ្មុំអឺរ៉ុប +Name[ko]=유럽 벌꿀 Name[lt]=Europinė bitė Name[lv]=Eiropas medus bite Name[nb]=Europeisk honningbie diff -Nru palapeli-4.12.95/puzzles/panther-chameleon-female.desktop palapeli-4.12.97/puzzles/panther-chameleon-female.desktop --- palapeli-4.12.95/puzzles/panther-chameleon-female.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/puzzles/panther-chameleon-female.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -18,6 +18,7 @@ Name[it]=Furcifer pardalis Name[kk]=Теңбіл хамелеон Name[km]=បង្កួយ​យក្ស +Name[ko]=팬서 카멜레온 Name[lv]=Furcifer pardalis Name[nb]=Furcifer pardalis Name[nds]=Furcifer pardalis @@ -58,6 +59,7 @@ Comment[it]=Camaleonte pantera femmina Comment[kk]=Теңбіл хамелеонның ұрғашысы Comment[km]=បង្កួយ​យក្សញី​ +Comment[ko]=암컷 팬서 카멜레온 Comment[lv]=Sieviešu kārtas pantērhameleons Comment[nb]=Panterkameleon hunn Comment[nds]=En Se vun't Pantherchamäleon diff -Nru palapeli-4.12.95/slicers/palapeli_goldbergslicer.desktop palapeli-4.12.97/slicers/palapeli_goldbergslicer.desktop --- palapeli-4.12.95/slicers/palapeli_goldbergslicer.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/slicers/palapeli_goldbergslicer.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -30,6 +30,7 @@ Name[it]=Raccolta di suddivisori per Palapeli Name[kk]=Palapeli басқатырғыш жиыны Name[km]=សម្រាំង​ឧបករណ៍​ចិត​​របស់ Palapeli +Name[ko]=Palapeli 절단기 모음 Name[lv]=Palapeli sadalītāju kolekcija Name[nb]=Samling av skjærere for Palapeli Name[nds]=Palapeli-Snittsammeln @@ -68,6 +69,7 @@ Comment[it]=Precedentemente noto come suddivisore di Goldberg Comment[kk]=Бұрын Гольдберг тілімдеуі деп аталған Comment[km]=ពី​មុន​ត្រូវ​បាន​ស្គាល់​ថា​ជា​ឧបករណ៍​ Goldberg +Comment[ko]=Goldberg 절단기로 알려짐 Comment[lv]=Iepriekš pazīstams kā Goldberga sadalītājs Comment[nb]=Tidligere kjent som Goldberg-skjærer Comment[nds]=Vördem as "Goldberg-Snitt" begäng diff -Nru palapeli-4.12.95/slicers/palapeli_jigsawslicer.desktop palapeli-4.12.97/slicers/palapeli_jigsawslicer.desktop --- palapeli-4.12.95/slicers/palapeli_jigsawslicer.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/slicers/palapeli_jigsawslicer.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -32,6 +32,7 @@ Name[it]=Pezzi a incastro classici Name[kk]=Классикалық басқатырғыш тілімдері Name[km]=បំណែក​រូប​ផ្គុំ​ក្លាស៊ិក +Name[ko]=고전 직소 조각 Name[lv]=Klasiski gabaliņi Name[nb]=Klassiske puslespillbrikker Name[nds]=Klass'sch Pusseldelen diff -Nru palapeli-4.12.95/slicers/palapeli_rectslicer.desktop palapeli-4.12.97/slicers/palapeli_rectslicer.desktop --- palapeli-4.12.95/slicers/palapeli_rectslicer.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/slicers/palapeli_rectslicer.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -31,6 +31,7 @@ Name[it]=Pezzi rettangolari Name[kk]=Тікбұрышты тілімдері Name[km]=បំណែក​រាង​ចតុ​កោណ +Name[ko]=정사각형 조각 Name[lv]=Taisnstūraini gabaliņi Name[mr]=आयताकृती मोहरे Name[nb]=Firkantbrikker diff -Nru palapeli-4.12.95/src/engine/gameplay.cpp palapeli-4.12.97/src/engine/gameplay.cpp --- palapeli-4.12.95/src/engine/gameplay.cpp 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/src/engine/gameplay.cpp 2014-03-25 18:50:02.000000000 +0000 @@ -73,13 +73,13 @@ , m_puzzle(0) , m_pieceAreaSize(QSizeF(32.0, 32.0)) // Allow 1024 pixels initially. , m_savegameTimer(new QTimer(this)) + , m_currentHolder(0) + , m_previousHolder(0) , m_loadingPuzzle(false) , m_restoredGame(false) , m_originalPieceCount(0) , m_currentPieceCount(0) , m_sizeFactor(1.3) - , m_currentHolder(0) - , m_previousHolder(0) , m_playing(false) , m_canDeletePuzzle(false) // No puzzle selected at startup. , m_canExportPuzzle(false) @@ -122,6 +122,8 @@ delete view; } } + m_currentHolder = 0; + m_previousHolder = 0; } void Palapeli::GamePlay::init() diff -Nru palapeli-4.12.95/src/palapeli.desktop palapeli-4.12.97/src/palapeli.desktop --- palapeli-4.12.95/src/palapeli.desktop 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/src/palapeli.desktop 2014-03-25 18:50:02.000000000 +0000 @@ -21,6 +21,7 @@ Name[it]=Palapeli Name[kk]=Palapeli Name[km]=Palapeli +Name[ko]=Palapeli Name[lt]=Palapeli Name[lv]=Palapeli Name[mr]=पालापेली @@ -66,6 +67,7 @@ GenericName[it]=Gioco di puzzle GenericName[kk]=Қиыстырма басқатырғыш ойыны GenericName[km]=ល្បែង​ផ្គុំ​រូប +GenericName[ko]=직소 퍼즐 게임 GenericName[lv]=Gabaliņu mīklas spēle GenericName[mr]=जिगसो कोडे खेळ GenericName[nb]=Puslespill diff -Nru palapeli-4.12.95/src/palapeli.notifyrc palapeli-4.12.97/src/palapeli.notifyrc --- palapeli-4.12.95/src/palapeli.notifyrc 2014-03-10 18:48:34.000000000 +0000 +++ palapeli-4.12.97/src/palapeli.notifyrc 2014-03-25 18:50:02.000000000 +0000 @@ -19,6 +19,7 @@ Comment[it]=Puzzle per Palapeli Comment[kk]=Palapeli қиыстырма басқатырғышы Comment[km]=ល្បែង​ផ្គុំ​រូប​ Palapeli +Comment[ko]=Palapeli 직소 퍼즐 Comment[lv]=Palapeli gabaliņu mīkla Comment[mr]=पालापेली जिगसो कोडे Comment[nb]=Palapeli puslespill @@ -62,6 +63,7 @@ Name[it]=Operazioni di gestione dei file Name[kk]=Файл басқару амалдары Name[km]=ប្រតិបត្តិការ​គ្រប់គ្រង​ឯកសារ​ +Name[ko]=파일 관리 작업 Name[lv]=Failu pārvaldīšanas operācijas Name[mr]=फाईल व्यवस्थापन कार्ये Name[nb]=Filbehandlingsoperasjoner @@ -107,6 +109,7 @@ Name[it]=Importazione del puzzle Name[kk]=Басқатырғышты импорттау Name[km]=នាំចូល​ល្បែង​ផ្គុំ​រូប +Name[ko]=퍼즐 가져오는 중 Name[lv]=Importē mīklu Name[mr]=कोडे आयात करत आहे Name[nb]=Importerer puslespill @@ -149,6 +152,7 @@ Comment[it]=Hai aggiunto un puzzle alla raccolta locale. Comment[kk]=Басқатырғышты жергілікті сақталған басқатырғыш жиынына импортау Comment[km]=ល្បែង​ផ្គុំ​រូប​កំពុង​​ត្រូវ​បាន​នាំ​ចូល​ទៅ​ក្នុង​សម្រាំង​ល្បែង​ផ្គុំ​រូប​មូលដ្ឋាន +Comment[ko]=로컬 퍼즐 모음집으로 퍼즐을 가져오고 있습니다 Comment[lv]=Mīkla tiek importēta vietējā mīklu kolekcijā Comment[nb]=Importerer puslespill til den lokale puslespillsamlingen Comment[nds]=En Radel warrt jüst na de lokaal Radelsammeln importeert