Mercurial > hg > sonic-visualiser
changeset 1133:ccc667cdb8ad 3.0-integration
Merge from default branch
author | Chris Cannam |
---|---|
date | Thu, 04 Feb 2016 11:22:30 +0000 |
parents | 56113c813bf5 (current diff) 13fbcc6ea4c7 (diff) |
children | 9a0b4e331e9d |
files | configure i18n/sonic-visualiser_cs_CZ.ts |
diffstat | 3 files changed, 94 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/acinclude.m4 Thu Feb 04 11:20:37 2016 +0000 +++ b/acinclude.m4 Thu Feb 04 11:22:30 2016 +0000 @@ -69,6 +69,9 @@ AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/) fi if test x$QMAKE = x ; then + AC_CHECK_PROG(QMAKE, qt5-qmake, $QTDIR/bin/qt5-qmake,,$QTDIR/bin/) +fi +if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/) fi if test x$QMAKE = x ; then @@ -78,6 +81,9 @@ AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then + AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) +fi +if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) fi if test x$QMAKE = x ; then
--- a/configure Thu Feb 04 11:20:37 2016 +0000 +++ b/configure Thu Feb 04 11:22:30 2016 +0000 @@ -4149,6 +4149,45 @@ fi if test x$QMAKE = x ; then + # Extract the first word of "qt5-qmake", so it can be a program name with args. +set dummy qt5-qmake; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_QMAKE+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$QMAKE"; then + ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $QTDIR/bin/ +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_QMAKE="$QTDIR/bin/qt5-qmake" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +QMAKE=$ac_cv_prog_QMAKE +if test -n "$QMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5 +$as_echo "$QMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test x$QMAKE = x ; then # Extract the first word of "qmake", so it can be a program name with args. set dummy qmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -4266,6 +4305,45 @@ fi if test x$QMAKE = x ; then + # Extract the first word of "qt5-qmake", so it can be a program name with args. +set dummy qt5-qmake; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_QMAKE+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$QMAKE"; then + ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_QMAKE="qt5-qmake" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +QMAKE=$ac_cv_prog_QMAKE +if test -n "$QMAKE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5 +$as_echo "$QMAKE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test x$QMAKE = x ; then # Extract the first word of "qmake", so it can be a program name with args. set dummy qmake; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--- a/i18n/sonic-visualiser_cs_CZ.ts Thu Feb 04 11:20:37 2016 +0000 +++ b/i18n/sonic-visualiser_cs_CZ.ts Thu Feb 04 11:22:30 2016 +0000 @@ -3579,15 +3579,15 @@ </message> <message> <source>Export audio from selection into a data file</source> - <translation type="unfinished"></translation> + <translation>Vyvést zvuk z výběru do datového souboru</translation> </message> <message> <source>Export the selected regions into a single file</source> - <translation type="unfinished"></translation> + <translation>Vyvést vybrané oblasti do jednoho souboru</translation> </message> <message> <source>Export the whole file</source> - <translation type="unfinished"></translation> + <translation>Vyvést celý soubor</translation> </message> <message> <source>Playback Speed</source> @@ -3595,7 +3595,7 @@ </message> <message> <source>Export Audio Data...</source> - <translation type="unfinished"></translation> + <translation>&Vyvést zvuková data...</translation> </message> <message> <source>Export Annotation La&yer...</source> @@ -5055,27 +5055,27 @@ </message> <message> <source>Follow system locale</source> - <translation type="unfinished"></translation> + <translation>Použít jazyk systému</translation> </message> <message> <source>Russian</source> - <translation type="unfinished"></translation> + <translation>Ruština</translation> </message> <message> <source>British English</source> - <translation type="unfinished"></translation> + <translation>Britská angličtina</translation> </message> <message> <source>American English</source> - <translation type="unfinished"></translation> + <translation>Americká angličtina</translation> </message> <message> <source>Czech</source> - <translation type="unfinished"></translation> + <translation>Čeština</translation> </message> <message> <source>User interface language</source> - <translation type="unfinished"></translation> + <translation>Jazyk uživatelského rozhraní</translation> </message> <message> <source>Allow network usage</source>