From 080a32b01ec8829184f23d0860c3238c8df61eba Mon Sep 17 00:00:00 2001 From: SeeLook <945374+SeeLook@users.noreply.github.com> Date: Sat, 13 Jan 2018 19:22:26 +0100 Subject: [PATCH] Approved context changes to Hungarian translation, updated changelog. Bumped to version 1.5.2-alpha3 --- CMakeLists.txt | 14 +++---- README | 40 +++++++++--------- changes | 11 +++++ lang/nootka_hu.qm | Bin 119503 -> 118971 bytes lang/nootka_hu.ts | 61 +++++++++++++--------------- packaging/appimage/make-appimage.sh | 3 +- src/libs/core/nootkaconfig.h | 2 +- src/main/tnameitem.cpp | 2 +- 8 files changed, 71 insertions(+), 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbb58509c..115c2fdc0 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,16 @@ ######################################################################## # MAIN CMAKE FILE FOR Nootka ######################################################################## - + cmake_minimum_required(VERSION 3.1.0) +cmake_policy(SET CMP0071 NEW) + project(nootka) set(Nootka_VERSION_MAJOR "1") set(Nootka_VERSION_MINOR "5") -set(Nootka_VERSION_PATCH "1-alpha2") +set(Nootka_VERSION_PATCH "2-alpha3") set(Nootka_VERSION "${Nootka_VERSION_MAJOR}.${Nootka_VERSION_MINOR}") @@ -32,8 +34,6 @@ if (APPLE) ") endif (APPLE) -add_subdirectory(src) - ########################################################################### #INSTALLATION ########################################################################### @@ -75,6 +75,8 @@ if (NOT DPKG_CMD) unset(DPKG_CMD) endif (NOT DPKG_CMD) +add_subdirectory(src) + if(WIN32) set(INS_PREF ".") else(WIN32) @@ -117,11 +119,9 @@ if(APPLE OR WIN32) "${QT_TRANSLATIONS_DIR}/qtbase_de.qm" "${QT_TRANSLATIONS_DIR}/qtbase_es.qm" "${QT_TRANSLATIONS_DIR}/qtbase_fr.qm" + "${QT_TRANSLATIONS_DIR}/qtbase_hu.qm" "${QT_TRANSLATIONS_DIR}/qtbase_pl.qm" "${QT_TRANSLATIONS_DIR}/qtbase_ru.qm" - # So far not provided by Qt - #"${CMAKE_CURRENT_SOURCE_DIR}/lang/qtbase/qtbase_es.qm" - ) endif(APPLE OR WIN32) diff --git a/README b/README index ef0be3d6d..120580b6a 100644 --- a/README +++ b/README @@ -24,13 +24,13 @@ and helps with developing skills of playing and singing notes from a score. - c++11 capable compiler (tested with gcc >=4.9 and clang) - cmake at least version 3.1.0 (http://cmake.org) - Qt libraries (at least version 5.9) - In particular: Qt5Core, Qt5Gui, Qt5Widgets, Qt5PrintSupport, Qt5Network, Qt5Qml, Qt5QtQuick, Qt5QuickControls2 + In particular: Qt5Core, Qt5Gui, Qt5Widgets, Qt5PrintSupport, Qt5Network, Qt5Qml, Qt5QtQuick, Qt5QuickControls2 - Ogg Vorbis (http://www.xiph.org/downloads/) both ogg and vorbis. Dll libraries are on mentioned site in vorbis-tools archive and headers are in libogg and libvorbis archives. Under Linux: libvorbis-dev & libogg-dev (or similar) - FFTW libraries (http://www.fftw.org/) - Under Linux: libfftw3-dev (or similar) + Under Linux: libfftw3-dev (or similar) - under Linux and MacOs only SoundTouch library (http://www.surina.net/soundtouch/) (libsoundtouch and libsoundtouch-dev) @@ -49,11 +49,11 @@ In details: 4. go into created dir (i.e. cd build) --------------------------------------------------------------------------------------------------------- 5. Launch: - cmake ../ - or - ccmake ../ - or - launch graphical cmake-gui and select source and build directories there + cmake ../ + or + ccmake ../ + or + launch graphical cmake-gui and select source and build directories there --------------------------------------------------------------------------------------------------------- if you get error about not found libfftw or libvorbis put them manually as a cmake launch parameter: @@ -70,7 +70,7 @@ In details: or do the same with GUI !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - NOTE for Windows build: + NOTE for Windows build: If you put unpacked archives of fftw and ogg-vorbis in the 'build' directory, and you remove the versions numbers from their names, to have: libogg, libvorbis, fftw and vorbis-tools directories, @@ -84,20 +84,20 @@ In details: - PulseAudio (requires libpulse-dev) When those headers/libs are found - options are selected automatically but they can be controlled by: - -DENABLE_JACK=OFF -DENABLE_PULSEAUDIO=OFF (OFF or ON) - --------------------------------------------------------------------------------------------------------- + -DENABLE_JACK=OFF -DENABLE_PULSEAUDIO=OFF (OFF or ON) + --------------------------------------------------------------------------------------------------------- 6. then call make or make -j[number of CPU cores], f.e.: make -j4 --------------------------------------------------------------------------------------------------------- - If you want to launch Nootka without installing - in a place where it is compiled - call - make runinplace - it will copy or link all necessary staff next to build executable - then invoke - ./src/nootka - or just hit a file called 'nootka' + call + make runinplace + it will copy or link all necessary stuff next to build executable + then invoke + ./src/nootka + or just hit a file called 'nootka' --------------------------------------------------------------------------------------------------------- 7. make install (usually as root) alternatively you can invoke @@ -111,8 +111,8 @@ In details: - make uninstall (usually as root) +++++++++++++++++++++++++++++ Qt Creator +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Steps from 2 to 8 can be achieved also in Qt Creator - development IDE. - Just open CMakeLists.txt file, placed in main Nootka archive folder and follow the instructions + Steps from 2 to 8 can be achieved also in Qt Creator - development IDE. + Just open CMakeLists.txt file, placed in main Nootka archive folder and follow the instructions ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ !!!!!!!!!!!! GOOD LUCK !!!!!!!!! @@ -137,8 +137,8 @@ has to be called before! ###################################################################################### 1. Install Xcode & X11 (from MacOs install DVD or App Store). XCode SDK is not required 2. Install MacPorts - http://www.macports.org/install.php - and in terminal type: + http://www.macports.org/install.php + and in terminal type: sudo port install pkgconfig cmake mercurial fftw-3-single libvorbis soundtouch Alternatively you can use Fink or another MacOs packaging system diff --git a/changes b/changes index 51f7ee0d5..22903b8d4 100644 --- a/changes +++ b/changes @@ -1,4 +1,5 @@ 1.5.2 alpha3 + - score supports bowing symbols, read them from XML - improved level creator 1.5.1 alpha2 @@ -17,6 +18,16 @@ - many improvements of user interface - option for enable/disable animations +1.4.5 + Nootka says: I speak Hungarian + - added Hungarian translations + - Stylus support on touch screens (Requires Qt 5.9/Android 4.2 and above) + - using secure SSL connections when possible (update check, links) + BUGS FIXES + - Don't stop pitch detection when question and answer are a sound + ANDROID + - Removed memory leaks, fixed two issues causing random crashes + 1.4.4 - German translation is complete - support for marking more frets on the fingerboard diff --git a/lang/nootka_hu.qm b/lang/nootka_hu.qm index c60ec25eb9c7b8af37e49ca432cf879fc1d9c726..9cc8e9458a3d16e4634eef485eee48eb8b0b6f3d 100644 GIT binary patch delta 10074 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 N;P(1O-X*wR{(o*1wDtf1 delta 10320 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 diff --git a/lang/nootka_hu.ts b/lang/nootka_hu.ts index be33d51cc..5fcc0ff6a 100644 --- a/lang/nootka_hu.ts +++ b/lang/nootka_hu.ts @@ -84,7 +84,7 @@ </message> </context> <context> - <name>AudioInSettings</name> + <name>SoundPage</name> <message> <source>input device</source> <translation>bemeneti eszköz</translation> @@ -227,9 +227,6 @@ <source>It is rather necessary for mic input but may be switched off for instrument line-in plugged with less noise.</source> <translation>Mikrofonhoz valószÃnűleg szükséges, de bemenethez csatlakoztatott hangszerekhez, kevés zaj esetén valószÃnűleg nem indokolt.</translation> </message> -</context> -<context> - <name>AudioOutSettings</name> <message> <source>play sound</source> <translation>hang lejátszása</translation> @@ -302,6 +299,9 @@ <source>no midi ports</source> <translation>midi port nem található</translation> </message> +</context> +<context> + <name>AudioOutSettings</name> <message> <source>no devices found</source> <translation>eszköz nem található</translation> @@ -316,7 +316,7 @@ </message> </context> <context> - <name>Einstrument</name> + <name>Tinstrument</name> <message> <source>other instrument</source> <translation>más hangszer</translation> @@ -639,7 +639,7 @@ </message> </context> <context> - <name>Tcanvas</name> + <name>TtipHandler</name> <message> <source>%1 was detected</source> <comment>note name</comment> @@ -1364,7 +1364,7 @@ </message> </context> <context> - <name>TguitarSettings</name> + <name>InstrumentPage</name> <message> <source>tuning of the guitar</source> <translation>gitár hangolása</translation> @@ -1459,6 +1459,10 @@ <source>always show this help window</source> <translation>mindig mutassa ezt a súgó ablakot</translation> </message> + <message> + <source>Open online documentation</source> + <translation>Online dokumentáció megnyitása</translation> + </message> </context> <context> <name>TintonationCombo</name> @@ -1642,7 +1646,7 @@ </message> </context> <context> - <name>TlevelCreatorDlg</name> + <name>LevelCreator</name> <message> <source>Questions</source> <translation>Kérdések</translation> @@ -1753,7 +1757,7 @@ jelek</translation> </message> </context> <context> - <name>TlevelPreview</name> + <name>TlevelPreviewItem</name> <message> <source>Level summary:</source> <translation>Szint összegzése:</translation> @@ -1790,14 +1794,6 @@ jelek</translation> <source>octave does no matter</source> <translation>számÃt az oktáv</translation> </message> - <message> - <source>note range:</source> - <translation>hangtartomány:</translation> - </message> - <message> - <source>fret range:</source> - <translation>bund tartomány:</translation> - </message> </context> <context> <name>TlevelSelector</name> @@ -2086,7 +2082,7 @@ nem Nootka fájl!</translation> </message> </context> <context> - <name>TnotationRadioGroup</name> + <name>NameStyleSelector</name> <message> <source>Naming style</source> <translation>Nevezéktan</translation> @@ -2160,7 +2156,7 @@ nem Nootka fájl!</translation> </message> </context> <context> - <name>TnoteName</name> + <name>TnameItem</name> <message> <source>Sub</source> <translation>Szub</translation> @@ -2244,7 +2240,7 @@ nem Nootka fájl!</translation> </message> </context> <context> - <name>TnoteNameSettings</name> + <name>ScorePage</name> <message> <source>names highlight color</source> <translation>nevek kiemelÅ‘ szÃne</translation> @@ -2772,13 +2768,6 @@ nem Nootka fájl!</translation> <translation>lejátszás</translation> </message> </context> -<context> - <name>TsettingsDialogBase</name> - <message> - <source>Open online documentation</source> - <translation>Online dokumentáció megnyitása</translation> - </message> -</context> <context> <name>TstartExamDlg</name> <message> @@ -2897,7 +2886,7 @@ nem Nootka fájl!</translation> </message> </context> <context> - <name>TsupportNootka</name> + <name>SupportPage</name> <message> <source>You also can help with making Nootka better.</source> <translation>Ön is segÃthet a Nootka fejlesztésében.</translation> @@ -3206,7 +3195,7 @@ nem Nootka fájl!</translation> </message> </context> <context> - <name>accidSettings</name> + <name>AccidsPage</name> <message> <source># - sharps</source> <translation># - keresztek</translation> @@ -3272,8 +3261,8 @@ nem Nootka fájl!</translation> <translation>teljes vizsgára csak egy kiválasztott hangnem.</translation> </message> <message> - <source>Select a key signature. Appropriate accidentals used in exam will be automatically selected!</source> - <translation>Válasszon egy hangnemet. A megfelelÅ‘ módosÃtó jelzÅ‘k automatikusan a vizsgához rendelÅ‘dnek!</translation> + <source>Select a key signature. Appropriate accidentals used in this level will be selected automatically.</source> + <translation>Válasszon egy hangnemet. A megfelelÅ‘ módosÃtó jelzÅ‘k automatikusan a vizsgához rendelÅ‘dnek.</translation> </message> <message> <source>if checked, in exam user have to select a key signature, otherwise it is shown by application.</source> @@ -3389,7 +3378,15 @@ nem Nootka fájl!</translation> </message> </context> <context> - <name>rangeSettings</name> + <name>RangePage</name> + <message> + <source>note range:</source> + <translation>hangtartomány:</translation> + </message> + <message> + <source>fret range:</source> + <translation>bund tartomány:</translation> + </message> <message> <source>adjust fret range</source> <translation>bund távolság beállÃtása</translation> diff --git a/packaging/appimage/make-appimage.sh b/packaging/appimage/make-appimage.sh index dcdfc0960..4ddb7b5d1 100755 --- a/packaging/appimage/make-appimage.sh +++ b/packaging/appimage/make-appimage.sh @@ -4,7 +4,7 @@ # creates directory structure with all stuff (libraries, icons, etc.), # # then creates AppImage # # # -# Copyright (C) 2011-2017 by Tomasz Bojczuk <seelook@gmail.com> # +# Copyright (C) 2011-2018 by Tomasz Bojczuk <seelook@gmail.com> # # # # Arguments: # # - source directory # @@ -63,6 +63,7 @@ cp $TRANS_PATH/qtbase_cs.qm AppDir/usr/share/nootka/lang cp $TRANS_PATH/qtbase_de.qm AppDir/usr/share/nootka/lang cp $TRANS_PATH/qtbase_es.qm AppDir/usr/share/nootka/lang cp $TRANS_PATH/qtbase_fr.qm AppDir/usr/share/nootka/lang +cp $TRANS_PATH/qtbase_hu.qm AppDir/usr/share/nootka/lang cp $TRANS_PATH/qtbase_pl.qm AppDir/usr/share/nootka/lang cp $TRANS_PATH/qtbase_ru.qm AppDir/usr/share/nootka/lang diff --git a/src/libs/core/nootkaconfig.h b/src/libs/core/nootkaconfig.h index 4532e6775..2db565e19 100644 --- a/src/libs/core/nootkaconfig.h +++ b/src/libs/core/nootkaconfig.h @@ -1,3 +1,3 @@ -#define NOOTKA_VERSION "1.5.1-alpha2" +#define NOOTKA_VERSION "1.5.2-alpha3" diff --git a/src/main/tnameitem.cpp b/src/main/tnameitem.cpp index 7c27af49b..235d1c45a 100644 --- a/src/main/tnameitem.cpp +++ b/src/main/tnameitem.cpp @@ -186,7 +186,7 @@ QString TnameItem::nameText() const { QString TnameItem::octaveName(int oNr) const { - return oNr > -4 && oNr < 5 ? shortOctaveNames[oNr + 3] : QString(); + return oNr > -4 && oNr < 5 ? tr(shortOctaveNames[oNr + 3]) : QString(); } -- GitLab