diff -Nru tanglet-1.5.3/ChangeLog tanglet-1.5.4/ChangeLog --- tanglet-1.5.3/ChangeLog 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/ChangeLog 2019-08-07 13:59:01.000000000 +0000 @@ -1,3 +1,11 @@ +1.5.4 +----- +* FIXED: Window icon didn't work in Wayland. +* Improved loading locales. +* Improved Windows deployment. +* Replaced deprecated code. +* Translation updates: French, Greek, Russian. + 1.5.3 ----- * FIXED: Automatic high DPI support. diff -Nru tanglet-1.5.3/debian/changelog tanglet-1.5.4/debian/changelog --- tanglet-1.5.3/debian/changelog 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/changelog 2019-08-07 13:59:05.000000000 +0000 @@ -1,114 +1,87 @@ -tanglet (1.5.3-1) unstable; urgency=medium +tanglet (1.5.4-0ppa1~disco) disco; urgency=low - * New upstream version. - * Bump standards version to 4.1.5. + * Update to 1.5.4 - -- Innocent De Marchi Tue, 24 Jul 2018 11:16:18 +0100 + -- Graeme Gott Wed, 07 Aug 2019 13:59:05 +0000 -tanglet (1.5.2-1) unstable; urgency=medium +tanglet (1.5.3-0ppa1~disco) disco; urgency=low - * New upstream version. - * Removed add-desktop-keyword.patch (has been added by the - author in the sources). - * Updated years on d/copyright. + * Update to 1.5.3 - -- Innocent De Marchi Sun, 10 Jun 2018 18:34:10 +0100 + -- Graeme Gott Fri, 20 Jul 2018 16:30:29 +0000 -tanglet (1.5.1-1) unstable; urgency=medium +tanglet (1.5.2-0ppa1~disco) disco; urgency=low - [ Innocent De Marchi ] - * New upstream version. - * Added qttools5-dev-tools build-dependency on debian/control. - * Bump to debhelper and compat level 11. - * Bump standards to 4.1.4. - * Removed unnecessary dh argument --parallel. - * Added hardening flags on debian/rules. - * Updated add-keywords-entry patch. - * Migrated to salsa repository. - * Updated homepage and copyright format to secure URI. - * Updated years in debian/copyright. - * Added Multi-Arch field on debian/control. - * Added debian/upstream/metadata file. + * Update to 1.5.2 - [ Markus Koschany ] - * Drop deprecated menu file. - * Install the upstream man page. + -- Graeme Gott Tue, 29 May 2018 11:14:44 +0000 - -- Innocent De Marchi Sat, 14 Apr 2018 18:07:32 +0100 +tanglet (1.5.1-0ppa1~disco) disco; urgency=low -tanglet (1.3.1-2) unstable; urgency=medium + * Update to 1.5.1 - * QT_SELECT in d/rules added (Closes: #777611) + -- Graeme Gott Thu, 28 Dec 2017 15:16:40 +0000 - -- Dariusz Dwornikowski Fri, 13 Feb 2015 18:07:32 +0100 +tanglet (1.5.0-0ppa1~disco) disco; urgency=low -tanglet (1.3.1-1) unstable; urgency=medium + * Update to 1.5.0 - * Imported Upstream version 1.3.1 - * Removed libqt4-dev from Build-Deps (upstream switched to QT5) - * Added qtbase5-dev to Build-Deps - * Bump standards to 3.9.6 - - no changes needed + -- Graeme Gott Sat, 05 Aug 2017 18:41:56 +0000 - -- Dariusz Dwornikowski Mon, 09 Feb 2015 19:18:48 +0100 +tanglet (1.4.0-0ppa2~disco) disco; urgency=low -tanglet (1.2.2-2) unstable; urgency=medium + * Split out data files. - * GPL-3+ in copyright (Closes: #747864) + -- Graeme Gott Sun, 09 Oct 2016 13:25:04 +0000 - -- Dariusz Dwornikowski Tue, 13 May 2014 09:25:37 +0200 +tanglet (1.4.0-0ppa1~disco) disco; urgency=low -tanglet (1.2.2-1) unstable; urgency=medium + * Update to 1.4.0 - * Imported Upstream version 1.2.2. - * Added keywords to desktop file and menu entry (Closes: #738038) - * Updated copyright to DEP-5 - * Added VCS fields to d/control - * Watch file fixed - * Migrated to dh - * Compat changed to 9, bump standards to 3.9.5 - * Updated manpage (Closes: #617539) - * New maintainer (Closes: #746458) - * Split packages to tanglet-data and tanglet + -- Graeme Gott Sat, 08 Oct 2016 22:45:36 +0000 - -- Dariusz Dwornikowski Sun, 04 May 2014 12:10:14 +0200 +tanglet (1.3.1-0ppa1~disco) disco; urgency=low -tanglet (1.1.1-1.1) unstable; urgency=low - - * Non-maintainer upload. - * debian/patches/undefined_reference.diff: Fixed FTBFS. Closes: #615784. - * debian/clean: Added. + * New upstream release - -- Bart Martens Sun, 09 Oct 2011 08:17:07 +0200 + -- Graeme Gott Sun, 25 Jan 2015 15:58:14 +0000 -tanglet (1.1.1-1) unstable; urgency=low +tanglet (1.3.0-0ppa1~disco) disco; urgency=low * New upstream release + - Added support for high DPI displays. + - Switched to C++11 random classes. + - Removed support for Qt 4. + - Translation updates: Czech, French, German, Lithuanian, Malay, Polish, + Romanian. - -- tang ke Mon, 24 May 2010 08:56:35 +0800 + -- Graeme Gott Sat, 24 Jan 2015 10:32:15 +0000 -tanglet (1.1.0-2) unstable; urgency=low +tanglet (1.2.2-0ppa2~disco) disco; urgency=low - * fixed the settings. (Closes: #579710) + * Switch to Qt 5 + * Update copyright file - -- tang ke Fri, 30 Apr 2010 12:39:51 +0800 + -- Graeme Gott Sun, 11 May 2014 16:53:40 +0000 -tanglet (1.1.0-1) unstable; urgency=low +tanglet (1.2.2-0ppa1~disco) disco; urgency=low * New upstream release - * add the resource files. (Closes: #571691) - - -- tang ke Wed, 14 Apr 2010 13:16:51 +0800 - -tanglet (1.0.1.1-1) unstable; urgency=low - - * upstream version update + - Added support for Qt 5. + - Improved fetching player namer. + - Improved build system. + - Renamed XPM icon. + - FIXED: Sometimes reselected last letter. + - FIXED: Could not make a guess after new roll. + - FIXED: Letters on board were not highlighted after keyboard input. + - Translation updates: French, Hungarian, Italian, Spanish, + Spanish (Chile), Turkish, Ukrainian. + - Word list updates: English, Hungarian. - -- tang ke Mon, 25 Jan 2010 08:40:04 +0800 + -- Graeme Gott Thu, 08 Aug 2013 19:58:29 +0000 -tanglet (1.0.1-1) unstable; urgency=low +tanglet (1.2.1-0ppa1~disco) disco; urgency=low - * Initial release (Closes: #561794) - * Switch to dpkg-source 3.0 (quilt) format + * Initial release - -- tang ke Fri, 22 Jan 2010 10:04:53 +0800 + -- Graeme Gott Tue, 25 Jun 2013 20:24:37 +0000 diff -Nru tanglet-1.5.3/debian/clean tanglet-1.5.4/debian/clean --- tanglet-1.5.3/debian/clean 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/clean 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -*.o -*.cpp diff -Nru tanglet-1.5.3/debian/compat tanglet-1.5.4/debian/compat --- tanglet-1.5.3/debian/compat 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/compat 2018-06-28 20:11:03.000000000 +0000 @@ -1 +1 @@ -11 +10 diff -Nru tanglet-1.5.3/debian/control tanglet-1.5.4/debian/control --- tanglet-1.5.3/debian/control 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/control 2018-06-28 20:11:26.000000000 +0000 @@ -1,40 +1,28 @@ Source: tanglet Section: games Priority: optional -Maintainer: Debian Games Team -Uploaders: Innocent De Marchi -Build-Depends: - debhelper (>= 11), - qtbase5-dev, - qttools5-dev-tools (>=5.2), - pkg-config, - zlib1g-dev -Standards-Version: 4.1.5 +Maintainer: Graeme Gott +Build-Depends: debhelper (>= 9), qtbase5-dev, qttools5-dev-tools, zlib1g-dev, pkg-config +Standards-Version: 4.1.4 Homepage: https://gottcode.org/tanglet/ -Vcs-Git: https://salsa.debian.org/games-team/tanglet.git -Vcs-Browser: https://salsa.debian.org/games-team/tanglet Package: tanglet Architecture: any -Depends: - tanglet-data (>= ${source:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: single player word finding game based on Boggle - The Object of the game is to list as many words as you can before - the time runs out. Every time you find a new word, you are given - more time. Each word must be at least three letters long. +Depends: tanglet-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: Single player word finding game based on Boggle + The object of the game is to list as many words as you can before the + time runs out. There are several timer modes that determine how much + time you start with, and if you get extra time when you find a word. Package: tanglet-data Architecture: all -Multi-Arch: foreign Replaces: tanglet (<< 1.2.2-1) Breaks: tanglet (<< 1.2.2-1) Depends: ${misc:Depends}, ${shlibs:Depends} -Description: single player word finding game based on Boggle - data files - The Object of the game is to list as many words as you can before - the time runs out. Every time you find a new word, you are given - more time. Each word must be at least three letters long. +Description: Single player word finding game based on Boggle - data files + The object of the game is to list as many words as you can before the + time runs out. There are several timer modes that determine how much + time you start with, and if you get extra time when you find a word. . This package provides data files required by tanglet. They include word lists and translations. diff -Nru tanglet-1.5.3/debian/copyright tanglet-1.5.4/debian/copyright --- tanglet-1.5.3/debian/copyright 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/copyright 2018-06-28 20:11:43.000000000 +0000 @@ -1,15 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Tanglet Upstream-Contact: Graeme Gott Source: https://gottcode.org/tanglet/ Files: * -Copyright: 2000-2018 Graeme Gott +Copyright: 2009-2018 Graeme Gott License: GPL-3+ Files: debian/* -Copyright: 2009 tangke , - 2014 Dariusz Dwornikowski - 2018 Innocent De Marchi +Copyright: 2013-2018 Graeme Gott License: GPL-3+ License: GPL-3+ @@ -23,5 +22,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the full text of the GNU General Public License + version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. diff -Nru tanglet-1.5.3/debian/dirs tanglet-1.5.4/debian/dirs --- tanglet-1.5.3/debian/dirs 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/games -usr/share/icons/hicolor/48x48/ -usr/share/applications/ diff -Nru tanglet-1.5.3/debian/gbp.conf tanglet-1.5.4/debian/gbp.conf --- tanglet-1.5.3/debian/gbp.conf 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -[DEFAULT] -debian-branch=master -pristine-tar = True - -[git-buildpackage] -export-dir = ../build-area/ - -[import-orig] -filter = debian/* diff -Nru tanglet-1.5.3/debian/manpages tanglet-1.5.4/debian/manpages --- tanglet-1.5.3/debian/manpages 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -doc/tanglet.6 diff -Nru tanglet-1.5.3/debian/rules tanglet-1.5.4/debian/rules --- tanglet-1.5.3/debian/rules 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/rules 2018-06-28 20:11:58.000000000 +0000 @@ -1,17 +1,13 @@ #!/usr/bin/make -f -export QT_SELECT=5 +export QT_SELECT = 5 + export DEB_BUILD_MAINT_OPTIONS = hardening=+all -CPPFLAGS ?= $(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS ?= $(shell dpkg-buildflags --get CFLAGS) -LDFLAGS ?= $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed -CFLAGS += -Wall -g +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk %: - dh $@ + dh $@ --parallel override_dh_auto_configure: - dh_auto_configure -- PREFIX=/usr BINDIR=games \ - CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAGS)" + dh_auto_configure -- BINDIR=games diff -Nru tanglet-1.5.3/debian/source/format tanglet-1.5.4/debian/source/format --- tanglet-1.5.3/debian/source/format 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru tanglet-1.5.3/debian/tanglet.docs tanglet-1.5.4/debian/tanglet.docs --- tanglet-1.5.3/debian/tanglet.docs 1970-01-01 00:00:00.000000000 +0000 +++ tanglet-1.5.4/debian/tanglet.docs 2017-07-30 17:00:49.000000000 +0000 @@ -0,0 +1,2 @@ +README +CREDITS diff -Nru tanglet-1.5.3/debian/tanglet.install tanglet-1.5.4/debian/tanglet.install --- tanglet-1.5.3/debian/tanglet.install 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/tanglet.install 2017-07-30 17:01:10.000000000 +0000 @@ -1,4 +1,7 @@ usr/games/tanglet usr/share/applications/ usr/share/icons/ +usr/share/man/ +usr/share/metainfo/ +usr/share/mime/ usr/share/pixmaps/ diff -Nru tanglet-1.5.3/debian/upstream/metadata tanglet-1.5.4/debian/upstream/metadata --- tanglet-1.5.3/debian/upstream/metadata 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -Contact: Graeme Gott -Name: tanglet -Homepage: https://gottcode.org/tanglet/ -Reference: - Author: Graeme Gott - Title: Documentation - Year: 2017 - Type: manual - URL: https://gottcode.org/tanglet/ -Watch: https://github.com/gottcode/tanglet/releases .*/archive/v(\d[\d\.]+)\.tar\.gz diff -Nru tanglet-1.5.3/debian/watch tanglet-1.5.4/debian/watch --- tanglet-1.5.3/debian/watch 2018-07-24 09:30:08.000000000 +0000 +++ tanglet-1.5.4/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -version=3 -https://github.com/gottcode/tanglet/releases .*/archive/v(\d[\d\.]+)\.tar\.gz - diff -Nru tanglet-1.5.3/.gitignore tanglet-1.5.4/.gitignore --- tanglet-1.5.3/.gitignore 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Makefile -build -tanglet -/data/*/dice -/data/*/words -*.qm -*~ diff -Nru tanglet-1.5.3/icons/icon.rc tanglet-1.5.4/icons/icon.rc --- tanglet-1.5.3/icons/icon.rc 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/icons/icon.rc 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "tanglet.ico" diff -Nru tanglet-1.5.3/icons/po/ru.po tanglet-1.5.4/icons/po/ru.po --- tanglet-1.5.3/icons/po/ru.po 1970-01-01 00:00:00.000000000 +0000 +++ tanglet-1.5.4/icons/po/ru.po 2019-08-07 13:59:01.000000000 +0000 @@ -0,0 +1,64 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Graeme Gott +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Виктор Ерухин , 2019 +msgid "" +msgstr "" +"Project-Id-Version: Tanglet\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-07 13:46+0000\n" +"PO-Revision-Date: 2019-04-27 16:55+0000\n" +"Last-Translator: Виктор Ерухин \n" +"Language-Team: Russian (http://www.transifex.com/gottcode/tanglet/language/" +"ru/)\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" +"%100>=11 && n%100<=14)? 2 : 3);\n" + +#: ../tanglet.appdata.xml.in:6 ../tanglet.desktop.in:3 +msgid "Tanglet" +msgstr "Tanglet" + +#: ../tanglet.appdata.xml.in:7 ../tanglet.desktop.in:5 +msgid "Single player variant of Boggle" +msgstr "Вариант игры в Боггл" + +#: ../tanglet.appdata.xml.in:10 +msgid "" +"Tanglet is a single player word finding game based on Boggle. The object of " +"the game is to list as many words as you can before the time runs out. There " +"are several timer modes that determine how much time you start with, and if " +"you get extra time when you find a word." +msgstr "" +"Tanglet - игра для поиска слов для одного игрока, основанная на Боггл. Цель " +"игры - перечислить как можно больше слов, прежде чем истечет время. Есть " +"несколько режимов таймера, которые определяют ваш ход, и ваше дополнительное " +"время, когда вы находите слово." + +#: ../tanglet.appdata.xml.in:12 +msgid "" +"You can join letters horizontally, vertically, or diagonally in any " +"direction to make a word, so as long as the letters are next to each other " +"on the board. However, you can not reuse the same letter cells in a single " +"word. Also, each word must be at least three letters on a normal board, and " +"four letters on a large board." +msgstr "" +"Вы можете соединять буквы по горизонтали, вертикали или диагонали в любом " +"направлении, чтобы составить слово, если буквы находятся рядом друг с другом " +"на доске. Однако вы не можете повторно использовать одинаковые буквенные " +"ячейки в одном слове. Кроме того, каждое слово должно содержать не менее " +"трех букв на обычной доске и четырех букв на большой доске." + +#: ../tanglet.desktop.in:4 +msgid "Word Finding Game" +msgstr "Игра в поиск слов" + +#: ../tanglet.xml.in.h:1 +msgid "Tanglet Game File" +msgstr "Файл Игры Tanglet" diff -Nru tanglet-1.5.3/icons/tanglet.appdata.xml tanglet-1.5.4/icons/tanglet.appdata.xml --- tanglet-1.5.3/icons/tanglet.appdata.xml 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/icons/tanglet.appdata.xml 2019-08-07 13:59:01.000000000 +0000 @@ -17,6 +17,7 @@ Tanglet Tanglet Tanglet + Tanglet Single player variant of Boggle Variant d'un jugador de Boggle Varianta hry Boggle pro jednoho hráče @@ -31,6 +32,7 @@ Jednoosobowa wersja gry Boggle. Uma variante do jogo Parole Variantă de joc Boggle într-un singur jucător + Вариант игры в Боггл

Tanglet is a single player word finding game based on Boggle. The object of the game is to list as many words as you can before the time runs out. There are several timer modes that determine how much time you start with, and if you get extra time when you find a word.

@@ -46,6 +48,7 @@

Tanglet jest jednosobową grą polegająca na wyszukiwaniu słów, opartą na grze Boggle. Celem gry jest wyszukanie tak wielu słów jak to możliwe przed upływem czasu. Istnieje kilka trybów gry, które determinują to z jaką ilością czasu zaczynasz i czy uzyskujesz dodatkowy czas za znalezienie słowa.

O Tanglet é um jogo de um só jogador para encontrar palavras, baseado no jogo Parole. O objetivo do jogo é encontrar o máximo de palavras possível antes do tempo se esgotar. Existem vários modos de temporizador que determinam o tempo com que se começa e se se obtém tempo extra quando se encontra uma palavra.

Tanglet este un joc de găsit cuvinte, într-un singur jucător, bazat pe Boggle. Obiectivul jocului este de a lista cît mai multe cuvinte înainte de expirarea timpului. Există mai multe moduri de temporizare care determină cu cît de mult timp începeţi, şi dacă aveţi timp suplimentar atunci cînd găsiţi un cuvînt.

+

Tanglet - игра для поиска слов для одного игрока, основанная на Боггл. Цель игры - перечислить как можно больше слов, прежде чем истечет время. Есть несколько режимов таймера, которые определяют ваш ход, и ваше дополнительное время, когда вы находите слово.

You can join letters horizontally, vertically, or diagonally in any direction to make a word, so as long as the letters are next to each other on the board. However, you can not reuse the same letter cells in a single word. Also, each word must be at least three letters on a normal board, and four letters on a large board.

Podeu unir lletres horitzontalment, verticalment o en diagonal en qualsevol direcció per a formar una paraula, sempre i quan les lletres estiguin contigües en el tauler. Però no podeu fer servir més d'una vegada la mateixa cel·la en una paraula. També, cada paraula ha de tenir tres lletres en el tauler normal o quatre lletres en el tauler gran.

@@ -60,6 +63,7 @@

Litery możesz łączyć w słowa; pionowo, posiomo, lub po skosie, w dowolnym kierunku, dopóty dopóki litery na planszy występują obok siebie. Aczkolwiek nie możesz użyć dwa razy tej samej komórki z literą. Dodatkowo każde słowo musi się składać z co najmniej trzech liter na planszy o normalnych rozmiarach i czterech liter na dużej planszy.

Pode-se juntar letras na horizontal, vertical e diagonal em qualquer direção para formar uma palavra, desde que as letras estejam logo na casa seguinte do tabuleiro. No entanto, não se pode tornar a usar uma letra de uma casa já selecionada numa só palavra. Além disso, cada palavra tem de ter pelo menos 3 letras num tabuleiro normal, e 4 letras num tabuleiro grande.

Puteţi alătura litere orizontal, vertical, sau în diagonală, în orice direcţie pentru a face un cuvînt, atîta timp cît literele sînt una lîngă alta pe tablă. Cu toate acestea, nu aveţi posibilitatea să reutilizaţi aceleaşi celule literă într-un singur cuvînt. De asemenea, fiecare cuvînt trebuie să fie de cel puţin trei litere pe o tablă obişnuită şi patru litere pe o tablă mare.

+

Вы можете соединять буквы по горизонтали, вертикали или диагонали в любом направлении, чтобы составить слово, если буквы находятся рядом друг с другом на доске. Однако вы не можете повторно использовать одинаковые буквенные ячейки в одном слове. Кроме того, каждое слово должно содержать не менее трех букв на обычной доске и четырех букв на большой доске.

@@ -111,6 +115,17 @@ + + +
    +
  • FIXED: Window icon didn't work in Wayland
  • +
  • Improved loading locales
  • +
  • Improved Windows deployment
  • +
  • Replaced deprecated code
  • +
  • Translation updates: French, Greek, Russian
  • +
+
+
    diff -Nru tanglet-1.5.3/icons/tanglet.desktop tanglet-1.5.4/icons/tanglet.desktop --- tanglet-1.5.3/icons/tanglet.desktop 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/icons/tanglet.desktop 2019-08-07 13:59:01.000000000 +0000 @@ -13,6 +13,7 @@ Name[pl]=Tanglet Name[pt]=Tanglet Name[ro]=Tanglet +Name[ru]=Tanglet GenericName=Word Finding Game GenericName[ca]=Joc de Recerca de Paraules GenericName[cs]=Hra o hledání slov @@ -27,6 +28,7 @@ GenericName[pl]=Gra słowna GenericName[pt]=Jogo de Descobrir Palavras GenericName[ro]=Joc de găsire a cuvintelor +GenericName[ru]=Игра в поиск слов Comment=Single player variant of Boggle Comment[ca]=Variant d'un jugador de Boggle Comment[cs]=Varianta hry Boggle pro jednoho hráče @@ -41,6 +43,7 @@ Comment[pl]=Jednoosobowa wersja gry Boggle. Comment[pt]=Uma variante do jogo Parole Comment[ro]=Variantă de joc Boggle într-un singur jucător +Comment[ru]=Вариант игры в Боггл Exec=tanglet %f Icon=tanglet Terminal=false diff -Nru tanglet-1.5.3/icons/tanglet.xml tanglet-1.5.4/icons/tanglet.xml --- tanglet-1.5.3/icons/tanglet.xml 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/icons/tanglet.xml 2019-08-07 13:59:01.000000000 +0000 @@ -14,6 +14,7 @@ Plik gry Tanglet Ficheiro de Jogo Tanglet Fişier joc Tanglet + Файл Игры Tanglet diff -Nru tanglet-1.5.3/mac_deploy.sh tanglet-1.5.4/mac_deploy.sh --- tanglet-1.5.3/mac_deploy.sh 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/mac_deploy.sh 2019-08-07 13:59:01.000000000 +0000 @@ -2,7 +2,7 @@ APP='Tanglet' BUNDLE="$APP.app" -VERSION='1.5.3' +VERSION='1.5.4' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -Nru tanglet-1.5.3/src/board.cpp tanglet-1.5.4/src/board.cpp --- tanglet-1.5.3/src/board.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/board.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -84,7 +84,7 @@ connect(m_max_score_details, &QToolButton::clicked, this, &Board::showMaximumWords); QHBoxLayout* score_layout = new QHBoxLayout; - score_layout->setMargin(0); + score_layout->setContentsMargins(0, 0, 0, 0); score_layout->addWidget(m_score); score_layout->addWidget(m_max_score_details); @@ -148,7 +148,7 @@ QWidget* found_tab = new QWidget(this); QVBoxLayout* found_layout = new QVBoxLayout(found_tab); found_layout->setSpacing(0); - found_layout->setMargin(0); + found_layout->setContentsMargins(0, 0, 0, 0); found_layout->addLayout(guess_layout); found_layout->addWidget(m_found); diff -Nru tanglet-1.5.3/src/generator.cpp tanglet-1.5.4/src/generator.cpp --- tanglet-1.5.3/src/generator.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/generator.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -67,8 +67,13 @@ } else { int index1 = randomInt(m_dice.count()); int index2 = randomInt(m_dice.count()); +#if (QT_VERSION >= QT_VERSION_CHECK(5,13,0)) + m_dice.swapItemsAt(index1, index2); + m_letters.swapItemsAt(index1, index2); +#else m_dice.swap(index1, index2); m_letters.swap(index1, index2); +#endif } solve(); } diff -Nru tanglet-1.5.3/src/letter.cpp tanglet-1.5.4/src/letter.cpp --- tanglet-1.5.3/src/letter.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/letter.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -138,7 +138,7 @@ QColor darker = color.darker(106); QColor darkest = color.darker(160); - int height = boundingRect().height(); + auto height = boundingRect().height(); QLinearGradient sides(0, 0, 0, height); sides.setColorAt(0, darker); @@ -150,7 +150,7 @@ face_border.setColorAt(1, darker); m_face->setPen(QPen(face_border, 1)); - int radius = height / 2; + auto radius = height / 2; QRadialGradient face(radius, radius, radius); face.setColorAt(0, color); face.setColorAt(0.5, color); diff -Nru tanglet-1.5.3/src/locale_dialog.cpp tanglet-1.5.4/src/locale_dialog.cpp --- tanglet-1.5.3/src/locale_dialog.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/locale_dialog.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018 Graeme Gott + * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2019 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 @@ -98,50 +98,38 @@ // Find current locale m_current = QSettings().value("Locale/Language").toString(); - QString current = !m_current.isEmpty() ? m_current : QLocale::system().name(); - QStringList translations = findTranslations(); - if (!translations.contains(m_appname + current)) { - current = current.left(2); - if (!translations.contains(m_appname + current)) { - current.clear(); - } - } - if (!current.isEmpty()) { - QLocale::setDefault(current); - } else { - current = "en"; + if (!m_current.isEmpty()) { + QLocale::setDefault(m_current); } + const QLocale locale; // Load translators - static QTranslator qt_translator; - qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - QCoreApplication::installTranslator(&qt_translator); - - static QTranslator qtbase_translator; - if (translations.contains("qtbase_" + current) || translations.contains("qtbase_" + current.left(2))) { - qtbase_translator.load("qtbase_" + current, m_path); - } else { - qtbase_translator.load("qtbase_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); - } - QCoreApplication::installTranslator(&qtbase_translator); - static QTranslator translator; - translator.load(m_appname + current, m_path); - QCoreApplication::installTranslator(&translator); + if (translator.load(locale, m_appname, "", m_path)) { + QCoreApplication::installTranslator(&translator); - // Work around bug in Qt 5 where text direction is not loaded - QGuiApplication::setLayoutDirection(QLocale(current).textDirection()); + const QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + + static QTranslator qtbase_translator; + if (qtbase_translator.load(locale, "qtbase", "_", m_path) || qtbase_translator.load(locale, "qtbase", "_", path)) { + QCoreApplication::installTranslator(&qtbase_translator); + } + + static QTranslator qt_translator; + if (qt_translator.load(locale, "qt", "_", m_path) || qt_translator.load(locale, "qt", "_", path)) { + QCoreApplication::installTranslator(&qt_translator); + } + } } //----------------------------------------------------------------------------- QString LocaleDialog::languageName(const QString& language) { - QString lang_code = language.left(5); - QLocale locale(lang_code); QString name; - if (lang_code.length() > 2) { - if (locale.name() == lang_code) { + const QLocale locale(language); + if (language.contains('_')) { + if (locale.name() == language) { name = locale.nativeLanguageName() + " (" + locale.nativeCountryName() + ")"; } else { name = locale.nativeLanguageName() + " (" + language + ")"; diff -Nru tanglet-1.5.3/src/main.cpp tanglet-1.5.4/src/main.cpp --- tanglet-1.5.3/src/main.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/main.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2009, 2010, 2011, 2012, 2014, 2015, 2018 Graeme Gott + * Copyright (C) 2009, 2010, 2011, 2012, 2014, 2015, 2018, 2019 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 @@ -27,7 +27,7 @@ #include int main(int argc, char** argv) { -#if !defined(Q_OS_MAC) && (QT_VERSION >= QT_VERSION_CHECK(5,6,0)) +#if !defined(Q_OS_MAC) if (!qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO") && !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR") && !qEnvironmentVariableIsSet("QT_SCALE_FACTOR") @@ -43,6 +43,7 @@ app.setOrganizationName("GottCode"); #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) app.setWindowIcon(QIcon::fromTheme("tanglet", QIcon(":/tanglet.png"))); + app.setDesktopFileName("tanglet"); #endif app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); diff -Nru tanglet-1.5.3/src/new_game_dialog.cpp tanglet-1.5.4/src/new_game_dialog.cpp --- tanglet-1.5.3/src/new_game_dialog.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/new_game_dialog.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -112,7 +112,7 @@ } QHBoxLayout* size_buttons = new QHBoxLayout; - size_buttons->setMargin(0); + size_buttons->setContentsMargins(0, 0, 0, 0); size_buttons->addStretch(); size_buttons->addWidget(m_normal_size); size_buttons->addWidget(m_large_size); diff -Nru tanglet-1.5.3/src/solver.cpp tanglet-1.5.4/src/solver.cpp --- tanglet-1.5.3/src/solver.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/solver.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -64,7 +64,7 @@ cell.position = QPoint(c,r); cell.checked = false; - QList n = neighbors.at(index); + const auto& n = neighbors.at(index); for (int i = 0; i < n.count(); ++i) { const QPoint& neighbor = n.at(i); cell.neighbors.append(&m_cells[neighbor.x()][neighbor.y()]); diff -Nru tanglet-1.5.3/src/src.pro tanglet-1.5.4/src/src.pro --- tanglet-1.5.3/src/src.pro 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/src.pro 2019-08-07 13:59:01.000000000 +0000 @@ -5,7 +5,7 @@ CONFIG(debug, debug|release) { CONFIG += warn_on DEFINES += QT_DEPRECATED_WARNINGS - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051100 + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051300 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT } @@ -25,7 +25,7 @@ RCC_DIR = ../build # Set program version -VERSION = 1.5.3 +VERSION = 1.5.4 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name @@ -94,7 +94,9 @@ QMAKE_BUNDLE_DATA += GAME_DATA } else:win32 { - RC_FILE = ../icons/icon.rc + RC_ICONS = ../icons/tanglet.ico + QMAKE_TARGET_DESCRIPTION = "Word finding game" + QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2019 Graeme Gott" } else:unix { RESOURCES += ../icons/icon.qrc diff -Nru tanglet-1.5.3/src/window.cpp tanglet-1.5.4/src/window.cpp --- tanglet-1.5.3/src/window.cpp 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/src/window.cpp 2019-08-07 13:59:01.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Graeme Gott + * Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 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 @@ -550,7 +550,7 @@ QString("

    %1
    %2
    %3
    %4

    %5

    %6

    ") .arg(tr("Tanglet %1").arg(QCoreApplication::applicationVersion()), tr("A single player variant of Boggle"), - tr("Copyright © 2009-%1 Graeme Gott").arg("2018"), + tr("Copyright © 2009-%1 Graeme Gott").arg("2019"), tr("Released under the GPL 3 license"), tr("English word list is based on SCOWL by Kevin Atkinson"), tr("Hebrew word list is based on Hspell by Nadav Har'El and Dan Kenigsberg")) diff -Nru tanglet-1.5.3/tanglet.pro tanglet-1.5.4/tanglet.pro --- tanglet-1.5.3/tanglet.pro 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/tanglet.pro 2019-08-07 13:59:01.000000000 +0000 @@ -1,8 +1,8 @@ lessThan(QT_MAJOR_VERSION, 5) { - error("Tanglet requires Qt 5.2 or greater") + error("Tanglet requires Qt 5.9 or greater") } -equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) { - error("Tanglet requires Qt 5.2 or greater") +equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 9) { + error("Tanglet requires Qt 5.9 or greater") } TEMPLATE = subdirs diff -Nru tanglet-1.5.3/tools/dice/dice.pro tanglet-1.5.4/tools/dice/dice.pro --- tanglet-1.5.3/tools/dice/dice.pro 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/tools/dice/dice.pro 2019-08-07 13:59:01.000000000 +0000 @@ -5,7 +5,7 @@ CONFIG(debug, debug|release) { CONFIG += warn_on DEFINES += QT_DEPRECATED_WARNINGS - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051100 + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051300 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT } diff -Nru tanglet-1.5.3/tools/wordlist/wordlist.pro tanglet-1.5.4/tools/wordlist/wordlist.pro --- tanglet-1.5.3/tools/wordlist/wordlist.pro 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/tools/wordlist/wordlist.pro 2019-08-07 13:59:01.000000000 +0000 @@ -5,7 +5,7 @@ CONFIG(debug, debug|release) { CONFIG += warn_on DEFINES += QT_DEPRECATED_WARNINGS - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051100 + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051300 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT } diff -Nru tanglet-1.5.3/translations/tanglet_el.ts tanglet-1.5.4/translations/tanglet_el.ts --- tanglet-1.5.3/translations/tanglet_el.ts 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/translations/tanglet_el.ts 2019-08-07 13:59:01.000000000 +0000 @@ -45,16 +45,16 @@ %1 of %n point(s) - - - + + %1 of %n πόντοι + %1 από %n πόντοι 3 of %n point(s) - - - + + 3 of %n πόντοι + 3 από %n πόντοι @@ -87,7 +87,7 @@ The maximum score was calculated from the following thirty words: - Το παιχνίδι που συγκέντρωσε τη μέγιστη βαθμολογία υπολογίζεται από τις ακόλουθες τριάντα λέξεις: + Το παιχνίδι που συγκέντρωσε τη μέγιστη βαθμολογία υπολογίζεται απ' τις ακόλουθες τριάντα λέξεις: @@ -116,163 +116,163 @@ Tanglet - + Tanglet Classic - + Κλασσικό Refill - + Αναπλήρωση Stamina - + Σθένος Strikeout - + Εξάλειψη Allotment - + Μερίδιο Discipline - + Πειθαρχία Counts down from 30 seconds and increases on correct guesses. - + Αντίστροφη μέτρηση 30'' κι αύξηση σε περίπτωση σωστής πρόβλεψης. Counts down from 3 minutes. - + Αντίστροφη μέτρηση 3'. Counts down from 30 seconds and refills on correct guesses. - + Αντίστροφη μέτρηση 30'' κι αναπλήρωση σε περίπτωση σωστής πρόβλεψης. Counts down from 45 seconds and pauses on correct guesses. - + Αντίστροφη μέτρηση 45'' και παύση σε περίπτωση σωστής πρόβλεψης. Game ends after 3 incorrect guesses. - + Λήξη παιχνιδιού, μετά από 3 λάθος προβλέψεις. Game ends after 30 guesses. - + Λήξη παιχνιδιού, μετά από 30 προβλέψεις. Counts down from 30 seconds and increases or decreases on guesses. - + Αντίστροφη μέτρηση 30'' κι αύξηση ή μείωση, μετά τη πρόβλεψη. Generator Unable to read dice from file. - + Αδυναμία ανάγνωσης ζαριού, από αρχείο. Unable to read word list from file. - + Αδυναμία ανάγνωσης καταλόγου λέξεων, από αρχείο. LanguageDialog Board Language - + Γλώσσα Ταμπλό Custom - + Συμπεριφορά Choose... - + Επιλογή... <b>Note:</b> These settings will take effect when you start a new game. - + <b>Σημείωση:</b> Οι ρυθμίσεις θα εφαρμοστούν μετά την επανέναρξη του παιχνιδιού. Language: - + Γλώσσα: Dice: - + Ζάρι: Word list: - + Κατάλογος λέξεων: Dictionary: - + Λεξικό: Choose Dice File - + Επιλογή Αρχείου Ζαριού Choose Word List File - + Επιλογή Αρχείου Καταλόγου Λέξεων LocaleDialog Select application language: - + Επιλογή γλώσσας εφαρμογής: <System Language> - + <Γλώσσα Συστήματος> Note - + Σημείωση Please restart this application for the change in language to take effect. - + Παρακαλώ επανεκκινήστε την εφαρμογή, για να εφαρμοστούν οι αλλαγές. NewGameDialog New Game - + Νέο Παιχνίδι Amount of Words: - + Αριθμός Λέξεων: Minimum Word Length: - + Ελάχιστο Μήκος Λέξης Low - + Χαμηλό Medium - + Μέτριο High - + Ψηλό Random - + Τυχαίο %n letter(s) @@ -286,305 +286,305 @@ ScoresDialog High Scores - + Μεγαλύτερες Βαθμολογίες <b>Name</b> - + <b>Όνομα</b> <b>Score</b> - + <b>Βαθμολογία</b> <b>Date</b> - + <b>Ημερομηνία</b> <b>Timer</b> - + <b>Χρόνος</b> #%1 - + #%1 Question - + Ερώτηση Clear high scores? - + Καθαρισμός Μεγαλύτερων Βαθμολογιών Window Tanglet - + Tanglet <p><b><big>Paused</big></b><br>Click to resume playing.</p> - + <p><b><big>Παύση</big></b><br>Κλικ για συνέχεια παιχνιδιού.</p> <p><b><big>Please wait</big></b><br>Loading game...</p> - + <p><b><big>Παρακαλώ περιμένετε</big></b><br>Φόρτωση παιχνιδιού...</p> Click to start a new game. - + Κλικ για έναρξη νέου παιχνιδιού. <p><b><big>Please wait</big></b><br>Generating a new board...</p> - + <p><b><big>Παρακαλώ περιμένετε</big></b><br>Σχεδιασμός νέου ταμπλό...</p> <p><b><big>Please wait</big></b><br>Optimizing word list...</p> - + <p><b><big>Παρακαλώ περιμένετε</big></b><br>Βελτιστοποίηση καταλόγου λέξεων ...</p> &Game - + &Παιχνίδι New &Game... - + Νέο &Παιχνίδι... Ctrl+Shift+N - + Ctrl+Shift+N &New Roll - + &Νέο ρίξιμο &Choose... - + &Επιλογή... &Share... - + &Μοίρασμα... &End - + &Τέλος &Pause - + &Παύση Ctrl+P - + Ctrl+P &Details - + &Λεπτομέρειες &High Scores - + &Μεγαλύτερες Βαθμολογίες &Quit - + &Εγκατάλειψη Ctrl+Q - + Ctrl+Q &Settings - + &Ρυθμίσεις Show &Maximum Score - + Προβολή &Μεγαλύτερων Βαθμολογιών &Never - + &Ποτέ &End Of Game - + &Τέλος Παιχνιδιού &Always - + &Πάντα Show Missed &Words - + Προβολή Παραληφθέντων &Λέξεων Show Word &Counts - + Προβολή Μετρητή &Λέξεων &Board Language... - + &Γλώσσα Ταμπλό... Application &Language... - + Γλώσσα &Εφαρμογής &Help - + &Βοήθεια &Controls - + &Έλεγχοι &About - + &Σχετικά About &Hspell - + Σχετικά &με το HSpell About &Qt - + Σχετικά &με το Qt About &SCOWL - + Σχετικά &με το SCOWL Copyright &copy; 2009-%1 Graeme Gott - + Συγγραφέας &δικαιώματα; 2009-%1 Graeme Gott Tanglet %1 - + Tanglet %1 About - + Σχετικά A single player variant of <a href="http://en.wikipedia.org/wiki/Boggle">Boggle</a> - + Μια παραλλαγή για ένα παίχτη, του <a href="http://en.wikipedia.org/wiki/Boggle">Boggle</a> Released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL 3</a> license - + Έκδοση υπό <a href="http://www.gnu.org/licenses/gpl.html">GPL 3</a> άδεια English word list is based on <a href="http://wordlist.sourceforge.net/">SCOWL</a> by Kevin Atkinson - + Ο Αγγλικός κατάλογος λέξεων, βασίστηκε στο <a href="http://wordlist.sourceforge.net/">SCOWL</a> του Kevin Atkinson Hebrew word list is based on <a href="http://hspell.ivrix.org.il/">Hspell</a> by Nadav Har'El and Dan Kenigsberg - + Ο Εβραϊκός κατάλογος λέξεων, βασίστηκε στο <a href="http://hspell.ivrix.org.il/">Hspell</a> των Nadav Har'El και Dan Kenigsberg About Hspell - + Σχετικά με το Hspell About SCOWL - + Σχετικά με το SCOWL Import Game - + Εισαγωγή παιχνιδιού Tanglet Games (*.tanglet) - + Παιχνίδια Tanglet (*.tanglet) Unable to start requested game. - + Αδυναμία έναρξης του ζητουμένου παιχνιδιού. Error - Σφάλμα + Σφάλμα Export Game - + Εξαγωγή παιχνιδιού Question - + Ερώτηση End the current game? - + Λήξη παιχνιδιού; Details - Λεπτομέρειες + Λεπτομέρειες Board Size: - + Μέγεθος Ταμπλό: Normal - Κανονικά + Κανονικό Large - Μεγάλα + Μεγάλο Word Density: - + Πυκνότητα Λέξης: Word Length: - + Μήκος Λέξης: %1 or more letters - + %1 ή περισσότερα γράμματα Game Type: - + Τύπος Παιχνιδιού: Description: - + Περιγραφή: Controls - + Έλεγχοι: <p><b><big>Mouse Play:</big></b><br><b>Select a word:</b> Click on the letters of a word.<br><b>Make a guess:</b> Click on the last selected letter.<br><b>Erase letters:</b> Click on an earlier selected letter.<br><b>Clear the word:</b> Click twice on the first selected letter.</p><p><b><big>Keyboard Play:</big></b><br><b>Select a word:</b> Type the letters of a word.<br><b>Make a guess:</b> Press Enter.<br><b>Clear the word:</b> Press Ctrl+Backspace.</p> - + <p><b><big>Παιχνίδι Ποντικιού:</big></b><br><b>Επιλέξτε λέξη:</b> Κλικ στα γράμματα της λέξης.<br><b>Κάντε μια πρόβλεψη:</b> Κλικ στο τελευταίο επιλεγμένο γράμμα.<br><b>Διαγράψτε γράμματα:</b>Κλικ σε προηγουμένως επιλεγμέν γράμμα.<br><b>Καθαρισμός λέξης:</b>Διπλό κλικ στο πρώτο επιλεγμένο γράμμα.</p><p><b><big>Παιχνίδι Πληκτρολογίου:</big></b><br><b>Επιλέξτε λέξη:</b> Πληκτρολογήστε τα γράμματα της λέξης.<br><b>Κάντε μια πρόβλεψη:</b> Πατήστε Enter.<br><b>Καθαρισμός λέξης:</b> Πατήστε Ctrl+Backspace.</p> WordCounts Letters: - + Γράμματα: Found: - + Βρέθηκαν: %1<br><b>%2</b> - + %1<br><b>%2</b> %1<br><b>%2/%3</b> - + %1<br><b>%2/%3</b> %1<br>%2/%3 - + %1<br>%2/%3 @@ -601,11 +601,11 @@ main Word finding game - + Παιχνίδι εύρεσης λέξεων A game file to play. - + Αρχείο παιχνιδιού. diff -Nru tanglet-1.5.3/translations/tanglet_fr.ts tanglet-1.5.4/translations/tanglet_fr.ts --- tanglet-1.5.3/translations/tanglet_fr.ts 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/translations/tanglet_fr.ts 2019-08-07 13:59:01.000000000 +0000 @@ -601,11 +601,11 @@ main Word finding game - + Jeu de recherche de mots A game file to play. - + Un fichier de jeu à lire. diff -Nru tanglet-1.5.3/translations/tanglet_ru.ts tanglet-1.5.4/translations/tanglet_ru.ts --- tanglet-1.5.3/translations/tanglet_ru.ts 1970-01-01 00:00:00.000000000 +0000 +++ tanglet-1.5.4/translations/tanglet_ru.ts 2019-08-07 13:59:01.000000000 +0000 @@ -0,0 +1,621 @@ + + + + + Board + + Details + Подробности + + + Clear + Очистить + + + Guess + Угадать + + + Found + Найдено + + + Normal + Нормально + + + Large + Большое + + + Missed + Пропустить + + + Error + Ошибка + + + Success + Победа + + + Game Over + Игра окончена + + + %1 of %n point(s) + + + + + + + + 3 of %n point(s) + + + + + + + + 2 of %n point(s) + + + + + + + + 1 of %n point(s) + + + + + + + + 0 of %n point(s) + + + + + + + + %n point(s) + + + + + + + + The maximum score was calculated from the following thirty words: + Максимальная оценка была рассчитана из следующих тридцати слов: + + + + Clock + + m:ss + m:ss + + + %n guesses(s) + + + + + + + + +%1 + +%1 + + + %n strike(s) + + + + + + + + Tanglet + Tanglet + + + Classic + Классический + + + Refill + Пополнение + + + Stamina + Выносливость + + + Strikeout + Выбывание + + + Allotment + Распределение + + + Discipline + Тренировочный + + + Counts down from 30 seconds and increases on correct guesses. + Отсчитывает 30 секунд и увеличивается, если отгадано правильно + + + Counts down from 3 minutes. + Отсчет от 3 минут. + + + Counts down from 30 seconds and refills on correct guesses. + Отсчитывает 30 секунд и добавляет к правильно отгаданным + + + Counts down from 45 seconds and pauses on correct guesses. + Отсчитывает 45 секунд и делает паузу на правильные отгадки. + + + Game ends after 3 incorrect guesses. + Игра заканчивается после 3 неверных отгадках. + + + Game ends after 30 guesses. + Игра заканчивается после 30 отгадок. + + + Counts down from 30 seconds and increases or decreases on guesses. + Отсчитывает 30 секунд и увеличивается или уменьшается по отгадкам. + + + + Generator + + Unable to read dice from file. + Невозможно прочитать кости из файла. + + + Unable to read word list from file. + Невозможно прочитать список слов из файла. + + + + LanguageDialog + + Board Language + Язык поля + + + Custom + Изменить + + + Choose... + Выбрать... + + + <b>Note:</b> These settings will take effect when you start a new game. + <b>Примечание:</b> Эти настройки вступят в силу при запуске новой игры. + + + Language: + Язык: + + + Dice: + Кость: + + + Word list: + Список слов: + + + Dictionary: + Словарь: + + + Choose Dice File + Выбрать кости + + + Choose Word List File + Выбрать файл со Списком слов + + + + LocaleDialog + + Select application language: + Выберите язык приложения: + + + <System Language> + <System Language> + + + Note + Заметка + + + Please restart this application for the change in language to take effect. + Пожалуйста, перезапустите приложение, чтобы изменение языка вступило в силу. + + + + NewGameDialog + + New Game + Новая Игра + + + Amount of Words: + Количество слов: + + + Minimum Word Length: + Минимальная длина слова: + + + Low + Легкий + + + Medium + Средний + + + High + Сложный + + + Random + Случайный + + + %n letter(s) + + + + + + + + + ScoresDialog + + High Scores + Лучшие результаты + + + <b>Name</b> + <b>Имя</b> + + + <b>Score</b> + <b>Результат</b> + + + <b>Date</b> + <b>Дата</b> + + + <b>Timer</b> + <b>Таймер</b> + + + #%1 + #%1 + + + Question + Вопрос + + + Clear high scores? + Очистить Лучшие результаты? + + + + Window + + Tanglet + Tanglet + + + <p><b><big>Paused</big></b><br>Click to resume playing.</p> + <p><b><big>Пауза</big></b><br>Нажмите, чтобы возобновить игру.</p> + + + <p><b><big>Please wait</big></b><br>Loading game...</p> + <p><b><big>Пожалуйста, подождите</big></b><br>Загрузка игры...</p> + + + Click to start a new game. + Нажмите, чтобы начать новую игру. + + + <p><b><big>Please wait</big></b><br>Generating a new board...</p> + <p><b><big>Пожалуйста, подождите</big></b><br>Создание нового поля...</p> + + + <p><b><big>Please wait</big></b><br>Optimizing word list...</p> + <p><b><big>Пожалуйста, подождите</big></b><br>Оптимизация списка слов...</p> + + + &Game + &Игра + + + New &Game... + Новая &Игра... + + + Ctrl+Shift+N + Ctrl+Shift+N + + + &New Roll + &Заново + + + &Choose... + &Выбрать... + + + &Share... + &Поделиться... + + + &End + &Конец + + + &Pause + &Пауза + + + Ctrl+P + Ctrl+P + + + &Details + &Детали + + + &High Scores + &Лучшие результаты + + + &Quit + &Выход + + + Ctrl+Q + Ctrl+Q + + + &Settings + &Настройки + + + Show &Maximum Score + Показать &Максимальный счет + + + &Never + &Никогда + + + &End Of Game + &Конец игры + + + &Always + &Всегда + + + Show Missed &Words + Показать пропущенные &Слова + + + Show Word &Counts + Показать слово &Счет + + + &Board Language... + &Язык Доски... + + + Application &Language... + Приложение &Язык.. + + + &Help + &Помощь + + + &Controls + &Управление + + + &About + &Информация + + + About &Hspell + О &Hspell + + + About &Qt + О &Qt + + + About &SCOWL + О &SCOWL + + + Copyright &copy; 2009-%1 Graeme Gott + Copyright &copy; 2009-%1 Graeme Gott + + + Tanglet %1 + Tanglet %1 + + + About + О приложении + + + A single player variant of <a href="http://en.wikipedia.org/wiki/Boggle">Boggle</a> + Однопользовательский вариант <a href="http://en.wikipedia.org/wiki/Boggle">Боггл</a> + + + Released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL 3</a> license + Релиз представлен на <a href="http://www.gnu.org/licenses/gpl.html">GPL 3</a> лицензии + + + English word list is based on <a href="http://wordlist.sourceforge.net/">SCOWL</a> by Kevin Atkinson + Список слов на Английском основан на <a href="http://wordlist.sourceforge.net/">SCOWL</a> от Kevin Atkinson + + + Hebrew word list is based on <a href="http://hspell.ivrix.org.il/">Hspell</a> by Nadav Har'El and Dan Kenigsberg + Список слов на Иврите основан на <a href="http://hspell.ivrix.org.il/">Hspell</a> от Nadav Har'El и Dan Kenigsberg + + + About Hspell + О Hspell + + + About SCOWL + О SCOWL + + + Import Game + Выбрать Игру + + + Tanglet Games (*.tanglet) + Игры Tanglet (*.tanglet) + + + Unable to start requested game. + Невозможно запустить запрошенную игру. + + + Error + Ошибка + + + Export Game + Сохранить Игру + + + Question + Вопрос + + + End the current game? + Завершить текущую игру? + + + Details + Детали + + + Board Size: + Размер поля: + + + Normal + Нормальный + + + Large + Большой + + + Word Density: + Количество слов: + + + Word Length: + Длина слов: + + + %1 or more letters + %1 или больше символов + + + Game Type: + Тип игры: + + + Description: + Описание: + + + Controls + Управление + + + <p><b><big>Mouse Play:</big></b><br><b>Select a word:</b> Click on the letters of a word.<br><b>Make a guess:</b> Click on the last selected letter.<br><b>Erase letters:</b> Click on an earlier selected letter.<br><b>Clear the word:</b> Click twice on the first selected letter.</p><p><b><big>Keyboard Play:</big></b><br><b>Select a word:</b> Type the letters of a word.<br><b>Make a guess:</b> Press Enter.<br><b>Clear the word:</b> Press Ctrl+Backspace.</p> + <p><b><big>Игра мышкой:</big></b><br><b>Выберите слово:</b> Нажмите на буквы слова.<br><b>Угадать:</b> Нажмите на последнюю выбранную букву.<br><b>Стереть буквы:</b> Нажмите на ранее выбранную букву.<br><b>Очистить слово:</b> Нажмите дважды на первую выбранную букву.</p><p><b><big>Игра на клавиатуре:</b><br><b>Выберите слово:</b> Введите буквы слова.<br><b>Угадать:</b> Нажмите Enter.<br><b>Очистить слово:</b> Нажмите Ctrl+Backspace.</p> + + + + WordCounts + + Letters: + Буквы: + + + Found: + Найти: + + + %1<br><b>%2</b> + %1<br><b>%2</b> + + + %1<br><b>%2/%3</b> + %1<br><b>%2/%3</b> + + + %1<br>%2/%3 + %1<br>%2/%3 + + + + WordTree + + %n point(s) + + + + + + + + + main + + Word finding game + Игра в поиск слов + + + A game file to play. + Файл игры. + + + diff -Nru tanglet-1.5.3/windows/installer.nsi tanglet-1.5.4/windows/installer.nsi --- tanglet-1.5.3/windows/installer.nsi 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/windows/installer.nsi 2019-08-07 13:59:01.000000000 +0000 @@ -4,7 +4,7 @@ !define APPNAME "Tanglet" !define VERSIONMAJOR 1 !define VERSIONMINOR 5 -!define VERSIONPATCH 3 +!define VERSIONPATCH 4 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/tanglet/" @@ -26,7 +26,7 @@ OutFile "${APPNAME}_${APPVERSION}.exe" ;Default installation folder -InstallDir "$PROGRAMFILES\${APPNAME}" +InstallDir "$PROGRAMFILES64\${APPNAME}" InstallDirRegKey HKLM "Software\${APPNAME}" "" ;Request application privileges for Windows Vista diff -Nru tanglet-1.5.3/windows_deploy.bat tanglet-1.5.4/windows_deploy.bat --- tanglet-1.5.3/windows_deploy.bat 2018-07-20 15:42:37.000000000 +0000 +++ tanglet-1.5.4/windows_deploy.bat 2019-08-07 13:59:01.000000000 +0000 @@ -3,7 +3,7 @@ @ECHO OFF SET APP=Tanglet -SET VERSION=1.5.3 +SET VERSION=1.5.4 ECHO Copying executable MKDIR %APP%