diff -Nru hexalate-1.1.0/ChangeLog hexalate-1.1.1/ChangeLog --- hexalate-1.1.0/ChangeLog 2016-10-09 18:30:58.000000000 +0000 +++ hexalate-1.1.1/ChangeLog 2017-08-05 11:51:02.000000000 +0000 @@ -1,3 +1,51 @@ +commit 4c0ff358509da7c349c42d8d55c97e432196312c +Author: Graeme Gott +Date: 2017-08-05 + + Bump version number. + +commit 1218987cfcf2ad00db001cbfccb88d4f70db0f4a +Author: Graeme Gott +Date: 2017-07-05 + + Update deprecation warning. + +commit 75f86b8aec845115aa2669d29fff8afa0a0618bd +Author: Graeme Gott +Date: 2017-07-01 + + FIXED: Did not always install translations in Linux. + +commit 029aa3b14c7f3a23c4afadbee9bfedee15f2a781 +Author: Graeme Gott +Date: 2017-04-13 + + Disable narrowing conversions in slots. + +commit aaa110243e6183e72dd1d0a753bdaab4dea6c93e +Author: Graeme Gott +Date: 2017-02-01 + + Update AppData installation directory. + +commit 934f7f0dfdfa5ffc885665b37f4288f05c9d7d44 +Author: Graeme Gott +Date: 2017-01-26 + + Warn about deprecated code. + +commit dada6ac08c42ec84dba56a0c5c998d18b070446e +Author: Graeme Gott +Date: 2017-01-03 + + Sync translations with Transifex. + +commit bf53bec66a466b7d93a1337951e729a00184eea6 +Author: Graeme Gott +Date: 2017-01-03 + + Update copyright year. + commit 9441dde0ebc5bd1963be1c91dead09cbbf71b2ee Author: Graeme Gott Date: 2016-10-09 diff -Nru hexalate-1.1.0/debian/changelog hexalate-1.1.1/debian/changelog --- hexalate-1.1.0/debian/changelog 2016-10-09 18:37:34.000000000 +0000 +++ hexalate-1.1.1/debian/changelog 2017-08-05 11:53:14.000000000 +0000 @@ -1,3 +1,9 @@ +hexalate (1.1.1-0ppa1~zesty1) zesty; urgency=low + + * Update to 1.1.1 + + -- Graeme Gott Sat, 05 Aug 2017 11:53:14 +0000 + hexalate (1.1.0-0ppa1~zesty1) zesty; urgency=low * Update to 1.1.0 diff -Nru hexalate-1.1.0/hexalate.pro hexalate-1.1.1/hexalate.pro --- hexalate-1.1.0/hexalate.pro 2016-10-09 18:30:14.000000000 +0000 +++ hexalate-1.1.1/hexalate.pro 2017-08-05 11:50:01.000000000 +0000 @@ -6,6 +6,10 @@ QT += widgets CONFIG += warn_on c++11 +DEFINES += QT_DEPRECATED_WARNINGS +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900 +DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT + # Allow in-tree builds !win32 { MOC_DIR = build @@ -14,7 +18,7 @@ } # Set program version -VERSION = 1.1.0 +VERSION = 1.1.1 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name @@ -74,9 +78,9 @@ desktop.path = $$PREFIX/share/applications appdata.files = icons/hexalate.appdata.xml - appdata.path = $$PREFIX/share/appdata/ + appdata.path = $$PREFIX/share/metainfo/ - qm.files = translations/*.qm + qm.files = $$replace(TRANSLATIONS, .ts, .qm) qm.path = $$PREFIX/share/hexalate/translations qm.CONFIG += no_check_exist diff -Nru hexalate-1.1.0/icons/hexalate.appdata.xml hexalate-1.1.1/icons/hexalate.appdata.xml --- hexalate-1.1.0/icons/hexalate.appdata.xml 2016-10-09 18:10:03.000000000 +0000 +++ hexalate-1.1.1/icons/hexalate.appdata.xml 2017-01-03 10:54:10.000000000 +0000 @@ -25,6 +25,7 @@ Putar bulatan untuk padankan warna Draai cirkels om kleuren te koppelen Obróć koła, aby dopasować kolory + Rode os círculos para combinar as cores. Rotiţi cercurile pentru potrivirea culorilor Вращайте круги, чтобы сопоставить цвета @@ -37,6 +38,7 @@

Hexalate merupakan permainan padanan warna. Matlamat permainan adalah untuk putar dan letak semula bulatan supaya setiap bahagian sepadan warnanya. Anda boleh putar dengan mengklik kanan, dan anda boleh alih bulatan dengan menyeretnya. Permainan menyimpan kedudukan dan putaran bulatan sepanjang permainan.

Hexalate is een kleurkoppel spel. Het doel is om de cirkels zo te draaien en te positioneren dat elke koppellijn dezelfde kleur heeft. Cirkels kun je draaien door de rechtermuisklik en verplaatsen door ze te slepen. Het spel slaat de positie en de rotaties van de cirkels tijdens het spel op.

Hexalate jest grą dopasowania kolorów. Celem gry jest obrócić i ustawić koła, tak aby ich linie były dopasowane do tych samych kolorów. Możesz obracać koła klikając prawym przyciskiem myszy i przenosić je przeciągnięciem myszy. Gra zapisuje pozycje i obroty kół przy następnym uruchomieniu.

+

Hexalate é um jogo de combinação de cores. O objetivo do jogo é rodar e posicionar os círculos para que cada linha seja combinada com as mesmas cores. Você roda os círculos apertando o botão direito do mouse, e move os círculos arrastando-os. O jogo guarda as posições e rotações dos círculos através das rodadas.

Hexalate este un joc de potrivire a culorilor. Scopul jocului este de a roti şi poziţiona cercurile astfel încît fiecare linie care se atinge să se potrivească la culoare. Rotiţi cercurile cu clic dreapta, şi mutaţi cercurile prin glisarea acestora. Jocul stochează poziţiile şi rotaţiile cercurilor din întreaga rulare.

Hexalate - игра сопоставления цветов. Цель игры состоит в том, чтобы вращать и перемещать круги так, что бы каждый цветной луч касался другого луча такого же цвета. Круги можно вращать и перемещать правой кнопкой мыши. Игра сохраняет позиции кругов и можно продолжить играть при следующем запуске.

diff -Nru hexalate-1.1.0/icons/hexalate.desktop hexalate-1.1.1/icons/hexalate.desktop --- hexalate-1.1.0/icons/hexalate.desktop 2016-10-09 18:09:51.000000000 +0000 +++ hexalate-1.1.1/icons/hexalate.desktop 2017-01-03 10:53:55.000000000 +0000 @@ -34,6 +34,7 @@ Comment[ms]=Putar bulatan untuk padankan warna Comment[nl]=Draai cirkels om kleuren te koppelen Comment[pl]=Obróć koła, aby dopasować kolory +Comment[pt_BR]=Rode os círculos para combinar as cores. Comment[ro]=Rotiţi cercurile pentru potrivirea culorilor Comment[ru]=Вращайте круги, чтобы сопоставить цвета Exec=hexalate diff -Nru hexalate-1.1.0/icons/po/pt_BR.po hexalate-1.1.1/icons/po/pt_BR.po --- hexalate-1.1.0/icons/po/pt_BR.po 2016-10-09 18:09:29.000000000 +0000 +++ hexalate-1.1.1/icons/po/pt_BR.po 2017-01-03 10:53:55.000000000 +0000 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jonathan Andrade , 2016 msgid "" msgstr "" "Project-Id-Version: Hexalate\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-14 20:49+0000\n" -"PO-Revision-Date: 2014-11-13 21:49+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" +"PO-Revision-Date: 2016-12-01 14:50+0000\n" +"Last-Translator: Jonathan Andrade \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/gottcode/" "hexalate/language/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -24,7 +25,7 @@ #: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3 msgid "Spin circles to match colors" -msgstr "" +msgstr "Rode os círculos para combinar as cores." #: ../hexalate.appdata.xml.in.h:3 msgid "" @@ -33,6 +34,11 @@ "circles by right clicking, and you move circles by dragging them. The game " "stores the positions and rotations of the circles across runs." msgstr "" +"Hexalate é um jogo de combinação de cores. O objetivo do jogo é rodar e " +"posicionar os círculos para que cada linha seja combinada com as mesmas " +"cores. Você roda os círculos apertando o botão direito do mouse, e move os " +"círculos arrastando-os. O jogo guarda as posições e rotações dos círculos " +"através das rodadas." #: ../hexalate.desktop.in.h:2 msgid "Color Matching Game" diff -Nru hexalate-1.1.0/mac_deploy.sh hexalate-1.1.1/mac_deploy.sh --- hexalate-1.1.0/mac_deploy.sh 2016-10-09 18:30:06.000000000 +0000 +++ hexalate-1.1.1/mac_deploy.sh 2017-08-05 11:50:08.000000000 +0000 @@ -2,7 +2,7 @@ APP='Hexalate' BUNDLE="$APP.app" -VERSION='1.1.0' +VERSION='1.1.1' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -Nru hexalate-1.1.0/NEWS hexalate-1.1.1/NEWS --- hexalate-1.1.0/NEWS 2016-10-09 18:27:59.000000000 +0000 +++ hexalate-1.1.1/NEWS 2017-08-05 11:50:35.000000000 +0000 @@ -1,3 +1,8 @@ +1.1.1 +----- +* FIXED: Did not always install translations in Linux. +* Translation updates: Portuguese (Brazil) + 1.1.0 ----- * Added support for high DPI displays. diff -Nru hexalate-1.1.0/src/window.cpp hexalate-1.1.1/src/window.cpp --- hexalate-1.1.0/src/window.cpp 2016-10-02 16:59:53.000000000 +0000 +++ hexalate-1.1.1/src/window.cpp 2017-01-03 10:52:49.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2009, 2010, 2013, 2014, 2015, 2016 Graeme Gott + * Copyright (C) 2009, 2010, 2013, 2014, 2015, 2016, 2017 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -74,7 +74,7 @@ QMessageBox::about(this, tr("About Hexalate"), QString("

%1 %2
%3
%4
%5

") .arg(tr("Hexalate"), QCoreApplication::applicationVersion(), tr("A color matching game"), - tr("Copyright © 2009-%1 Graeme Gott").arg("2016"), + tr("Copyright © 2009-%1 Graeme Gott").arg("2017"), tr("Released under the GPL 3 license").arg("\"http://www.gnu.org/licenses/gpl.html\"")) ); } diff -Nru hexalate-1.1.0/windows/installer.nsi hexalate-1.1.1/windows/installer.nsi --- hexalate-1.1.0/windows/installer.nsi 2016-10-09 18:30:21.000000000 +0000 +++ hexalate-1.1.1/windows/installer.nsi 2017-08-05 11:50:15.000000000 +0000 @@ -4,7 +4,7 @@ !define APPNAME "Hexalate" !define VERSIONMAJOR 1 !define VERSIONMINOR 1 -!define VERSIONPATCH 0 +!define VERSIONPATCH 1 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/hexalate/"