Merge pull request #52 from QuasarApp/buildFixes

Change submodules structure
This commit is contained in:
Andrei Yankovich 2021-04-16 09:11:12 +03:00 committed by GitHub
commit 6bcaaae95f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 235 additions and 581 deletions

4
.gitignore vendored
View File

@ -73,3 +73,7 @@ snap/plugins/__pycache__/
*.snap
data/
\.buildconfig
build/
docs/

12
.gitmodules vendored
View File

@ -1,18 +1,18 @@
[submodule "Patronum"]
path = Patronum
path = submodules/Patronum
url = https://github.com/QuasarApp/Patronum.git
[submodule "Heart"]
path = Heart
path = submodules/Heart
url = https://github.com/QuasarApp/Heart.git
[submodule "HanoiTowers/client/ViewSolutions"]
path = HanoiTowers/client/ViewSolutions
path = submodules/ViewSolutions
url = https://github.com/QuasarApp/ViewSolutions.git
[submodule "HanoiTowers/client/SimpleQmlNotify"]
path = HanoiTowers/client/SimpleQmlNotify
path = submodules/SimpleQmlNotify
url = https://github.com/QuasarApp/SimpleQmlNotify.git
[submodule "HanoiTowers/client/QMLLoginView"]
path = HanoiTowers/client/QMLLoginView
path = submodules/QMLLoginView
url = https://github.com/QuasarApp/QMLLoginView.git
[submodule "HanoiTowers/client/Credits"]
path = HanoiTowers/client/Credits
path = submodules/Credits
url = https://github.com/QuasarApp/Credits

View File

@ -12,9 +12,11 @@ set(BUILD_SHARED_LIBS ON)
include(Heart/QuasarAppLib/CMake/ccache.cmake)
include(Heart/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
include(submodules/Heart/QuasarAppLib/CMake/ccache.cmake)
include(submodules/Heart/QuasarAppLib/CMake/QuasarAppCITargets.cmake)
include(submodules/Heart/QuasarAppLib/CMake/ProjectOut.cmake)
include(submodules/Heart/QuasarAppLib/CMake/Version.cmake)
include(submodules/Heart/QuasarAppLib/CMake/QtUtils.cmake)
if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32")
@ -23,6 +25,28 @@ if (DEFINED TARGET_PLATFORM_TOOLCHAIN)
endif()
endif()
if (NOT DEFINED HANOI_TESTS)
set(HANOI_TESTS ON)
if (ANDROID)
set(HANOI_TESTS OFF)
endif()
endif()
if (NOT DEFINED HANOI_SERVER)
set(HANOI_SERVER ON)
if (ANDROID OR WIN32)
set(HANOI_SERVER OFF)
endif()
endif()
if (NOT DEFINED HANOI_CLIENT)
set(HANOI_CLIENT ON)
endif()
SET(INSTALLER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/installer/")
SET(DATA_DIR "${INSTALLER_DIR}/packages/HanoiTowers/data")
@ -59,10 +83,39 @@ find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
# Add sub directories
add_subdirectory(Heart)
add_subdirectory(Patronum)
add_subdirectory(HanoiTowers)
#add_subdirectory(hanoi_towers/ViewSolutions)
if (HANOI_TESTS)
set (CREDITS_TESTS ON)
set (HEART_TESTS ON)
set (PATRONUM_TESTS ON)
else()
set (CREDITS_TESTS OFF)
set (HEART_TESTS OFF)
set (PATRONUM_TESTS OFF)
endif()
add_subdirectory(submodules/Heart)
add_subdirectory(HanoiTowers/Protockol)
if (HANOI_CLIENT)
set (CREDITS_EXAMPLES OFF)
set (LOGINVIEW_EXAMPLES OFF)
set (VIEWSOLUTIONS_EXAMPLES OFF)
add_subdirectory(submodules/QMLLoginView)
add_subdirectory(submodules/SimpleQmlNotify)
add_subdirectory(submodules/ViewSolutions)
add_subdirectory(submodules/Credits)
add_subdirectory(HanoiTowers/client)
endif()
if (HANOI_SERVER)
add_subdirectory(submodules/Patronum)
add_subdirectory(HanoiTowers/Server)
add_subdirectory(HanoiTowers/Terminal)
endif()

View File

@ -1,19 +0,0 @@
#
# Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed.
#
cmake_minimum_required(VERSION 3.1)
include(../Heart/QuasarAppLib/CMake/ProjectOut.cmake)
include(../Heart/QuasarAppLib/CMake/ccache.cmake)
include(../Heart/QuasarAppLib/CMake/Version.cmake)
include(../Heart/QuasarAppLib/CMake/QtUtils.cmake)
add_subdirectory(Protockol)
add_subdirectory(client)
add_subdirectory(Server)
add_subdirectory(Terminal)

View File

@ -2,8 +2,9 @@
#define FIXWORLDREQUEST_H
#include <abstractdata.h>
#include "hanoitowersprotockol_global.h"
class FixWorldRequest: public QH::PKG::AbstractData
class HANOITOWERSPROTOCOL_EXPORT FixWorldRequest: public QH::PKG::AbstractData
{
public:
FixWorldRequest();

View File

@ -11,8 +11,9 @@
#include <QString>
#include <streambase.h>
#include <QSharedPointer>
#include "hanoitowersprotockol_global.h"
struct UserPreview: public QH::StreamBase {
struct HANOITOWERSPROTOCOL_EXPORT UserPreview: public QH::StreamBase {
explicit UserPreview();
explicit UserPreview(const QString& id);
@ -20,7 +21,7 @@ struct UserPreview: public QH::StreamBase {
QString userName;
int record;
friend bool operator==(const UserPreview& left, const UserPreview& right);
friend bool HANOITOWERSPROTOCOL_EXPORT operator==(const UserPreview& left, const UserPreview& right);
// StreamBase interface
protected:

View File

@ -13,10 +13,11 @@
#include <QSet>
#include <dbobjectset.h>
#include <itoken.h>
#include "hanoitowersprotockol_global.h"
class WorldUpdate;
class World: public QH::PKG::DBObjectSet, public QH::IToken
class HANOITOWERSPROTOCOL_EXPORT World: public QH::PKG::DBObjectSet, public QH::IToken
{
public:
World(const QString& worldName = "World");

View File

@ -16,7 +16,9 @@
#include <isubscribabledata.h>
#include <itoken.h>
class WorldUpdate: public QH::PKG::AbstractData, public QH::IToken,
#include "hanoitowersprotockol_global.h"
class HANOITOWERSPROTOCOL_EXPORT WorldUpdate: public QH::PKG::AbstractData, public QH::IToken,
public QH::PKG::ISubscribableData
{
public:

View File

@ -11,17 +11,6 @@ cmake_minimum_required(VERSION 3.1)
set(CURRENT_PROJECT "${PROJECT_NAME}Client")
set (CREDITS_TESTS OFF)
set (CREDITS_EXAMPLES OFF)
set (LOGINVIEW_EXAMPLES OFF)
set (VIEWSOLUTIONS_EXAMPLES OFF)
add_subdirectory(QMLLoginView)
add_subdirectory(SimpleQmlNotify)
add_subdirectory(ViewSolutions)
add_subdirectory(Credits)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
@ -32,7 +21,12 @@ file(GLOB SOURCE_CPP
"*.cpp" "*.qrc"
)
add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
if (ANDROID)
add_library(${CURRENT_PROJECT} ${SOURCE_CPP})
else()
add_executable(${CURRENT_PROJECT} ${SOURCE_CPP})
endif()
target_link_libraries(${CURRENT_PROJECT} PRIVATE QmlNotyfyService HanoiTowersProtockol LoginView Credits)
target_include_directories(${CURRENT_PROJECT} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

@ -1 +0,0 @@
Subproject commit 498423b476de8938539d16ce50a526a578bae424

@ -1 +0,0 @@
Subproject commit 2f71a23f6f875acaf73ee9055f20223260633f10

Binary file not shown.

View File

@ -161,44 +161,6 @@
<translation>Fog animation</translation>
</message>
</context>
<context>
<name>Credits</name>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="31"/>
<source>Join the development fund and support QuasarApp to help with the development of our projects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="50"/>
<source>If you would like to use bitcoins to support us, you can transfer coins to these address. If you want to be included in the patron list, send an e-mail message - **QuasarApp@yandex.by**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="60"/>
<source>**Note**: You must send a message signed with address of the bitcoin wallet from which the payment was made.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="79"/>
<source>**bitcoin:bc1q4wnp58plhx4fwnfnzz3e4slulv2gzzts89w2f7**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="89"/>
<source># Our patrons list:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="98"/>
<source>## Silver Membership Patrons:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="106"/>
<source>* Rustem Husnutdinov</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Game</name>
<message>
@ -323,143 +285,115 @@
<context>
<name>LoginView</name>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<source>Create a new account</source>
<translation>Create a new account</translation>
<translation type="vanished">Create a new account</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="249"/>
<source>LogIn</source>
<translation>Login</translation>
<translation type="vanished">Login</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="22"/>
<source>Please fill this form to create an account</source>
<translation>Please fill this form to create an account</translation>
<translation type="vanished">Please fill this form to create an account</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="23"/>
<source>Please fill this form to login in your account</source>
<translation>Please fill this form to login in your account</translation>
<translation type="vanished">Please fill this form to login in your account</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="62"/>
<source>First Name</source>
<translation>First Name</translation>
<translation type="vanished">First Name</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="65"/>
<source>Empy or incorrect name. Please enter yuor name.</source>
<translation>Empty or incorrect name. Please enter your name.</translation>
<translation type="vanished">Empty or incorrect name. Please enter your name.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="80"/>
<source>Last Name</source>
<translation>Last Name</translation>
<translation type="vanished">Last Name</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="107"/>
<source>Select you country</source>
<translation>Select you country</translation>
<translation type="vanished">Select you country</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="129"/>
<source>EMail</source>
<translation>EMail</translation>
<translation type="vanished">EMail</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="133"/>
<source>Empty or incorrect email address. Please enter yuor name.</source>
<translation>Empty or incorrect email address. Please enter your email.</translation>
<translation type="vanished">Empty or incorrect email address. Please enter your email.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="148"/>
<source>Nickname</source>
<translation>Nickname</translation>
<translation type="vanished">Nickname</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="152"/>
<source>Empty or incorrect Nickname. Please enter yuor name.</source>
<translation>Empty or incorrect Nickname. Please enter your Nickname.</translation>
<translation type="vanished">Empty or incorrect Nickname. Please enter your Nickname.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="174"/>
<source>Pasword</source>
<translation>Password</translation>
<translation type="vanished">Password</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="188"/>
<source>Confirm pasword</source>
<translation>Confirm password</translation>
<translation type="vanished">Confirm password</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="200"/>
<source>Forgot password</source>
<translation>Forgot password</translation>
<translation type="vanished">Forgot password</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="220"/>
<source>I accept the Terms of use</source>
<translation>I accept the Terms of use</translation>
<translation type="vanished">I accept the Terms of use</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="227"/>
<source>Show terms of use</source>
<translation>Show terms of use</translation>
<translation type="vanished">Show terms of use</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="248"/>
<source>SignUp</source>
<translation>SignUp</translation>
<translation type="vanished">SignUp</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="281"/>
<source>Login In</source>
<translation>Login</translation>
<translation type="vanished">Login</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="284"/>
<source>Sign Up</source>
<translation>SignUp</translation>
<translation type="vanished">SignUp</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="347"/>
<source>Password must match the 1st field and the password cannot be empty</source>
<translation>Password must match the 1st field and the password cannot be empty</translation>
<translation type="vanished">Password must match the 1st field and the password cannot be empty</translation>
</message>
</context>
<context>
<name>LoginView::LVMainModel</name>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="204"/>
<source>must be longer than 8 characters</source>
<translation>Must be longer than 8 characters</translation>
<translation type="vanished">Must be longer than 8 characters</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="208"/>
<source>must contain numbers</source>
<translation>Must contain numbers</translation>
<translation type="vanished">Must contain numbers</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="212"/>
<source>must contain small chars</source>
<translation>Must contain small chars</translation>
<translation type="vanished">Must contain small chars</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="216"/>
<source>must contain large chars</source>
<translation>Must contain large chars</translation>
<translation type="vanished">Must contain large chars</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="220"/>
<source>must contain extra chars (!@#$%^&amp;*)</source>
<translation>Must contain extra chars (!@#$%^&amp;*)</translation>
<translation type="vanished">Must contain extra chars (!@#$%^&amp;*)</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="223"/>
<source>Password requirements: </source>
<translation>Password requirements: </translation>
<translation type="vanished">Password requirements: </translation>
</message>
</context>
<context>
@ -503,10 +437,8 @@
<context>
<name>NotificationForm</name>
<message>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="16"/>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="18"/>
<source>Message</source>
<translation>Message</translation>
<translation type="vanished">Message</translation>
</message>
</context>
<context>
@ -638,14 +570,12 @@
<translation>Hanoi Towers</translation>
</message>
<message>
<location filename="../QMLLoginView/example/main.qml" line="28"/>
<source>Example of LoginView</source>
<translation>Example of Login view</translation>
<translation type="vanished">Example of Login view</translation>
</message>
<message>
<location filename="../ViewSolutions/Examples/src/main.qml" line="113"/>
<source>Examples of View Solutions</source>
<translation>Examples of View solutions</translation>
<translation type="vanished">Examples of View solutions</translation>
</message>
</context>
</TS>

Binary file not shown.

View File

@ -183,44 +183,6 @@
<translation></translation>
</message>
</context>
<context>
<name>Credits</name>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="31"/>
<source>Join the development fund and support QuasarApp to help with the development of our projects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="50"/>
<source>If you would like to use bitcoins to support us, you can transfer coins to these address. If you want to be included in the patron list, send an e-mail message - **QuasarApp@yandex.by**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="60"/>
<source>**Note**: You must send a message signed with address of the bitcoin wallet from which the payment was made.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="79"/>
<source>**bitcoin:bc1q4wnp58plhx4fwnfnzz3e4slulv2gzzts89w2f7**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="89"/>
<source># Our patrons list:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="98"/>
<source>## Silver Membership Patrons:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="106"/>
<source>* Rustem Husnutdinov</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Game</name>
<message>
@ -364,143 +326,115 @@
<context>
<name>LoginView</name>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<source>Create a new account</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="249"/>
<source>LogIn</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="22"/>
<source>Please fill this form to create an account</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="23"/>
<source>Please fill this form to login in your account</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="62"/>
<source>First Name</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="65"/>
<source>Empy or incorrect name. Please enter yuor name.</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="80"/>
<source>Last Name</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="107"/>
<source>Select you country</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="129"/>
<source>EMail</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="133"/>
<source>Empty or incorrect email address. Please enter yuor name.</source>
<translation> yuorメールを入力してください</translation>
<translation type="vanished"> yuorメールを入力してください</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="148"/>
<source>Nickname</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="152"/>
<source>Empty or incorrect Nickname. Please enter yuor name.</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="174"/>
<source>Pasword</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="188"/>
<source>Confirm pasword</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="200"/>
<source>Forgot password</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="220"/>
<source>I accept the Terms of use</source>
<translation>使</translation>
<translation type="vanished">使</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="227"/>
<source>Show terms of use</source>
<translation>使</translation>
<translation type="vanished">使</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="248"/>
<source>SignUp</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="281"/>
<source>Login In</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="284"/>
<source>Sign Up</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="347"/>
<source>Password must match the 1st field and the password cannot be empty</source>
<translation>1</translation>
<translation type="vanished">1</translation>
</message>
</context>
<context>
<name>LoginView::LVMainModel</name>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="204"/>
<source>must be longer than 8 characters</source>
<translation>8</translation>
<translation type="vanished">8</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="208"/>
<source>must contain numbers</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="212"/>
<source>must contain small chars</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="216"/>
<source>must contain large chars</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="220"/>
<source>must contain extra chars (!@#$%^&amp;*)</source>
<translation> @$^*</translation>
<translation type="vanished"> @$^*</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="223"/>
<source>Password requirements: </source>
<translation>:</translation>
<translation type="vanished">:</translation>
</message>
</context>
<context>
@ -548,10 +482,8 @@
<context>
<name>NotificationForm</name>
<message>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="16"/>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="18"/>
<source>Message</source>
<translation></translation>
<translation type="vanished"></translation>
</message>
</context>
<context>
@ -771,15 +703,5 @@ Minimum steps for this lvl: %1</source>
<source>Hanoi Towers</source>
<translation></translation>
</message>
<message>
<location filename="../QMLLoginView/example/main.qml" line="28"/>
<source>Example of LoginView</source>
<translation></translation>
</message>
<message>
<location filename="../ViewSolutions/Examples/src/main.qml" line="113"/>
<source>Examples of View Solutions</source>
<translation></translation>
</message>
</context>
</TS>

Binary file not shown.

View File

@ -183,44 +183,6 @@
<translation>Анимация тумана</translation>
</message>
</context>
<context>
<name>Credits</name>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="31"/>
<source>Join the development fund and support QuasarApp to help with the development of our projects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="50"/>
<source>If you would like to use bitcoins to support us, you can transfer coins to these address. If you want to be included in the patron list, send an e-mail message - **QuasarApp@yandex.by**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="60"/>
<source>**Note**: You must send a message signed with address of the bitcoin wallet from which the payment was made.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="79"/>
<source>**bitcoin:bc1q4wnp58plhx4fwnfnzz3e4slulv2gzzts89w2f7**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="89"/>
<source># Our patrons list:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="98"/>
<source>## Silver Membership Patrons:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="106"/>
<source>* Rustem Husnutdinov</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Game</name>
<message>
@ -360,143 +322,115 @@
<context>
<name>LoginView</name>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<source>Create a new account</source>
<translation>Создать новый аккаунт</translation>
<translation type="vanished">Создать новый аккаунт</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="249"/>
<source>LogIn</source>
<translation>Логин</translation>
<translation type="vanished">Логин</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="22"/>
<source>Please fill this form to create an account</source>
<translation>Для создания аккаунта пожалуста заполните эту форму</translation>
<translation type="vanished">Для создания аккаунта пожалуста заполните эту форму</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="23"/>
<source>Please fill this form to login in your account</source>
<translation>Пожалуйста заполните эту форму для входа в свой аккаунт</translation>
<translation type="vanished">Пожалуйста заполните эту форму для входа в свой аккаунт</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="62"/>
<source>First Name</source>
<translation>Имя</translation>
<translation type="vanished">Имя</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="65"/>
<source>Empy or incorrect name. Please enter yuor name.</source>
<translation>Вы не заполнили форму или ввели некорректное имя. Пожалуйста, введите корректное имя.</translation>
<translation type="vanished">Вы не заполнили форму или ввели некорректное имя. Пожалуйста, введите корректное имя.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="80"/>
<source>Last Name</source>
<translation>Фамилия</translation>
<translation type="vanished">Фамилия</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="107"/>
<source>Select you country</source>
<translation>Выберите свою страну</translation>
<translation type="vanished">Выберите свою страну</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="129"/>
<source>EMail</source>
<translation>EMail</translation>
<translation type="vanished">EMail</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="133"/>
<source>Empty or incorrect email address. Please enter yuor name.</source>
<translation>Вы не заполнили форму или ввели неверный адрес электронной почты. Пожалуйста, введите верный email адрес.</translation>
<translation type="vanished">Вы не заполнили форму или ввели неверный адрес электронной почты. Пожалуйста, введите верный email адрес.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="148"/>
<source>Nickname</source>
<translation>Никнейм</translation>
<translation type="vanished">Никнейм</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="152"/>
<source>Empty or incorrect Nickname. Please enter yuor name.</source>
<translation>Вы не заполнили форму или ввели некорректный никнейм. Пожалуйста, введите корректный никнейм.</translation>
<translation type="vanished">Вы не заполнили форму или ввели некорректный никнейм. Пожалуйста, введите корректный никнейм.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="174"/>
<source>Pasword</source>
<translation>Пароль</translation>
<translation type="vanished">Пароль</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="188"/>
<source>Confirm pasword</source>
<translation>Подтвердить пароль</translation>
<translation type="vanished">Подтвердить пароль</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="200"/>
<source>Forgot password</source>
<translation>Я не помню свой пароль</translation>
<translation type="vanished">Я не помню свой пароль</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="220"/>
<source>I accept the Terms of use</source>
<translation>Я принимаю Условия использования</translation>
<translation type="vanished">Я принимаю Условия использования</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="227"/>
<source>Show terms of use</source>
<translation>Показать Условия использования</translation>
<translation type="vanished">Показать Условия использования</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="248"/>
<source>SignUp</source>
<translation>Зарегистрироваться</translation>
<translation type="vanished">Зарегистрироваться</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="281"/>
<source>Login In</source>
<translation>Войти</translation>
<translation type="vanished">Войти</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="284"/>
<source>Sign Up</source>
<translation>Зарегистрироваться</translation>
<translation type="vanished">Зарегистрироваться</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="347"/>
<source>Password must match the 1st field and the password cannot be empty</source>
<translation>Пароль должен совпадать, и не может быть пустым.</translation>
<translation type="vanished">Пароль должен совпадать, и не может быть пустым.</translation>
</message>
</context>
<context>
<name>LoginView::LVMainModel</name>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="204"/>
<source>must be longer than 8 characters</source>
<translation>Должен быть длиннее 8 символов</translation>
<translation type="vanished">Должен быть длиннее 8 символов</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="208"/>
<source>must contain numbers</source>
<translation>Должен содержать цифры</translation>
<translation type="vanished">Должен содержать цифры</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="212"/>
<source>must contain small chars</source>
<translation>Должен содержать строчные буквы</translation>
<translation type="vanished">Должен содержать строчные буквы</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="216"/>
<source>must contain large chars</source>
<translation>Должен содержать заглавные буквы</translation>
<translation type="vanished">Должен содержать заглавные буквы</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="220"/>
<source>must contain extra chars (!@#$%^&amp;*)</source>
<translation>Должен содержать символы (! @ # $% ^ &amp; *)</translation>
<translation type="vanished">Должен содержать символы (! @ # $% ^ &amp; *)</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="223"/>
<source>Password requirements: </source>
<translation>Требования к паролю:</translation>
<translation type="vanished">Требования к паролю:</translation>
</message>
</context>
<context>
@ -544,10 +478,8 @@
<context>
<name>NotificationForm</name>
<message>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="16"/>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="18"/>
<source>Message</source>
<translation>Сообщение</translation>
<translation type="vanished">Сообщение</translation>
</message>
</context>
<context>
@ -771,15 +703,5 @@ Minimum steps for this lvl: %1</source>
<source>Hanoi Towers</source>
<translation>Ханойские Башни</translation>
</message>
<message>
<location filename="../QMLLoginView/example/main.qml" line="28"/>
<source>Example of LoginView</source>
<translation></translation>
</message>
<message>
<location filename="../ViewSolutions/Examples/src/main.qml" line="113"/>
<source>Examples of View Solutions</source>
<translation></translation>
</message>
</context>
</TS>

Binary file not shown.

View File

@ -183,44 +183,6 @@
<translation>Sis Animasyonu</translation>
</message>
</context>
<context>
<name>Credits</name>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="31"/>
<source>Join the development fund and support QuasarApp to help with the development of our projects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="50"/>
<source>If you would like to use bitcoins to support us, you can transfer coins to these address. If you want to be included in the patron list, send an e-mail message - **QuasarApp@yandex.by**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="60"/>
<source>**Note**: You must send a message signed with address of the bitcoin wallet from which the payment was made.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="79"/>
<source>**bitcoin:bc1q4wnp58plhx4fwnfnzz3e4slulv2gzzts89w2f7**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="89"/>
<source># Our patrons list:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="98"/>
<source>## Silver Membership Patrons:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="106"/>
<source>* Rustem Husnutdinov</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Game</name>
<message>
@ -361,143 +323,115 @@ Bu seviye için minimum adımlar: %2</translation>
<context>
<name>LoginView</name>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<source>Create a new account</source>
<translation>Yeni bir hesap oluştur</translation>
<translation type="vanished">Yeni bir hesap oluştur</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="249"/>
<source>LogIn</source>
<translation>Oturum </translation>
<translation type="vanished">Oturum </translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="22"/>
<source>Please fill this form to create an account</source>
<translation>Lütfen bir hesap oluşturmak için bu formu doldurun</translation>
<translation type="vanished">Lütfen bir hesap oluşturmak için bu formu doldurun</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="23"/>
<source>Please fill this form to login in your account</source>
<translation>Lütfen hesabınıza giriş yapmak için bu formu doldurun</translation>
<translation type="vanished">Lütfen hesabınıza giriş yapmak için bu formu doldurun</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="62"/>
<source>First Name</source>
<translation>İsim</translation>
<translation type="vanished">İsim</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="65"/>
<source>Empy or incorrect name. Please enter yuor name.</source>
<translation>Empy veya yanlış isim. Lütfen adınızı girin.</translation>
<translation type="vanished">Empy veya yanlış isim. Lütfen adınızı girin.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="80"/>
<source>Last Name</source>
<translation>Soyad</translation>
<translation type="vanished">Soyad</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="107"/>
<source>Select you country</source>
<translation>Ülkenizi seçin</translation>
<translation type="vanished">Ülkenizi seçin</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="129"/>
<source>EMail</source>
<translation>EMail</translation>
<translation type="vanished">EMail</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="133"/>
<source>Empty or incorrect email address. Please enter yuor name.</source>
<translation>E-posta adresi boş veya yanlış. Lütfen e-posta adresinizi girin.</translation>
<translation type="vanished">E-posta adresi boş veya yanlış. Lütfen e-posta adresinizi girin.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="148"/>
<source>Nickname</source>
<translation>Takma ad</translation>
<translation type="vanished">Takma ad</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="152"/>
<source>Empty or incorrect Nickname. Please enter yuor name.</source>
<translation>Boş veya yanlış Takma ad. Lütfen takma adınızı girin.</translation>
<translation type="vanished">Boş veya yanlış Takma ad. Lütfen takma adınızı girin.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="174"/>
<source>Pasword</source>
<translation>Parola</translation>
<translation type="vanished">Parola</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="188"/>
<source>Confirm pasword</source>
<translation>Şifreyi Onayla</translation>
<translation type="vanished">Şifreyi Onayla</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="200"/>
<source>Forgot password</source>
<translation>Parolanızı mı unuttunuz</translation>
<translation type="vanished">Parolanızı mı unuttunuz</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="220"/>
<source>I accept the Terms of use</source>
<translation>Kullanım şartlarını kabul ediyorum</translation>
<translation type="vanished">Kullanım şartlarını kabul ediyorum</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="227"/>
<source>Show terms of use</source>
<translation>Kullanım şartlarını göster</translation>
<translation type="vanished">Kullanım şartlarını göster</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="248"/>
<source>SignUp</source>
<translation>Kaydol</translation>
<translation type="vanished">Kaydol</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="281"/>
<source>Login In</source>
<translation>Oturum </translation>
<translation type="vanished">Oturum </translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="284"/>
<source>Sign Up</source>
<translation>Kaydol</translation>
<translation type="vanished">Kaydol</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="347"/>
<source>Password must match the 1st field and the password cannot be empty</source>
<translation>Parola 1. alanla eşleşmelidir ve parola boş olamaz</translation>
<translation type="vanished">Parola 1. alanla eşleşmelidir ve parola boş olamaz</translation>
</message>
</context>
<context>
<name>LoginView::LVMainModel</name>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="204"/>
<source>must be longer than 8 characters</source>
<translation>8 karakterden uzun olmalıdır</translation>
<translation type="vanished">8 karakterden uzun olmalıdır</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="208"/>
<source>must contain numbers</source>
<translation>sayıları içermelidir</translation>
<translation type="vanished">sayıları içermelidir</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="212"/>
<source>must contain small chars</source>
<translation>küçük karakterler içermelidir</translation>
<translation type="vanished">küçük karakterler içermelidir</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="216"/>
<source>must contain large chars</source>
<translation>küçük karakterler içermelidir</translation>
<translation type="vanished">küçük karakterler içermelidir</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="220"/>
<source>must contain extra chars (!@#$%^&amp;*)</source>
<translation>ekstra karakterler içermelidir (!@#$%^&amp;*)</translation>
<translation type="vanished">ekstra karakterler içermelidir (!@#$%^&amp;*)</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="223"/>
<source>Password requirements: </source>
<translation>Parola gereksinimleri: </translation>
<translation type="vanished">Parola gereksinimleri: </translation>
</message>
</context>
<context>
@ -545,10 +479,8 @@ Bu seviye için minimum adımlar: %2</translation>
<context>
<name>NotificationForm</name>
<message>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="16"/>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="18"/>
<source>Message</source>
<translation>İleti</translation>
<translation type="vanished">İleti</translation>
</message>
</context>
<context>
@ -772,15 +704,5 @@ Bu lvl için minimum adımlar:%1</translation>
<source>Hanoi Towers</source>
<translation>Hanoi Kuleleri</translation>
</message>
<message>
<location filename="../QMLLoginView/example/main.qml" line="28"/>
<source>Example of LoginView</source>
<translation></translation>
</message>
<message>
<location filename="../ViewSolutions/Examples/src/main.qml" line="113"/>
<source>Examples of View Solutions</source>
<translation></translation>
</message>
</context>
</TS>

Binary file not shown.

View File

@ -183,44 +183,6 @@
<translation>Анімація туману</translation>
</message>
</context>
<context>
<name>Credits</name>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="31"/>
<source>Join the development fund and support QuasarApp to help with the development of our projects.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="50"/>
<source>If you would like to use bitcoins to support us, you can transfer coins to these address. If you want to be included in the patron list, send an e-mail message - **QuasarApp@yandex.by**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="60"/>
<source>**Note**: You must send a message signed with address of the bitcoin wallet from which the payment was made.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="79"/>
<source>**bitcoin:bc1q4wnp58plhx4fwnfnzz3e4slulv2gzzts89w2f7**</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="89"/>
<source># Our patrons list:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="98"/>
<source>## Silver Membership Patrons:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../Credits/src/Library/src/QuasarAppCreditsModule/Credits.qml" line="106"/>
<source>* Rustem Husnutdinov</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Game</name>
<message>
@ -361,143 +323,115 @@
<context>
<name>LoginView</name>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<source>Create a new account</source>
<translation>Створити новий акаунт</translation>
<translation type="vanished">Створити новий акаунт</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="21"/>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="249"/>
<source>LogIn</source>
<translation>Увійти</translation>
<translation type="vanished">Увійти</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="22"/>
<source>Please fill this form to create an account</source>
<translation>Заповніть цю форму, щоб створити обліковий запис</translation>
<translation type="vanished">Заповніть цю форму, щоб створити обліковий запис</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="23"/>
<source>Please fill this form to login in your account</source>
<translation>Заповніть цю форму, щоб увійти у свій обліковий запис</translation>
<translation type="vanished">Заповніть цю форму, щоб увійти у свій обліковий запис</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="62"/>
<source>First Name</source>
<translation>Ім&apos;я</translation>
<translation type="vanished">Ім&apos;я</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="65"/>
<source>Empy or incorrect name. Please enter yuor name.</source>
<translation>Порожня форма або неправильне ім&apos;я. Введіть коректне ім&apos;я.</translation>
<translation type="vanished">Порожня форма або неправильне ім&apos;я. Введіть коректне ім&apos;я.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="80"/>
<source>Last Name</source>
<translation>Прізвище</translation>
<translation type="vanished">Прізвище</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="107"/>
<source>Select you country</source>
<translation>Виберіть країну</translation>
<translation type="vanished">Виберіть країну</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="129"/>
<source>EMail</source>
<translation>EMail</translation>
<translation type="vanished">EMail</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="133"/>
<source>Empty or incorrect email address. Please enter yuor name.</source>
<translation>Форма не заповнена або введений невірний email. Введіть вірний email.</translation>
<translation type="vanished">Форма не заповнена або введений невірний email. Введіть вірний email.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="148"/>
<source>Nickname</source>
<translation>Нікнейм</translation>
<translation type="vanished">Нікнейм</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="152"/>
<source>Empty or incorrect Nickname. Please enter yuor name.</source>
<translation>Порожня форма або неправильний нікнейм. Введіть коректний нікнейм.</translation>
<translation type="vanished">Порожня форма або неправильний нікнейм. Введіть коректний нікнейм.</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="174"/>
<source>Pasword</source>
<translation>Пароль</translation>
<translation type="vanished">Пароль</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="188"/>
<source>Confirm pasword</source>
<translation>Підтвердьте пароль</translation>
<translation type="vanished">Підтвердьте пароль</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="200"/>
<source>Forgot password</source>
<translation>Забули пароль</translation>
<translation type="vanished">Забули пароль</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="220"/>
<source>I accept the Terms of use</source>
<translation>Я приймаю Умови використання</translation>
<translation type="vanished">Я приймаю Умови використання</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="227"/>
<source>Show terms of use</source>
<translation>Показати умови використання</translation>
<translation type="vanished">Показати умови використання</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="248"/>
<source>SignUp</source>
<translation>Реєстрація</translation>
<translation type="vanished">Реєстрація</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="281"/>
<source>Login In</source>
<translation>Логін</translation>
<translation type="vanished">Логін</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="284"/>
<source>Sign Up</source>
<translation>Реєстрація</translation>
<translation type="vanished">Реєстрація</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/LoginViewModule/LoginView.qml" line="347"/>
<source>Password must match the 1st field and the password cannot be empty</source>
<translation>Пароль повинен відповідати 1-му полю, і пароль не може бути порожнім</translation>
<translation type="vanished">Пароль повинен відповідати 1-му полю, і пароль не може бути порожнім</translation>
</message>
</context>
<context>
<name>LoginView::LVMainModel</name>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="204"/>
<source>must be longer than 8 characters</source>
<translation>має містити більше 8 символів</translation>
<translation type="vanished">має містити більше 8 символів</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="208"/>
<source>must contain numbers</source>
<translation>повинні містити цифри</translation>
<translation type="vanished">повинні містити цифри</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="212"/>
<source>must contain small chars</source>
<translation>повинен містити невеликі символи</translation>
<translation type="vanished">повинен містити невеликі символи</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="216"/>
<source>must contain large chars</source>
<translation>повинен містити великі символи</translation>
<translation type="vanished">повинен містити великі символи</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="220"/>
<source>must contain extra chars (!@#$%^&amp;*)</source>
<translation>повинен містити додаткові символи (! @ # $% ^ &amp; *)</translation>
<translation type="vanished">повинен містити додаткові символи (! @ # $% ^ &amp; *)</translation>
</message>
<message>
<location filename="../QMLLoginView/LoginView/src/lvmainmodel.cpp" line="223"/>
<source>Password requirements: </source>
<translation>Вимоги до пароля:</translation>
<translation type="vanished">Вимоги до пароля:</translation>
</message>
</context>
<context>
@ -545,10 +479,8 @@
<context>
<name>NotificationForm</name>
<message>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="16"/>
<location filename="../SimpleQmlNotify/NotifyModule/NotificationForm.qml" line="18"/>
<source>Message</source>
<translation>Повідомлення</translation>
<translation type="vanished">Повідомлення</translation>
</message>
</context>
<context>
@ -756,15 +688,5 @@ Minimum steps for this lvl: %1</source>
<source>Hanoi Towers</source>
<translation>Ханої вежі</translation>
</message>
<message>
<location filename="../QMLLoginView/example/main.qml" line="28"/>
<source>Example of LoginView</source>
<translation></translation>
</message>
<message>
<location filename="../ViewSolutions/Examples/src/main.qml" line="113"/>
<source>Examples of View Solutions</source>
<translation></translation>
</message>
</context>
</TS>

View File

@ -183,12 +183,11 @@ GridLayout {
eonline.checked = onlieUser
}
readonly property int questionCode: Math.random() * 1000
readonly property int questionCode: 0;
function remove() {
notificationService.setQuestion(qsTr("Remove %0 user").arg(userModel.userId),
questionCode = notificationService.setQuestion(qsTr("Remove %0 user").arg(userModel.userId),
qsTr("All saved data and records will be delete, Do you want continuee?"),
"",
questionCode)
"")
}
Connections {
target: notificationService

1
Heart

@ -1 +0,0 @@
Subproject commit 4fd83c73c1b9ca6ba3db1c4037e186eb5d23340a

@ -1 +0,0 @@
Subproject commit be2c0035fc1883fdf7e3faf21cacf34ac640d7fd

1
submodules/Credits Submodule

@ -0,0 +1 @@
Subproject commit a573a0a898b51d4d5be4979bf70b09ceb0bc6cc8

1
submodules/Heart Submodule

@ -0,0 +1 @@
Subproject commit 471045efa487c9816a1c771f7b4ac82b8b27f3f2

1
submodules/Patronum Submodule

@ -0,0 +1 @@
Subproject commit 4bf11554586f823f7ccd05ad295e90e3eeea449c

@ -0,0 +1 @@
Subproject commit 57e4287b3dbb387e59f401b9447f2a561a6c12e8