[hexalate] 01/10: New upstream version 1.1.1
Unit 193
unit193-guest at moszumanska.debian.org
Wed Sep 13 14:23:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
unit193-guest pushed a commit to branch master
in repository hexalate.
commit a4c363ec7e8607d095877d473255dd48b3e1c192
Author: Unit 193 <unit193 at ubuntu.com>
Date: Wed Sep 13 09:52:56 2017 -0400
New upstream version 1.1.1
---
.gitignore | 1 +
CREDITS | 10 ++-
NEWS | 16 +++++
README | 5 +-
doc/hexalate.6 | 36 +++++++++++
hexalate.pro | 55 +++++++++++-----
icons/hexalate.appdata.xml | 93 ++++++++++++++++++++++++++
icons/hexalate.desktop | 30 +++++++--
icons/hexalate.icns | Bin 187133 -> 426077 bytes
icons/hicolor/1024x1024/apps/hexalate.png | Bin 0 -> 101992 bytes
icons/hicolor/128x128/apps/hexalate.png | Bin 8959 -> 8716 bytes
icons/hicolor/16x16/apps/hexalate.png | Bin 679 -> 666 bytes
icons/hicolor/22x22/apps/hexalate.png | Bin 1052 -> 1033 bytes
icons/hicolor/24x24/apps/hexalate.png | Bin 1205 -> 1210 bytes
icons/hicolor/256x256/apps/hexalate.png | Bin 20106 -> 19197 bytes
icons/hicolor/32x32/apps/hexalate.png | Bin 1795 -> 1538 bytes
icons/hicolor/48x48/apps/hexalate.png | Bin 2823 -> 2779 bytes
icons/hicolor/512x512/apps/hexalate.png | Bin 0 -> 42612 bytes
icons/hicolor/64x64/apps/hexalate.png | Bin 4276 -> 3952 bytes
icons/icon.qrc | 9 +--
icons/po/ca.po | 39 +++++++++++
icons/po/cs.po | 40 ++++++++++++
icons/po/de.po | 45 +++++++++++++
icons/po/description.pot | 38 +++++++++++
icons/po/el.po | 39 +++++++++++
icons/po/es.po | 44 +++++++++++++
icons/po/et.po | 39 +++++++++++
icons/po/fr.po | 39 +++++++++++
icons/po/hu.po | 44 +++++++++++++
icons/po/it.po | 39 +++++++++++
icons/po/lt.po | 46 +++++++++++++
icons/po/ms.po | 45 +++++++++++++
icons/po/nl.po | 44 +++++++++++++
icons/po/pl.po | 46 +++++++++++++
icons/po/pt_BR.po | 45 +++++++++++++
icons/po/ro.po | 46 +++++++++++++
icons/po/ru.po | 46 +++++++++++++
icons/po/tr.po | 39 +++++++++++
icons/po/update-po.sh | 66 +++++++++++++++++++
mac_deploy.sh | 6 +-
src/locale_dialog.cpp | 45 +++++++------
src/main.cpp | 20 ++----
src/piece.cpp | 18 ++----
src/piece.h | 2 +-
src/puzzle.cpp | 26 +++++---
src/window.cpp | 17 ++---
translations/hexalate_ca.qm | Bin 1057 -> 0 bytes
translations/hexalate_ca.ts | 33 ----------
translations/hexalate_cs.qm | Bin 2130 -> 0 bytes
translations/hexalate_cs.ts | 33 ----------
translations/hexalate_de.qm | Bin 2264 -> 0 bytes
translations/hexalate_de.ts | 37 +----------
translations/hexalate_el.qm | Bin 2332 -> 0 bytes
translations/hexalate_el.ts | 33 ----------
translations/hexalate_en.qm | Bin 23 -> 0 bytes
translations/hexalate_en.ts | 33 ----------
translations/hexalate_es.qm | Bin 2290 -> 0 bytes
translations/hexalate_es.ts | 33 ----------
translations/hexalate_et.qm | Bin 2140 -> 0 bytes
translations/hexalate_et.ts | 33 ----------
translations/hexalate_fr.qm | Bin 2296 -> 0 bytes
translations/hexalate_fr.ts | 33 ----------
translations/hexalate_hu.qm | Bin 2127 -> 0 bytes
translations/hexalate_hu.ts | 33 ----------
translations/hexalate_it.ts | 104 ++++++++++++++++++++++++++++++
translations/hexalate_lt.ts | 104 ++++++++++++++++++++++++++++++
translations/hexalate_ms.qm | Bin 2195 -> 0 bytes
translations/hexalate_ms.ts | 33 ----------
translations/hexalate_nl.qm | Bin 2152 -> 0 bytes
translations/hexalate_nl.ts | 33 ----------
translations/hexalate_pl.qm | Bin 2166 -> 0 bytes
translations/hexalate_pl.ts | 33 ----------
translations/hexalate_pt_BR.qm | Bin 2214 -> 0 bytes
translations/hexalate_pt_BR.ts | 33 ----------
translations/hexalate_ro.qm | Bin 2211 -> 0 bytes
translations/hexalate_ro.ts | 33 ----------
translations/hexalate_ru.qm | Bin 2153 -> 0 bytes
translations/hexalate_ru.ts | 39 +----------
translations/hexalate_tr.qm | Bin 2165 -> 0 bytes
translations/hexalate_tr.ts | 33 ----------
windows/installer.nsi | 26 ++++----
81 files changed, 1341 insertions(+), 649 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3dc64e3..3ce9578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
Makefile
build
hexalate
+*.qm
*~
diff --git a/CREDITS b/CREDITS
index 4ba7865..0320151 100644
--- a/CREDITS
+++ b/CREDITS
@@ -30,11 +30,17 @@ Greek:
Hungarian:
* Dániel Lévai
+Italian:
+* Angela
+
+Lithuanian:
+* Moo
+
Malay:
* abuyop
Polish:
-* michtrz (M T)
+* Michał Trzebiatowski
Portuguese (Brazil)
* Evandro
@@ -54,4 +60,4 @@ Turkish:
Libraries
---------
-* Qt, http://qt-project.org/
+* Qt, http://www.qt.io/
diff --git a/NEWS b/NEWS
index 8f0542d..b2c8984 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+1.1.1
+-----
+* FIXED: Did not always install translations in Linux.
+* Translation updates: Portuguese (Brazil)
+
+1.1.0
+-----
+* Added support for high DPI displays.
+* Switched to C++11 random classes.
+* Removed support for Qt 4.
+* Generate binary translations at build time.
+* FIXED: Was not properly loading Qt translations.
+* FIXED: Application layout did not respect RTL languages.
+* Translation updates: Czech, Dutch, German, Greek, Hungarian, Italian,
+ Lithuanian, Malay, Polish, Portuguese (Brazil), Romanian, Russian, Spanish.
+
1.0.3
-----
* Added README file.
diff --git a/README b/README
index feb463f..f907aa4 100644
--- a/README
+++ b/README
@@ -1,4 +1,7 @@
About
=====
-Hexalate is a color matching game. The goal of the game is to rotate and position the circles so that each touching line matches in color. You rotate circles by right clicking, and you move circles by dragging them. The game stores the positions and rotations of the circles across runs.
+Hexalate is a color matching game. The goal of the game is to rotate and
+position the circles so that each touching line matches in color. You
+rotate circles by right clicking, and you move circles by dragging them.
+The game stores the positions and rotations of the circles across runs.
diff --git a/doc/hexalate.6 b/doc/hexalate.6
new file mode 100644
index 0000000..6347465
--- /dev/null
+++ b/doc/hexalate.6
@@ -0,0 +1,36 @@
+.TH "HEXALATE" "6" "February 2014"
+
+.SH "NAME"
+hexalate \- color matching game
+
+.SH "SYNOPSIS"
+.PP
+.B hexalate
+
+.SH "DESCRIPTION"
+.PP
+Hexalate is a color matching game. The goal of the game is to rotate and
+position the circles so that each touching line matches in color. You
+rotate circles by right clicking, and you move circles by dragging them.
+The game stores the positions and rotations of the circles across runs.
+
+.SH "COPYRIGHT"
+.PP
+Copyright \(co 2014 Graeme Gott
+.PP
+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
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+.PP
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+.PP
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+.SH "AUTHOR"
+.PP
+Graeme Gott <graeme at gottcode.org>.
diff --git a/hexalate.pro b/hexalate.pro
index 73c80c3..801e231 100644
--- a/hexalate.pro
+++ b/hexalate.pro
@@ -1,25 +1,34 @@
-TEMPLATE = app
-greaterThan(QT_MAJOR_VERSION, 4) {
- QT += widgets
-}
-CONFIG += warn_on
-macx {
- CONFIG += x86_64
+lessThan(QT_VERSION, 5.2) {
+ error("Hexalate requires Qt 5.2 or greater")
}
-MOC_DIR = build
-OBJECTS_DIR = build
-RCC_DIR = build
+TEMPLATE = app
+QT += widgets
+CONFIG += warn_on c++11
+
+DEFINES += QT_DEPRECATED_WARNINGS
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900
+DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
-VERSION = 1.0.3
+# Allow in-tree builds
+!win32 {
+ MOC_DIR = build
+ OBJECTS_DIR = build
+ RCC_DIR = build
+}
+
+# Set program version
+VERSION = 1.1.1
DEFINES += VERSIONSTR=\\\"$${VERSION}\\\"
+# Set program name
unix: !macx {
TARGET = hexalate
} else {
TARGET = Hexalate
}
+# Specify program sources
HEADERS = src/board.h \
src/locale_dialog.h \
src/piece.h \
@@ -33,16 +42,23 @@ SOURCES = src/board.cpp \
src/puzzle.cpp \
src/window.cpp
+# Generate translations
TRANSLATIONS = $$files(translations/hexalate_*.ts)
+qtPrepareTool(LRELEASE, lrelease)
+updateqm.input = TRANSLATIONS
+updateqm.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.qm
+updateqm.commands = $$LRELEASE -silent ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+updateqm.CONFIG += no_link target_predeps
+QMAKE_EXTRA_COMPILERS += updateqm
-RESOURCES = icons/icon.qrc
+# Install program data
macx {
ICON = icons/hexalate.icns
} else:win32 {
RC_FILE = icons/icon.rc
-}
+} else:unix: {
+ RESOURCES = icons/icon.qrc
-unix: !macx {
isEmpty(PREFIX) {
PREFIX = /usr/local
}
@@ -61,8 +77,15 @@ unix: !macx {
desktop.files = icons/hexalate.desktop
desktop.path = $$PREFIX/share/applications
- qm.files = translations/*.qm
+ appdata.files = icons/hexalate.appdata.xml
+ appdata.path = $$PREFIX/share/metainfo/
+
+ qm.files = $$replace(TRANSLATIONS, .ts, .qm)
qm.path = $$PREFIX/share/hexalate/translations
+ qm.CONFIG += no_check_exist
+
+ man.files = doc/hexalate.6
+ man.path = $$PREFIX/share/man/man6
- INSTALLS += target icon pixmap desktop qm
+ INSTALLS += target icon pixmap desktop appdata qm man
}
diff --git a/icons/hexalate.appdata.xml b/icons/hexalate.appdata.xml
new file mode 100644
index 0000000..5723026
--- /dev/null
+++ b/icons/hexalate.appdata.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+ <id>hexalate.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-3.0+</project_license>
+ <name>Hexalate</name>
+ <name xml:lang="cs">Hexalate</name>
+ <name xml:lang="de">Hexalate</name>
+ <name xml:lang="es">Hexalate</name>
+ <name xml:lang="hu">Hexalate</name>
+ <name xml:lang="lt">Hexalate</name>
+ <name xml:lang="ms">Hexalate</name>
+ <name xml:lang="nl">Hexalate</name>
+ <name xml:lang="pl">Hexalate</name>
+ <name xml:lang="pt_BR">Hexalate</name>
+ <name xml:lang="ro">Hexalate</name>
+ <name xml:lang="ru">Hexalate</name>
+ <name xml:lang="tr">Hexalate</name>
+ <summary>Spin circles to match colors</summary>
+ <summary xml:lang="cs">Otáčejte kruhy tak, aby se barvy shodovaly</summary>
+ <summary xml:lang="de">Drehen Sie Kreise, um Farben in Übereinstimmung zu bringen</summary>
+ <summary xml:lang="es">Gire los círculos para hacer coincidir los colores</summary>
+ <summary xml:lang="hu">Forgassa a köröket a színek illesztéséhez</summary>
+ <summary xml:lang="lt">Sukite ratus, kad sutaptų spalvos</summary>
+ <summary xml:lang="ms">Putar bulatan untuk padankan warna</summary>
+ <summary xml:lang="nl">Draai cirkels om kleuren te koppelen</summary>
+ <summary xml:lang="pl">Obróć koła, aby dopasować kolory</summary>
+ <summary xml:lang="pt_BR">Rode os círculos para combinar as cores.</summary>
+ <summary xml:lang="ro">Rotiţi cercurile pentru potrivirea culorilor</summary>
+ <summary xml:lang="ru">Вращайте круги, чтобы сопоставить цвета</summary>
+
+ <description>
+ <p>Hexalate is a color matching game. The goal of the game is to rotate and position the circles so that each touching line matches in color. You rotate circles by right clicking, and you move circles by dragging them. The game stores the positions and rotations of the circles across runs.</p>
+ <p xml:lang="de">Hexalate ist ein Farbenrätsel. Ziel des Spiels ist es, die Kreise so zu drehen und zu positionieren, dass alle sich berührenden Linien die gleiche Farbe haben. Sie können die Kreise durch einen rechten Mausklick rotieren und durch Ziehen mit der Maus positionieren. Das Spiel merkt sich den Spielstand, wenn Sie es beenden und neu starten.</p>
+ <p xml:lang="es">Hexalate es un juego de coincidir colores. La meta del juego es rotar y posicionar los círculos para que cada línea próxima coincida en color. Rotas los círculos dando clic derecho, y mueves los círculos arrastrándolos. El juego almacena la posición y rotación de los círculos entre juegos.</p>
+ <p xml:lang="hu">A Hexalate egy színpárosító játék. A játék célja a körök forgatása és áthelyezése úgy, hogy minden érintkező vonal színben illeszkedjen. A köröket a jobb kattintással forgathatja, és húzással mozgathatja azokat. A játék eltárolja a körök pozícióit és forgatásait a futtatások között.</p>
+ <p xml:lang="lt">Hexalate yra spalvų sutapimo žaidimas. Žaidimo tikslas yra sukti ir nustatyti tokią ratų padėtį, kad kievienos susiliečiančios linijos spalva sutaptų. Jūs sukate ratus, spusteldami ant jų dešiniuoju pelės mygtukų, o tempdami - juos perkeliate. Paleidimo tarpais, žaidimas išsaugo ratų vietą ir pasukimą.</p>
+ <p xml:lang="ms">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.</p>
+ <p xml:lang="nl">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.</p>
+ <p xml:lang="pl">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.</p>
+ <p xml:lang="pt_BR">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.</p>
+ <p xml:lang="ro">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.</p>
+ <p xml:lang="ru">Hexalate - игра сопоставления цветов. Цель игры состоит в том, чтобы вращать и перемещать круги так, что бы каждый цветной луч касался другого луча такого же цвета. Круги можно вращать и перемещать правой кнопкой мыши. Игра сохраняет позиции кругов и можно продолжить играть при следующем запуске.</p>
+ </description>
+
+ <screenshots>
+ <screenshot type="default">
+ <image>https://gottcode.org/hexalate/screenshots/appdata.png</image>
+ </screenshot>
+ </screenshots>
+
+ <url type="homepage">https://gottcode.org/hexalate/</url>
+ <url type="bugtracker">https://gottcode.org/hexalate/bugs/</url>
+ <url type="donation">https://gottcode.org/tip/</url>
+ <url type="translate">https://www.transifex.com/projects/p/hexalate/</url>
+
+ <developer_name>Graeme Gott</developer_name>
+ <update_contact>graeme at gottcode.org</update_contact>
+
+ <translation type="qt">hexalate</translation>
+
+ <provides>
+ <binary>hexalate</binary>
+ </provides>
+
+ <kudos>
+ <kudo>HiDpiIcon</kudo>
+ <kudo>ModernToolkit</kudo>
+ </kudos>
+
+ <content_rating type="oars-1.0">
+ <content_attribute id="violence-cartoon">none</content_attribute>
+ <content_attribute id="violence-fantasy">none</content_attribute>
+ <content_attribute id="violence-realistic">none</content_attribute>
+ <content_attribute id="violence-bloodshed">none</content_attribute>
+ <content_attribute id="violence-sexual">none</content_attribute>
+ <content_attribute id="drugs-alcohol">none</content_attribute>
+ <content_attribute id="drugs-narcotics">none</content_attribute>
+ <content_attribute id="drugs-tobacco">none</content_attribute>
+ <content_attribute id="sex-nudity">none</content_attribute>
+ <content_attribute id="sex-themes">none</content_attribute>
+ <content_attribute id="language-profanity">none</content_attribute>
+ <content_attribute id="language-humor">none</content_attribute>
+ <content_attribute id="language-discrimination">none</content_attribute>
+ <content_attribute id="social-chat">none</content_attribute>
+ <content_attribute id="social-info">none</content_attribute>
+ <content_attribute id="social-audio">none</content_attribute>
+ <content_attribute id="social-location">none</content_attribute>
+ <content_attribute id="social-contacts">none</content_attribute>
+ <content_attribute id="money-purchasing">none</content_attribute>
+ <content_attribute id="money-gambling">none</content_attribute>
+ </content_rating>
+</component>
diff --git a/icons/hexalate.desktop b/icons/hexalate.desktop
index f73d6d2..70a3391 100644
--- a/icons/hexalate.desktop
+++ b/icons/hexalate.desktop
@@ -1,22 +1,42 @@
[Desktop Entry]
Name=Hexalate
+Name[cs]=Hexalate
Name[de]=Hexalate
Name[es]=Hexalate
Name[hu]=Hexalate
+Name[lt]=Hexalate
Name[ms]=Hexalate
+Name[nl]=Hexalate
Name[pl]=Hexalate
Name[pt_BR]=Hexalate
Name[ro]=Hexalate
+Name[ru]=Hexalate
Name[tr]=Hexalate
GenericName=Color Matching Game
-GenericName[de]=Farbabstimmungsspiel
-GenericName[es]=Juego de igualación de colores
-GenericName[hu]=Színkereső játék
-GenericName[ms]=Permainan Memadankan Warna
+GenericName[cs]=Hra o shodě barev
+GenericName[de]=Farbenrätsel
+GenericName[es]=Juego de Coincidir Colores
+GenericName[hu]=Színpárosító játék
+GenericName[lt]=Spalvų sutapimo žaidimas
+GenericName[ms]=Permainan Padanan Warna
+GenericName[nl]=Kleur koppel spel
GenericName[pl]=Gra dopasowania kolorów
GenericName[pt_BR]=Jogo de combinação de cores
-GenericName[ro]=Joc de potrivire culori
+GenericName[ro]=Joc de potrivire a culorilor
+GenericName[ru]=Игра подбора цветов
GenericName[tr]=Renk Eşleştirme Oyunu
+Comment=Spin circles to match colors
+Comment[cs]=Otáčejte kruhy tak, aby se barvy shodovaly
+Comment[de]=Drehen Sie Kreise, um Farben in Übereinstimmung zu bringen
+Comment[es]=Gire los círculos para hacer coincidir los colores
+Comment[hu]=Forgassa a köröket a színek illesztéséhez
+Comment[lt]=Sukite ratus, kad sutaptų spalvos
+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
Icon=hexalate
Terminal=false
diff --git a/icons/hexalate.icns b/icons/hexalate.icns
index c48afe9..6b04bc8 100644
Binary files a/icons/hexalate.icns and b/icons/hexalate.icns differ
diff --git a/icons/hicolor/1024x1024/apps/hexalate.png b/icons/hicolor/1024x1024/apps/hexalate.png
new file mode 100644
index 0000000..6239b8e
Binary files /dev/null and b/icons/hicolor/1024x1024/apps/hexalate.png differ
diff --git a/icons/hicolor/128x128/apps/hexalate.png b/icons/hicolor/128x128/apps/hexalate.png
index 5b11215..ab9c3b1 100644
Binary files a/icons/hicolor/128x128/apps/hexalate.png and b/icons/hicolor/128x128/apps/hexalate.png differ
diff --git a/icons/hicolor/16x16/apps/hexalate.png b/icons/hicolor/16x16/apps/hexalate.png
index 023bbb2..2d00381 100644
Binary files a/icons/hicolor/16x16/apps/hexalate.png and b/icons/hicolor/16x16/apps/hexalate.png differ
diff --git a/icons/hicolor/22x22/apps/hexalate.png b/icons/hicolor/22x22/apps/hexalate.png
index 61a6ba5..e65e05f 100644
Binary files a/icons/hicolor/22x22/apps/hexalate.png and b/icons/hicolor/22x22/apps/hexalate.png differ
diff --git a/icons/hicolor/24x24/apps/hexalate.png b/icons/hicolor/24x24/apps/hexalate.png
index 353099f..2b0cf65 100644
Binary files a/icons/hicolor/24x24/apps/hexalate.png and b/icons/hicolor/24x24/apps/hexalate.png differ
diff --git a/icons/hicolor/256x256/apps/hexalate.png b/icons/hicolor/256x256/apps/hexalate.png
index f123807..30d5d74 100644
Binary files a/icons/hicolor/256x256/apps/hexalate.png and b/icons/hicolor/256x256/apps/hexalate.png differ
diff --git a/icons/hicolor/32x32/apps/hexalate.png b/icons/hicolor/32x32/apps/hexalate.png
index 7ca7167..1e6c557 100644
Binary files a/icons/hicolor/32x32/apps/hexalate.png and b/icons/hicolor/32x32/apps/hexalate.png differ
diff --git a/icons/hicolor/48x48/apps/hexalate.png b/icons/hicolor/48x48/apps/hexalate.png
index 0a435a2..eed24de 100644
Binary files a/icons/hicolor/48x48/apps/hexalate.png and b/icons/hicolor/48x48/apps/hexalate.png differ
diff --git a/icons/hicolor/512x512/apps/hexalate.png b/icons/hicolor/512x512/apps/hexalate.png
new file mode 100644
index 0000000..18bdfe9
Binary files /dev/null and b/icons/hicolor/512x512/apps/hexalate.png differ
diff --git a/icons/hicolor/64x64/apps/hexalate.png b/icons/hicolor/64x64/apps/hexalate.png
index 470cc44..7bbedbb 100644
Binary files a/icons/hicolor/64x64/apps/hexalate.png and b/icons/hicolor/64x64/apps/hexalate.png differ
diff --git a/icons/icon.qrc b/icons/icon.qrc
index 8e79303..96970a7 100644
--- a/icons/icon.qrc
+++ b/icons/icon.qrc
@@ -1,12 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
- <file>hicolor/256x256/apps/hexalate.png</file>
- <file>hicolor/128x128/apps/hexalate.png</file>
- <file>hicolor/64x64/apps/hexalate.png</file>
- <file>hicolor/48x48/apps/hexalate.png</file>
- <file>hicolor/32x32/apps/hexalate.png</file>
- <file>hicolor/24x24/apps/hexalate.png</file>
- <file>hicolor/22x22/apps/hexalate.png</file>
- <file>hicolor/16x16/apps/hexalate.png</file>
+ <file alias="hexalate.png">hicolor/256x256/apps/hexalate.png</file>
</qresource>
</RCC>
diff --git a/icons/po/ca.po b/icons/po/ca.po
new file mode 100644
index 0000000..e0f8032
--- /dev/null
+++ b/icons/po/ca.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+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 <EMAIL at ADDRESS>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/hexalate/"
+"language/ca/)\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
diff --git a/icons/po/cs.po b/icons/po/cs.po
new file mode 100644
index 0000000..3ea4617
--- /dev/null
+++ b/icons/po/cs.po
@@ -0,0 +1,40 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# fri, 2014
+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-12-28 09:32+0000\n"
+"Last-Translator: fri\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/hexalate/language/"
+"cs/)\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Otáčejte kruhy tak, aby se barvy shodovaly"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Hra o shodě barev"
diff --git a/icons/po/de.po b/icons/po/de.po
new file mode 100644
index 0000000..0aae91e
--- /dev/null
+++ b/icons/po/de.po
@@ -0,0 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# enz <markus.enzenberger at gmail.com>, 2014
+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-12-21 11:54+0000\n"
+"Last-Translator: enz <markus.enzenberger at gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/hexalate/language/"
+"de/)\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Drehen Sie Kreise, um Farben in Übereinstimmung zu bringen"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 ist ein Farbenrätsel. Ziel des Spiels ist es, die Kreise so zu "
+"drehen und zu positionieren, dass alle sich berührenden Linien die gleiche "
+"Farbe haben. Sie können die Kreise durch einen rechten Mausklick rotieren "
+"und durch Ziehen mit der Maus positionieren. Das Spiel merkt sich den "
+"Spielstand, wenn Sie es beenden und neu starten."
+
+#: ../hexalate.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Farbenrätsel"
diff --git a/icons/po/description.pot b/icons/po/description.pot
new file mode 100644
index 0000000..7a77afd
--- /dev/null
+++ b/icons/po/description.pot
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+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: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
diff --git a/icons/po/el.po b/icons/po/el.po
new file mode 100644
index 0000000..fe120aa
--- /dev/null
+++ b/icons/po/el.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+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 <EMAIL at ADDRESS>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/hexalate/language/"
+"el/)\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
diff --git a/icons/po/es.po b/icons/po/es.po
new file mode 100644
index 0000000..dfe8cfa
--- /dev/null
+++ b/icons/po/es.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Edgar Carballo <karvayoEdgar at gmail.com>, 2015
+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: 2015-02-11 08:39+0000\n"
+"Last-Translator: Edgar Carballo <karvayoEdgar at gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/gottcode/hexalate/language/"
+"es/)\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Gire los círculos para hacer coincidir los colores"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 es un juego de coincidir colores. La meta del juego es rotar y "
+"posicionar los círculos para que cada línea próxima coincida en color. Rotas "
+"los círculos dando clic derecho, y mueves los círculos arrastrándolos. El "
+"juego almacena la posición y rotación de los círculos entre juegos."
+
+#: ../hexalate.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Juego de Coincidir Colores"
diff --git a/icons/po/et.po b/icons/po/et.po
new file mode 100644
index 0000000..4ed25c8
--- /dev/null
+++ b/icons/po/et.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+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 <EMAIL at ADDRESS>\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/hexalate/"
+"language/et/)\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
diff --git a/icons/po/fr.po b/icons/po/fr.po
new file mode 100644
index 0000000..41a9951
--- /dev/null
+++ b/icons/po/fr.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+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 <EMAIL at ADDRESS>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/hexalate/language/"
+"fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
diff --git a/icons/po/hu.po b/icons/po/hu.po
new file mode 100644
index 0000000..f9e9c37
--- /dev/null
+++ b/icons/po/hu.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Balázs Úr <urbalazs at gmail.com>, 2015
+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: 2015-04-09 14:58+0000\n"
+"Last-Translator: Balázs Úr <urbalazs at gmail.com>\n"
+"Language-Team: Hungarian (http://www.transifex.com/gottcode/hexalate/"
+"language/hu/)\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Forgassa a köröket a színek illesztéséhez"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"circles by right clicking, and you move circles by dragging them. The game "
+"stores the positions and rotations of the circles across runs."
+msgstr ""
+"A Hexalate egy színpárosító játék. A játék célja a körök forgatása és "
+"áthelyezése úgy, hogy minden érintkező vonal színben illeszkedjen. A köröket "
+"a jobb kattintással forgathatja, és húzással mozgathatja azokat. A játék "
+"eltárolja a körök pozícióit és forgatásait a futtatások között."
+
+#: ../hexalate.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Színpárosító játék"
diff --git a/icons/po/it.po b/icons/po/it.po
new file mode 100644
index 0000000..cdce062
--- /dev/null
+++ b/icons/po/it.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+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 <EMAIL at ADDRESS>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/hexalate/"
+"language/it/)\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr ""
diff --git a/icons/po/lt.po b/icons/po/lt.po
new file mode 100644
index 0000000..84625c6
--- /dev/null
+++ b/icons/po/lt.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Moo, 2014,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: 2016-04-15 21:47+0000\n"
+"Last-Translator: Moo\n"
+"Language-Team: Lithuanian (http://www.transifex.com/gottcode/hexalate/"
+"language/lt/)\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Sukite ratus, kad sutaptų spalvos"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 yra spalvų sutapimo žaidimas. Žaidimo tikslas yra sukti ir "
+"nustatyti tokią ratų padėtį, kad kievienos susiliečiančios linijos spalva "
+"sutaptų. Jūs sukate ratus, spusteldami ant jų dešiniuoju pelės mygtukų, o "
+"tempdami - juos perkeliate. Paleidimo tarpais, žaidimas išsaugo ratų vietą "
+"ir pasukimą."
+
+#: ../hexalate.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Spalvų sutapimo žaidimas"
diff --git a/icons/po/ms.po b/icons/po/ms.po
new file mode 100644
index 0000000..dd99251
--- /dev/null
+++ b/icons/po/ms.po
@@ -0,0 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# abuyop <abuyop at gmail.com>, 2014
+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-12-29 01:59+0000\n"
+"Last-Translator: abuyop <abuyop at gmail.com>\n"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/"
+"hexalate/language/ms_MY/)\n"
+"Language: ms\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"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Putar bulatan untuk padankan warna"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Permainan Padanan Warna"
diff --git a/icons/po/nl.po b/icons/po/nl.po
new file mode 100644
index 0000000..a68e017
--- /dev/null
+++ b/icons/po/nl.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# RobertBorst <webmaster at fam-borst.nl>, 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: 2016-08-21 14:12+0000\n"
+"Last-Translator: RobertBorst <webmaster at fam-borst.nl>\n"
+"Language-Team: Dutch (http://www.transifex.com/gottcode/hexalate/language/"
+"nl/)\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Draai cirkels om kleuren te koppelen"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Kleur koppel spel"
diff --git a/icons/po/pl.po b/icons/po/pl.po
new file mode 100644
index 0000000..cce0bbe
--- /dev/null
+++ b/icons/po/pl.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# M T <michtrz at gmail.com>, 2015
+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: 2015-10-25 22:04+0000\n"
+"Last-Translator: M T <michtrz at gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/gottcode/hexalate/language/"
+"pl/)\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Obróć koła, aby dopasować kolory"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Gra dopasowania kolorów"
diff --git a/icons/po/pt_BR.po b/icons/po/pt_BR.po
new file mode 100644
index 0000000..27a003f
--- /dev/null
+++ b/icons/po/pt_BR.po
@@ -0,0 +1,45 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Jonathan Andrade <jonyandrade.silva at gmail.com>, 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: 2016-12-01 14:50+0000\n"
+"Last-Translator: Jonathan Andrade <jonyandrade.silva at gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/gottcode/"
+"hexalate/language/pt_BR/)\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Rode os círculos para combinar as cores."
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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"
+msgstr "Jogo de combinação de cores"
diff --git a/icons/po/ro.po b/icons/po/ro.po
new file mode 100644
index 0000000..8ab9649
--- /dev/null
+++ b/icons/po/ro.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Oprea Nicolae <jaff2002 at yahoo.com>, 2014
+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-14 13:37+0000\n"
+"Last-Translator: Oprea Nicolae <jaff2002 at yahoo.com>\n"
+"Language-Team: Romanian (http://www.transifex.com/projects/p/hexalate/"
+"language/ro/)\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Rotiţi cercurile pentru potrivirea culorilor"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Joc de potrivire a culorilor"
diff --git a/icons/po/ru.po b/icons/po/ru.po
new file mode 100644
index 0000000..75afe24
--- /dev/null
+++ b/icons/po/ru.po
@@ -0,0 +1,46 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Alexandr Uspensky <AlexandrUSP at yandex.com>, 2015
+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: 2015-04-09 13:08+0000\n"
+"Last-Translator: Alexandr Uspensky <AlexandrUSP at yandex.com>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/gottcode/hexalate/"
+"language/ru_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"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr "Вращайте круги, чтобы сопоставить цвета"
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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 - игра сопоставления цветов. Цель игры состоит в том, чтобы вращать "
+"и перемещать круги так, что бы каждый цветной луч касался другого луча "
+"такого же цвета. Круги можно вращать и перемещать правой кнопкой мыши. Игра "
+"сохраняет позиции кругов и можно продолжить играть при следующем запуске."
+
+#: ../hexalate.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Игра подбора цветов"
diff --git a/icons/po/tr.po b/icons/po/tr.po
new file mode 100644
index 0000000..ebff076
--- /dev/null
+++ b/icons/po/tr.po
@@ -0,0 +1,39 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Graeme Gott
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+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 <EMAIL at ADDRESS>\n"
+"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/"
+"hexalate/language/tr_TR/)\n"
+"Language: tr\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"
+
+#: ../hexalate.appdata.xml.in.h:1 ../hexalate.desktop.in.h:1
+msgid "Hexalate"
+msgstr "Hexalate"
+
+#: ../hexalate.appdata.xml.in.h:2 ../hexalate.desktop.in.h:3
+msgid "Spin circles to match colors"
+msgstr ""
+
+#: ../hexalate.appdata.xml.in.h:3
+msgid ""
+"Hexalate is a color matching game. The goal of the game is to rotate and "
+"position the circles so that each touching line matches in color. You rotate "
+"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.desktop.in.h:2
+msgid "Color Matching Game"
+msgstr "Renk Eşleştirme Oyunu"
diff --git a/icons/po/update-po.sh b/icons/po/update-po.sh
new file mode 100755
index 0000000..1f240f7
--- /dev/null
+++ b/icons/po/update-po.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+
+echo -n 'Preparing files...'
+cd ..
+
+rm -f hexalate.desktop.in.h
+rm -f hexalate.desktop.in
+cp hexalate.desktop hexalate.desktop.in
+sed -e '/^Name\[/ d' \
+ -e '/^GenericName\[/ d' \
+ -e '/^Comment\[/ d' \
+ -e 's/^Name/_Name/' \
+ -e 's/^GenericName/_GenericName/' \
+ -e 's/^Comment/_Comment/' \
+ -i hexalate.desktop.in
+intltool-extract --quiet --type=gettext/ini hexalate.desktop.in
+
+rm -f hexalate.appdata.xml.in.h
+rm -f hexalate.appdata.xml.in
+cp hexalate.appdata.xml hexalate.appdata.xml.in
+sed -e '/p xml:lang/ d' \
+ -e '/summary xml:lang/ d' \
+ -e '/name xml:lang/ d' \
+ -e 's/<p>/<_p>/' \
+ -e 's/<\/p>/<\/_p>/' \
+ -e 's/<summary>/<_summary>/' \
+ -e 's/<\/summary>/<\/_summary>/' \
+ -e 's/<name>/<_name>/' \
+ -e 's/<\/name>/<\/_name>/' \
+ -i hexalate.appdata.xml.in
+intltool-extract --quiet --type=gettext/xml hexalate.appdata.xml.in
+
+cd po
+echo ' DONE'
+
+
+echo -n 'Extracting messages...'
+xgettext --from-code=UTF-8 --c++ --keyword=_ --keyword=N_:1 \
+ --package-name='Hexalate' --copyright-holder='Graeme Gott' \
+ --output=description.pot ../*.h
+sed 's/CHARSET/UTF-8/' -i description.pot
+echo ' DONE'
+
+
+echo -n 'Updating translations...'
+for POFILE in *.po;
+do
+ echo -n " $POFILE"
+ msgmerge --quiet --update --backup=none $POFILE description.pot
+done
+echo ' DONE'
+
+
+echo -n 'Merging translations...'
+cd ..
+
+intltool-merge --quiet --desktop-style po hexalate.desktop.in hexalate.desktop
+rm -f hexalate.desktop.in.h
+rm -f hexalate.desktop.in
+
+intltool-merge --quiet --xml-style po hexalate.appdata.xml.in hexalate.appdata.xml
+rm -f hexalate.appdata.xml.in.h
+rm -f hexalate.appdata.xml.in
+
+echo ' DONE'
diff --git a/mac_deploy.sh b/mac_deploy.sh
index 0b2c436..65360b7 100755
--- a/mac_deploy.sh
+++ b/mac_deploy.sh
@@ -2,7 +2,7 @@
APP='Hexalate'
BUNDLE="$APP.app"
-VERSION='1.0.3'
+VERSION='1.1.1'
# Remove any previous disk folder or DMG
echo -n 'Preparing... '
@@ -37,12 +37,12 @@ do
mkdir "$LPROJ"
sed "s/????/${translation}/" < 'mac/locversion.plist' > "${LPROJ}/locversion.plist"
- QT_TRANSLATION="${QTDIR}/translations/qt_${translation}.qm"
+ QT_TRANSLATION="${QTDIR}/translations/qtbase_${translation}.qm"
if [ -e "$QT_TRANSLATION" ]; then
cp -f "$QT_TRANSLATION" "$TRANSLATIONS"
fi
- QT_TRANSLATION="${QTDIR}/translations/qt_${translation:0:2}.qm"
+ QT_TRANSLATION="${QTDIR}/translations/qtbase_${translation:0:2}.qm"
if [ -e "$QT_TRANSLATION" ]; then
cp -f "$QT_TRANSLATION" "$TRANSLATIONS"
fi
diff --git a/src/locale_dialog.cpp b/src/locale_dialog.cpp
index d2f8419..eff7552 100644
--- a/src/locale_dialog.cpp
+++ b/src/locale_dialog.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2010, 2011, 2012, 2013 Graeme Gott <graeme at gottcode.org>
+ * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016 Graeme Gott <graeme at gottcode.org>
*
* 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
@@ -20,10 +20,10 @@
#include "locale_dialog.h"
#include <QComboBox>
-#include <QCoreApplication>
#include <QDialogButtonBox>
#include <QDir>
#include <QFile>
+#include <QGuiApplication>
#include <QHash>
#include <QLabel>
#include <QLibraryInfo>
@@ -33,6 +33,8 @@
#include <QTranslator>
#include <QVBoxLayout>
+#include <algorithm>
+
//-----------------------------------------------------------------------------
QString LocaleDialog::m_current;
@@ -51,21 +53,20 @@ LocaleDialog::LocaleDialog(QWidget* parent) :
m_translations = new QComboBox(this);
m_translations->addItem(tr("<System Language>"));
- QString translation;
QStringList translations = findTranslations();
- foreach (translation, translations) {
+ for (QString translation : translations) {
if (translation.startsWith("qt")) {
continue;
}
translation.remove(m_appname);
m_translations->addItem(languageName(translation), translation);
}
- int index = qMax(0, m_translations->findData(m_current));
+ int index = std::max(0, m_translations->findData(m_current));
m_translations->setCurrentIndex(index);
QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
- connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
- connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
+ connect(buttons, &QDialogButtonBox::accepted, this, &LocaleDialog::accept);
+ connect(buttons, &QDialogButtonBox::rejected, this, &LocaleDialog::reject);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->setSizeConstraint(QLayout::SetFixedSize);
@@ -88,7 +89,7 @@ void LocaleDialog::loadTranslator(const QString& name, const QStringList& datadi
paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
paths.append(appdir + "/../Resources");
}
- foreach (const QString& path, paths) {
+ for (const QString& path : paths) {
if (QFile::exists(path + "/translations/")) {
m_path = path + "/translations/";
break;
@@ -113,16 +114,19 @@ void LocaleDialog::loadTranslator(const QString& name, const QStringList& datadi
// Load translators
static QTranslator qt_translator;
- if (translations.contains("qt_" + current) || translations.contains("qt_" + current.left(2))) {
- qt_translator.load("qt_" + current, m_path);
+ if (translations.contains("qtbase_" + current) || translations.contains("qtbase_" + current.left(2))) {
+ qt_translator.load("qtbase_" + current, m_path);
} else {
- qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+ qt_translator.load("qtbase_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
}
QCoreApplication::installTranslator(&qt_translator);
static QTranslator translator;
translator.load(m_appname + current, m_path);
QCoreApplication::installTranslator(&translator);
+
+ // Work around bug in Qt 5 where text direction is not loaded
+ QGuiApplication::setLayoutDirection(QLocale(current).textDirection());
}
//-----------------------------------------------------------------------------
@@ -132,7 +136,6 @@ QString LocaleDialog::languageName(const QString& language)
QString lang_code = language.left(5);
QLocale locale(lang_code);
QString name;
-#if (QT_VERSION >= QT_VERSION_CHECK(4,8,0))
if (lang_code.length() > 2) {
if (locale.name() == lang_code) {
name = locale.nativeLanguageName() + " (" + locale.nativeCountryName() + ")";
@@ -142,20 +145,16 @@ QString LocaleDialog::languageName(const QString& language)
} else {
name = locale.nativeLanguageName();
}
- if (locale.textDirection() == Qt::RightToLeft) {
- name.prepend(QChar(0x202b));
- }
-#else
- if (lang_code.length() > 2) {
- if (locale.name() == lang_code) {
- name = QLocale::languageToString(locale.language()) + " (" + QLocale::countryToString(locale.country()) + ")";
+ if (name.isEmpty() || name == "C") {
+ if (language == "eo") {
+ name = "Esperanto";
} else {
- name = QLocale::languageToString(locale.language()) + " (" + language + ")";
+ name = language;
}
- } else {
- name = QLocale::languageToString(locale.language());
}
-#endif
+ if (locale.textDirection() == Qt::RightToLeft) {
+ name.prepend(QChar(0x202b));
+ }
return name;
}
diff --git a/src/main.cpp b/src/main.cpp
index 02b874a..70425f9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009, 2010, 2012, 2013 Graeme Gott <graeme at gottcode.org>
+ * Copyright (C) 2009, 2010, 2012, 2013, 2014, 2015 Graeme Gott <graeme at gottcode.org>
*
* 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,23 +27,13 @@ int main(int argc, char** argv) {
QApplication app(argc, argv);
app.setApplicationName("Hexalate");
app.setApplicationVersion(VERSIONSTR);
+ app.setApplicationDisplayName(Window::tr("Hexalate"));
app.setOrganizationDomain("gottcode.org");
app.setOrganizationName("GottCode");
- {
- QIcon fallback(":/hicolor/256x256/apps/hexalate.png");
- fallback.addFile(":/hicolor/128x128/apps/hexalate.png");
- fallback.addFile(":/hicolor/64x64/apps/hexalate.png");
- fallback.addFile(":/hicolor/48x48/apps/hexalate.png");
- fallback.addFile(":/hicolor/32x32/apps/hexalate.png");
- fallback.addFile(":/hicolor/24x24/apps/hexalate.png");
- fallback.addFile(":/hicolor/22x22/apps/hexalate.png");
- fallback.addFile(":/hicolor/16x16/apps/hexalate.png");
-#if (QT_VERSION >= (QT_VERSION_CHECK(4,6,0)))
- app.setWindowIcon(QIcon::fromTheme("hexalate", fallback));
-#else
- app.setWindowIcon(fallback);
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
+ app.setWindowIcon(QIcon::fromTheme("hexalate", QIcon(":/hexalate.png")));
#endif
- }
+ app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
LocaleDialog::loadTranslator("hexalate_");
diff --git a/src/piece.cpp b/src/piece.cpp
index 30f3cb9..5916a6f 100644
--- a/src/piece.cpp
+++ b/src/piece.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009, 2010 Graeme Gott <graeme at gottcode.org>
+ * Copyright (C) 2009, 2010, 2014 Graeme Gott <graeme at gottcode.org>
*
* 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
@@ -46,7 +46,6 @@ Piece::Piece(Puzzle* puzzle)
m_connectors.append(-1);
}
setFlag(ItemIsMovable, true);
- setCacheMode(DeviceCoordinateCache);
setHighlight(false);
for (int i = 0; i < 24; ++i) {
@@ -54,7 +53,7 @@ Piece::Piece(Puzzle* puzzle)
}
m_rotate_timer = new QTimer(this);
- connect(m_rotate_timer, SIGNAL(timeout()), this, SLOT(rotateConnectors()));
+ connect(m_rotate_timer, &QTimer::timeout, this, &Piece::rotateConnectors);
m_rotate_timer->setInterval(40);
m_puzzle->addItem(this);
@@ -98,10 +97,8 @@ bool Piece::setConnector(int offset, int value) {
/*****************************************************************************/
void Piece::setHighlight(bool highlight) {
- setCacheMode(NoCache);
setPen(QPen(highlight ? Qt::white : Qt::darkGray, 2));
setZValue(highlight ? 2 : 1);
- setCacheMode(DeviceCoordinateCache);
}
/*****************************************************************************/
@@ -113,8 +110,7 @@ void Piece::setPosition(const QPointF& position) {
/*****************************************************************************/
-void Piece::spin() {
- int rotations = rand() % 6;
+void Piece::spin(int rotations) {
int angle = 90;
for (int i = 0; i < rotations; ++i) {
m_connectors.move(5, 0);
@@ -164,7 +160,7 @@ void Piece::mouseMoveEvent(QGraphicsSceneMouseEvent* event) {
// Find piece containing center
Piece* swap_piece = 0;
QList<QGraphicsItem*> items = scene()->items(sceneBoundingRect().center());
- foreach (QGraphicsItem* item, items) {
+ for (QGraphicsItem* item : items) {
Piece* piece = qgraphicsitem_cast<Piece*>(item);
if (piece && piece != this) {
swap_piece = piece;
@@ -261,9 +257,9 @@ void Piece::moveTo(const QPointF& new_pos) {
animation->setPosAt(0, pos());
animation->setPosAt(1, new_pos);
- connect(timeline, SIGNAL(finished()), this, SLOT(actionFinished()));
- connect(timeline, SIGNAL(finished()), animation, SLOT(deleteLater()));
- connect(timeline, SIGNAL(finished()), timeline, SLOT(deleteLater()));
+ connect(timeline, &QTimeLine::finished, this, &Piece::actionFinished);
+ connect(timeline, &QTimeLine::finished, animation, &QGraphicsItemAnimation::deleteLater);
+ connect(timeline, &QTimeLine::finished, timeline, &QTimeLine::deleteLater);
timeline->start();
}
diff --git a/src/piece.h b/src/piece.h
index fd6cc58..548da3f 100644
--- a/src/piece.h
+++ b/src/piece.h
@@ -43,7 +43,7 @@ public:
bool setConnector(int offset, int value);
void setHighlight(bool highlight);
void setPosition(const QPointF& position);
- void spin();
+ void spin(int rotations);
bool fromString(const QString& string);
QString toString() const;
diff --git a/src/puzzle.cpp b/src/puzzle.cpp
index 4911c1b..40f73c6 100644
--- a/src/puzzle.cpp
+++ b/src/puzzle.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009 Graeme Gott <graeme at gottcode.org>
+ * Copyright (C) 2009, 2014, 2015 Graeme Gott <graeme at gottcode.org>
*
* 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
@@ -29,6 +29,7 @@
#include <algorithm>
#include <ctime>
+#include <random>
/*****************************************************************************/
@@ -77,7 +78,12 @@ void Puzzle::generate() {
m_done = false;
// Set random seed
- srand(time(0));
+#ifndef Q_OS_WIN
+ std::random_device rd;
+ std::mt19937 gen(rd());
+#else
+ std::mt19937 gen(time(0));
+#endif
// Add board background
createBackground();
@@ -89,7 +95,7 @@ void Puzzle::generate() {
// Create first piece
QList<int> colors = m_pieces.first()->colors();
- std::random_shuffle(colors.begin(), colors.end());
+ std::shuffle(colors.begin(), colors.end(), gen);
for (int i = 0; i < 6; ++i) {
int color = colors.at(i);
m_pieces.first()->setConnector(i, color);
@@ -105,7 +111,8 @@ void Puzzle::generate() {
QList<int> colors2 = m_pieces.at(next)->colors();
colors = colors1 + colors2;
colors.erase(std::set_intersection(colors1.begin(), colors1.end(), colors2.begin(), colors2.end(), colors.begin()), colors.end());
- int color = colors.at(rand() % colors.count());
+ std::uniform_int_distribution<int> dis(0, colors.count() - 1);
+ int color = colors.at(dis(gen));
m_pieces.at(i)->setConnector(offset, color);
m_pieces.at(next)->setConnector(match(offset), color);
}
@@ -114,7 +121,7 @@ void Puzzle::generate() {
for (int i = 1; i < 7; ++i) {
Piece* piece = m_pieces.at(i);
colors = piece->colors();
- std::random_shuffle(colors.begin(), colors.end());
+ std::shuffle(colors.begin(), colors.end(), gen);
for (int j = 0; j < 6; ++j) {
if (piece->connector(j) == -1) {
piece->setConnector(j, colors.takeFirst());
@@ -123,9 +130,10 @@ void Puzzle::generate() {
}
// Randomize board
- std::random_shuffle(m_pieces.begin(), m_pieces.end());
- foreach (Piece* piece, m_pieces) {
- piece->spin();
+ std::shuffle(m_pieces.begin(), m_pieces.end(), gen);
+ std::uniform_int_distribution<int> dis(0, 5);
+ for (Piece* piece : m_pieces) {
+ piece->spin(dis(gen));
}
// Position pieces
@@ -224,7 +232,7 @@ void Puzzle::save() {
void Puzzle::createBackground() {
QGraphicsItem* background = addEllipse(10, 10, 300, 300, QPen(Qt::darkGray, 2), Qt::gray);
- foreach (const QPointF& position, positions) {
+ for (const QPointF& position : positions) {
QGraphicsItem* item = addEllipse(0, 0, 70, 70, Qt::NoPen, Qt::darkGray);
item->setPos(position + QPointF(15,15));
item->setParentItem(background);
diff --git a/src/window.cpp b/src/window.cpp
index d534025..c353186 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2009, 2010, 2013, 2014 Graeme Gott <graeme at gottcode.org>
+ * Copyright (C) 2009, 2010, 2013, 2014, 2015, 2016, 2017 Graeme Gott <graeme at gottcode.org>
*
* 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
@@ -30,24 +30,25 @@
/*****************************************************************************/
Window::Window() {
- setWindowTitle(tr("Hexalate"));
-
// Create game board
Board* board = new Board(this);
setCentralWidget(board);
// Create menus
QMenu* menu = menuBar()->addMenu(tr("&Game"));
- menu->addAction(tr("&New"), board, SLOT(newGame()), tr("Ctrl+N"));
+ menu->addAction(tr("&New"), board, SLOT(newGame()), QKeySequence::New);
menu->addSeparator();
- menu->addAction(tr("&Quit"), qApp, SLOT(quit()), tr("Ctrl+Q"));
+ QAction* action = menu->addAction(tr("&Quit"), qApp, SLOT(quit()), QKeySequence::Quit);
+ action->setMenuRole(QAction::QuitRole);
menu = menuBar()->addMenu(tr("&Settings"));
menu->addAction(tr("Application &Language..."), this, SLOT(setLocale()));
menu = menuBar()->addMenu(tr("&Help"));
- menu->addAction(tr("&About"), this, SLOT(about()));
- menu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+ action = menu->addAction(tr("&About"), this, SLOT(about()));
+ action->setMenuRole(QAction::AboutRole);
+ action = menu->addAction(tr("About &Qt"), qApp, SLOT(aboutQt()));
+ action->setMenuRole(QAction::AboutQtRole);
// Restore size and position
restoreGeometry(QSettings().value("Geometry").toByteArray());
@@ -73,7 +74,7 @@ void Window::about() {
QMessageBox::about(this, tr("About Hexalate"), QString("<p align='center'><big><b>%1 %2</b></big><br/>%3<br/><small>%4<br/>%5</small></p>")
.arg(tr("Hexalate"), QCoreApplication::applicationVersion(),
tr("A color matching game"),
- tr("Copyright © 2009-%1 Graeme Gott").arg("2014"),
+ tr("Copyright © 2009-%1 Graeme Gott").arg("2017"),
tr("Released under the <a href=%1>GPL 3</a> license").arg("\"http://www.gnu.org/licenses/gpl.html\""))
);
}
diff --git a/translations/hexalate_ca.qm b/translations/hexalate_ca.qm
deleted file mode 100644
index 0f61be8..0000000
Binary files a/translations/hexalate_ca.qm and /dev/null differ
diff --git a/translations/hexalate_ca.ts b/translations/hexalate_ca.ts
index bd97397..a78940e 100644
--- a/translations/hexalate_ca.ts
+++ b/translations/hexalate_ca.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Pregunta</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Abortar aquesta partida?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation type="unfinished"></translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Èxit</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Ho sento</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>No s'ha pogut carregar la darrera partida. Començant una partida nova.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Joc</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nou</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Surt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Ajuda</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&Sobre l'applicació</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Sobre &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Sobre Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Un joc de combinació de colors</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/hexalate_cs.qm b/translations/hexalate_cs.qm
deleted file mode 100644
index 77cdfbc..0000000
Binary files a/translations/hexalate_cs.qm and /dev/null differ
diff --git a/translations/hexalate_cs.ts b/translations/hexalate_cs.ts
index 1573115..644ecfa 100644
--- a/translations/hexalate_cs.ts
+++ b/translations/hexalate_cs.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Otázka</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Přerušitnynější hru?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Vybrat jazyk programu:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Jazyk systému></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Poznámka</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Spusťte, prosím, tento program znovu, aby se změna jazyka projevila..</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Úspěch</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Promiňte</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Předchozí hru se nepodařilo nahrát. Spouští se nová hra.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Hra</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nová</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Ukončit</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Nastavení</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Jazyk programu...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Nápověda</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&O programu</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>O &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>O Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Hra o shodě barev</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Autorské právo © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Vydáno pod licencí <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_de.qm b/translations/hexalate_de.qm
deleted file mode 100644
index 0a9552f..0000000
Binary files a/translations/hexalate_de.qm and /dev/null differ
diff --git a/translations/hexalate_de.ts b/translations/hexalate_de.ts
index 2594f7e..faf528f 100644
--- a/translations/hexalate_de.ts
+++ b/translations/hexalate_de.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Frage</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Gegenwärtiges Spiel abbrechen?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Anwendungssprache auswählen:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Systemeinstellung></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Hinweis</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Bitte starten Sie diese Anwendung neu um den Wechsel der Sprache auszuführen.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Richtig gelöst</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Sorry</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Letztes Spiel konnte nicht geladen werden. Ein neues Spiel wird gestartet.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Spiel</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Neu</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Beenden</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Einstellungen</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
- <translation>&Anwendungssprache...</translation>
+ <translation>&Anwendungssprache ...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Hilfe</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>Üb&er</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Über &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Über Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
- <translation>Ein Farbabstimmungsspiel</translation>
+ <translation>Ein Farbenrätsel</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Veröffentlicht unter der <a href=%1>GPL-3</a>-Lizenz</translation>
</message>
diff --git a/translations/hexalate_el.qm b/translations/hexalate_el.qm
deleted file mode 100644
index f7fc14a..0000000
Binary files a/translations/hexalate_el.qm and /dev/null differ
diff --git a/translations/hexalate_el.ts b/translations/hexalate_el.ts
index bb0349a..2b9f783 100644
--- a/translations/hexalate_el.ts
+++ b/translations/hexalate_el.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Ερωτηση</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Ματαίωση σημερινόυ παιχνίδιου;</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Επιλέξτε γλώσσα εφαρμογής:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Γλωσσα συστηματος></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Παρατηρηση</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Παρακαλώ κάντε επανεκκίνηση της εφαρμογής αυτής για αλλαγή στη γλώσσα να τεθεί σε ισχύ.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Επιτυχία</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Συγνωμη</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Δεν είναι δυνατή η φόρτωση προηγούμενου παιχνίδιυ. Ξεκινηστε ένα νέο παιχνίδι.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>Παιχνιδι</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>Νεο</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>Κλεισιμο</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>Ρυθμισεις</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>Γλωσσα συστηματος...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>Βοηθεια</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>Σχετικα</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Σχετικα με το Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Σχετικα με το Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Ένα παιχνίδι αντιστοίχισης χρωμάτων</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Released under the <a href=%1>GPL 3</a> license</translation>
</message>
diff --git a/translations/hexalate_en.qm b/translations/hexalate_en.qm
deleted file mode 100644
index 9dad8df..0000000
Binary files a/translations/hexalate_en.qm and /dev/null differ
diff --git a/translations/hexalate_en.ts b/translations/hexalate_en.ts
index 4e1a811..dbadc45 100644
--- a/translations/hexalate_en.ts
+++ b/translations/hexalate_en.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation type="unfinished"></translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation type="unfinished"></translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation type="unfinished"></translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/hexalate_es.qm b/translations/hexalate_es.qm
deleted file mode 100644
index e3492a5..0000000
Binary files a/translations/hexalate_es.qm and /dev/null differ
diff --git a/translations/hexalate_es.ts b/translations/hexalate_es.ts
index 593c697..e5254ca 100644
--- a/translations/hexalate_es.ts
+++ b/translations/hexalate_es.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Pregunta</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>¿Quiere interrumpir la partida actual?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Seleccione el idioma de la aplicación:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Idioma del sistema></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Nota</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Reinicie la aplicación para el cambio de idioma surta efecto.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Éxito</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Lo sentimos</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>No se ha podido cargar la última partida. Empezando una nueva.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Partida</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nueva</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Salir</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Configuración</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Idioma de la aplicación…</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Ayuda</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&Acerca de</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Acerca de &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Acerca de Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Un juego de igualación de colores</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Publicado bajo la licencia <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_et.qm b/translations/hexalate_et.qm
deleted file mode 100644
index ee9d511..0000000
Binary files a/translations/hexalate_et.qm and /dev/null differ
diff --git a/translations/hexalate_et.ts b/translations/hexalate_et.ts
index ed1da12..39a7d6c 100644
--- a/translations/hexalate_et.ts
+++ b/translations/hexalate_et.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Küsimus</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Katkestada praegune mäng?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Vali rakenduse keel:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Süsteemi keel></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Märkus</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Keele muudatuse mõjumiseks taaskäivita palun see programm.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Korras</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Vabandust</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Eelmise mängu laadimine ebaõnnestus. Uue mängu alustamine.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>Mäng</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>Uus</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>Lõpeta</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Seaded</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>Rakendus ja keel...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>Abiinfo</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>Rakendusest</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>&Qt info</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Hexalate info</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Värvide sobitamise mäng</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Autoriõigused © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Antud välja <a href=%1>GPL 3</a> litsentsi alusel</translation>
</message>
diff --git a/translations/hexalate_fr.qm b/translations/hexalate_fr.qm
deleted file mode 100644
index d277982..0000000
Binary files a/translations/hexalate_fr.qm and /dev/null differ
diff --git a/translations/hexalate_fr.ts b/translations/hexalate_fr.ts
index 120345c..64bbea8 100644
--- a/translations/hexalate_fr.ts
+++ b/translations/hexalate_fr.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Question</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Abandonner le jeu ?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Sélectionner la langue de l'application :</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Langue du système></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Remarque</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Veuillez relancer l'application pour que la modification prenne effet. </translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Succès</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Désolé</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Impossible de charger le dernier jeu. Démarrage d'une nouvelle partie.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Jeu</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nouveau</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Quitter</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Paramètres</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Langue de l'application…</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Aide</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>À &propos de…</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>À propos de &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>À propos de Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Un jeu d'association de couleurs</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Distribué sous licence GNU <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_hu.qm b/translations/hexalate_hu.qm
deleted file mode 100644
index f3149cc..0000000
Binary files a/translations/hexalate_hu.qm and /dev/null differ
diff --git a/translations/hexalate_hu.ts b/translations/hexalate_hu.ts
index b8c17ac..13665c7 100644
--- a/translations/hexalate_hu.ts
+++ b/translations/hexalate_hu.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Kérdés</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Játék megszakítása?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Program nyelve:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Rendszer nyelve></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Figyelem</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>A nyelvi változások érvénybelépéséhez újra kell indítani a programot.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Siker</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Nem sikerült betölteni az előző játékot. Új játék indul.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Játék</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>Ú&j</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Kilépés</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Beállítások</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>Program nye&lve...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Segítség</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&Névjegy</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>&Qt névjegye</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Hexalate névjegye</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Színkereső játék</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Released under the <a href=%1>GPL 3</a> license</translation>
</message>
diff --git a/translations/hexalate_it.ts b/translations/hexalate_it.ts
new file mode 100644
index 0000000..9f92251
--- /dev/null
+++ b/translations/hexalate_it.ts
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it" sourcelanguage="en">
+<context>
+ <name>Board</name>
+ <message>
+ <source>Question</source>
+ <translation>Domanda</translation>
+ </message>
+ <message>
+ <source>Abort current game?</source>
+ <translation>Terminare il gioco attuale?</translation>
+ </message>
+</context>
+<context>
+ <name>LocaleDialog</name>
+ <message>
+ <source>Select application language:</source>
+ <translation>Selezionare la lingua dell'applicazione:</translation>
+ </message>
+ <message>
+ <source><System Language></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Note</source>
+ <translation>Nota</translation>
+ </message>
+ <message>
+ <source>Please restart this application for the change in language to take effect.</source>
+ <translation>Si prega di riavviare l'applicazione per rendere il cambio della lingua effettivo.</translation>
+ </message>
+</context>
+<context>
+ <name>Puzzle</name>
+ <message>
+ <source>Success</source>
+ <translation>Successo</translation>
+ </message>
+ <message>
+ <source>Sorry</source>
+ <translation>Scusa</translation>
+ </message>
+ <message>
+ <source>Unable to load previous game. Starting a new game.</source>
+ <translation>Non riesco ad aprire il gioco precedente. Inizia un altro gioco.</translation>
+ </message>
+</context>
+<context>
+ <name>Window</name>
+ <message>
+ <source>Hexalate</source>
+ <translation>Hexalate</translation>
+ </message>
+ <message>
+ <source>&Game</source>
+ <translation>&Gioco</translation>
+ </message>
+ <message>
+ <source>&New</source>
+ <translation>&Nuovo</translation>
+ </message>
+ <message>
+ <source>&Quit</source>
+ <translation>&Esci</translation>
+ </message>
+ <message>
+ <source>&Settings</source>
+ <translation>&Settaggi</translation>
+ </message>
+ <message>
+ <source>Application &Language...</source>
+ <translation>Applicazione &Lingua...</translation>
+ </message>
+ <message>
+ <source>&Help</source>
+ <translation>&Aiuto</translation>
+ </message>
+ <message>
+ <source>&About</source>
+ <translation>&Info</translation>
+ </message>
+ <message>
+ <source>About &Qt</source>
+ <translation>Info &Qt</translation>
+ </message>
+ <message>
+ <source>About Hexalate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>A color matching game</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Copyright © 2009-%1 Graeme Gott</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>Released under the <a href=%1>GPL 3</a> license</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+</TS>
diff --git a/translations/hexalate_lt.ts b/translations/hexalate_lt.ts
new file mode 100644
index 0000000..b2056f9
--- /dev/null
+++ b/translations/hexalate_lt.ts
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="lt" sourcelanguage="en">
+<context>
+ <name>Board</name>
+ <message>
+ <source>Question</source>
+ <translation>Klausimas</translation>
+ </message>
+ <message>
+ <source>Abort current game?</source>
+ <translation>Nutraukti dabartinį žaidimą?</translation>
+ </message>
+</context>
+<context>
+ <name>LocaleDialog</name>
+ <message>
+ <source>Select application language:</source>
+ <translation>Pasirinkite programos kalbą:</translation>
+ </message>
+ <message>
+ <source><System Language></source>
+ <translation><Sistemos kalba></translation>
+ </message>
+ <message>
+ <source>Note</source>
+ <translation>Pastaba</translation>
+ </message>
+ <message>
+ <source>Please restart this application for the change in language to take effect.</source>
+ <translation>Prašome paleisti programą iš naujo, kad įsigaliotų kalbos pakeitimai.</translation>
+ </message>
+</context>
+<context>
+ <name>Puzzle</name>
+ <message>
+ <source>Success</source>
+ <translation>Sekmė</translation>
+ </message>
+ <message>
+ <source>Sorry</source>
+ <translation>Deja</translation>
+ </message>
+ <message>
+ <source>Unable to load previous game. Starting a new game.</source>
+ <translation>Neįmanoma įkelti ankstesnio žaidimo. Pradedamas naujas žaidimas.</translation>
+ </message>
+</context>
+<context>
+ <name>Window</name>
+ <message>
+ <source>Hexalate</source>
+ <translation>Hexalate</translation>
+ </message>
+ <message>
+ <source>&Game</source>
+ <translation>&Žaidimas</translation>
+ </message>
+ <message>
+ <source>&New</source>
+ <translation>&Naujas</translation>
+ </message>
+ <message>
+ <source>&Quit</source>
+ <translation>&Baigti</translation>
+ </message>
+ <message>
+ <source>&Settings</source>
+ <translation>&Nustatymai</translation>
+ </message>
+ <message>
+ <source>Application &Language...</source>
+ <translation>Programos kalba</translation>
+ </message>
+ <message>
+ <source>&Help</source>
+ <translation>&Pagalba</translation>
+ </message>
+ <message>
+ <source>&About</source>
+ <translation>&Apie</translation>
+ </message>
+ <message>
+ <source>About &Qt</source>
+ <translation>Apie &Qt</translation>
+ </message>
+ <message>
+ <source>About Hexalate</source>
+ <translation>Apie Hexalate</translation>
+ </message>
+ <message>
+ <source>A color matching game</source>
+ <translation>Spalvų sutapimo žaidimas</translation>
+ </message>
+ <message>
+ <source>Copyright © 2009-%1 Graeme Gott</source>
+ <translation>Autorių Teisės © 2009-%1 Graeme Gott</translation>
+ </message>
+ <message>
+ <source>Released under the <a href=%1>GPL 3</a> license</source>
+ <translation>Išleista pagal <a href=%1>GPL 3</a> licenciją</translation>
+ </message>
+</context>
+</TS>
diff --git a/translations/hexalate_ms.qm b/translations/hexalate_ms.qm
deleted file mode 100644
index 63c6bd3..0000000
Binary files a/translations/hexalate_ms.qm and /dev/null differ
diff --git a/translations/hexalate_ms.ts b/translations/hexalate_ms.ts
index 963c715..d5e6cae 100644
--- a/translations/hexalate_ms.ts
+++ b/translations/hexalate_ms.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Soalan</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Henti paksa permainan semasa?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Pilih bahasa aplikasi:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Bahasa Sistem></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Nota</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Sila mulakan semula aplikasi ini supaya perubahan bahasa berkesan.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Berjaya</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Maaf</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Tidak boleh muatkan permainan terdahulu. Memulakan permainan baru.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Permainan</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Baru</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Keluar</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Tetapan</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Bahasa Aplikasi...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>Ba&ntuan</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>Perih&al</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Perihal &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Perihal Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Merupakan permainan padanan warna</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Hakcipta © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Dikeluarkan dibawah lesen <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_nl.qm b/translations/hexalate_nl.qm
deleted file mode 100644
index c1ef5c6..0000000
Binary files a/translations/hexalate_nl.qm and /dev/null differ
diff --git a/translations/hexalate_nl.ts b/translations/hexalate_nl.ts
index 513e9fc..02b19b7 100644
--- a/translations/hexalate_nl.ts
+++ b/translations/hexalate_nl.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Vraag</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Huidig spel afbreken?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Selekteer Taal:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Systeem Taal></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Aantekening</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Herstart AUB dit programma om de verandering van de taal door te voeren.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Succes</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Sorry</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Kan huidige spel onmogelijk laden. Begin een nieuw spel.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Spel</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nieuw</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Einde</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+O</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Instellingen</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>Programma &Taal...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Help</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&Over</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Over &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Over Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Een kleuren combinatiespel</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Auteursrecht &copie; 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Uitgebracht omder de <a href=%1>GPL 3</a> licensie</translation>
</message>
diff --git a/translations/hexalate_pl.qm b/translations/hexalate_pl.qm
deleted file mode 100644
index 5adb368..0000000
Binary files a/translations/hexalate_pl.qm and /dev/null differ
diff --git a/translations/hexalate_pl.ts b/translations/hexalate_pl.ts
index 866aaae..75b2e18 100644
--- a/translations/hexalate_pl.ts
+++ b/translations/hexalate_pl.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Pytanie</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Czy chcesz zakończyć bieżącą grę?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Wybierz język programu:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Język systemowy></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Uwaga</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Proszę ponownie uruchomić ten program, aby zastosować zmianę języka.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Sukces</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Przepraszam</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Nie można załadować poprzedniej gry. Rozpoczęcie nowej gry.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Gra</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nowa</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Zakończ</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Ustawienia</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Język programu...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Pomoc</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&O</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>O &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>O Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Gra dopasowania kolorów </translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Prawo autorskie © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Wydano na licencji <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_pt_BR.qm b/translations/hexalate_pt_BR.qm
deleted file mode 100644
index 56ba388..0000000
Binary files a/translations/hexalate_pt_BR.qm and /dev/null differ
diff --git a/translations/hexalate_pt_BR.ts b/translations/hexalate_pt_BR.ts
index f2d3852..5f34d63 100644
--- a/translations/hexalate_pt_BR.ts
+++ b/translations/hexalate_pt_BR.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Questão</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Abortar jogo atual?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Selecione o idioma do aplicativo:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Idioma do sistema></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Nota</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Favor, reinicie o aplicativo para que seja efetuada a alteração do idioma.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Êxito</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Desculpe</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Não é possível carregar jogo anterior. Iniciando um novo jogo.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>Jo&go</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Novo</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Sair</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+S</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Configurações</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Idioma do aplicativo...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Ajuda</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>S&obre</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Sobre o &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Sobre o Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Um jogo de combinação de cores</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Lançado sob a licença <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_ro.qm b/translations/hexalate_ro.qm
deleted file mode 100644
index f1e4fcd..0000000
Binary files a/translations/hexalate_ro.qm and /dev/null differ
diff --git a/translations/hexalate_ro.ts b/translations/hexalate_ro.ts
index daa6954..8358597 100644
--- a/translations/hexalate_ro.ts
+++ b/translations/hexalate_ro.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Întrebare</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Abandonaţi jocul curent?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Selectaţi limba aplicaţiei:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Limbaj Sistem></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Notă</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Vă rugăm reporniţi această aplicaţie pentru ca schimbarea limbii să aibă efect.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Succes</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Scuze</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Nu s-a putut încărca jocul precedent. Pornire joc nou.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Joc</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Nou</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Ieşire</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Setări</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>&Limbă aplicaţie...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Ajutor</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&Despre</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>Despre &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Despre Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Un joc de potrivire a culorilor</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Toate drepturile rezervate © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Lansat sub licenţă <a href=%1>GPL 3</a></translation>
</message>
diff --git a/translations/hexalate_ru.qm b/translations/hexalate_ru.qm
deleted file mode 100644
index 9f84261..0000000
Binary files a/translations/hexalate_ru.qm and /dev/null differ
diff --git a/translations/hexalate_ru.ts b/translations/hexalate_ru.ts
index ea2fe96..8348f54 100644
--- a/translations/hexalate_ru.ts
+++ b/translations/hexalate_ru.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Вопрос</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Прервать текущую игру?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Выберите язык приложения:</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Язык Системы></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Примечание</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Пожалуйста, перезагрузите приложения, чтобы изменения языка вступили в силу.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Успех</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Извините</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Не удается загрузить предыдущую игры. Начните новую игру.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Игра</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Новая</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Выход</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Настройки</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>Приложение &Язык...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Помощь</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
- <translation>&Об</translation>
+ <translation>&Об игре</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
- <translation>Об &Qt</translation>
+ <translation>О &Qt</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
- <translation>Об Hexalate</translation>
+ <translation>О Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Игра подбор цветов</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Выпущено под <a href=%1> GPL 3 </ A> лицензий</translation>
</message>
diff --git a/translations/hexalate_tr.qm b/translations/hexalate_tr.qm
deleted file mode 100644
index fa23bf5..0000000
Binary files a/translations/hexalate_tr.qm and /dev/null differ
diff --git a/translations/hexalate_tr.ts b/translations/hexalate_tr.ts
index 6f792f2..878f850 100644
--- a/translations/hexalate_tr.ts
+++ b/translations/hexalate_tr.ts
@@ -4,12 +4,10 @@
<context>
<name>Board</name>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Question</source>
<translation>Yeni Oyun</translation>
</message>
<message>
- <location filename="../src/board.cpp" line="45"/>
<source>Abort current game?</source>
<translation>Başlamak istediğinize emin misiniz?</translation>
</message>
@@ -17,22 +15,18 @@
<context>
<name>LocaleDialog</name>
<message>
- <location filename="../src/locale_dialog.cpp" line="50"/>
<source>Select application language:</source>
<translation>Uygulama dilini seçiniz</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="53"/>
<source><System Language></source>
<translation><Sistem Dili></translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Note</source>
<translation>Not</translation>
</message>
<message>
- <location filename="../src/locale_dialog.cpp" line="183"/>
<source>Please restart this application for the change in language to take effect.</source>
<translation>Lütfen değişikliklerin uygulanması için uygulamayı yeniden başlatın.</translation>
</message>
@@ -40,17 +34,14 @@
<context>
<name>Puzzle</name>
<message>
- <location filename="../src/puzzle.cpp" line="162"/>
<source>Success</source>
<translation>Başarılı</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Sorry</source>
<translation>Üzgünüm</translation>
</message>
<message>
- <location filename="../src/puzzle.cpp" line="204"/>
<source>Unable to load previous game. Starting a new game.</source>
<translation>Önceki oyunu yükleme başarısız. Yeni oyun başlatılıyor.</translation>
</message>
@@ -58,78 +49,54 @@
<context>
<name>Window</name>
<message>
- <location filename="../src/window.cpp" line="33"/>
- <location filename="../src/window.cpp" line="74"/>
<source>Hexalate</source>
<translation>Hexalate</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="40"/>
<source>&Game</source>
<translation>&Oyun</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
<source>&New</source>
<translation>&Yeni</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="41"/>
- <source>Ctrl+N</source>
- <translation>Ctrl+N</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="43"/>
<source>&Quit</source>
<translation>&Çıkış</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="43"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../src/window.cpp" line="45"/>
<source>&Settings</source>
<translation>&Ayarlar</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="46"/>
<source>Application &Language...</source>
<translation>uygulama &Dil...</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="48"/>
<source>&Help</source>
<translation>&Yardım</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="49"/>
<source>&About</source>
<translation>&Hakkında</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="50"/>
<source>About &Qt</source>
<translation>&Qt Hakkında</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="73"/>
<source>About Hexalate</source>
<translation>Hexalate Hakkında</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="75"/>
<source>A color matching game</source>
<translation>Renk eşleştirme oyunu</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="76"/>
<source>Copyright © 2009-%1 Graeme Gott</source>
<translation>Copyright © 2009-%1 Graeme Gott</translation>
</message>
<message>
- <location filename="../src/window.cpp" line="77"/>
<source>Released under the <a href=%1>GPL 3</a> license</source>
<translation>Released under the <a href=%1>GPL 3</a> license</translation>
</message>
diff --git a/windows/installer.nsi b/windows/installer.nsi
index b7098d4..5246dcf 100644
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -3,10 +3,10 @@
!define APPNAME "Hexalate"
!define VERSIONMAJOR 1
-!define VERSIONMINOR 0
-!define VERSIONPATCH 3
+!define VERSIONMINOR 1
+!define VERSIONPATCH 1
!define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}"
-!define ABOUTURL "http://gottcode.org/hexalate/"
+!define ABOUTURL "https://gottcode.org/hexalate/"
;--------------------------------
;Includes
@@ -162,9 +162,6 @@ Section "install"
;Copy files
SetOutPath $INSTDIR
File ..\release\Hexalate.exe
- File $%QTDIR%\bin\icudt51.dll
- File $%QTDIR%\bin\icuin51.dll
- File $%QTDIR%\bin\icuuc51.dll
File $%QTDIR%\bin\libgcc_s_dw2-1.dll
File $%QTDIR%\bin\libstdc++-6.dll
File $%QTDIR%\bin\libwinpthread-1.dll
@@ -172,7 +169,15 @@ Section "install"
File $%QTDIR%\bin\Qt5Gui.dll
File $%QTDIR%\bin\Qt5Widgets.dll
+ SetOutPath $INSTDIR\platforms
+ File $%QTDIR%\plugins\platforms\qwindows.dll
+
+ SetOutPath $INSTDIR\translations
+ File ..\translations\*.qm
+ File $%QTDIR%\translations\qtbase_*.qm
+
;Create ReadMe file
+ SetOutPath $INSTDIR
File /oname=ReadMe.txt ..\README
FileOpen $4 "ReadMe.txt" a
FileSeek $4 0 END
@@ -189,13 +194,6 @@ Section "install"
${FileJoin} "ReadMe.txt" "NEWS" "ReadMe.txt"
Delete $INSTDIR\NEWS
- SetOutPath $INSTDIR\platforms
- File $%QTDIR%\plugins\platforms\qwindows.dll
-
- SetOutPath $INSTDIR\translations
- File ..\translations\*.qm
- File $%QTDIR%\translations\qt_*.qm
-
;Registry information for add/remove programs
WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
@@ -247,7 +245,7 @@ Section "Uninstall"
Delete $INSTDIR\Hexalate.exe
Delete $INSTDIR\ReadMe.txt
Delete $INSTDIR\*.dll
- Delete $INSTDIR\platforms\qwindows.dll
+ Delete $INSTDIR\platforms\*.dll
Delete $INSTDIR\translations\*.qm
Delete $INSTDIR\Uninstall.exe
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/hexalate.git
More information about the Pkg-games-commits
mailing list