Hello community, here is the log from the commit of package kmahjongg for openSUSE:Factory checked in at 2017-08-28 15:07:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmahjongg (Old) and /work/SRC/openSUSE:Factory/.kmahjongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmahjongg" Mon Aug 28 15:07:29 2017 rev:65 rq:516387 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmahjongg/kmahjongg.changes 2017-07-29 08:58:12.895891514 +0200 +++ /work/SRC/openSUSE:Factory/.kmahjongg.new/kmahjongg.changes 2017-08-28 15:07:38.841026238 +0200 @@ -1,0 +2,18 @@ +Fri Aug 11 22:45:42 UTC 2017 - christo...@krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Fix undo tile selection + * Use Q_DECLARE_OVERRIDE + +------------------------------------------------------------------- +Sat Aug 5 18:18:07 UTC 2017 - christo...@krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kmahjongg-17.04.3.tar.xz New: ---- kmahjongg-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.uG9ap9/_old 2017-08-28 15:07:39.832886718 +0200 +++ /var/tmp/diff_new_pack.uG9ap9/_new 2017-08-28 15:07:39.852883905 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmahjongg # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kmahjongg -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Mahjongg game License: GPL-2.0+ @@ -32,8 +33,8 @@ BuildRequires: kconfig-devel BuildRequires: kcoreaddons-devel BuildRequires: kcrash-devel -BuildRequires: kdeclarative-devel BuildRequires: kdbusaddons-devel +BuildRequires: kdeclarative-devel BuildRequires: kdoctools-devel BuildRequires: knewstuff-devel BuildRequires: kxmlgui-devel @@ -47,7 +48,9 @@ BuildRequires: pkgconfig(Qt5Svg) Obsoletes: kmahjongg5 < %{version} Provides: kmahjongg5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,14 +79,14 @@ %files %defattr(-,root,root) -%doc COPYING COPYING.DOC +%doc COPYING* %{_kf5_bindir}/kmahjongg -%{_kf5_htmldir}/en/kmahjongg/ +%doc %lang(en) %{_kf5_htmldir}/en/kmahjongg/ %{_kf5_applicationsdir}/org.kde.kmahjongg.desktop +%{_kf5_configkcfgdir}/ %{_kf5_iconsdir}/hicolor/*/apps/kmahjongg.* %{_kf5_sharedir}/kmahjongg/ -%{_kf5_configkcfgdir}/ -%{_kf5_sharedir}/kxmlgui5 +%{_kf5_kxmlguidir}/ %if %{with lang} %files lang -f %{name}.lang ++++++ kmahjongg-17.04.3.tar.xz -> kmahjongg-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/org.kde.kmahjongg.appdata.xml new/kmahjongg-17.08.0/org.kde.kmahjongg.appdata.xml --- old/kmahjongg-17.04.3/org.kde.kmahjongg.appdata.xml 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/org.kde.kmahjongg.appdata.xml 2017-07-24 17:22:59.000000000 +0200 @@ -29,6 +29,7 @@ <name xml:lang="sr-ijekavian">К‑маџонг</name> <name xml:lang="sr-ijekavianlatin">K‑madžong</name> <name xml:lang="sv">Mahjongg</name> + <name xml:lang="tr">KMahjongg</name> <name xml:lang="uk">KMahjongg</name> <name xml:lang="x-test">xxKMahjonggxx</name> <name xml:lang="zh-CN">KMahjongg</name> @@ -51,6 +52,7 @@ <summary xml:lang="sr-ijekavian">Маџонг пасијанс</summary> <summary xml:lang="sr-ijekavianlatin">Madžong pasijans</summary> <summary xml:lang="sv">Mahjongg-patiens</summary> + <summary xml:lang="tr">Mahjongg Solitaire</summary> <summary xml:lang="uk">Пасьянс «Маджонґ»</summary> <summary xml:lang="x-test">xxMahjong Solitairexx</summary> <summary xml:lang="zh-TW">麻將遊戲</summary> @@ -81,6 +83,7 @@ <p xml:lang="sr-ijekavian">К‑маџонг је забавна игра на табли заснована на чувеној оријенталној игри маџонг (од кинеског 麻將).</p> <p xml:lang="sr-ijekavianlatin">K‑madžong je zabavna igra na tabli zasnovana na čuvenoj orijentalnoj igri madžong (od kineskog 麻將).</p> <p xml:lang="sv">Mahjongg är ett roligt brädspel som är skapat baserat på det berömda orientaliska spelet Mahjong (från kinesiskans 麻將).</p> + <p xml:lang="tr">KMahjongg, Mahjong'un ünlü doğu oyunu (Çin'den 麻將) sonrasında oluşturulmuş eğlenceli bir tahta oyunudur.</p> <p xml:lang="uk">KMahjongg — це захоплива гра на дошці, створена на основі відомої східної гри у маджонґ (китайською 麻將).</p> <p xml:lang="x-test">xxKMahjongg is a fun board game created after the famous oriental game of Mahjong (from Chinese 麻將).xx</p> <p xml:lang="zh-CN">KMahjongg 是一个来源于东方游戏“麻将”的有趣棋牌游戏。</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/de/docs/kmahjongg/index.docbook new/kmahjongg-17.08.0/po/de/docs/kmahjongg/index.docbook --- old/kmahjongg-17.04.3/po/de/docs/kmahjongg/index.docbook 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/de/docs/kmahjongg/index.docbook 2017-08-11 02:40:45.000000000 +0200 @@ -122,7 +122,7 @@ <para >&kmahjongg; ist ein Brettspiel, das an das berühmte orientalische Spiel >Mahjong (Chinesisch: <foreignphrase lang="zh" >麻將</foreignphrase ->) angelehnt ist. Anders als das Original ist &kmahjongg; ein Spiel für einen Spieler, was als Mahjong Soltär bekannt ist. </para> +>) angelehnt ist. Anders als das Original ist &kmahjongg; ein Spiel für einen Spieler, was als Mahjong Solitär bekannt ist. </para> <para >In &kmahjongg; sind die Steine gemischt und in einer bestimmten Form >angeordnet. Der Spieler muss alle Steine vom Spielbrett entfernen, indem er >zu jedem Stein den passenden Partner findet. </para> </chapter> @@ -651,7 +651,7 @@ ><title >Hinweis:</title ><para ->Es gibt Ausnahmen von dieser Regel. Im tradidionellen Mahjong-Spiel hat außer den <quote +>Es gibt Ausnahmen von dieser Regel. Im traditionellen Mahjong-Spiel hat außer den <quote >Blumen</quote > und den <quote >Jahreszeiten</quote @@ -787,7 +787,7 @@ >Startet ein Spiel mit einer bestimmten Nummer.</action> <screenshot> <screeninfo ->Spiel mit bestimmter Numme starten</screeninfo> +>Spiel mit bestimmter Nummer starten</screeninfo> <mediaobject> <imageobject ><imagedata fileref="numbered.png" format="PNG"/></imageobject> @@ -1066,7 +1066,7 @@ >Hilfe</guimenu >, weitere Informationen dazu finden Sie in den Abschnitten über die Menüs ><ulink url="help:/fundamentals/ui.html#menus-settings" >Einstellungen</ulink -> und <ulink url="help:/fundamentals/uihtml#menus-help" +> und <ulink url="help:/fundamentals/ui.html#menus-help" >Hilfe</ulink > der &kde;-Grundlagen. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/en_GB/kmahjongg.po new/kmahjongg-17.08.0/po/en_GB/kmahjongg.po --- old/kmahjongg-17.04.3/po/en_GB/kmahjongg.po 2017-07-11 02:22:07.000000000 +0200 +++ new/kmahjongg-17.08.0/po/en_GB/kmahjongg.po 2017-08-11 02:40:44.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kmahjongg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-14 08:09+0100\n" -"PO-Revision-Date: 2017-05-21 17:38+0000\n" +"PO-Revision-Date: 2017-05-21 16:22+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" "Language-Team: English <kde-i18n-...@kde.org>\n" "Language: en_GB\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/he/kmahjongg.po new/kmahjongg-17.08.0/po/he/kmahjongg.po --- old/kmahjongg-17.04.3/po/he/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/he/kmahjongg.po 2017-08-11 02:40:44.000000000 +0200 @@ -544,201 +544,3 @@ #, kde-format msgid "Generate solvable games" msgstr "צור משחקים הניתנים לסיום" - -#~ msgid "Sorry, you have lost the game." -#~ msgstr "צר לי, הפסדת במשחק." - -#, fuzzy -#~ msgid "Now it is you again." -#~ msgstr "עכשיו שוב תורך." - -#~ msgid "Congratulations. You have won!" -#~ msgstr "מזל טוב. זכית!" - -#~ msgid "Error converting board information!" -#~ msgstr "שגיאה בהמרת מידע הלוח!" - -#~ msgid "Only saving to local files currently supported." -#~ msgstr "כרגע נתמכת רק שמירה לקבצים מקומיים." - -#, fuzzy -#~ msgid "Could not write saved game." -#~ msgstr "אין אפשרות לכתוב לקובץ. יוצא." - -#, fuzzy -#~ msgid "&Edit" -#~ msgstr "יציאה" - -#~ msgid "Load..." -#~ msgstr "טען..." - -#~ msgid "Change Background Image" -#~ msgstr "שינוי תמונת רקע" - -#~ msgid "*.bgnd|Background Image (*.bgnd)\n" -#~ msgstr "*.bgnd|תמונת רקע\n" - -#~ msgid "Change Tile Set" -#~ msgstr "שינוי ערכת מרצפות" - -#~ msgid "*.tileset|Tile Set File (*.tileset)\n" -#~ msgstr "*.tileset|קובץ ערכת מרצפות (*.tileset)\n" - -#~ msgid "*.layout|Board Layout File (*.layout)\n" -#~ msgstr "*.layout|קובץ סידור לוח (*.layout)\n" - -#~ msgid "Change Board Layout" -#~ msgstr "שינוי סידור לוח" - -#~ msgid "*.theme|KMahjongg Theme File (*.theme)\n" -#~ msgstr "*.theme|ערכת נושא של KMahjongg (*.theme)\n" - -#~ msgid "Choose Theme" -#~ msgstr "בחירת ערכת נושא" - -#~ msgid "*|All Files" -#~ msgstr "*|כל הקבצים" - -#~ msgid "That is not a valid theme file." -#~ msgstr "זהו לא קובץ ערכת נושא תקף." - -#~ msgid "Save Theme" -#~ msgstr "שמירת ערכת נושא" - -#~ msgid "Overwrite" -#~ msgstr "שכתב" - -#, fuzzy -#~ msgid "" -#~ "An error occurred when loading the board layout %1\n" -#~ "KMahjongg will continue with the default layout." -#~ msgstr "" -#~ "אירעה שגיאה במהלך טעינת סידור הלוח %1\n" -#~ "היישום KMahjongg יסתיים כעת." - -#~ msgid "" -#~ "KMahjongg could not locate the file: %1\n" -#~ "or the default file of type: %2\n" -#~ "KMahjongg will now terminate" -#~ msgstr "" -#~ "אין ל־KMahjongg אפשרות למצוא את הקובץ: %1\n" -#~ "או את קובץ ברירת המחדל מסוג: %2\n" -#~ "KMahjongg יסתיים כעת" - -#~ msgid "Open La&yout..." -#~ msgstr "פתיחת &סידור..." - -#~ msgid "Show &Matching Tiles" -#~ msgstr "הצג מרצפות תו&אמות" - -#~ msgid "Hide &Matching Tiles" -#~ msgstr "הסתר מרצפות תו&אמות" - -#~ msgid "Whether to show removed tiles." -#~ msgstr "האם להציג מרצפות שהוסרו." - -#~ msgid "Show removed tiles" -#~ msgstr "הצג מרצפות שהוסרו" - -#~ msgid "Pos" -#~ msgstr "מיקום" - -#~ msgid "Name" -#~ msgstr "שם" - -#~ msgid "Board" -#~ msgstr "לוח" - -#~ msgid "Score" -#~ msgstr "תוצאה" - -#~ msgid "Time" -#~ msgstr "זמן" - -#~ msgid "Scores" -#~ msgstr "תוצאות" - -#~ msgid "Anonymous" -#~ msgstr "אלמוני" - -#~ msgid "" -#~ "Resetting the high scores will remove all high score entries both in " -#~ "memory and on disk. Do you wish to proceed?" -#~ msgstr "" -#~ "איפוס תוצאות השיא יסיר את כל רשומות תוצאות השיא, הן בזיכרון והן על הדיסק. " -#~ "האם ברצונך להמשיך?" - -#~ msgid "Reset High Scores" -#~ msgstr "אפס את תוצאות השיא" - -#~ msgid "Reset" -#~ msgstr "אפס" - -#~ msgid "" -#~ "An error occurred when loading the tileset file %1\n" -#~ "KMahjongg will now terminate." -#~ msgstr "" -#~ "אירעה שגיאה במהלך טעינת קובץ ערכת המרצפות %1\n" -#~ "היישום KMahjongg יסתיים כעת." - -#~ msgid "" -#~ "An error occurred when loading the background image\n" -#~ "%1" -#~ msgstr "" -#~ "אירעה שגיאה במהלך פתיחת תמונת הרקע\n" -#~ "%1" - -#~ msgid "KMahjongg will now terminate." -#~ msgstr "היישום KMahjongg יסתיים עכשיו." - -#~ msgid "" -#~ "Failed to load image:\n" -#~ "%1" -#~ msgstr "" -#~ "טעינת התמונה נכשלה:\n" -#~ "%1" - -#~ msgid "Open Th&eme..." -#~ msgstr "פתיחת ער&כת נושא..." - -#~ msgid "Open &Tileset..." -#~ msgstr "פתיחת ע&רכת מרצפות..." - -#~ msgid "Open &Background..." -#~ msgstr "פתיחת ר&קע..." - -#~ msgid "Sa&ve Theme..." -#~ msgstr "שמירת ערכת ה&נושא..." - -#~ msgid "Play winning animation" -#~ msgstr "הצג אנימציית ניצחון" - -#~ msgid "Background" -#~ msgstr "רקע" - -#~ msgid "Scale" -#~ msgstr "מתוח" - -#~ msgid "Tiled" -#~ msgstr "פרוש" - -#~ msgid "Tiles" -#~ msgstr "מרצפות" - -#~ msgid "Draw shadows" -#~ msgstr "הצג צלליות" - -#~ msgid "Use mini-tiles" -#~ msgstr "השתמש במרצפות זעירות" - -#~ msgid "Whether to use miniature tiles." -#~ msgstr "האם להשתמש בלבנים מיניאטוריות." - -#~ msgid "Whether the tiles have shadows." -#~ msgstr "האם לצללים יהיה צל." - -#~ msgid "Whether the background should be tiled instead of scaled." -#~ msgstr "האם הרקע יהיה מלבנים במקום מתוח." - -#~ msgid "Whether an animation should be played on victory." -#~ msgstr "האם תהיה אנימציה אחרי ניצחון." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/hu/kmahjongg.po new/kmahjongg-17.08.0/po/hu/kmahjongg.po --- old/kmahjongg-17.04.3/po/hu/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/hu/kmahjongg.po 2017-08-11 02:40:44.000000000 +0200 @@ -12,7 +12,7 @@ "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.4\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/it/docs/kmahjongg/index.docbook new/kmahjongg-17.08.0/po/it/docs/kmahjongg/index.docbook --- old/kmahjongg-17.04.3/po/it/docs/kmahjongg/index.docbook 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/it/docs/kmahjongg/index.docbook 2017-08-11 02:40:45.000000000 +0200 @@ -76,7 +76,7 @@ >2016-01-04</date ><!-- Date of (re)writing, or update.--> <releaseinfo ->0.9 (Applicazioni 16.04)</releaseinfo +>0.9 (Applications 16.04)</releaseinfo ><!-- Application version number. Use the variable definitions within header >to change this value.--> <!--Short description of this document. Do not change unless necessary!--> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/pl/kmahjongg.po new/kmahjongg-17.08.0/po/pl/kmahjongg.po --- old/kmahjongg-17.04.3/po/pl/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/pl/kmahjongg.po 2017-08-11 02:40:44.000000000 +0200 @@ -1,4 +1,4 @@ -# Version: $Revision: 1486960 $ +# Version: $Revision: 1486952 $ # translation of kmahjongg.po to Polish # translation of kmahjongg.po to # translation of kmahjongg.po to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/pt/docs/kmahjongg/index.docbook new/kmahjongg-17.08.0/po/pt/docs/kmahjongg/index.docbook --- old/kmahjongg-17.04.3/po/pt/docs/kmahjongg/index.docbook 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/pt/docs/kmahjongg/index.docbook 2017-08-11 02:40:45.000000000 +0200 @@ -1,12 +1,6 @@ <?xml version="1.0" ?> <!--IMPORTANT: please note that 'Do not change this!' notice does not apply to translators --> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kmahjongg;" -> - <!ENTITY kappversion "0.8" -><!--Applicaion version. Use this variable everywhere it's needed.--> - <!ENTITY package "kdegames" -> <!-- do not change this! --> <!ENTITY % Portuguese "INCLUDE" > <!-- change language only here --> <!ENTITY % addindex "IGNORE" @@ -17,7 +11,7 @@ > <!-- do not change this! --> <bookinfo> <title ->Manual do &kappname;</title +>O Manual do &kmahjongg;</title > <!-- This is the title of this docbook. --> <!-- List of immidiate authors begins here. --> <!--INPORTANT! - All other contributors: [to be determined] --> @@ -63,20 +57,20 @@ <legalnotice >&FDLNotice;</legalnotice> - + <date ->2012-08-06</date +>2016-01-04</date ><!-- Date of (re)writing, or update.--> <releaseinfo ->&kappversion; (&kde; 4.9)</releaseinfo +>0.9 (Aplicações 16.04)</releaseinfo ><!-- Application version number. Use the variable definitions within header >to change this value.--> - + <!--Short description of this document. Do not change unless necessary!--> <abstract> <para ->Esta documentação descreve o jogo &kappname; na versão &kappversion;</para> +>Esta documentação descreve o jogo &kmahjongg; na versão 0.9</para> </abstract> - + <!--List of relevan keywords--> <keywordset> <keyword @@ -126,13 +120,13 @@ ></note ><!--Number of possible players. It can be: One, Two,..., Multiplayer--> <para ->O &kappname; é um jogo de tabuleiro engraçado criado com base no jogo famoso oriental que é o Mahjong (do chinês <foreignphrase lang="zh" +>O &kmahjongg; é um jogo de tabuleiro engraçado criado com base no jogo famoso oriental que é o Mahjong (do chinês <foreignphrase lang="zh" >麻將</foreignphrase ->). Ao contrário do original, &kappname; é um jogo de correspondência de peças para um ou dois jogadores. </para> +>). Ao contrário do original, o &kmahjongg; é um jogo de correspondência de peças para um jogador, sendo uma variante conhecida por Mahjongg Solitário. </para> <para >No &kmahjongg;, as peças são baralhadas e empilhadas umas por cima das >outras, com o objectivo de criar uma dada forma. O jogador terá depois de >remover todas as peças do tabuleiro, localizando o par correspondente de cada >peça. </para> </chapter> - + <chapter id="howto" ><title >Como jogar</title @@ -147,7 +141,7 @@ ><!--Describe the objective of the game.--> <!--How to play description. Don't be to specific on rules as they have a separate section in this document--> <para ->O &kappname; irá carregar automaticamente uma disposição predefinida logo que iniciar o jogo, para que possa começar logo a jogar. </para> +>O &kmahjongg; irá carregar automaticamente uma disposição predefinida logo que iniciar o jogo, para que possa começar logo a jogar. </para> <note ><title >Nota:</title @@ -173,7 +167,7 @@ <para >Descobrir o máximo de correspondências para remover todas as peças do campo. ></para> </chapter> - + <chapter id="rules_and_tips" ><title >Regras do Jogo, Estratégias e Sugestões</title @@ -211,7 +205,7 @@ >Barra de Estado</term> <listitem ><para ->A Barra de Estado localiza-se no fundo do ecrã e contém quatro áreas. A primeira indica as peças removidas/totais e o número de peças correspondentes que têm lados livres. A segunda área contém o número de sequência do jogo em curso. Na terceira área, o jogador poderá saber quando o jogo estiver pronto e a última área mostra o relógio do jogo, que mantém um registo do tempo que decorreu desde o início do jogo até ao seu fim. </para +>A Barra de Estado localiza-se no fundo do ecrã e contém quatro áreas. A primeira área mostra o relógio do jogo, que mantém um registo do tempo que decorreu desde o início do jogo até ao seu fim. A segunda área apresenta as peças removidas/totais e o número de peças que têm faces livres. A terceira área mostra o número de sequência do jogo que está a jogar; por fim, a última área permite ao jogador saber quando o jogo está pronto. </para ></listitem> </varlistentry> </variablelist> @@ -630,6 +624,10 @@ <itemizedlist> <listitem ><para +>O número de peças num tabuleiro do KMahjongg pode ser diferente do conjunto-padrão de peças do Mahjong. Isso significa que o número de ocorrências das peças do mesmo tipo também pode ser diferente do número apresentado na tabela acima.</para +></listitem> + <listitem +><para >Só poderá seleccionar as peças <quote >abertas</quote >.</para @@ -648,8 +646,7 @@ ><para >As peças correspondentes são as peças cujas imagens da face correspondem >exactamente.</para ></listitem> - </itemizedlist -> + </itemizedlist> <note ><title >Nota:</title @@ -671,7 +668,7 @@ ><para >As peças das <quote >Estações</quote -> não têm duplicados no conjunto e poderão corresponder directamente entre si. </para +> não têm duplicados no conjunto e poderão corresponder directamente entre si.</para ></listitem> <listitem ><para @@ -695,8 +692,8 @@ </sect1> </chapter> - - + + <chapter id="interface" ><title >Apresentação à Interface</title @@ -705,12 +702,11 @@ > and <varlistentry >. Split the chapter into sections using <sect1(2,3) > for better viewing.--> - - <sect1 id="game-menu"> - <title ->O Menu <guimenu ->Jogo</guimenu -></title> + +<sect1 id="menu"> +<title +>Opções do Menu</title> + <variablelist> <varlistentry id="game-menu-new"> <term @@ -730,7 +726,7 @@ <listitem ><para ><action ->Inicia um jogo novo.</action +>Inicia um novo jogo.</action ></para ></listitem> </varlistentry> @@ -917,17 +913,10 @@ ><para ><action >Sai</action -> do &kappname;.</para +> do &kmahjongg;.</para ></listitem> </varlistentry> - </variablelist> -</sect1> -<sect1 id="move-menu"> - <title ->O Menu <guimenu ->Mover</guimenu -></title> - <variablelist> + <varlistentry id="move-menu-undo"> <term ><menuchoice @@ -1028,14 +1017,7 @@ > no tabuleiro.</para ></listitem> </varlistentry> - </variablelist> -</sect1> -<sect1 id="view-menu"> - <title ->O Menu <guimenu ->Ver</guimenu -></title> - <variablelist> + <varlistentry id="view-menu-rotate-c"> <term ><menuchoice @@ -1077,117 +1059,21 @@ ></listitem> </varlistentry> </variablelist> -</sect1> -<sect1 id="settings-menu"> - <title ->O Menu <guimenu ->Configuração</guimenu -></title> - <variablelist> - <varlistentry> - <term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Mostrar a Barra de Ferramentas</guimenuitem -> </menuchoice -></term> - <listitem -><para ->Mostra ou esconde a barra de ferramentas.</para -></listitem> - </varlistentry> - <varlistentry id="settings-menu-statusbar"> - <term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Mostrar a Barra de Estado</guimenuitem -> </menuchoice -></term> - <listitem -><para ->Mostra ou esconde a barra de estado.</para -></listitem> - </varlistentry> - <!--varlistentry id="settings-menu-hide-matching"> - <term -><menuchoice> - <guimenu ->Settings</guimenu> - <guimenuitem ->Show/Hide Matching Tiles</guimenuitem> - </menuchoice -></term> - <listitem -><para ->Shows or hides matching tiles by not flashing the matching free tiles when a corresponding tile is selected.</para -></listitem> - </varlistentry--> - <varlistentry id="settings-menu-shortcuts"> - <term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Configurar os Atalhos...</guimenuitem -> </menuchoice -></term> - <listitem -><para -><action ->Mostra uma janela normal de configuração de atalhos do &kde;</action -> para mudar os <link linkend="default-keybindings" ->atalhos do teclado</link -> do &kappname;.</para -></listitem> - </varlistentry> - <varlistentry id="settings-menu-toolbar"> - <term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Configurar as Barras de Ferramentas...</guimenuitem -> </menuchoice -></term> - <listitem -><para ->Mostra uma janela normal do &kde; onde poderá configurar os ícones da barra de ferramentas.</para -></listitem> - </varlistentry> - <varlistentry id="settings-menu-settings"> - <term -><menuchoice -><guimenu +<para +>Para além disso, o &kmahjongg; tem os menus de <guimenu >Configuração</guimenu -> <guimenuitem ->Configurar o &kappname;...</guimenuitem -> </menuchoice -></term> - <listitem -><para -><action ->Abre uma janela para configurar o &kappname;.</action -> Para mais detalhes, veja <link linkend="configuration" ->aqui</link ->.</para -></listitem> - </varlistentry> - </variablelist> -</sect1> - <sect1 id="help" -><!--This is a standard Help menubar entry. Only change if needed.--> -<title ->O Menu <guimenu +> e <guimenu >Ajuda</guimenu -></title> -&help.menu.documentation; </sect1> +> normais do &kde;; para mais informações, leia as secções acerca dos menus de <ulink url="help:/fundamentals/ui.html#menus-settings" +>Configuração</ulink +> e <ulink url="help:/fundamentals/ui.html#menus-help" +>Ajuda</ulink +> dos Fundamentos do &kde;. </para> + +</sect1> </chapter> - - + + <chapter id="faq" ><title >Perguntas mais frequentes</title @@ -1204,7 +1090,7 @@ ></question> <answer ><para ->Sim. Para mudar a aparência do &kappname;. use a opção do <link linkend="settings-menu-settings" +>Sim. Para mudar a aparência do &kmahjongg;. use a opção do <link linkend="menu" >menu</link > para abrir o <link linkend="configuration" >utilitário de configuração</link @@ -1222,10 +1108,10 @@ ></answer> </qandaentry> <!--Please add more Q&As if needed--> - + </qandaset> </chapter> - + <chapter id="configuration" ><title >Configuração do Jogo</title @@ -1250,17 +1136,15 @@ ><guimenu >Configuração</guimenu ><guimenuitem ->Configurar o &kappname;...</guimenuitem +>Configurar o &kmahjongg;...</guimenuitem ></menuchoice > abre a janela para <guilabel ->Configurar o &kappname;</guilabel +>Configurar o &kmahjongg;</guilabel >.</para> <sect1 id="general-options" ><title ->Configuração <guilabel ->Geral</guilabel -></title> +>Opções gerais</title> <variablelist> <varlistentry> <term @@ -1287,9 +1171,7 @@ <sect1 id="layout-options" ><title ->Opções da <guilabel ->Disposição do Tabuleiro</guilabel -></title> +>Opções da disposição do tabuleiro</title> <variablelist> <varlistentry> <term @@ -1331,9 +1213,7 @@ <sect1 id="tiles-options" ><title ->Opções das <guilabel ->Peças</guilabel -></title> +>Opções das peças</title> <variablelist> <varlistentry> <term @@ -1365,9 +1245,7 @@ <sect1 id="background-options" ><title ->Opções do <guilabel ->Fundo</guilabel -></title> +>Opções do fundo</title> <variablelist> <varlistentry> <term @@ -1410,221 +1288,173 @@ ></menuchoice > permite-lhe modificar os atalhos de teclado por omissão.</para> -<screenshot> -<screeninfo ->Janela de Configuração dos Atalhos</screeninfo> - <mediaobject> - - <imageobject> - <imagedata fileref="shortcuts.png" format="PNG"/> - </imageobject> - <textobject> - <phrase ->Janela de Configuração dos Atalhos</phrase> - </textobject> - </mediaobject> -</screenshot> - <para >Os atalhos de teclado por omissão são os seguintes: </para> -<para> -<variablelist> - -<varlistentry> -<term -><keycap ->D</keycap -></term> -<listitem> -<para ->Coloca o jogo no modo de Demonstração. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><keycap ->H</keycap -></term> -<listitem> -<para ->Dá-lhe uma dica, piscando duas peças correspondente. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><keycap ->F1</keycap -></term> -<listitem> -<para ->Mostra este manual. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><keycombo action="simul" ->&Ctrl;<keycap ->O</keycap -></keycombo -></term> -<listitem> -<para ->Carrega um jogo previamente gravado. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +<table> +<title +>Atalhos do Teclado</title> +<tgroup cols="2"> +<thead +><row +><entry +>Combinação de Teclas</entry +><entry +>Acção</entry +></row +></thead> +<tbody> +<row +><entry ><keycombo action="simul" >&Ctrl;<keycap >N</keycap ></keycombo -></term> -<listitem> -<para ->Inicia um jogo novo. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><keycap ->P</keycap -></term> -<listitem> -<para ->Coloca o jogo em pausa ou prossegue com ele. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Inicia um jogo novo</entry +></row> +<row +><entry ><keycombo action="simul" >&Ctrl;<keycap ->Q</keycap -></keycombo -></term> -<listitem> -<para ->Sai do jogo. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><keycombo action="simul" ->&Ctrl;&Shift;<keycap ->Z</keycap +>O</keycap ></keycombo -></term> -<listitem> -<para ->Repete a jogada anulada. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Carrega um jogo previamente gravado</entry +></row> +<row +><entry ><keycap >F5</keycap -></term> -<listitem> -<para ->Reinicia o jogo. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Reiniciar o jogo</entry +></row> +<row +><entry ><keycombo action="simul" >&Ctrl;<keycap >S</keycap ></keycombo -></term> -<listitem> -<para ->Grava o jogo. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Grava o jogo</entry +></row> +<row +><entry +><keycap +>P</keycap +></entry +><entry +>Coloca o jogo em pausa ou prossegue com ele</entry +></row> +<row +><entry ><keycombo action="simul" >&Ctrl;<keycap >H</keycap ></keycombo -></term> -<listitem> -<para ->Mostra os recordes. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Mostra os recordes</entry +></row> +<row +><entry +><keycombo action="simul" +>&Ctrl;<keycap +>Q</keycap +></keycombo +></entry +><entry +>Sai do jogo</entry +></row> +<row +><entry ><keycombo action="simul" >&Ctrl;<keycap >Z</keycap ></keycombo -></term> -<listitem> -<para ->Anula a jogada. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Anula a jogada</entry +></row> +<row +><entry +><keycombo action="simul" +>&Ctrl;&Shift;<keycap +>Z</keycap +></keycombo +></entry +><entry +>Repete a jogada anulada</entry +></row> +<row +><entry ><keycap ->F</keycap -></term> -<listitem> -<para ->Rodar a janela no sentido dos ponteiros do relógio. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +>H</keycap +></entry +><entry +>Dá-lhe uma dica, piscando duas peças correspondentes</entry +></row> +<row +><entry +><keycap +>D</keycap +></entry +><entry +>Coloca o jogo no modo de Demonstração</entry +></row> +<row +><entry ><keycap >G</keycap -></term> -<listitem> -<para ->Rodar a janela no sentido inverso ao dos ponteiros do relógio. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term +></entry +><entry +>Rodar a janela no sentido dos ponteiros do relógio</entry +></row> +<row +><entry +><keycap +>F</keycap +></entry +><entry +>Rodar a janela no sentido inverso ao dos ponteiros do relógio</entry +></row> +<row +><entry +><keycap +>F1</keycap +></entry +><entry +>Mostra este manual</entry +></row> +<row +><entry ><keycombo action="simul" >&Shift;<keycap >F1</keycap ></keycombo -></term> -<listitem> -<para ->Ajuda O Que É Isto? </para> -</listitem> -</varlistentry> +></entry +><entry +>A ajuda O que é Isto?</entry +></row> -</variablelist> -</para> +</tbody> +</tgroup> +</table> </sect1> </chapter> - + <chapter id="credits" ><title >Créditos e Licença</title > <!-- do not change this! --> <!--This chapter is for credits and licenses.--> <para ->O &kappname; para o &kde; </para> +>O &kmahjongg; para o &kde; </para> <para >Programa com 'copyright' © 1997 de <personname @@ -1706,9 +1536,7 @@ ><surname >Cid</surname ></personname -> <email ->astal...@terra.es</email -></para +> &Albert.Astals.Cid.mail;</para ></listitem> <listitem ><para @@ -1734,7 +1562,7 @@ > <email >justli...@bellsouth.net</email > </para> - + <!-- !!!do not change ANYTHING after this line!!!! --> <para >Tradução de José Nuno Pires <email @@ -1742,22 +1570,8 @@ ></para > &underFDL; &underGPL; </chapter> - - -<appendix id="installation"> -<title ->Instalação</title> - -&install.intro.documentation; - - -<sect1 id="Compilation"> -<title ->Compilação e Instalação</title> -&install.compile.documentation; </sect1> -</appendix> - -&documentation.index; + +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/sk/kmahjongg.po new/kmahjongg-17.08.0/po/sk/kmahjongg.po --- old/kmahjongg-17.04.3/po/sk/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/sk/kmahjongg.po 2017-08-11 02:40:44.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kmahjongg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-14 08:09+0100\n" -"PO-Revision-Date: 2017-04-16 20:08+0100\n" +"PO-Revision-Date: 2017-04-16 21:09+0100\n" "Last-Translator: Roman Paholik <wizzar...@gmail.com>\n" "Language-Team: Slovak <kde...@linux.sk>\n" "Language: sk\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/sl/kmahjongg.po new/kmahjongg-17.08.0/po/sl/kmahjongg.po --- old/kmahjongg-17.04.3/po/sl/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/sl/kmahjongg.po 2017-08-11 02:40:44.000000000 +0200 @@ -2,7 +2,7 @@ # Translation of kmahjongg.po to Slovenian # SLOVENIAN TRANSLATION OF KDEGAMES. # Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -# $Id: kmahjongg.po 1485813 2017-03-25 04:54:51Z scripty $ +# $Id: kmahjongg.po 1485808 2017-03-25 03:24:04Z scripty $ # $Source$ # # Marko Samastur <mar...@elite.org>, 2000. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/zh_CN/kmahjongg.po new/kmahjongg-17.08.0/po/zh_CN/kmahjongg.po --- old/kmahjongg-17.04.3/po/zh_CN/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/zh_CN/kmahjongg.po 2017-08-11 02:40:45.000000000 +0200 @@ -1,25 +1,20 @@ -# translation of kmahjongg.po to zh_CN -# Copyright (C) 2002,2003 Free Software Foundation, Inc. -# -# Wang Jian <l...@linux.ustc.edu.cn>, 1998. -# Funda Wang <fundaw...@en2china.com>, 2003. -# Xiong Jiang <jxi...@offtopic.org>, 2003. -# Lie Ex <lilith...@gmail.com>, 2009. -# Ni Hui <shuizhuyuan...@126.com>, 2012. msgid "" msgstr "" -"Project-Id-Version: kmahjongg\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-14 08:09+0100\n" -"PO-Revision-Date: 2012-06-17 19:31+0800\n" -"Last-Translator: Ni Hui <shuizhuyuan...@126.com>\n" -"Language-Team: Chinese Simplified <kde-ch...@kde.org>\n" +"PO-Revision-Date: 2017-08-05 09:35-0400\n" +"Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kdegames/kmahjongg.pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -117,10 +112,7 @@ msgstr "打开版面布局" #: src/editor.cpp:307 src/editor.cpp:345 -#, fuzzy, kde-format -#| msgid "" -#| "*.layout|Board Layout (*.layout)\n" -#| "*|All Files" +#, kde-format msgid "Board Layout (*.layout);;All Files (*)" msgstr "" "*.layout|版面布局文件(*.layout)\n" @@ -294,20 +286,19 @@ msgstr "版面布局" #: src/kmahjongg.cpp:384 -#, fuzzy, kde-format -#| msgid "Game over: You have no moves left." +#, kde-format msgid "Game Over: You have no moves left." -msgstr "游戏结束：你没有可走动的牌了。" +msgstr "" #: src/kmahjongg.cpp:385 #, kde-format msgid "Game Over" -msgstr "" +msgstr "游戏结束" #: src/kmahjongg.cpp:387 #, kde-format msgid "Restart" -msgstr "" +msgstr "重启" #: src/kmahjongg.cpp:477 #, kde-format @@ -355,10 +346,9 @@ msgstr "保存游戏" #: src/kmahjongg.cpp:658 -#, fuzzy, kde-format -#| msgid "Could not read from file. Aborting." +#, kde-format msgid "Could not open file for saving." -msgstr "不能从文件中读取。中止。" +msgstr "" #. i18n: ectx: label, entry (TileSet), group (General) #: src/kmahjongg.kcfg:9 @@ -421,10 +411,9 @@ msgstr "主工具栏" #: src/main.cpp:30 -#, fuzzy, kde-format -#| msgid "Mahjongg Solitaire for KDE" +#, kde-format msgid "Mahjongg Solitaire by KDE" -msgstr "KDE 麻将对对碰游戏" +msgstr "" #: src/main.cpp:37 #, kde-format @@ -547,24 +536,3 @@ #, kde-format msgid "Generate solvable games" msgstr "生成有解的游戏" - -#~ msgid "Sorry, you have lost the game." -#~ msgstr "抱歉，你输了。" - -#~ msgid "Now it is you again." -#~ msgstr "又该你了。" - -#~ msgid "Congratulations. You have won!" -#~ msgstr "恭喜。你赢了！" - -#~ msgid "Error converting board information!" -#~ msgstr "转换版面信息时出错！" - -#~ msgid "Only saving to local files currently supported." -#~ msgstr "现在只支持保存到本地文件。" - -#~ msgid "Could not write saved game." -#~ msgstr "不能写入保存的文件。中止。" - -#~ msgid "Mauricio Piacentini" -#~ msgstr "Mauricio Piacentini" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/po/zh_TW/kmahjongg.po new/kmahjongg-17.08.0/po/zh_TW/kmahjongg.po --- old/kmahjongg-17.04.3/po/zh_TW/kmahjongg.po 2017-07-11 02:22:08.000000000 +0200 +++ new/kmahjongg-17.08.0/po/zh_TW/kmahjongg.po 2017-08-11 02:40:45.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: kmahjongg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-14 08:09+0100\n" -"PO-Revision-Date: 2017-03-25 21:42+0800\n" +"PO-Revision-Date: 2017-07-03 20:58+0800\n" "Last-Translator: Jeff Huang <s8321...@gmail.com>\n" "Language-Team: Chinese <kde-i18n-...@kde.org>\n" "Language: zh_TW\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/editor.h new/kmahjongg-17.08.0/src/editor.h --- old/kmahjongg-17.04.3/src/editor.h 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/editor.h 2017-07-24 17:22:59.000000000 +0200 @@ -65,8 +65,8 @@ void slotModeChanged(QAction *); protected: - void resizeEvent(QResizeEvent * event); - void paintEvent(QPaintEvent * pa); + void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent * pa) Q_DECL_OVERRIDE; void setupToolbar(); void drawBackground(QPixmap * to) const; @@ -83,7 +83,7 @@ /** * Override the closeEvent(...) method of qdialog. */ - void closeEvent(QCloseEvent * e); + void closeEvent(QCloseEvent * e) Q_DECL_OVERRIDE; /** * Update the tile size. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/frameimage.h new/kmahjongg-17.08.0/src/frameimage.h --- old/kmahjongg-17.04.3/src/frameimage.h 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/frameimage.h 2017-07-24 17:22:59.000000000 +0200 @@ -52,10 +52,10 @@ void mouseMoved(QMouseEvent * e); protected: - void mousePressEvent(QMouseEvent * e); - void mouseMoveEvent(QMouseEvent * e); - void resizeEvent(QResizeEvent * e); - void paintEvent(QPaintEvent * pa); + void mousePressEvent(QMouseEvent * e) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent * e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent * e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent * pa) Q_DECL_OVERRIDE; private: int m_rx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/gameitem.h new/kmahjongg-17.08.0/src/gameitem.h --- old/kmahjongg-17.04.3/src/gameitem.h 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/gameitem.h 2017-07-24 17:22:59.000000000 +0200 @@ -104,12 +104,12 @@ /** * Overrides the paint method of QGraphicsItem. */ - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, + QWidget * widget) Q_DECL_OVERRIDE; /** * Overrides the boundingRect method of QGraphicsItem. */ - virtual QRectF boundingRect() const; + QRectF boundingRect() const Q_DECL_OVERRIDE; /** * Returns the rect of the item. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/gamescene.h new/kmahjongg-17.08.0/src/gamescene.h --- old/kmahjongg-17.04.3/src/gamescene.h 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/gamescene.h 2017-07-24 17:22:59.000000000 +0200 @@ -100,16 +100,16 @@ /** * Override from QGraphicsScene. */ - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * mouseEvent); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent * mouseEvent) Q_DECL_OVERRIDE; /** * Override from QGraphicsScene. */ - void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent); + void mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent) Q_DECL_OVERRIDE; /** * Override from QGraphicsScene. * Mouse wheel rotates view. */ - void wheelEvent(QGraphicsSceneWheelEvent * mouseEvent); + void wheelEvent(QGraphicsSceneWheelEvent * mouseEvent) Q_DECL_OVERRIDE; /** * Test if the item is selectable or not. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/gameview.cpp new/kmahjongg-17.08.0/src/gameview.cpp --- old/kmahjongg-17.04.3/src/gameview.cpp 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/gameview.cpp 2017-07-24 17:22:59.000000000 +0200 @@ -121,7 +121,7 @@ bool GameView::undo() { // Clear user selections. - scene()->clearSelection(); + clearSelectedTile(); if (m_gameData->m_tileNum < m_gameData->m_maxTileNum) { m_gameData->clearRemovedTilePair(m_gameData->MoveListData(m_gameData->m_tileNum + 1), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/gameview.h new/kmahjongg-17.08.0/src/gameview.h --- old/kmahjongg-17.04.3/src/gameview.h 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/gameview.h 2017-07-24 17:22:59.000000000 +0200 @@ -262,11 +262,11 @@ protected: /** * Override from QGraphicsView. */ - virtual void resizeEvent(QResizeEvent * event); + void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE; /** * Override from QGraphicsView. */ - virtual void mousePressEvent(QMouseEvent * mouseEvent); + void mousePressEvent(QMouseEvent * mouseEvent) Q_DECL_OVERRIDE; signals: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmahjongg-17.04.3/src/kmahjongg.h new/kmahjongg-17.08.0/src/kmahjongg.h --- old/kmahjongg-17.04.3/src/kmahjongg.h 2017-06-13 05:13:00.000000000 +0200 +++ new/kmahjongg-17.08.0/src/kmahjongg.h 2017-07-24 17:22:59.000000000 +0200 @@ -60,8 +60,8 @@ protected: void setupKAction(); void setupStatusBar(); - void changeEvent(QEvent * event); - void closeEvent(QCloseEvent * event); + void changeEvent(QEvent * event) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent * event) Q_DECL_OVERRIDE; private slots: void showSettings();
