Hello community, here is the log from the commit of package kshisen for openSUSE:Factory checked in at 2017-08-28 15:08:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kshisen (Old) and /work/SRC/openSUSE:Factory/.kshisen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kshisen" Mon Aug 28 15:08:26 2017 rev:64 rq:516424 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kshisen/kshisen.changes 2017-07-29 08:59:08.272067877 +0200 +++ /work/SRC/openSUSE:Factory/.kshisen.new/kshisen.changes 2017-08-28 15:08:26.462327509 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:46:00 UTC 2017 - [email protected] + +- 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 : + * Use Q_DECLARE_OVERRIDE + +------------------------------------------------------------------- +Sat Aug 5 18:18:45 UTC 2017 - [email protected] + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kshisen-17.04.3.tar.xz New: ---- kshisen-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kshisen.spec ++++++ --- /var/tmp/diff_new_pack.bLkbar/_old 2017-08-28 15:08:27.978114287 +0200 +++ /var/tmp/diff_new_pack.bLkbar/_new 2017-08-28 15:08:28.006110349 +0200 @@ -1,7 +1,7 @@ # # spec file for package kshisen # -# 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: kshisen -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: Shisen-Sho Mahjongg-like game License: GPL-2.0+ @@ -32,10 +33,10 @@ Patch1: cpp14.patch BuildRequires: extra-cmake-modules BuildRequires: kconfig-devel -BuildRequires: kxmlgui-devel BuildRequires: kcrash-devel BuildRequires: kdbusaddons-devel BuildRequires: kdoctools-devel +BuildRequires: kxmlgui-devel BuildRequires: libkdegames-devel BuildRequires: libkmahjongg-devel BuildRequires: pkgconfig @@ -46,7 +47,9 @@ BuildRequires: pkgconfig(Qt5Test) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,15 +80,15 @@ %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kf5_bindir}/kshisen -%{_kf5_htmldir}/en/kshisen/ +%dir %{_kf5_appstreamdir} +%doc %lang(en) %{_kf5_htmldir}/en/kshisen/ %{_kf5_applicationsdir}/org.kde.kshisen.desktop -%{_kf5_iconsdir}/hicolor/*/apps/kshisen.* +%{_kf5_appstreamdir}/org.kde.kshisen.appdata.xml +%{_kf5_bindir}/kshisen %{_kf5_configkcfgdir}/ -%{_kf5_sharedir}/sounds/kshisen/ +%{_kf5_iconsdir}/hicolor/*/apps/kshisen.* %{_kf5_kxmlguidir}/ -%{_kf5_appstreamdir}/org.kde.kshisen.appdata.xml -%dir %{_kf5_appstreamdir} +%{_kf5_sharedir}/sounds/kshisen/ %if %{with lang} %files lang -f %{name}.lang ++++++ kshisen-17.04.3.tar.xz -> kshisen-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/org.kde.kshisen.appdata.xml new/kshisen-17.08.0/org.kde.kshisen.appdata.xml --- old/kshisen-17.04.3/org.kde.kshisen.appdata.xml 2017-06-13 05:13:52.000000000 +0200 +++ new/kshisen-17.08.0/org.kde.kshisen.appdata.xml 2017-07-15 16:21:30.000000000 +0200 @@ -28,6 +28,7 @@ <name xml:lang="sr-ijekavian">К‑шисен</name> <name xml:lang="sr-ijekavianlatin">KShisen</name> <name xml:lang="sv">kshisen</name> + <name xml:lang="tr">KShisen</name> <name xml:lang="uk">KShisen</name> <name xml:lang="x-test">xxKShisenxx</name> <name xml:lang="zh-CN">KShisen</name> @@ -56,6 +57,7 @@ <summary xml:lang="sr-ijekavian">Игра с плочицама попут маџонга</summary> <summary xml:lang="sr-ijekavianlatin">Igra s pločicama poput madžonga</summary> <summary xml:lang="sv">Shisen-Sho Mahjongg-liknande brickspel</summary> + <summary xml:lang="tr">Shisen-Sho Mahjongg Benzeri Döşeme Oyunu</summary> <summary xml:lang="uk">Шісен-шо, схожа на маджонґ гра з плитками</summary> <summary xml:lang="x-test">xxShisen-Sho Mahjongg-like Tile Gamexx</summary> <summary xml:lang="zh-CN">类似连连看的麻将游戏</summary> @@ -86,6 +88,7 @@ <p xml:lang="sr-ijekavian">К‑шисен је игра налик на пасијанс са стандардним скупом маџонг плочица. За разлику од маџонга, К‑шисен има само један слој измешаних плочица.</p> <p xml:lang="sr-ijekavianlatin">KShisen je igra nalik na pasijans sa standardnim skupom madžong pločica. Za razliku od madžonga, KShisen ima samo jedan sloj izmešanih pločica.</p> <p xml:lang="sv">Ksisen är ett patiensliknande spel som spelas med den vanliga uppsättningen Mahjong-brickor. I motsats till Mahjong har Kshisen dock bara ett lager med blandade brickor.</p> + <p xml:lang="tr">KShisen, Mahjong standart kiremit kümesini kullanarak oynanan, solitaire benzeri bir oyundur. Bununla birlikte Mahjong'tan farklı olarak, KShisen'in sadece tek katmanlı döşeme vardır.</p> <p xml:lang="uk">KShisen — гра, подібна до пасьянсу, у якій використовуються плитки маджонґа. Втім, на відміну від класичної гри у маджонґ, у KShisen ви матимете справу лише з одним шаром плиток.</p> <p xml:lang="x-test">xxKShisen is a solitaire-like game played using the standard set of Mahjong tiles. Unlike Mahjong however, KShisen has only one layer of scrambled tiles.xx</p> <p xml:lang="zh-CN">KShisen 是一个使用麻将牌的类牌游戏。和麻将配对不同的是，KShisen 只有一层打乱的牌。</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/bg/kshisen.po new/kshisen-17.08.0/po/bg/kshisen.po --- old/kshisen-17.04.3/po/bg/kshisen.po 2017-07-11 02:22:29.000000000 +0200 +++ new/kshisen-17.08.0/po/bg/kshisen.po 2017-08-11 02:41:41.000000000 +0200 @@ -1,49 +1,47 @@ -# Bulgarian translation of KDE. -# This file is licensed under the GPL. -# -# $Id: kshisen.po 1475095 2016-11-19 20:01:24Z scripty $ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. # +# Radostin Radnev <[email protected]>, 2005. +# Yasen Pramatarov <[email protected]>, 2017. msgid "" msgstr "" -"Project-Id-Version: kshisen\n" +"Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:15+0100\n" -"PO-Revision-Date: 2005-07-03 11:35+0300\n" -"Last-Translator: Radostin Radnev <[email protected]>\n" -"Language-Team: Bulgarian <[email protected]>\n" +"PO-Revision-Date: 2017-05-05 14:39+0200\n" +"Last-Translator: Yasen Pramatarov <[email protected]>\n" +"Language-Team: Bulgarian <[email protected]>\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" -#, fuzzy, kde-format -#| msgid "Your name:" +#, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Вашето име:" +msgstr "Радостин Раднев,Ясен Праматаров" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "Радостин Раднев,Ясен Праматаров" #: src/app.cpp:100 src/app.cpp:338 #, kde-format msgid "Select a tile" -msgstr "" +msgstr "Изберете плочка" #: src/app.cpp:103 #, kde-format msgid "Time: 0:00:00" -msgstr "" +msgstr "Време: 0:00:00" #: src/app.cpp:106 -#, fuzzy, kde-format -#| msgid " Removed: %1/%2 " +#, kde-format msgid "Removed: 0/0" -msgstr " Премахнати плочки: %1/%2 " +msgstr "Премахнати: 0/0" #: src/app.cpp:109 #, fuzzy, kde-format @@ -54,13 +52,13 @@ #: src/app.cpp:128 #, kde-format msgid "Play Sounds" -msgstr "" +msgstr "Включване на звуци" #: src/app.cpp:258 #, kde-format msgctxt "time string: hh:mm:ss" msgid "%1:%2:%3" -msgstr "" +msgstr "%1:%2:%3" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Gravity) #: src/app.cpp:267 src/app.cpp:370 src/settings.ui:26 @@ -71,12 +69,12 @@ #: src/app.cpp:270 #, kde-format msgid "Yes" -msgstr "" +msgstr "Да" #: src/app.cpp:272 #, kde-format msgid "No" -msgstr "" +msgstr "Но" #: src/app.cpp:278 #, kde-format @@ -107,10 +105,9 @@ msgstr "" #: src/app.cpp:302 -#, fuzzy, kde-format -#| msgid " Your time: %1:%2:%3 %4" +#, kde-format msgid "Your time: %1:%2:%3 %4" -msgstr " Вашето време: %1:%2:%3 %4" +msgstr "Вашето време: %1:%2:%3 %4" #: src/app.cpp:306 #, kde-format @@ -118,10 +115,9 @@ msgstr "(Пауза) " #: src/app.cpp:314 -#, fuzzy, kde-format -#| msgid " Removed: %1/%2 " +#, kde-format msgid "Removed: %1/%2 " -msgstr " Премахнати плочки: %1/%2 " +msgstr "Премахнати: %1/%2 " #: src/app.cpp:343 #, kde-format @@ -186,7 +182,7 @@ #: src/kshisenui.rc:13 #, kde-format msgid "Main Toolbar" -msgstr "" +msgstr "Основна лента с инструменти" #: src/main.cpp:44 #, fuzzy, kde-format @@ -202,70 +198,63 @@ #: src/main.cpp:59 #, kde-format msgid "Copyright 1997 Mario Weilguni" -msgstr "" +msgstr "Copyright 1997 Mario Weilguni" #: src/main.cpp:61 #, kde-format msgid "Frederik Schwarzer" -msgstr "" +msgstr "Frederik Schwarzer" #: src/main.cpp:61 #, kde-format msgid "Current Maintainer" -msgstr "Current Maintainer" +msgstr "Текуща поддръжка" #: src/main.cpp:62 #, kde-format msgid "Dave Corrie" -msgstr "" +msgstr "Dave Corrie" #: src/main.cpp:62 -#, fuzzy, kde-format -#| msgid "Current Maintainer" +#, kde-format msgid "Former Maintainer" -msgstr "Current Maintainer" +msgstr "Предишна поддръжка" #: src/main.cpp:63 #, kde-format msgid "Mario Weilguni" -msgstr "" +msgstr "Mario Weilguni" #: src/main.cpp:63 #, kde-format msgid "Original Author" -msgstr "Original Author" +msgstr "Първоначален автор" #: src/main.cpp:64 #, kde-format msgid "Mauricio Piacentini" -msgstr "" +msgstr "Mauricio Piacentini" #: src/main.cpp:64 #, kde-format msgid "KMahjonggLib integration for KDE4" -msgstr "" +msgstr "Интеграция на KMahjonggLib в KDE4" #: src/main.cpp:65 #, kde-format msgid "Jason Lane" -msgstr "" +msgstr "Jason Lane" #: src/main.cpp:65 -#, fuzzy, kde-format -#| msgid "" -#| "Added 'tiles removed' counter\n" -#| "Tile smooth-scaling and window resizing" +#, kde-format msgid "" "Added 'tiles removed' counter<br/>Tile smooth-scaling and window resizing" msgstr "" -"Added 'tiles removed' counter\n" -"Tile smooth-scaling and window resizing" #: src/main.cpp:66 -#, fuzzy, kde-format -#| msgid "Thanks also to everyone who should be listed here but isn't!" +#, kde-format msgid "Thanks also to everyone who should be listed here but is not!" -msgstr "Thanks also to everyone who should be listed here but isn't!" +msgstr "" #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_Gravity) #: src/settings.ui:23 @@ -286,8 +275,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Solvable) #: src/settings.ui:36 -#, fuzzy, kde-format -#| msgid "Allow unsolvable games" +#, kde-format msgid "Create solvable games only" msgstr "Само разрешими игри" @@ -396,7 +384,7 @@ #: src/settings.ui:196 #, kde-format msgid "Board Size" -msgstr "" +msgstr "Размер на дъската" #. i18n: ectx: property (text), widget (QLabel, textLabel8) #: src/settings.ui:226 @@ -408,7 +396,7 @@ #: src/settings.ui:246 #, kde-format msgid "16x9" -msgstr "" +msgstr "16x9" #. i18n: ectx: property (text), widget (QLabel, textLabel7) #: src/settings.ui:269 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/de/docs/kshisen/index.docbook new/kshisen-17.08.0/po/de/docs/kshisen/index.docbook --- old/kshisen-17.04.3/po/de/docs/kshisen/index.docbook 2017-07-11 02:22:29.000000000 +0200 +++ new/kshisen-17.08.0/po/de/docs/kshisen/index.docbook 2017-08-11 02:41:41.000000000 +0200 @@ -965,7 +965,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> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/he/kshisen.po new/kshisen-17.08.0/po/he/kshisen.po --- old/kshisen-17.04.3/po/he/kshisen.po 2017-07-11 02:22:29.000000000 +0200 +++ new/kshisen-17.08.0/po/he/kshisen.po 2017-08-11 02:41:41.000000000 +0200 @@ -428,65 +428,3 @@ #, kde-format msgid "30x16" msgstr "30x16" - -#~ msgctxt "Menu title" -#~ msgid "&Move" -#~ msgstr "&תנועה" - -#~ msgid "(gravity)" -#~ msgstr "(כבידה)" - -#~ msgid "Tile Size" -#~ msgstr "גודל לבנים" - -#~ msgid "Hall of Fame" -#~ msgstr "היכל התהילה" - -#~ msgid "Rank" -#~ msgstr "דירוג" - -#~ msgid "Name" -#~ msgstr "שם" - -#~ msgid "Time" -#~ msgstr "זמן" - -#~ msgid "Size" -#~ msgstr "גודל" - -#~ msgid "Score" -#~ msgstr "תוצאה" - -#, fuzzy -#~ msgid "Enter your Name" -#~ msgstr "סוף המשחק" - -#, fuzzy -#~ msgid "" -#~ "You have made it into the \"Hall Of Fame\". Type in your name so mankind " -#~ "will always remember your cool rating." -#~ msgstr "" -#~ "נכנסת ל\"היכל התהילה\". הקלד את\n" -#~ "שמך כדי שהאנושות תזכור תמיד את\n" -#~ "הדירוג המגניב שלך." - -#~ msgid "Your name:" -#~ msgstr "השם שלך:" - -#~ msgid "Game Paused" -#~ msgstr "משחק מושהה" - -#~ msgid "This game is solvable." -#~ msgstr "משחק זה ניתן לסיום." - -#~ msgid "This game is NOT solvable." -#~ msgstr "משחק זה אינו ניתן לסיום." - -#~ msgid "&Finish" -#~ msgstr "&סיים" - -#~ msgid "Prefer unscaled tiles" -#~ msgstr "העדף לבנים בגודל מקורי" - -#~ msgid "Cannot load tiles pixmap!" -#~ msgstr "אין אפשרות לטעון את התמונות!" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/hu/kshisen.po new/kshisen-17.08.0/po/hu/kshisen.po --- old/kshisen-17.04.3/po/hu/kshisen.po 2017-07-11 02:22:29.000000000 +0200 +++ new/kshisen-17.08.0/po/hu/kshisen.po 2017-08-11 02:41:41.000000000 +0200 @@ -11,7 +11,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/kshisen-17.04.3/po/it/docs/kshisen/index.docbook new/kshisen-17.08.0/po/it/docs/kshisen/index.docbook --- old/kshisen-17.04.3/po/it/docs/kshisen/index.docbook 2017-07-11 02:22:30.000000000 +0200 +++ new/kshisen-17.08.0/po/it/docs/kshisen/index.docbook 2017-08-11 02:41:41.000000000 +0200 @@ -138,7 +138,7 @@ <date >2016-05-09</date> <releaseinfo ->1.10 (Applicazioni 16.04)</releaseinfo> +>1.10 (Applications 16.04)</releaseinfo> <!--Short description of this document. Do not change unless necessary!--> <abstract> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/pt/docs/kshisen/index.docbook new/kshisen-17.08.0/po/pt/docs/kshisen/index.docbook --- old/kshisen-17.04.3/po/pt/docs/kshisen/index.docbook 2017-07-11 02:22:30.000000000 +0200 +++ new/kshisen-17.08.0/po/pt/docs/kshisen/index.docbook 2017-08-11 02:41:42.000000000 +0200 @@ -1,10 +1,5 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "&kshisen;"> - <!ENTITY kappversion "1.8.1" -> <!--Application 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" @@ -15,7 +10,7 @@ > <!-- do not change this! --> <bookinfo> <title ->Manual do &kappname;</title +>O Manual do &kshisen;</title > <!-- This is the title of the docbook. Leave as is unless change is > necessary.--> <!-- List of immidiate authors begins here. --> <!--INPORTANT! - All other contributors: [to be determined] --> @@ -85,15 +80,14 @@ <legalnotice >&FDLNotice;</legalnotice> <date ->2010-10-03</date> +>2016-05-09</date> <releaseinfo ->&kappversion; (&kde; 4.5)</releaseinfo -><!-- Application version number. Use the variable definitions within header to change this value.--> +>1.10 (Aplicações 16.04)</releaseinfo> <!--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 &kshisen; na versão 1.10</para> </abstract> <!--List of relevant keywords--> @@ -146,13 +140,24 @@ <!--Short game description starts here. 3-4 sentences (paragraphs)--> <para ->O &kappname; é um jogo solitário jogado com o conjunto-padrão de peças do Mahjong. Ao contrário do Mahjong, contudo, o &kappname; só tem uma camada de peças sobrepostas. Poderá remover as peças correspondentes se estas puderem ser ligadas por uma linha com não mais que duas curvas nesta. Ao mesmo tempo, a linha não pode passar por cima de outras peças. Para ganhar um jogo do &kappname;, o jogador terá de remover todas as peças do tabuleiro. </para> +>O &kshisen; é um jogo solitário jogado com o conjunto-padrão de peças do Mahjong. Ao contrário do Mahjong, contudo, o &kshisen; só tem uma camada de peças sobrepostas. Poderá remover as peças correspondentes se estas puderem ser ligadas por uma linha com não mais que duas curvas nesta. Ao mesmo tempo, a linha não pode passar por cima de outras peças. Para ganhar um jogo do &kshisen;, o jogador terá de remover todas as peças do tabuleiro. </para> </chapter> <chapter id="howto" ><title >Como Jogar</title > <!-- do not change this! --> + <screenshot> + <mediaobject> + <imageobject> + <imagedata fileref="gameboard.png" format="PNG"/> + </imageobject> + <textobject> + <phrase +>Tabuleiro do &kshisen;</phrase> + </textobject> + </mediaobject> + </screenshot> <!--IMPORTANT: If the game has no defined objective, please remove the below line.--> <note ><title @@ -163,7 +168,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 &kshisen; irá carregar automaticamente uma disposição predefinida logo que iniciar o jogo, para que possa começar logo a jogar. </para> <para >Deverá estudar cuidadosamente as peças dispostas no tabuleiro e descobrir >duas peças que correspondam exactamente. Quando tiver encontrado um destes >pares, use o seu rato para as seleccionar. </para> <para @@ -684,7 +689,10 @@ > and <varlistentry >. Split the chapter into sections using <sect1(2,3) > for better viewing. --> - <sect1 id="game-menu"> + <sect1 id="menu"> + <title +>Opções do Menu</title> + <sect2 id="game-menu"> <title >O Menu Jogo</title> @@ -780,7 +788,7 @@ </term> <listitem ><para ->Mostra os seus dez melhores resultados do &kappname;.</para +>Mostra os seus dez melhores resultados do &kshisen;.</para ></listitem> </varlistentry> @@ -803,7 +811,7 @@ ><para ><action >Sai</action -> do &kappname;.</para +> do &kshisen;.</para ></listitem> </varlistentry> @@ -812,9 +820,9 @@ <para >Alguns dos itens do menu também podem ser controlados através de combinações >de teclas. Veja em <xref linkend="key-bindings"/> a lista. </para> - </sect1> + </sect2> - <sect1 id="move-menu"> + <sect2 id="move-menu"> <title >O Menu Movimento</title> @@ -894,9 +902,9 @@ </variablelist> - </sect1> + </sect2> - <sect1 id="settings-menu"> + <sect2 id="settings-menu"> <title >O Menu Configuração</title> @@ -918,94 +926,144 @@ ></listitem> </varlistentry> - <varlistentry> - <term> - <menuchoice -><guimenu ->Configuração</guimenu -><guimenuitem ->Mostrar a Barra de Ferramentas</guimenuitem -> </menuchoice> - </term> - <listitem -><para ->Comuta (activa ou desactiva) a visibilidade da barra de ferramentas.</para -></listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice -><guimenu ->Configuração</guimenu -><guimenuitem ->Mostrar a Barra de Estado</guimenuitem -> </menuchoice> - </term> - <listitem -><para ->Comuta (activa ou desactiva) a visibilidade da barra de estado.</para -></listitem> - </varlistentry> - - <varlistentry> - <term> - <menuchoice -><guimenu ->Configuração</guimenu -><guimenuitem ->Configurar os Atalhos...</guimenuitem -> </menuchoice> - </term> - <listitem -><para -><action ->Abre uma janela que lhe permite definir de novo todos os atalhos de teclado.</action -></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 a janela normal do &kde; para configurar os ícones da barra de ferramentas.</para -></listitem> - </varlistentry> - <varlistentry id="game-settings-settings"> <term> <menuchoice ><guimenu >Configuração</guimenu ><guimenuitem ->Configurar o &kappname;...</guimenuitem +>Configurar o &kshisen;...</guimenuitem > </menuchoice> </term> <listitem ><para >Abre a <link linkend="configuration" >janela de configuração</link -> para mudar a configuração do &kappname;.</para +> para mudar a configuração do &kshisen;.</para ></listitem> </varlistentry> </variablelist> - + <para +>Para além disso, o &kshisen; tem os menus de <guimenu +>Configuração</guimenu +> e <guimenu +>Ajuda</guimenu +> 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> + </sect2> </sect1> - <sect1 id="help" -><!--This is a standard Help menubar entry. Only change if needed.--> + <sect1 id="key-bindings"> <title ->O Menu Ajuda</title> -&help.menu.documentation; </sect1> +>Teclas Predefinidas</title> + + <para +>Os atalhos por omissão são:</para> + + <informaltable> + <tgroup cols="2"> + <tbody> + <row +><entry +>Novo</entry +><entry +><keycombo action="simul" +>&Ctrl;<keycap +>N</keycap +></keycombo +></entry +></row> + <row +><entry +>Reiniciar o Jogo</entry +><entry +><keycap +>F5</keycap +></entry +></row> + <row +><entry +>Pausa</entry +><entry +><keycap +>P</keycap +></entry +></row> + <row +><entry +>Mostrar os Recordes</entry +><entry +><keycombo action="simul" +>&Ctrl;<keycap +>H</keycap +></keycombo +></entry +></row> + <row +><entry +>Sair</entry +><entry +><keycombo action="simul" +>&Ctrl;<keycap +>Q</keycap +></keycombo +></entry +></row> + <row +><entry +>Desfazer</entry +><entry +><keycombo action="simul" +>&Ctrl;<keycap +>Z</keycap +></keycombo +></entry +></row> + <row +><entry +>Refazer</entry +><entry +><keycombo action="simul" +>&Ctrl;&Shift;<keycap +>Z</keycap +></keycombo +></entry +></row> + <row +><entry +>Sugestão</entry +><entry +><keycap +>H</keycap +></entry +></row> + <row +><entry +>Manual do &kshisen;</entry +><entry +><keycap +>F1</keycap +></entry +></row> + <row +><entry +>O Que é Isto?</entry +><entry +><keycombo action="simul" +>&Ctrl;&Shift;<keycap +>F1</keycap +></keycombo +></entry +></row> + </tbody> + </tgroup> + </informaltable> + + </sect1> </chapter> @@ -1024,7 +1082,7 @@ ></question> <answer ><para ->Sim. Para mudar a aparência do &kappname;, use a opção do <link linkend="game-settings-settings" +>Sim. Para mudar a aparência do &kshisen;, use a opção do <link linkend="game-settings-settings" >menu</link > para abrir o <link linkend="configuration" >utilitário de configuração</link @@ -1066,19 +1124,19 @@ ><guimenu >Configuração</guimenu ><guimenuitem ->Configurar o &kappname;...</guimenuitem +>Configurar o &kshisen;...</guimenuitem ></menuchoice > irá abrir uma janela de configuração que lhe permite alterar o comportamento > do jogo. </para> <screenshot> <screeninfo ->A janela de configuração do &kappname;</screeninfo> +>A janela de configuração do &kshisen;</screeninfo> <mediaobject> <imageobject ><imagedata fileref="kshisen-configuration.png" format="PNG"/></imageobject> <textobject ><phrase ->A janela de configuração do &kappname;</phrase +>A janela de configuração do &kshisen;</phrase ></textobject> </mediaobject> </screenshot> @@ -1117,7 +1175,7 @@ ></term> <listitem ><para ->Usar as regras tradicionais para corresponder as peças. A versão anterior do &kappname; permitia apenas a correspondência exacta de peças, o que é inconsistente com as regras do Mahjong. Recomenda-se que deixe esta opção assinalada. </para +>Usar as regras tradicionais para corresponder as peças. A versão anterior do &kshisen; permitia apenas a correspondência exacta de peças, o que é inconsistente com as regras do Mahjong. Recomenda-se que deixe esta opção assinalada. </para ></listitem> </varlistentry> @@ -1189,7 +1247,7 @@ ></term> <listitem ><para ->Abre as páginas de ajuda do &kappname; (este documento). </para +>Abre as páginas de ajuda do &kshisen; (este documento). </para ></listitem> </varlistentry> @@ -1228,113 +1286,6 @@ </variablelist> - <sect1 id="key-bindings"> - <title ->Teclas Predefinidas</title> - - <para ->Os atalhos por omissão são:</para> - - <informaltable> - <tgroup cols="2"> - <tbody> - <row -><entry ->Novo</entry -><entry -><keycombo action="simul" ->&Ctrl;<keycap ->N</keycap -></keycombo -></entry -></row> - <row -><entry ->Reiniciar o Jogo</entry -><entry -><keycap ->F5</keycap -></entry -></row> - <row -><entry ->Pausa</entry -><entry -><keycap ->P</keycap -></entry -></row> - <row -><entry ->Mostrar os Recordes</entry -><entry -><keycombo action="simul" ->&Ctrl;<keycap ->H</keycap -></keycombo -></entry -></row> - <row -><entry ->Sair</entry -><entry -><keycombo action="simul" ->&Ctrl;<keycap ->Q</keycap -></keycombo -></entry -></row> - <row -><entry ->Desfazer</entry -><entry -><keycombo action="simul" ->&Ctrl;<keycap ->Z</keycap -></keycombo -></entry -></row> - <row -><entry ->Refazer</entry -><entry -><keycombo action="simul" ->&Ctrl;&Shift;<keycap ->Z</keycap -></keycombo -></entry -></row> - <row -><entry ->Sugestão</entry -><entry -><keycap ->H</keycap -></entry -></row> - <row -><entry ->Manual do &kappname;</entry -><entry -><keycap ->F1</keycap -></entry -></row> - <row -><entry ->O Que é Isto?</entry -><entry -><keycombo action="simul" ->&Ctrl;&Shift;<keycap ->F1</keycap -></keycombo -></entry -></row> - </tbody> - </tgroup> - </informaltable> - - </sect1> </chapter> <chapter id="credits" @@ -1344,24 +1295,20 @@ <!--This chapter is for credits and licenses.--> <para ->&kappname; com 'copyright' 1997 de &Mario.Weilguni; &Mario.Weilguni.mail; </para> +>&kshisen; com 'copyright' 1997 de &Mario.Weilguni; &Mario.Weilguni.mail; </para> <para ->&kappname; com 'copyright' 2002-2004 de <email ->Dave Corrie [email protected]</email +>&kshisen; com 'copyright' 2002-2004 de Dave Corrie <email +>[email protected]</email > </para> <para ->&kappname; com 'copyright' 2009-2012 de Frederik Schwarzer <email ->[email protected]</email -> </para> +>&kshisen; com 'copyright' 2009-2012 de &Frederik.Schwarzer; &Frederik.Schwarzer.mail; </para> <para >Documentação com 'copyright' 2000 de &Dirk.Doerflinger; <email >[email protected]</email > </para> <para ->Documentação com 'copyright' 2009-2010 de Frederik Schwarzer <email ->[email protected]</email -> </para> +>Documentação com 'copyright' 2009-2010 de &Frederik.Schwarzer; &Frederik.Schwarzer.mail; </para> <para >Tradução de José Nuno Pires <email @@ -1370,19 +1317,6 @@ > &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; </book> <!-- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/tr/kshisen.po new/kshisen-17.08.0/po/tr/kshisen.po --- old/kshisen-17.04.3/po/tr/kshisen.po 2017-07-11 02:22:29.000000000 +0200 +++ new/kshisen-17.08.0/po/tr/kshisen.po 2017-08-11 02:41:41.000000000 +0200 @@ -20,8 +20,8 @@ "POT-Creation-Date: 2016-11-19 20:15+0100\n" "PO-Revision-Date: 2017-05-16 09:07+0000\n" "Last-Translator: Mete <[email protected]>\n" -"Language-Team: Turkish " -"(http://www.transifex.com/projects/p/kdegames-k-tr/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/kdegames-k-tr/"; +"language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -297,8 +297,8 @@ msgstr "" "<b>Sadece çözülebilir oyunlara izin ver</b><p>Seçildiğinde sadece çözümü " "olan oyunlarla karşılaşacaksınız.</p><p>Not: Çözülebilir oyunda bile, eğer " -"döşemeleri yanlış sırada kaldırırsanız, oyunu bitirmeyi " -"başaramayacaksınız!</p>" +"döşemeleri yanlış sırada kaldırırsanız, oyunu bitirmeyi başaramayacaksınız!</" +"p>" #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Solvable) #: src/settings.ui:36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/po/zh_CN/kshisen.po new/kshisen-17.08.0/po/zh_CN/kshisen.po --- old/kshisen-17.04.3/po/zh_CN/kshisen.po 2017-07-11 02:22:29.000000000 +0200 +++ new/kshisen-17.08.0/po/zh_CN/kshisen.po 2017-08-11 02:41:41.000000000 +0200 @@ -1,26 +1,20 @@ -# translation of kshisen.po to 简体中文 -# Copyright (C) 2003, 2009 Free Software Foundation, Inc. -# -# Wang Jian <[email protected]>, 1998. -# Xiong Jiang <[email protected]>, 2003. -# Lie_Ex <[email protected]>, 2007-2009. -# Ni Hui <[email protected]>, 2009, 2011. -# Feng Chao <[email protected]>, 2011. -# Guo Yunhe <[email protected]>, 2017. msgid "" msgstr "" -"Project-Id-Version: kshisen\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2016-11-19 20:15+0100\n" -"PO-Revision-Date: 2017-02-02 17:41+0200\n" -"Last-Translator: Guo Yunhe <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"PO-Revision-Date: 2017-08-05 09:35-0400\n" +"Last-Translator: guoyunhebrave <[email protected]>\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 2.0\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kdegames/kshisen.pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -208,10 +202,9 @@ msgstr "连连看" #: src/main.cpp:59 -#, fuzzy, kde-format -#| msgid "(c) 1997, Mario Weilguni" +#, kde-format msgid "Copyright 1997 Mario Weilguni" -msgstr "(c) 1997，Mario Weilguni" +msgstr "" #: src/main.cpp:61 #, kde-format @@ -449,10 +442,3 @@ #, kde-format msgid "30x16" msgstr "30x16" - -#~ msgctxt "Menu title" -#~ msgid "&Move" -#~ msgstr "移动(&M)" - -#~ msgid "Congratulation!" -#~ msgstr "恭喜！" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kshisen-17.04.3/src/board.h new/kshisen-17.08.0/src/board.h --- old/kshisen-17.04.3/src/board.h 2017-06-13 05:13:52.000000000 +0200 +++ new/kshisen-17.08.0/src/board.h 2017-07-15 16:21:30.000000000 +0200 @@ -69,9 +69,9 @@ /// Number of different kinds of tiles in the game. static int constexpr nTiles = 42; - virtual void paintEvent(QPaintEvent * e); - virtual void mousePressEvent(QMouseEvent * e); - virtual void resizeEvent(QResizeEvent * e); + void paintEvent(QPaintEvent * e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent * e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent * e) Q_DECL_OVERRIDE; void setDelay(int); int delay() const; @@ -193,7 +193,7 @@ void undrawConnection(); protected: - virtual QSize sizeHint() const; + QSize sizeHint() const Q_DECL_OVERRIDE; private: // functions /** Calculates the board's offset.
