Projects
Multimedia
LiVES
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 36
View file
LiVES.changes
Changed
@@ -1,7 +1,14 @@ ------------------------------------------------------------------- +Sat Oct 22 17:23:19 UTC 2016 - avvissu@yandex.by + +- Update to 2.8.0: + * see: /usr/share/doc/packages/lives/ChangeLog +- Add freedesktop.org icon themes + +------------------------------------------------------------------- Mon Jun 27 18:17:18 UTC 2016 - avvissu@yandex.by -- Update to 2.6.3 +- Update to 2.6.3: * see: /usr/share/doc/packages/lives/ChangeLog - Remove patch: * lives-2.6.0_lcolor.patch (fixed in upstream)
View file
LiVES.spec
Changed
@@ -20,7 +20,7 @@ %define soname 0 Name: LiVES -Version: 2.6.3 +Version: 2.8.0 Release: 0 Summary: Video Editor and VJ Tool License: GPL-2.0+ @@ -64,6 +64,7 @@ BuildRequires: pkgconfig(slang) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(vorbis) +BuildRequires: hicolor-icon-theme BuildRequires: update-desktop-files Requires: MPlayer Requires: cdrkit-cdrtools-compat @@ -157,7 +158,6 @@ popd #libweed %build - export CFLAGS="%{optflags} -fno-strict-aliasing -I$PWD/libweed/" export CPPFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS" @@ -172,8 +172,6 @@ find %{buildroot} \( -name \*.la -o -name \*.a \) -exec rm {} \; -mv "%{buildroot}%{_datadir}/app-install/icons/lives.png" \ - "%{buildroot}%{_datadir}/pixmaps/lives.png" rm -rf "%{buildroot}%{_datadir}/app-install" for l in de_DE nl_NL; do @@ -195,6 +193,14 @@ %find_lang lives +%post +%icon_theme_cache_post +%desktop_database_post + +%postun +%icon_theme_cache_postun +%desktop_database_postun + %post -n libweed%{soname} -p /sbin/ldconfig %postun -n libweed%{soname} -p /sbin/ldconfig @@ -248,8 +254,8 @@ %{_datadir}/lives/plugins/effects/RFXscripts/*.script %dir %{_datadir}/lives/resources %{_datadir}/lives/resources/* +%{_datadir}/icons/hicolor/*/apps/lives.??g %{_datadir}/pixmaps/lives.xpm -%{_datadir}/pixmaps/lives.png %dir %{_libdir}/lives %dir %{_libdir}/lives/plugins %dir %{_libdir}/lives/plugins/decoders @@ -449,5 +455,6 @@ %{_libdir}/libOSC_client.so %files lang -f lives.lang +%defattr(-,root,root) %changelog
View file
LiVES-2.6.3.tar.bz2/ChangeLog -> LiVES-2.8.0.tar.bz2/ChangeLog
Changed
@@ -1,5 +1,73 @@ -Version 2.6.3 -------------- +Version 2.8.0 (3 Sep 2016) +-------------------------- +Correct blank frame fix from 2.6.8 (add one to last frame). +Fix coding error when centering windows. +Correctly parse the path variables for frei0r, libvisual and ladspa. +Set nicer defaults for RGBDelay effect. + + + + +Version 2.6.8 (27 Aug 2016) +--------------------------- +Fix bug which could result in blank frames / hang after deleting frames. +Fix some internal issues with image types. +Fix a crash after recording a generator and cancelling. +Correctly remove layouts directory if the clips in a set are deleted. +Print info text if libav decoder cannot find a usable pixel format. + + + + + + +Version 2.6.7 (18 Aug 2016) +--------------------------- +Fix breakage in single image loader (regression). +Alter icon location to comply with LSB. +Fix for older libav. + + + + + +Version 2.6.6 (16 Aug 2016) +--------------------------- +Remove debugging and test code. +Allow closure of dialog boxes clicking on 'X'. + + + + + +Version 2.6.5 (14 Aug 2016) +--------------------------- +Fix bug with multitrack startup not showing clip editor on switch (regression). +Fix crash when statring in headless (nogui) mode (regression). +Remove some debugging output from 2.6.4 +Update rte window after mapping effects via OSC. +Add OSC commands /audio/source/set and /audio/source/get. + + + + + +Version 2.6.4 (7 Aug 2016) +-------------------------- +Fix bugs with opening new audio (regression). +Fix bug with yuv420p -> rgb palette conversions (regression). +Better centering of dialogs in some window managers. +Fix error with setting / resetting midi raw in Preferences. +Fix crash when opening clips with older versions of libav. +Minor compilation fixes. +Updated translations to French and Ukranian. + + + + + +Version 2.6.3 (8 May 2016) +-------------------------- Fix bug which caused error moving sets with no layouts (regression). Optimise recording of generated frames. Fixes for recording audio from external pulse audio.
View file
LiVES-2.6.3.tar.bz2/LiVES.doxygen -> LiVES-2.8.0.tar.bz2/LiVES.doxygen
Changed
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.6.3 +PROJECT_NUMBER = 2.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a
View file
LiVES-2.6.3.tar.bz2/Makefile.am -> LiVES-2.8.0.tar.bz2/Makefile.am
Changed
@@ -113,8 +113,8 @@ cp -f "$(srcdir)/menu-entries/LiVES.desktop" "$(DESTDIR)$(sharedir)/applications/" $(MKDIR_P) "$(DESTDIR)$(sharedir)/pixmaps/" cp -f "$(srcdir)/menu-entries/lives.xpm" "$(DESTDIR)$(sharedir)/pixmaps/" - $(MKDIR_P) "$(DESTDIR)$(sharedir)/app-install/icons/" - cp -f "$(srcdir)/menu-entries/lives.png" "$(DESTDIR)$(sharedir)/app-install/icons/" + $(MKDIR_P) "$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/" + cp -f "$(srcdir)/menu-entries/lives.png" "$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/" install-exec-local: rm -rf "$(DESTDIR)$(bindir)/lives"
View file
LiVES-2.6.3.tar.bz2/Makefile.in -> LiVES-2.8.0.tar.bz2/Makefile.in
Changed
@@ -1095,8 +1095,8 @@ cp -f "$(srcdir)/menu-entries/LiVES.desktop" "$(DESTDIR)$(sharedir)/applications/" $(MKDIR_P) "$(DESTDIR)$(sharedir)/pixmaps/" cp -f "$(srcdir)/menu-entries/lives.xpm" "$(DESTDIR)$(sharedir)/pixmaps/" - $(MKDIR_P) "$(DESTDIR)$(sharedir)/app-install/icons/" - cp -f "$(srcdir)/menu-entries/lives.png" "$(DESTDIR)$(sharedir)/app-install/icons/" + $(MKDIR_P) "$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/" + cp -f "$(srcdir)/menu-entries/lives.png" "$(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/" install-exec-local: rm -rf "$(DESTDIR)$(bindir)/lives"
View file
LiVES-2.6.3.tar.bz2/README -> LiVES-2.8.0.tar.bz2/README
Changed
@@ -64,16 +64,16 @@ If you got LiVES as a tar.gz or tar.bz2, at a terminal prompt, enter the following: - bzip2 -d LiVES-2.6.3.tar.bz2 + bzip2 -d LiVES-2.8.0.tar.bz2 or, - gzip -d LiVES-2.6.3.tar.gz + gzip -d LiVES-2.8.0.tar.gz depending on which version you have. Then: - tar xvf LIVES-2.6.3.tar + tar xvf LIVES-2.8.0.tar - cd lives-2.6.3 + cd lives-2.8.0
View file
LiVES-2.6.3.tar.bz2/build-lives-rfx-plugin -> LiVES-2.8.0.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="2.6.3"; +$builder_version="2.8.0"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-2.6.3.tar.bz2/configure -> LiVES-2.8.0.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LiVES 2.6.3. +# Generated by GNU Autoconf 2.69 for LiVES 2.8.0. # # Report bugs to <https://sourceforge.net/p/lives/bugs/>. # @@ -590,10 +590,10 @@ # Identity of this package. PACKAGE_NAME='LiVES' PACKAGE_TARNAME='lives' -PACKAGE_VERSION='2.6.3' -PACKAGE_STRING='LiVES 2.6.3' +PACKAGE_VERSION='2.8.0' +PACKAGE_STRING='LiVES 2.8.0' PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/' -PACKAGE_URL='http://lives-video' +PACKAGE_URL='http://lives-video.com' ac_unique_file="Makefile.am" ac_default_prefix=/usr @@ -769,6 +769,10 @@ OPENCV_LIBS_ONLY_L OPENCV_LIBS OPENCV_CFLAGS +HAVE_AVPRIV_SET_PTS_INFO_FALSE +HAVE_AVPRIV_SET_PTS_INFO_TRUE +HAVE_AV_SET_BITS_PER_SAMPLE_FALSE +HAVE_AV_SET_BITS_PER_SAMPLE_TRUE HAVE_AV_SET_PTS_INFO_FALSE HAVE_AV_SET_PTS_INFO_TRUE HAVE_AVFORMAT_INTERNAL_H_FALSE @@ -777,6 +781,8 @@ HAVE_AVFORMAT_CLOSE_INPUT_TRUE HAVE_AVFORMAT_FIND_STREAM_INFO_FALSE HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE +HAVE_AVFRAME_UNREF_FALSE +HAVE_AVFRAME_UNREF_TRUE HAVE_AVPACKET_UNREF_FALSE HAVE_AVPACKET_UNREF_TRUE HAVE_AVFORMAT_NEW_STREAM_FALSE @@ -1731,7 +1737,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LiVES 2.6.3 to adapt to many kinds of systems. +\`configure' configures LiVES 2.8.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1803,7 +1809,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 2.6.3:";; + short | recursive ) echo "Configuration of LiVES 2.8.0:";; esac cat <<\_ACEOF @@ -2007,7 +2013,7 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to <https://sourceforge.net/p/lives/bugs/>. -LiVES home page: <http://lives-video>. +LiVES home page: <http://lives-video.com>. _ACEOF ac_status=$? fi @@ -2070,7 +2076,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 2.6.3 +LiVES configure 2.8.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2797,7 +2803,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LiVES $as_me 2.6.3, which was +It was created by LiVES $as_me 2.8.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3778,7 +3784,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='2.6.3' + VERSION='2.8.0' cat >>confdefs.h <<_ACEOF @@ -26299,6 +26305,7 @@ HAVE_AVFORMAT_INTERNAL_H=false HAVE_AV_SET_PTS_INFO=false HAVE_AVPRIV_SET_PTS_INFO=false +HAVE_AV_GET_BITS_PER_SAMPLE=false if test "$HAVE_AVCODEC" = "true" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_open2 in -lavcodec" >&5 @@ -26511,6 +26518,48 @@ HAVE_AVFRAME_UNREF=false fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_get_bits_per_sample in -lavcodec" >&5 +$as_echo_n "checking for av_get_bits_per_sample in -lavcodec... " >&6; } +if ${ac_cv_lib_avcodec_av_get_bits_per_sample+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lavcodec $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char av_get_bits_per_sample (); +int +main () +{ +return av_get_bits_per_sample (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_avcodec_av_get_bits_per_sample=yes +else + ac_cv_lib_avcodec_av_get_bits_per_sample=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_av_get_bits_per_sample" >&5 +$as_echo "$ac_cv_lib_avcodec_av_get_bits_per_sample" >&6; } +if test "x$ac_cv_lib_avcodec_av_get_bits_per_sample" = xyes; then : + HAVE_AV_SET_BITS_PER_SAMPLE=true +else + HAVE_AV_SET_BITS_PER_SAMPLE=false +fi + fi if test "$HAVE_AVFORMAT" = "true" ; then @@ -26789,6 +26838,14 @@ HAVE_AVPACKET_UNREF_FALSE= fi + if $HAVE_AVFRAME_UNREF; then + HAVE_AVFRAME_UNREF_TRUE= + HAVE_AVFRAME_UNREF_FALSE='#' +else + HAVE_AVFRAME_UNREF_TRUE='#' + HAVE_AVFRAME_UNREF_FALSE= +fi + if $HAVE_AVFORMAT_FIND_STREAM_INFO; then HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE= HAVE_AVFORMAT_FIND_STREAM_INFO_FALSE='#' @@ -26821,6 +26878,22 @@ HAVE_AV_SET_PTS_INFO_FALSE= fi + if $HAVE_AV_SET_BITS_PER_SAMPLE; then + HAVE_AV_SET_BITS_PER_SAMPLE_TRUE= + HAVE_AV_SET_BITS_PER_SAMPLE_FALSE='#' +else + HAVE_AV_SET_BITS_PER_SAMPLE_TRUE='#' + HAVE_AV_SET_BITS_PER_SAMPLE_FALSE= +fi + + if $HAVE_AVPRIV_SET_PTS_INFO; then + HAVE_AVPRIV_SET_PTS_INFO_TRUE= + HAVE_AVPRIV_SET_PTS_INFO_FALSE='#' +else + HAVE_AVPRIV_SET_PTS_INFO_TRUE='#' + HAVE_AVPRIV_SET_PTS_INFO_FALSE= +fi + HAVE_OPENCV=false @@ -29887,6 +29960,10 @@ as_fn_error $? "conditional \"HAVE_AVPACKET_UNREF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_AVFRAME_UNREF_TRUE}" && test -z "${HAVE_AVFRAME_UNREF_FALSE}"; then + as_fn_error $? "conditional \"HAVE_AVFRAME_UNREF\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE}" && test -z "${HAVE_AVFORMAT_FIND_STREAM_INFO_FALSE}"; then
View file
LiVES-2.6.3.tar.bz2/configure.ac -> LiVES-2.8.0.tar.bz2/configure.ac
Changed
@@ -5,7 +5,7 @@ [m4_pattern_allow([^AC_.*])]) dnl IMPORTANT !! $version must also be set to exactly the same string in smogrify -AC_INIT(LiVES,2.6.3,https://sourceforge.net/p/lives/bugs/,,http://lives-video) +AC_INIT(LiVES,2.8.0,https://sourceforge.net/p/lives/bugs/,,http://lives-video.com) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -492,6 +492,7 @@ HAVE_AVFORMAT_INTERNAL_H=false HAVE_AV_SET_PTS_INFO=false HAVE_AVPRIV_SET_PTS_INFO=false +HAVE_AV_GET_BITS_PER_SAMPLE=false if test "$HAVE_AVCODEC" = "true" ; then AC_CHECK_LIB(avcodec,avcodec_open2,HAVE_AVCODEC_OPEN2=true,HAVE_AVCODEC_OPEN2=false) @@ -499,6 +500,7 @@ AC_CHECK_LIB(avcodec,av_codec_set_pkt_timebase,HAVE_AV_CODEC_SET_PKT_TIMEBASE=true,HAVE_AV_CODEC_SET_PKT_TIMEBASE=false) AC_CHECK_LIB(avcodec,av_packet_unref,HAVE_AVPACKET_UNREF=true,HAVE_AVPACKET_UNREF=false) AC_CHECK_LIB(avcodec,av_frame_unref,HAVE_AVFRAME_UNREF=true,HAVE_AVFRAME_UNREF=false) +AC_CHECK_LIB(avcodec,av_get_bits_per_sample,HAVE_AV_SET_BITS_PER_SAMPLE=true,HAVE_AV_SET_BITS_PER_SAMPLE=false) fi if test "$HAVE_AVFORMAT" = "true" ; then @@ -524,10 +526,13 @@ AM_CONDITIONAL(HAVE_AV_CODEC_SET_PKT_TIMEBASE,$HAVE_AV_CODEC_SET_PKT_TIMEBASE) AM_CONDITIONAL(HAVE_AVFORMAT_NEW_STREAM,$HAVE_AVFORMAT_NEW_STREAM) AM_CONDITIONAL(HAVE_AVPACKET_UNREF,$HAVE_AVPACKET_UNREF) +AM_CONDITIONAL(HAVE_AVFRAME_UNREF,$HAVE_AVFRAME_UNREF) AM_CONDITIONAL(HAVE_AVFORMAT_FIND_STREAM_INFO,$HAVE_AVFORMAT_FIND_STREAM_INFO) AM_CONDITIONAL(HAVE_AVFORMAT_CLOSE_INPUT,$HAVE_AVFORMAT_CLOSE_INPUT) AM_CONDITIONAL(HAVE_AVFORMAT_INTERNAL_H,$HAVE_AVFORMAT_INTERNAL_H) AM_CONDITIONAL(HAVE_AV_SET_PTS_INFO,$HAVE_AV_SET_PTS_INFO) +AM_CONDITIONAL(HAVE_AV_SET_BITS_PER_SAMPLE,$HAVE_AV_SET_BITS_PER_SAMPLE) +AM_CONDITIONAL(HAVE_AVPRIV_SET_PTS_INFO,$HAVE_AVPRIV_SET_PTS_INFO) HAVE_OPENCV=false
View file
LiVES-2.6.3.tar.bz2/liblives.doxygen -> LiVES-2.8.0.tar.bz2/liblives.doxygen
Changed
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.6.3 +PROJECT_NUMBER = 2.8.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a
View file
LiVES-2.6.3.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-2.8.0.tar.bz2/lives-plugins/plugins/decoders/Makefile.am
Changed
@@ -78,10 +78,22 @@ libav_cflags += -DHAVE_AVCODEC_ALLOC_CONTEXT3=1 endif +if HAVE_AV_CODEC_SET_PKT_TIMEBASE +libav_cflags += -DHAVE_AV_CODEC_SET_PKT_TIMEBASE=1 +endif + if HAVE_AVFORMAT_NEW_STREAM libav_cflags += -DHAVE_AVFORMAT_NEW_STREAM=1 endif +if HAVE_AVPACKET_UNREF +libav_cflags += -DHAVE_AVPACKET_UNREF=1 +endif + +if HAVE_AVFRAME_UNREF +libav_cflags += -DHAVE_AVFRAME_UNREF=1 +endif + if HAVE_AVFORMAT_FIND_STREAM_INFO libav_cflags += -DHAVE_AVFORMAT_FIND_STREAM_INFO=1 endif @@ -98,6 +110,12 @@ libav_cflags += -DHAVE_AV_SET_PTS_INFO=1 endif +if HAVE_AVPRIV_SET_PTS_INFO +libav_cflags += -DHAVE_AVPRIV_SET_PTS_INFO=1 +endif + + + flv_libs = flv_decoder.la FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
View file
LiVES-2.6.3.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-2.8.0.tar.bz2/lives-plugins/plugins/decoders/Makefile.in
Changed
@@ -97,11 +97,15 @@ @HAVE_DIRAC_TRUE@@HAVE_OGG_TRUE@am__append_6 = @DIRAC_LIBS@ @HAVE_AVCODEC_OPEN2_TRUE@@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_7 = -DHAVE_AVCODEC_OPEN2=1 @HAVE_AVCODEC_ALLOC_CONTEXT3_TRUE@@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_8 = -DHAVE_AVCODEC_ALLOC_CONTEXT3=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_NEW_STREAM_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_9 = -DHAVE_AVFORMAT_NEW_STREAM=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_10 = -DHAVE_AVFORMAT_FIND_STREAM_INFO=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_CLOSE_INPUT_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_11 = -DHAVE_AVFORMAT_CLOSE_INPUT=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_INTERNAL_H_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_12 = -DHAVE_AVFORMAT_INTERNAL_H=1 -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@@HAVE_AV_SET_PTS_INFO_TRUE@am__append_13 = -DHAVE_AV_SET_PTS_INFO=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@@HAVE_AV_CODEC_SET_PKT_TIMEBASE_TRUE@am__append_9 = -DHAVE_AV_CODEC_SET_PKT_TIMEBASE=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_NEW_STREAM_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_10 = -DHAVE_AVFORMAT_NEW_STREAM=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVPACKET_UNREF_TRUE@@HAVE_AVUTIL_TRUE@am__append_11 = -DHAVE_AVPACKET_UNREF=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVFRAME_UNREF_TRUE@@HAVE_AVUTIL_TRUE@am__append_12 = -DHAVE_AVFRAME_UNREF=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_FIND_STREAM_INFO_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_13 = -DHAVE_AVFORMAT_FIND_STREAM_INFO=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_CLOSE_INPUT_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_14 = -DHAVE_AVFORMAT_CLOSE_INPUT=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_INTERNAL_H_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_15 = -DHAVE_AVFORMAT_INTERNAL_H=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@@HAVE_AV_SET_PTS_INFO_TRUE@am__append_16 = -DHAVE_AV_SET_PTS_INFO=1 +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVPRIV_SET_PTS_INFO_TRUE@@HAVE_AVUTIL_TRUE@am__append_17 = -DHAVE_AVPRIV_SET_PTS_INFO=1 subdir = lives-plugins/plugins/decoders ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ @@ -612,7 +616,11 @@ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_10) \ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_11) \ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_12) \ -@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_13) +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_13) \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_14) \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_15) \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_16) \ +@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ $(am__append_17) @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_libs = flv_decoder.la @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
View file
LiVES-2.6.3.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c -> LiVES-2.8.0.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c
Changed
@@ -1,5 +1,5 @@ /// LiVES - avformat plugin -// (c) G. Finch 2010 <salsaman@xs4all.nl,salsaman@gmail.com> +// (c) G. Finch 2010 - 2016 <salsaman+lives@gmail.com> // released under the GNU GPL 3 or later // see file COPYING or www.gnu.org for details // @@ -81,7 +81,7 @@ void get_samps_and_signed(enum AVSampleFormat sfmt, int *asamps, boolean *asigned) { - *asamps=av_get_bytes_per_sample(sfmt)*8; + *asamps=av_get_bits_per_sample(sfmt); switch (sfmt) { case AV_SAMPLE_FMT_U8: @@ -187,7 +187,7 @@ static boolean attach_stream(lives_clip_data_t *cdata, boolean isclone) { // open the file and get a handle lives_av_priv_t *priv=cdata->priv; - AVProbeData pd; + AVProbeData pd={0}; AVInputFormat *fmt; AVCodec *vdecoder; @@ -219,8 +219,8 @@ pd.filename=cdata->URI; pd.buf=calloc(128,32); - - if ((pd.buf_size=stream_peek(priv->fd,pd.buf,2261))<2261) { + + if ((pd.buf_size=stream_peek(priv->fd,pd.buf,AVPROBE_PADDING_SIZE))<AVPROBE_PADDING_SIZE) { fprintf(stderr, "couldn't peek stream %d\n",pd.buf_size); return FALSE; } @@ -325,8 +325,25 @@ skip_init: s = priv->ic->streams[i]; - cc = s->codec; + +#ifdef API_3_1 + cc = avcodec_alloc_context3(NULL); + if (!cc) { + fprintf(stderr,"avcodec_decoder: out of memory\n"); + return FALSE; + } + + ret = avcodec_parameters_to_context(cc, s->codecpar); + if (ret < 0) { + fprintf(stderr,"avcodec_decoder: avparms to context failed\n"); + return FALSE; + } + +#else + cc = s->codec; +#endif + // vlc_fourcc_t fcc; //const char *psz_type = "unknown"; @@ -386,6 +403,11 @@ cdata->palettes[0]=avi_pix_fmt_to_weed_palette(cc->pix_fmt,&cdata->YUV_clamping); cdata->palettes[1]=WEED_PALETTE_END; + if (cdata->palettes[0]==WEED_PALETTE_END) { + fprintf(stderr,"avcodec_decoder: no usable palette found (%d)\n",cc->pix_fmt); + return FALSE; + } + sprintf(cdata->video_name,"%s",cc->codec_name); cdata->par=cc->sample_aspect_ratio.num/cc->sample_aspect_ratio.den; @@ -586,7 +608,7 @@ } if (priv->vstream==-1) { - fprintf(stderr,"avcodec_decoder: no video stream found"); + fprintf(stderr,"avcodec_decoder: no video stream found\n"); return FALSE; } @@ -637,11 +659,13 @@ static void detach_stream(lives_clip_data_t *cdata) { // close the file, free the decoder lives_av_priv_t *priv=cdata->priv; - close(priv->fd); + if (priv->fd>-1) close(priv->fd); // will close and free the context - if (priv->ic !=NULL) av_close_input_file(priv->ic); - + if (priv->ic !=NULL) { + avformat_close_input(&priv->ic); + } + if (cdata->palettes!=NULL) free(cdata->palettes); cdata->palettes=NULL; @@ -829,6 +853,7 @@ } cdata->URI=strdup(URI); if (!attach_stream(cdata,FALSE)) { + detach_stream(cdata); free(cdata->URI); cdata->URI=NULL; clip_data_free(cdata); @@ -858,6 +883,8 @@ } if (real_frames<=0) { + fprintf(stderr, + "avformat_decoder: ERROR - could not find the last frame\navformat_decoder: I will pass on this file as it may be broken.\n"); detach_stream(cdata); free(cdata->URI); cdata->URI=NULL; @@ -945,7 +972,7 @@ double time; AVStream *s = priv->ic->streams[priv->vstream]; - AVCodecContext *cc = s->codec; + AVCodecContext *cc; int64_t target_pts, MyPts, seek_target=10000000000; int64_t timex; @@ -969,6 +996,26 @@ if (tframe<0||tframe>=cdata->nframes||cdata->fps==0.) return FALSE; + + +#ifdef API_3_1 + cc = avcodec_alloc_context3(NULL); + if (!cc) { + fprintf(stderr,"avcodec_decoder: out of memory\n"); + return FALSE; + } + + ret = avcodec_parameters_to_context(cc, s->codecpar); + if (ret < 0) { + fprintf(stderr,"avcodec_decoder: avparms to context failed\n"); + return FALSE; + } + +#else + cc = s->codec; +#endif + + //cc->get_buffer = our_get_buffer; //cc->release_buffer = our_release_buffer; @@ -1016,6 +1063,7 @@ if (priv->pFrame==NULL||tframe!=priv->last_frame) { // same frame -> we reuse priv-pFrame; + //#define DEBUG #ifdef DEBUG fprintf(stderr,"pt a1 %d %ld\n",priv->last_frame,tframe); #endif @@ -1043,6 +1091,9 @@ seek_target=av_rescale_q(xtarget_pts, AV_TIME_BASE_Q, s->time_base); av_seek_frame(priv->ic, priv->vstream, seek_target, AVSEEK_FLAG_BACKWARD); +#ifdef DEBUG + fprintf(stderr,"pt a2 %d %ld\n",priv->last_frame,seek_target); +#endif avcodec_flush_buffers(cc); priv->black_fill=FALSE; MyPts=-1; @@ -1053,7 +1104,7 @@ // - while (1) { + do { if (priv->needs_packet) { do { @@ -1063,7 +1114,6 @@ fprintf(stderr,"ret was %d for tframe %ld\n",ret,tframe); #endif if (ret<0) { - av_packet_unref(&priv->packet); priv->needs_packet=TRUE; priv->last_frame=tframe; if (pixel_data==NULL) return FALSE; @@ -1095,7 +1145,7 @@ priv->packet.size-=ret; #else ret=avcodec_decode_video(cc, priv->pFrame, &gotFrame, priv->packet.data, priv->packet.size); - priv->pakcet.size=0; + priv->packet.size=0; #endif #ifdef DEBUG @@ -1103,7 +1153,6 @@ #endif
View file
LiVES-2.6.3.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h -> LiVES-2.8.0.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h
Changed
@@ -62,8 +62,8 @@ #if !HAVE_AV_SET_PTS_INFO -#if HAVE_AVFORMAT_INTERNAL_H +#if HAVE_AVFORMAT_INTERNAL_H && HAVE_AVPRIV_SET_PTS_INFO #include <avformat/internal.h> #define av_set_pts_info(a,b,c,d) avpriv_set_pts_info(a,b,c,d) @@ -77,7 +77,7 @@ -static UNUSED void av_set_pts_info(AVStream *s, int pts_wrap_bits, +static UNUSED void av_set_pts_info(AVStream *s, int pts_wrap_bits, unsigned int pts_num, unsigned int pts_den) { AVRational new_tb; if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) { @@ -113,6 +113,12 @@ #endif +#if !HAVE_AV_GET_BITS_PER_SAMPLE +#define av_get_bits_per_sample(a) (av_get_bytes_per_sample(a) * 8) +#endif + + + #endif // HAVE_LIBAV_LIBS #endif // HAVE_LIBAV_HELPER_H
View file
LiVES-2.6.3.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c -> LiVES-2.8.0.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c
Changed
@@ -318,7 +318,7 @@ for (j=0; j<3; j++) { if (j==2) snprintf(label,256," Frame -%-2d ",(i-1)/4); else weed_memset(label,0,1); - in_params[i+j]=weed_switch_init("",label,i<4?WEED_TRUE:WEED_FALSE); + in_params[i+j]=weed_switch_init("",label,(i+j==1||i+j==18||i+j==35)?WEED_TRUE:WEED_FALSE); } in_params[i+j]=weed_float_init("","",1.,0.,1.);
View file
LiVES-2.6.3.tar.bz2/lives-plugins/weed-plugins/frei0r.c -> LiVES-2.8.0.tar.bz2/lives-plugins/weed-plugins/frei0r.c
Changed
@@ -98,7 +98,6 @@ if (str1!=NULL) snprintf(target,tlen,"%s",str1); else return 0; return 1; - } //////////////////////////////////////////////////////////////// @@ -340,7 +339,7 @@ #endif char *fpp=getenv("FREI0R_PATH"); - +#define DEBUG #ifndef DEBUG int new_stdout=dup(1); int new_stderr=dup(2); @@ -348,6 +347,7 @@ close(1); close(2); #endif + if (fpp!=NULL) { vdirval=10; } else { @@ -367,7 +367,9 @@ if (curvdir!=NULL) closedir(curvdir); curvdir=opendir(vdir2); if (curvdir==NULL) vdirval=4; - else vdirval=3; + else { + vdirval=3; + } } if (vdirval==4) { @@ -380,11 +382,15 @@ vdirval=5; } + if (vdirval>9) { - if (!getenv_piece(vdir1,PATH_MAX,fpp,vdirval-10)) { + char *fpp_copy=strdup(fpp); + if (!getenv_piece(vdir1,PATH_MAX,fpp_copy,vdirval-10)) { + free(fpp_copy); vdirval=6; break; } + free(fpp_copy); if (!strlen(vdir1)) { vdirval++; @@ -401,38 +407,40 @@ weed_memset(vendor_name,0,1); do { + snprintf(dir1,PATH_MAX,"%s/%s",vdir1,vendor_name); - snprintf(dir1,PATH_MAX,"%s/%s",vdir1,vendor_name); - - if (vdirval<10) { - snprintf(dir2,PATH_MAX,"%s/%s",vdir2,vendor_name); - snprintf(dir3,PATH_MAX,"%s/%s",vdir3,vendor_name); - } + if (vdirval<10) { + snprintf(dir2,PATH_MAX,"%s/%s",vdir2,vendor_name); + snprintf(dir3,PATH_MAX,"%s/%s",vdir3,vendor_name); + } vdirent=readdir(curvdir); - if (vdirent==NULL) { - closedir(curvdir); - curvdir=NULL; - vdirval++; - break; - } - - if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue; - - snprintf(vendor_name,PATH_MAX,"%s",vdirent->d_name); + if (vdirent!=NULL) { + if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue; + snprintf(vendor_name,PATH_MAX,"%s",vdirent->d_name); + } if (vdirval==1) { curdir=opendir(dir3); - if (curdir==NULL) continue; + if (curdir==NULL) { + if (vdirent==NULL) break; + continue; + } } else if (vdirval==3) { if (curdir!=NULL) closedir(curdir); curdir=opendir(dir2); - if (curdir==NULL) continue; + if (curdir==NULL) { + if (vdirent==NULL) break; + continue; + } } else if (vdirval==5||vdirval>9) { if (curdir!=NULL) closedir(curdir); curdir=opendir(dir1); - if (curdir==NULL) continue; + if (curdir==NULL) { + if (vdirent==NULL) break; + continue; + } } finished=0; @@ -897,10 +905,12 @@ } // end vendor dir } while (vdirent!=NULL); + if (curvdir!=NULL) closedir(curvdir); + curvdir=NULL; + vdirval++; if (curdir!=NULL) closedir(curdir); } // end frei0r dirs - if (curvdir!=NULL) closedir(curvdir); #ifndef DEBUG dup2(new_stdout,1);
View file
LiVES-2.6.3.tar.bz2/lives-plugins/weed-plugins/ladspa.c -> LiVES-2.8.0.tar.bz2/lives-plugins/weed-plugins/ladspa.c
Changed
@@ -585,7 +585,9 @@ while (1) { // split by : + char *lpp_copy=strdup(lpp); getenv_piece(vdir,PATH_MAX,lpp,vdirval); + free(lpp_copy); if (!strlen(vdir)||vdir==NULL) break; curvdir=opendir(vdir); if (curvdir==NULL) break;
View file
LiVES-2.6.3.tar.bz2/lives-plugins/weed-plugins/libvis.c -> LiVES-2.8.0.tar.bz2/lives-plugins/weed-plugins/libvis.c
Changed
@@ -288,6 +288,8 @@ char *vdir; + if (lpp==NULL) return NULL; + // set hints for host weed_set_int_value(in_chantmpls[0],"audio_channels",2); weed_set_int_value(in_chantmpls[0],"audio_rate",44100); @@ -308,7 +310,7 @@ } vdir = strtok(lpp, ":"); - + // add lpp paths while (vdir!=NULL) { if (!strlen(vdir)) continue;
View file
LiVES-2.6.3.tar.bz2/lives-plugins/weed-plugins/toonz.cpp -> LiVES-2.8.0.tar.bz2/lives-plugins/weed-plugins/toonz.cpp
Changed
@@ -38,7 +38,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - +#include <array> +#include <random> #ifdef HAVE_SYSTEM_WEED #include <weed/weed.h>
View file
LiVES-2.6.3.tar.bz2/po/ar.po -> LiVES-2.8.0.tar.bz2/po/ar.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -103,84 +103,84 @@ msgstr "الحفاظ على ضبط\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "أيّ" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "بدون" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "مستحسن" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "معطّل !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**التخطيط الحالي**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "مُضمَّن" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "مخصص" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "اختبار" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "غيّر حجم" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "غيّر حجم جميع الإطارات" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_خلفية بيضاء" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "بدء خادوم جاك الصوت..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "بدء خادوم نقل جاك" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "يتصل بخادوم نقل جاك" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -192,115 +192,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "بدء خادوم بالص-اوديو..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "التحقق من إكتشاف التبعيات" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "تم العثور علي mplayer" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "لم يتم العثور علي mplayer" - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "تم العثور علي mplayer" - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "لم يتم العثور علي mplayer" - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "تم العثور علي mplayer" -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "تم العثور علي convert" - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "لم يتم العثور علي convert" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "تم العثور علي composite" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "لم يتم العثور علي composite" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "تم العثور على .'sox'\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "لم يتم العثور على .'sox'\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "إكتشاف...'cdda2wav'..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "عدم إكتشاف...'cdda2wav'..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "إكتشاف ...جاك..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "عدم إكتشاف ...جاك..."
View file
LiVES-2.6.3.tar.bz2/po/ca.po -> LiVES-2.8.0.tar.bz2/po/ca.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Catalan <ca@li.org>\n" @@ -103,85 +103,85 @@ msgstr "Grup de seguretat.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "qualsevol" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "Recomanat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "Espatllat" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**El disseny actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Incorporat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personalitzat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Comprova" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Insereix" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Redimensionat" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "reconfigureu totes les finestres" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Inici" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Carregant connexió d'efectes reals" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -193,115 +193,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Començant servidor d'audio pulsant..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Comprovant dependències opcionals:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...detectat..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NO S'HA DETECTAT..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...detectat..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NO S'HA DETECTAT..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...detectat..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "detectat convertidor" - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "NO S'HA DETECTAT convertidor" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "detectada composició" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "NO S'HA DETECTAT composició" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detectat...\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NO S'HA DETECTAT...\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...detectat..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NO S'HA DETECTAT..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detectat..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/cs.po -> LiVES-2.8.0.tar.bz2/po/cs.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: LiVEScz\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: <martin@svobodicz.com, ales@mur.at>\n" @@ -98,85 +98,85 @@ msgstr "Zachování nastavení.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Libovolný" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Žádný" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "doporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "zakázáno!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Bieżący układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Vestavěno" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Vlastní" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Test" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Sloučit" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Měním velikost" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Změnit velikost všech _snímků" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Prázdné pozadí" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Načítám pluginy pro efekty v reálném času..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -188,115 +188,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Kontrola dodatečných závislostí:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer... nalezen..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer... NENALEZEN..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer... nalezen..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer... NENALEZEN..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer... nalezen..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer... NENALEZEN..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert... nalezen..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert... NENALEZEN..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite... nalezen..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite... NENALEZEN..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox... nalezen\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox... NENALEZEN\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav... nalezen..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav... NENALEZEN..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd... nalezen..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/da.po -> LiVES-2.8.0.tar.bz2/po/da.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Danish <da@li.org>\n" @@ -85,85 +85,85 @@ msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Enhver" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Ingen" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "anbefalet" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Indbygget" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Brugerdefineret" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Test" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Indstillinger" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Ændrer størrelse" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Start ramme" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Start farve" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -175,108 +175,22 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "" - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "" - -#: src/main.c:1859 -msgid "mpv...detected..." -msgstr "" - -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." +#: src/main.c:1851 +#, c-format +msgid "%s...detected... " msgstr "" -#: src/main.c:1862 -msgid "convert...detected..." +#: src/main.c:1852 +#, c-format +msgid "%s...NOT DETECTED... " msgstr "" #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "" - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "" - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "" - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "" - -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "" -
View file
LiVES-2.6.3.tar.bz2/po/de_DE.po -> LiVES-2.8.0.tar.bz2/po/de_DE.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Lives 0.9.5\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2015-04-05 16:14+0000\n" "Last-Translator: Michael Kohl <rolf.michael.kohl@googlemail.com>\n" "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n" @@ -101,84 +101,84 @@ msgstr "Set wird erhalten.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Beliebig" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Kein(e)" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "empfohlen" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "deaktiviert!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Momentanes Layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Eingebaut" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Benutzerdefiniert" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Test" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Einfügen" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Skalieren" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Alle Frames _skalieren" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Vordergrund" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Hintergrund" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Lade Echtzeit-Effekt Plugins..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Jack Audio Server wird gestartet..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Jack Transport Server wird gestartet..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Verbindung zum Jack Transport Server wird hergestellt..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -199,115 +199,24 @@ "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu " "starten, oder " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "PulseAudio Server wird gestartet..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Optionale Abhängigkeiten werden überprüft:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...gefunden..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NICHT GEFUNDEN..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...gefunden..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NICHT GEFUNDEN..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...gefunden..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NICHT GEFUNDEN..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...gefunden..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NICHT GEFUNDEN..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...gefunden..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NICHT GEFUNDEN..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...gefunden\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NICHT GEFUNDEN\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...gefunden..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NICHT GEFUNDEN..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...gefunden..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...NICHT GEFUNDEN..."
View file
LiVES-2.6.3.tar.bz2/po/en_GB.po -> LiVES-2.8.0.tar.bz2/po/en_GB.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2015-04-16 10:52+0000\n" "Last-Translator: Andi Chandler <Unknown>\n" "Language-Team: English (United Kingdom) <en_GB@li.org>\n" @@ -109,84 +109,84 @@ msgstr "Preserving set.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Any" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "None" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recommended" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "disabled !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**The current layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Custom" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Test" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - %s" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Resizing" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Resize All Frames" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Foreground" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Background" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Loading realtime effect plugins..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Starting jack audio server..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Starting jack transport server..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Connecting to jack transport server..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -205,115 +205,24 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Starting pulse audio server..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Checking optional dependencies:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...detected..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NOT DETECTED..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...detected..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NOT DETECTED..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...detected..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...detected..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NOT DETECTED..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...detected..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NOT DETECTED..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detected\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NOT DETECTED\n" - -#: src/main.c:1868 -#, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...detected..." - -#: src/main.c:1869 #, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NOT DETECTED..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detected..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/es.po -> LiVES-2.8.0.tar.bz2/po/es.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2014-01-01 22:33+0000\n" "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -109,84 +109,84 @@ msgstr "Preservando el conjunto.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Cualquiera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Ninguno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "desactivado" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**La disposición actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Integrado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Prueba" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES:- Unir" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Redimensionar todos los cuadros" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Frente" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Fondo" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tiempo real..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Iniciando el servidor de audio jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -198,115 +198,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Iniciando servidor PulseAudio..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Comprobando dependencias opcionales:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer... detectado..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer... NO DETECTADO..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer... detectado..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer... NO DETECTADO..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer... detectado..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert... Detectado..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert... NO DETECTADO..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite... detectado..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite... NO DETECTADO..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox... detectado\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox... NO DETECTADO\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav... detectado..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav... NO DETECTADO..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd... detectado..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd... NO DETECTADO..."
View file
LiVES-2.6.3.tar.bz2/po/et.po -> LiVES-2.8.0.tar.bz2/po/et.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Estonian <et@li.org>\n" @@ -103,84 +103,84 @@ msgstr "Valiku säilitamine.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Kõik" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Pole" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "soovitatav" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "keelatud !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Praegune skeem**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Sisseehitatud" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Kohandatud" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Testi" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Mõõtmete muutmine" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_kõikide kaadrite suuruse muutmine" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Alusta" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Laen reaalaja efektide pluginaid..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Heli serveri jack käivitamine..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -192,114 +192,22 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Heli serveri pulse käivitamine..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...tuvastatud..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...ei tuvastatud..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...tuvastatud..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...ei tuvastatud..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...tuvastatud..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "konverdi...tuvastatud..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "konversioon...ei tuvastatud..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "komposiit...tuvastatud.." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "komposiit...ei tuvastatud..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...tuvastatud\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...ei tuvastatud\n" - -#: src/main.c:1868 -#, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "konverdi...tuvastatud..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "konversioon...ei tuvastatud..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "" - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr ""
View file
LiVES-2.6.3.tar.bz2/po/fi.po -> LiVES-2.8.0.tar.bz2/po/fi.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" @@ -110,85 +110,85 @@ msgstr "Säilytetään leikesarja.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Mikä tahansa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Ei mitään" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "suositeltu" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "kytketty pois päältä!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Nykyinen asettelu**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Mukauta" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Kokeile" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Lisäys" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Koon muutos" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Muuta kaikkien kuvien k_okoa" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "P_imennä tausta" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Käynnistetään jack-äänipalvelin..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Käynnistetään jack-välityspalvelin..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Yhdistetään jack-välityspalvelimeen..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -200,115 +200,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Käynnistetään pulse audio -palvelin..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Tarkistetaan valinnaiset riippuvuudet:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...havaittu..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...EI HAVAITTU..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...havaittu..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...EI HAVAITTU..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...havaittu..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...havaittu..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...EI HAVAITTU..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...havaittu..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...EI HAVAITTU..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...havaittu\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...EI HAVAITTU\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...havaittu..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...EI HAVAITTU..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...havaittu..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/fr.po -> LiVES-2.8.0.tar.bz2/po/fr.po
Changed
@@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2015-11-25 22:11+0000\n" "Last-Translator: Jean-Marc <Unknown>\n" "Language-Team: Français <kwizart@gmail.com>\n" @@ -107,84 +107,84 @@ msgstr "Marque positionnée.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Tous" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Aucun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recommandé" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "désactivé !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**La configuration actuelle**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Intégré" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personnalisé" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Essai" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES : - %s" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Recadrage" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Recadre Toutes Les Images" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Premier plan" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Arrière plan" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Chargement des greffons d'effets en temps réel…" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Démarrage du serveur audio jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Démarrage du serveur de transport jack..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Connexion au serveur de transport jack..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -196,113 +196,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Initialisation du serveur audio pulse..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Vérification des dépendances optionnelles :" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer... détecté..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer... NON DÉTECTÉ..." - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "" - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer... détecté..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer... NON DÉTECTÉ..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert... détecté..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert... NON DÉTECTÉ..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite... détecté..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite... NON DÉTECTÉ..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox... détecté\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox... NON DÉTECTÉ\n" - -#: src/main.c:1868 -#, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav... détecté..." - -#: src/main.c:1869 #, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav... NON DÉTECTÉ..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd... détecté..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd... NON DÉTECTÉ..." - -#: src/main.c:1872
View file
LiVES-2.6.3.tar.bz2/po/gl.po -> LiVES-2.8.0.tar.bz2/po/gl.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2015-04-20 18:32+0000\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -103,84 +103,84 @@ msgstr "Preservar o conxunto.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Calquera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Ningún" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "desactivado !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "** O esquema actual **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Incorporado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Proba" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - %s" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Redimensionar todos os fotogramas" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Primeiro plano" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Fondo" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tempo real..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Iniciando o servidor de son jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Iniciando o servidor de transporte jack..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Conectando co servidor de transporte jack..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -192,115 +192,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Comprobando as dependencias opcionais:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...detectado..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NON DETECTADO..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...detectado..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NON DETECTADO..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...detectado..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NON DETECTADO..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...detectado..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NON DETECTADO..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...detectados..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NON DETECTADO..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detectado\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NON DETECTADO\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...detectado..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NON DETECTADO..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detectado..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...NON DETECTADO..."
View file
LiVES-2.6.3.tar.bz2/po/he.po -> LiVES-2.8.0.tar.bz2/po/he.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -109,85 +109,85 @@ msgstr "מתבצע שימור האוסף.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "הכל" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "ללא" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "מומלץ" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "נוטרל !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**הפריסה הנוכחית**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "מובנה" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "מותאם אישית" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "בדיקה" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - מיזוג" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "שינוי גודל" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_שינוי גודל כל השקופיות" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "רקע _שחור" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "מתבצעת הפעלת שרת השמע jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "מפעיל את שרת התעבורה של jack..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "מתחבר לשרת התעבורה של jack..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -199,115 +199,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "מפעיל את שרת השמע Pulse..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "מתבצעת בדיקת חבילות תלות אפשריות:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...זוהה..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...לא זוהה..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...זוהה..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...לא זוהה..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...זוהה..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...לא זוהה..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...זוהה..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...לא זוהה..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...זוהה..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...לא זוהה..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...זוהה...\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...לא זוהה...\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...זוהה" - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...לא זוהה" - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...זוהה..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/hr.po -> LiVES-2.8.0.tar.bz2/po/hr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -103,85 +103,85 @@ msgstr "Očuvanje set.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Bilo koji" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Nijedan" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "preporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "isključeno !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Trenutni izgled**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Umetni" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Promjena veličine" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Zanemari promjene" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Zanemari promjene" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Učitavanje stvarnom efekt čep..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Pokrećem jack audio poslužitelj..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Pokrećem jack transport server..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Spajanje na jack transport server..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -193,115 +193,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Pokrećem pulse audio poslužitelj..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Provjera izborno ovisnosti:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...pronađen..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NIJE PRONAĐEN..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...pronađen..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NIJE PRONAĐEN..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...pronađen..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...pronađen..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NIJE PRONAĐEN..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...otkriti..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NIJE OTKRIVENA..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...pronađen\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NIJE PRONAĐEN...\n" - -#: src/main.c:1868 -#, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...pronađen..." - -#: src/main.c:1869 #, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NIJE PRONAĐEN..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...pronađen..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/hu.po -> LiVES-2.8.0.tar.bz2/po/hu.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2012-08-08 08:49+0000\n" "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n" "Language-Team: Magyar <lisovszki@gmail.com>\n" @@ -103,85 +103,85 @@ msgstr "Tartós beállítás.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Bármely" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Nincs" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "ajánlott" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "tíltva!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**A jelenlegi kimenet**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Beépített" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Egyéni" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Teszt" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Beszúrás" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Átméretezés" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Minden képkocka átméretezése" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Üres háttér" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Az azonnali effektek betöltése..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Jack audió szerver indítása" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -193,115 +193,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Pulse audio szerver indítása..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Ajánlott függőségek ellenőrzése" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...megtalálva" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NEM TALÁLOM.." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...megtalálva" - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NEM TALÁLOM.." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...megtalálva" -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...megtalálva" - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NEM TALÁLOM" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...megtalálva..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NEM TALÁLOM" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...megtalálva\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NEM TALÁLOM\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...megtalálva..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NEM TALÁLOM..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...megtalálva..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/it.po -> LiVES-2.8.0.tar.bz2/po/it.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Italian <it@li.org>\n" @@ -103,85 +103,85 @@ msgstr "Preservazione del set in corso.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Qualsiasi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Nessuno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "consigliato" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "disabilitato !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Il layout corrente**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Integrato" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personalizzato" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Test" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Unisci" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Ridimensionamento" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Ridimensiona tutti i fotogrammi" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "Sfondo _Vuoto" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Avvio del server audio jack in corso..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -193,115 +193,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Avviando il server audio pulse..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Controllo delle dipendenze opzionali in corso:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...rilevato..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NON RILEVATO..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...rilevato..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NON RILEVATO..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...rilevato..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...rilevato..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NON RILEVATO..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...rilevato..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NON RILEVATO..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...rilevato...\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NON RILEVATO...\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...rilevato..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NON RILEVATO..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...rilevato..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/ja.po -> LiVES-2.8.0.tar.bz2/po/ja.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -103,85 +103,85 @@ msgstr "セットの保護\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "なし" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "推奨" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "使用不能！" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**現在のレイアウト**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "ビルトイン" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "カスタム" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "テスト" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - 結合" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "リサイズ" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "全フレームのリサイズ(_R)" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "空白のバックグラウンド(_B)" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "リアルタイムエフェクトプラグインを読み込み中..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "JACKサーバーの音声機能を開始しています..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "JACKサーバーのトランスポート機能を開始しています..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "JACKサーバーのトランスポート機能に接続しています..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -193,115 +193,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "PulseAudioサーバーを開始しています..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "必ずしも必要ではない依存関係を確認しています:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayerが見つかりました..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayerは見つかりませんでした..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayerが見つかりました..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayerは見つかりませんでした..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayerが見つかりました..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convertが見つかりました..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convertは見つかりませんでした..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "compositeが見つかりました..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "compositeは見つかりませんでした..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "soxが見つかりました\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "soxは見つかりませんでした\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wavが見つかりました..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wavは見つかりませんでした..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackdが見つかりました..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/lives.pot -> LiVES-2.8.0.tar.bz2/po/lives.pot
Changed
@@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 2.6.3\n" +"Project-Id-Version: lives 2.8.0\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -84,82 +84,82 @@ msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "" -#: src/main.c:727 +#: src/main.c:728 msgid "_Resize All Frames..." msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -171,108 +171,22 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "" - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "" - -#: src/main.c:1859 -msgid "mpv...detected..." -msgstr "" - -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." +#: src/main.c:1851 +#, c-format +msgid "%s...detected... " msgstr "" -#: src/main.c:1862 -msgid "convert...detected..." +#: src/main.c:1852 +#, c-format +msgid "%s...NOT DETECTED... " msgstr "" #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "" - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "" - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "" - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "" - -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "" -
View file
LiVES-2.6.3.tar.bz2/po/nl_NL.po -> LiVES-2.8.0.tar.bz2/po/nl_NL.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES 0.9.5cvs\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: \n" @@ -82,84 +82,84 @@ msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Grootte aanpassen" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Draaikolk" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "Vervagen" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -171,108 +171,22 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "" - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "" - -#: src/main.c:1859 -msgid "mpv...detected..." -msgstr "" - -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." +#: src/main.c:1851 +#, c-format +msgid "%s...detected... " msgstr "" -#: src/main.c:1862 -msgid "convert...detected..." +#: src/main.c:1852 +#, c-format +msgid "%s...NOT DETECTED... " msgstr "" #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "" - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "" - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "" - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "" - -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "" - -#: src/main.c:1873
View file
LiVES-2.6.3.tar.bz2/po/oc.po -> LiVES-2.8.0.tar.bz2/po/oc.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Occitan (post 1500) <oc@li.org>\n" @@ -87,85 +87,85 @@ msgstr "Marca posicionada.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Quin que siá" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Pas cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "desactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**La configuracion actuala**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Integrat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personalizat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Testar" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Union" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Requadratge" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Requadra Totes Los Imatges" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Aviar" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Cargament dels plugins d'efièches en temps real" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Aviada del servidor àudio jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -177,115 +177,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Inicializacion del servidor àudio pulse..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Verificacion de las dependéncias opcionalas :" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer....detectat..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...PAS DETECTAT..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer....detectat..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...PAS DETECTAT..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer....detectat..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...detectat..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...PAS DETECTAT..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...detectat..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...PAS DETECTAT..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detectat\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...PAS DETECTAT\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...detectat..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...PAS DETECTAT..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detectat..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/pl.po -> LiVES-2.8.0.tar.bz2/po/pl.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" @@ -103,85 +103,85 @@ msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Dowolny" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Brak" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "zalecane" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "niepełnosprawnych !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Obecny układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Wbudowane" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Własne" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Przetestuj" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Wstaw" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Skalowanie" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Skaluj Wszystkie Klatki" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Uruchom" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -193,115 +193,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Uruchamianie serwera pulse audio" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Sprawdzanie zależności opcjonalne:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer... wykryto..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NIE WYKRYTO..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer... wykryto..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NIE WYKRYTO..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer... wykryto..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...wykrytych..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NIE WYKRYTO..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...wykrytych..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NIE WYKRYTO..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...wykrytych\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NIE WYKRYTO\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...wykrytych..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NIE WYKRYTO..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...wykrytych..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/pms.po -> LiVES-2.8.0.tar.bz2/po/pms.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-11-09 23:22+0000\n" "Last-Translator: Simon Uslengh <simoneislanda@libero.it>\n" "Language-Team: Piemontese <pms@li.org>\n" @@ -103,83 +103,83 @@ msgstr "Preservassion j'anpostassion\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "qualsëssìa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Gnun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "consejà" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "dësativà" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**L'atual formà**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Antregà" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Personaj" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Test" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Ardimensionament" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Ardimension-a tute le curnis" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Prim pian" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Drefond" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Caria dle gionte për j'efet an temp-real..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Andi dël jack audio server..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Andi dël jack transport server..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Conession al jack transport server..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -198,115 +198,24 @@ "\n" "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Andi dël pulse audio server..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Contròl dependense opsionaj:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...trovà..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NEN TROVÀ" - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...trovà..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NEN TROVÀ" - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...trovà..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...trovà..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NEN TROVÀ..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...TROVÀ..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NEN TROVÀ..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...TROVÀ\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NEN TROVÀ\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...TROVÀ..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NEN TROVÀ..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...TROVÀ..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...NEN TROVÀ..." -
View file
LiVES-2.6.3.tar.bz2/po/pt.po -> LiVES-2.8.0.tar.bz2/po/pt.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -93,85 +93,85 @@ msgstr "Preservando set.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "desactivado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**O layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Teste" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Mesclar" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "A redimensionar" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Redimensionar Todos Frames" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "A carregar plugins de efeito em tempo real..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -183,115 +183,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "A verificar as dependências opcionais:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...detectado..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NÃO DETECTADO..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...detectado..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NÃO DETECTADO..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...detectado..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...detectado..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NÃO DETECTADO..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...detectado..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NÃO DETECTADO..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detectado\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NÃO DETECTADO...\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...detectado..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NÃO DETECTADO..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detectado..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/pt_BR.po -> LiVES-2.8.0.tar.bz2/po/pt_BR.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2016-03-22 00:48+0000\n" "Last-Translator: salsaman <salsaman@gmail.com>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -100,83 +100,83 @@ msgstr "Preservando set.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "desativado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Teste" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "LiVES: - " -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Redimensionar Todos Frames" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Frente" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Fundo" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Carregando plugins de efeitos em tempo real..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Iniciando servidor de áudio jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Iniciando o servidor jack de transporte..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Conectando ao servidor jack de transporte..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -195,109 +195,24 @@ "\n" "Como alternativa, tente iniciar o LiVES com \"lives -jackopts 16\", ou " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Checando dependências opcionais:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...detectado..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NÃO DETECTADO..." - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "mplayer2...detectado" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer2...NÃO DETECTADO..." - -#: src/main.c:1859 -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mpv...detectado..." -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mpv...NÃO DETECTADO..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...detectado..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NÃO DETECTADO..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...detectado..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NÃO DETECTADO..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detectado\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NÃO DETECTADO...\n" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav/icedax...detectado..." - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav/icedax...NÃO DETECTADO..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detectado..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...NÃO DETECTADO..." - -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "pulse audio...detectado..." - -#: src/main.c:1873 -msgid "pulse audio...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/ro.po -> LiVES-2.8.0.tar.bz2/po/ro.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -104,85 +104,85 @@ msgstr "Păstrarea set.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Orice" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Nimic" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "dezactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "** Structura actuală **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Insera" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Redimensionare" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Redimensionarea tuturor cadrelor" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Ignoră schimbările" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Se incarcă modulele de efecte in timp real..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -194,115 +194,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Pornirea serverului audio pulse..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Verificarea dependenţelor opţionale:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...a fost detectat..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer... nu a fost detectat..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...a fost detectat..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer... nu a fost detectat..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...a fost detectat..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...detectat..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NU A FOST DETECTAT..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...detectat..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NU A FOST DETECTAT..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...detectat\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NU A FOST DETECTAT\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...detectat..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NU A FOST DETECTAT..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...detectat..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/ru.po -> LiVES-2.8.0.tar.bz2/po/ru.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2015-04-06 05:53+0000\n" "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n" "Language-Team: Russian <ru@li.org>\n" @@ -109,84 +109,84 @@ msgstr "Сохранение сборки.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Любой" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Нет" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "рекомендуемые" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "отключено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "Текущее размещение" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Встроенный" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Настраиваемый" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Тест" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - %s" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Масштабирование" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Масштабировать все кадры" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Передний план" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Фон" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Загрузка плагина эффектов реального времени..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Запуск передающего сервера jack..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Подключение к передающему jack-серверу..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -207,115 +207,24 @@ "Также, вы можете попробовать запустить программу таким образом \"lives -" "jackopts 16\" или " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Запуск сервера pulse audio..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Проверка опциональных зависимостей:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...обнаружен..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...НЕ ОБНАРУЖЕН..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...обнаружен..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...НЕ ОБНАРУЖЕН..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...обнаружен..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...обнаружен..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...НЕ ОБНАРУЖЕН..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...обнаружен..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...НЕ ОБНАРУЖЕН..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...обнаружен...\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...НЕ ОБНАРУЖЕН...\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...обнаружен..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...НЕ ОБНАРУЖЕН..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...обнаружен..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...НЕ ОБНАРУЖЕН..."
View file
LiVES-2.6.3.tar.bz2/po/sk.po -> LiVES-2.8.0.tar.bz2/po/sk.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -109,85 +109,85 @@ msgstr "Nastavenie zachovania.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Ktorýkoľvek" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Žiaden" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "doporučené" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "zakázané !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Súčasné rozloženie**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Vstavané" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Vlastné" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Otestovať" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Spojiť" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Zmena veľkosti" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Zmeniť veľkosť všetkých snímkov" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Prázdne pozadie" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Načítavam efekt rozšírenia v réálnom čase..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Spúšťam zvukový server jack..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -199,115 +199,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Spúšťam pulse audio server..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Kontrola dodatočných záavislostí:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...nájdený..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...NENÁJDENÝ..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...nájdený..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...NENÁJDENÝ..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...nájdený..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...nájdený..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...NENÁJDENÝ..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...nájdený..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...NENÁJDENÝ..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...nájdený\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...NENÁJDENÝ\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...nájdený..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...NENÁJDENÝ..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...nájdený..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/te.po -> LiVES-2.8.0.tar.bz2/po/te.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n" @@ -86,85 +86,85 @@ msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "ఏదైనా" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "ఏదీ వద్దు" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "సిఫారసుచేయబడింది" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "నిర్మితమైన" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "మలచిన" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "పరిశీలన" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "లైవ్స్" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "పరిమాణం మార్చుట" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "అన్ని చట్రాల పరిమాణం మార్చు (_R)" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_ప్రారంభం" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -176,108 +176,22 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "" - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "" - -#: src/main.c:1859 -msgid "mpv...detected..." -msgstr "" - -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." +#: src/main.c:1851 +#, c-format +msgid "%s...detected... " msgstr "" -#: src/main.c:1862 -msgid "convert...detected..." +#: src/main.c:1852 +#, c-format +msgid "%s...NOT DETECTED... " msgstr "" #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "" - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "" - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "" - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "" - -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "" -
View file
LiVES-2.6.3.tar.bz2/po/tr.po -> LiVES-2.8.0.tar.bz2/po/tr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -104,85 +104,85 @@ msgstr "Koruma ayarları.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Herhangi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Boş" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "tavsiye" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "Engelli!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Mevcut yerleşim düzeni**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Yapısal" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Özel" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Sınama" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - Birleştir" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Yeniden boyutlandırma" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Tüm çerçeveleri yeniden boyutlandır" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "_Boş arkaplan" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Gerçek zaman efekt eklentileri yükleniyor" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Jack audio sunucusu başlıyor..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Jack taşıma sunucusu başlıyor" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Jack taşıma sunucusuna bağlanılıyor" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -194,115 +194,24 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Pulse audio sunucusu başlıyor" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Isteğe bağlı bağımlılıkları denetleme:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer ... bulundu ..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer ... BULUNAMADI ..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer ... bulundu ..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer ... BULUNAMADI ..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer ... bulundu ..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...bulundu..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...BULUNAMADI..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite ... bulundu ..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite ... BULUNAMADI ..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...bulundu\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...BULUNAMADI\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...bulundu..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...BULUNAMADI..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...bulundu..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/ug.po -> LiVES-2.8.0.tar.bz2/po/ug.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Uyghur <ug@li.org>\n" @@ -85,84 +85,84 @@ msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "خالىغان" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "يوق" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "تەۋسىيە قىلغان" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "چەكلەنگەن!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "ئىچكى" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "ئىختىيارى" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "سىناق" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "ئاخىرقى كاندۇك" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "باشلا(_S)" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -174,108 +174,22 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "" - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "" - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "" - -#: src/main.c:1859 -msgid "mpv...detected..." -msgstr "" - -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." +#: src/main.c:1851 +#, c-format +msgid "%s...detected... " msgstr "" -#: src/main.c:1862 -msgid "convert...detected..." +#: src/main.c:1852 +#, c-format +msgid "%s...NOT DETECTED... " msgstr "" #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "" - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "" - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "" - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "" - -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "" - -#: src/main.c:1873
View file
LiVES-2.6.3.tar.bz2/po/uk.po -> LiVES-2.8.0.tar.bz2/po/uk.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2016-02-04 15:34+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -110,83 +110,83 @@ msgstr "Збереження набору.\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Будь-який" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Жодного" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "найліпший" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "вимкнено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Поточне компонування**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "Вбудований" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Нетиповий" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Перевірити" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Зміна розміру" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "_Змінити розміри всіх кадрів" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "Передній план" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "Тло" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Завантаження додатків ефектів реального часу…" -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack…" -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Запуск сервера передавання даних jack…" -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Встановлення з’єднання з сервером передавання даних jack…" -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -205,109 +205,24 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Запуск звукового сервера PulseAudio…" -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "Пошук додаткових залежностей:" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer… виявлено…" - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer…НЕ ВИЯВЛЕНО…" - -#: src/main.c:1856 -msgid "mplayer2...detected..." -msgstr "mplayer2...виявлено..." - -#: src/main.c:1857 -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer2...НЕ ВИЯВЛЕНО..." - -#: src/main.c:1859 -msgid "mpv...detected..." -msgstr "" - -#: src/main.c:1860 -msgid "mpv...NOT DETECTED..." -msgstr "" - -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert…виявлено…" - -#: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...НЕ ВИЯВЛЕНО…" - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite…виявлено…" - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite…НЕ ВИЯВЛЕНО…" - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox…виявлено\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox…НЕ ВИЯВЛЕНО\n" - -#: src/main.c:1868 -msgid "cdda2wav/icedax...detected..." -msgstr "" - -#: src/main.c:1869 -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "" - -#: src/main.c:1870 -msgid "jackd...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "jackd…виявлено…" -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "jackd…НЕ ВИЯВЛЕНО…" -#: src/main.c:1872 -msgid "pulse audio...detected..." -msgstr "pulse audio…виявлено…" - -#: src/main.c:1873 -msgid "pulse audio...NOT DETECTED..."
View file
LiVES-2.6.3.tar.bz2/po/uz.po -> LiVES-2.8.0.tar.bz2/po/uz.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Uzbek <uz@li.org>\n" @@ -110,84 +110,84 @@ msgstr "Йиғилганларни сақлаш\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "Исталган" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "Йўқ" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "тавсия қилинди" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "ўчирилди !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**Жорий қатлам**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "Бошқа" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "Синаш" -#: src/main.c:471 +#: src/main.c:472 msgid "LiVES: - " msgstr "" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "Ҳажми ўзгартирилмоқда" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "Барча кадрларнинг _ҳажмини ўзгартириш" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 #, fuzzy msgid "Background" msgstr "Сўниш" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "Реал вақт эффект плагинлари юкланмоқда..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "Jack аудио сервер ишга туширилмоқда..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "Jack транспорт сервери ишга туширилмоқда..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "Jack транспорт серверига уланмоқда..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -199,115 +199,23 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "Аудио сервер пульси ишга туширилмоқда..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...аниқланди..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...АНИҚЛАНМАДИ..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...аниқланди..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...АНИҚЛАНМАДИ..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...аниқланди..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "конвертлаш...аниқланди..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "конвертлаш...АНИҚЛАНМАДИ..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...аниқланди..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...АНИҚЛАНМАДИ..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...аниқланди\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...АНИҚЛАНМАДИ\n" - -#: src/main.c:1868 -#, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...аниқланди..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...АНИҚЛАНМАДИ..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...аниқланди..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...АНИҚЛАНМАДИ..."
View file
LiVES-2.6.3.tar.bz2/po/zh_CN.po -> LiVES-2.8.0.tar.bz2/po/zh_CN.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-05-08 10:03-0300\n" +"POT-Creation-Date: 2016-09-03 08:59-0300\n" "PO-Revision-Date: 2015-04-05 16:35+0000\n" "Last-Translator: Timothy Gu <timothy_gu@hotmail.com>\n" "Language-Team: Simplified Chinese <zh_CN@li.org>\n" @@ -100,84 +100,84 @@ msgstr "正在保存场景。\n" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:396 +#: src/main.c:397 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:398 +#: src/main.c:399 msgid "None" msgstr "无" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:400 +#: src/main.c:401 msgid "recommended" msgstr "推荐" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:402 +#: src/main.c:403 msgid "disabled !" msgstr "已禁用 ！" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:404 +#: src/main.c:405 msgid "**The current layout**" msgstr "**当前的布局**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:406 +#: src/main.c:407 msgid "Builtin" msgstr "内置" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:408 +#: src/main.c:409 msgid "Custom" msgstr "自定义" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:410 +#: src/main.c:411 msgid "Test" msgstr "测试" -#: src/main.c:471 +#: src/main.c:472 #, fuzzy msgid "LiVES: - " msgstr "LiVES: - 插入" -#: src/main.c:720 +#: src/main.c:721 msgid "Resizing" msgstr "正在调整尺寸" -#: src/main.c:727 +#: src/main.c:728 #, fuzzy msgid "_Resize All Frames..." msgstr "调整所有帧的尺寸(_R)" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Foreground" msgstr "" -#: src/main.c:1118 +#: src/main.c:1119 msgid "Background" msgstr "" -#: src/main.c:1646 +#: src/main.c:1647 msgid "Loading realtime effect plugins..." msgstr "正在加载实时效果插件..." -#: src/main.c:1712 +#: src/main.c:1713 msgid "Starting jack audio server..." msgstr "正在启动 jack 音频服务器..." -#: src/main.c:1714 +#: src/main.c:1715 msgid "Starting jack transport server..." msgstr "正在启动 jack 传输服务器..." -#: src/main.c:1715 +#: src/main.c:1716 msgid "Connecting to jack transport server..." msgstr "正在连接 jack 传输服务器..." -#: src/main.c:1745 +#: src/main.c:1746 #, c-format msgid "" "\n" @@ -196,115 +196,24 @@ "\n" "除此之外，尝试用启动命令行“lives -jackopts 16\"或 " -#: src/main.c:1782 +#: src/main.c:1783 msgid "Starting pulse audio server..." msgstr "正在开启 pulse 音频服务..." -#: src/main.c:1853 -msgid "Checking optional dependencies:" -msgstr "检查可选的依赖：" - -#: src/main.c:1854 -msgid "mplayer...detected..." -msgstr "mplayer...发现..." - -#: src/main.c:1855 -msgid "mplayer...NOT DETECTED..." -msgstr "mplayer...未发现..." - -#: src/main.c:1856 -#, fuzzy -msgid "mplayer2...detected..." -msgstr "mplayer...发现..." - -#: src/main.c:1857 -#, fuzzy -msgid "mplayer2...NOT DETECTED..." -msgstr "mplayer...未发现..." - -#: src/main.c:1859 -#, fuzzy -msgid "mpv...detected..." +#: src/main.c:1851 +#, fuzzy, c-format +msgid "%s...detected... " msgstr "mplayer...发现..." -#: src/main.c:1860 -#, fuzzy -msgid "mpv...NOT DETECTED..." +#: src/main.c:1852 +#, fuzzy, c-format +msgid "%s...NOT DETECTED... " msgstr "mplayer...未发现..." -#: src/main.c:1862 -msgid "convert...detected..." -msgstr "convert...发现..." - #: src/main.c:1863 -msgid "convert...NOT DETECTED..." -msgstr "convert...未发现..." - -#: src/main.c:1864 -msgid "composite...detected..." -msgstr "composite...发现..." - -#: src/main.c:1865 -msgid "composite...NOT DETECTED..." -msgstr "composite...未发现..." - -#: src/main.c:1866 -msgid "sox...detected\n" -msgstr "sox...发现\n" - -#: src/main.c:1867 -msgid "sox...NOT DETECTED\n" -msgstr "sox...未发现\n" - -#: src/main.c:1868 #, fuzzy -msgid "cdda2wav/icedax...detected..." -msgstr "cdda2wav...发现..." - -#: src/main.c:1869 -#, fuzzy -msgid "cdda2wav/icedax...NOT DETECTED..." -msgstr "cdda2wav...未发现..." - -#: src/main.c:1870 -msgid "jackd...detected..." -msgstr "jackd...发现..." - -#: src/main.c:1871 -msgid "jackd...NOT DETECTED..." -msgstr "jackd...未发现..."
View file
LiVES-2.6.3.tar.bz2/smogrify -> LiVES-2.8.0.tar.bz2/smogrify
Changed
@@ -23,7 +23,7 @@ # Do not change these except for testing ! $background=1; -$version="2.6.3"; +$version="2.8.0"; #$dyneversion="LIVES-20091209"; ################################################################### @@ -1562,7 +1562,6 @@ &get_file_info; ## here we set $mplay_command, $is_mpv - if ($panic) { unlink "$pidfile"; exit 1; @@ -1576,14 +1575,14 @@ $ss=" -start=$ARGV[5] "; } } - $frames=""; + $stframes=""; if (defined($ARGV[6]) && $ARGV[6] > 0) { $nframes=$ARGV[6]++; # cf below, we remove 1st frame if (!$is_mpv) { - $frames=" -frames $ARGV[6] "; + $stframes=" -frames $ARGV[6] "; } else { - $frames=" -frames=$ARGV[6] "; + $stframes=" -frames=$ARGV[6] "; } } @@ -1624,8 +1623,6 @@ $quality=int(100-$compression); } - $xframes=$frames; - if ($file=~/:\/\//) { $is_remote=2; #$wavhead=""; # need wav header, as user will probably finish by @@ -1633,7 +1630,6 @@ } - my $wavhead="nowaveheader"; if ($is_mpv) { @@ -1668,7 +1664,6 @@ $img_ext=$ximg_ext; } else { - $frames=$xframes; if ($achans eq "" || $achans eq "0") { $channs=""; @@ -1716,16 +1711,16 @@ if ($withsound eq "0") { #video only - $syscom="$mplay_command -quiet $band $osd $img_fmt $threadopts -fps 1000000. $ss $frames $noframedrop -ao null \"$file\" $extra_params <$nulfile"; + $syscom="$mplay_command -quiet $band $osd $img_fmt $threadopts -fps 1000000. $ss $stframes $noframedrop -ao null \"$file\" $extra_params <$nulfile"; } elsif ($withsound eq "1") { #video and audio - $syscom=$mplay_command . " -quiet $band $osd -fps 1000000. $img_fmt $ss $threadopts $noframedrop $frames $audcom $channs $aformnew -mc 0" + $syscom=$mplay_command . " -quiet $band $osd -fps 1000000. $img_fmt $ss $threadopts $noframedrop $stframes $audcom $channs $aformnew -mc 0" . " \"$file\" $extra_params <$nulfile"; } else { #audio only - $syscom=$mplay_command . " -quiet $band -vo null $vcnull $ss $frames $audcom $aformnew $channs \"$file\" $extra_params <$nulfile"; + $syscom=$mplay_command . " -quiet $band -vo null $vcnull $ss $stframes $audcom $aformnew $channs \"$file\" $extra_params <$nulfile"; } if (defined($DEBUG_OPEN)) { print STDERR "open command for $handle is: $syscom\n"; @@ -5554,7 +5549,10 @@ }; $fps=smog_system_direct("grep ID_VIDEO_FPS \"$file_ident\" 2>$nulfile"); $fps=(split("=",(split("\n",$fps))[0]))[1]; - chomp($fps); + $fps=trim($fps); + if ($fps eq "nan" or $fps eq "-nan") { + $fps=0.; + } if (! -f $file_ident) { return; @@ -5665,6 +5663,14 @@ } +sub trim { + ## trim whitespace from beginning and end + my $str=shift; + $str =~ s/^\s+//; + $str =~ s/\s+$//; + $str; +} + sub get_file_info { ## we will set the following if possible: # $count, $bpp, $type, $hsize, $vsize, $signed, $f_size, $arate, $achans, $asamps, $endian, $abitrate @@ -5842,7 +5848,6 @@ if ($type=~ m/^\[/) { $type=substr($type,1,-1); } - } @@ -5864,13 +5869,15 @@ else { $mp_com=&get_mplayer_location; - if ($is_mpv) { + + $format=&get_mplayer_format; + + if ($is_mpv && $format eq "") { sig_system_error("mpv cannot fully resample"); $panic=1; return; } - $format=&get_mplayer_format; $smcom="$mp_com -quiet \"$audio_in\" -ao pcm:nowaveheader:file=\"$audio_out\" $format >$nulfile 2>&1"; } @@ -5897,10 +5904,10 @@ smog_chdir("$curtmpdir"); if (&location("sox") eq "") { - $format=&get_mplayer_format; $mp_com=&get_mplayer_location; + $format=&get_mplayer_format; - if ($is_mpv) { + if ($is_mpv and $format eq "") { sig_system_error("mpv cannot fully resample"); $panic=1; return; @@ -7115,9 +7122,16 @@ $aendian=&get_endian; $asigned=1; -## TODO - mpv + $mplayer_command=&get_mplayer_location; $format=&get_mplayer_format; - $com=&rc_get("video_open_command") . " -quiet \"$file\" -ao pcm:waveheader:file=\"$audio_in\" $format >$nulfile 2>&1 <$nulfile"; + + if ($is_mpv && $format eq "") { + sig_system_error("mpv cannot fully resample"); + $panic=1; + return; + } + + $com="\"$mplayer_command\" -quiet \"$file\" -ao pcm:waveheader:file=\"$audio_in\" $format >$nulfile 2>&1 <$nulfile"; $smerr=smog_system($com); @@ -7231,6 +7245,22 @@ $nendian=$aendian; } + + if ($is_mpv) { + if ($nsamps==8) { + if ($nsigned==0) { + return "--af=lavrresample,format=u8"; + } + } + if ($nsamps==16) { + if ($nsigned==1) { + return "--af=lavrresample,format=s16"; + } + } + return ""; + } + + if ($nasamps==8) { if ($nsigned==0) { return "-format u8";
View file
LiVES-2.6.3.tar.bz2/src/Makefile.in -> LiVES-2.8.0.tar.bz2/src/Makefile.in
Changed
@@ -1516,8 +1516,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_LIBLIVES_FALSE@install-exec-local: @BUILD_LIBLIVES_FALSE@uninstall-local: +@BUILD_LIBLIVES_FALSE@install-exec-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
View file
LiVES-2.6.3.tar.bz2/src/callbacks.c -> LiVES-2.8.0.tar.bz2/src/callbacks.c
Changed
@@ -44,13 +44,34 @@ static char file_name[PATH_MAX]; -void lives_notify(int msgnumber,const char *msgstring) { +void lives_notify(int msgnumber, const char *msgstring) { #ifdef IS_LIBLIVES binding_cb(msgnumber, msgstring, mainw->id); #endif #ifdef ENABLE_OSC lives_osc_notify(msgnumber,msgstring); #endif + + +#ifdef TEST_NOTIFY + if (msgnumber==LIVES_OSC_NOTIFY_CLIPSET_OPENED) { + char *details=lives_strdup_printf(_("'LiVES opened the clip set' '%s'"), msgstring); + char *tmp=lives_strdup_printf("notify-send %s",details); + lives_system(tmp,TRUE); + lives_free(tmp); + lives_free(details); + } + + if (msgnumber==LIVES_OSC_NOTIFY_CLIPSET_SAVED) { + char *details=lives_strdup_printf(_("'LiVES saved the clip set' '%s'"), msgstring); + char *tmp=lives_strdup_printf("notify-send %s",details); + lives_system(tmp,TRUE); + lives_free(tmp); + lives_free(details); + } +#endif + + } @@ -857,6 +878,13 @@ lives_free(com); if (mainw->com_failed) { + if (current_file==-1) { + com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle); + lives_system(com,TRUE); + lives_free(com); + lives_freep((void **)&cfile); + mainw->current_file=-1; + } d_print_failed(); return; } @@ -989,6 +1017,19 @@ } +static void check_remove_layout_files(void) { + if (prompt_remove_layout_files()) { + // delete layout directory + char *msg,*laydir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL); + lives_rmdir(laydir,TRUE); + lives_free(laydir); + msg=lives_strdup_printf(_("Layouts were removed for set %s.\n"),mainw->set_name); + d_print(msg); + lives_free(msg); + } +} + + void on_close_activate(LiVESMenuItem *menuitem, livespointer user_data) { char *warn,*extra; char title[256]; @@ -1084,11 +1125,8 @@ char *ofile; char *sdir; char *cdir; - char *laydir; boolean has_layout_map=FALSE; - int i; - // TODO - combine this with lives_exit and make into a function @@ -1098,21 +1136,7 @@ } if (has_layout_map) { - if (prompt_remove_layout_files()) { - // delete layout files - for (i=1; i<MAX_FILES; i++) { - if (!(mainw->files[i]==NULL)) { - if (mainw->was_set&&mainw->files[i]->layout_map!=NULL) { - remove_layout_files(mainw->files[i]->layout_map); - } - } - } - - // delete layout directory - laydir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL); - lives_rmdir(laydir,FALSE); - lives_free(laydir); - } + check_remove_layout_files(); recover_layout_cancelled(FALSE); } @@ -1722,13 +1746,11 @@ void on_quit_activate(LiVESMenuItem *menuitem, livespointer user_data) { - char *esave_dir,*msg,*tmp; + char *msg,*tmp; boolean has_layout_map=FALSE; boolean had_clips=FALSE,legal_set_name; - register int i; - if (user_data!=NULL&&LIVES_POINTER_TO_INT(user_data)==1) mainw->only_close=TRUE; else mainw->only_close=FALSE; @@ -1842,20 +1864,7 @@ } if (has_layout_map) { - if (prompt_remove_layout_files()) { - // delete layout files - for (i=1; i<MAX_FILES; i++) { - if (!(mainw->files[i]==NULL)) { - if (mainw->was_set&&mainw->files[i]->layout_map!=NULL) { - remove_layout_files(mainw->files[i]->layout_map); - } - } - } - // delete layout directory - esave_dir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL); - lives_rmdir(esave_dir,FALSE); - lives_free(esave_dir); - } + check_remove_layout_files(); } } @@ -4986,6 +4995,7 @@ int last_file=-1,new_file=-1; int current_file=mainw->current_file; int clipnum=0; + int maxframe; memset(mainw->set_name,0,1); @@ -5056,6 +5066,7 @@ mt_sensitise(mainw->multitrack); mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack); } + lives_chdir(cwd,FALSE); lives_free(cwd); return FALSE; } @@ -5121,6 +5132,7 @@ } if (!keep_threaded_dialog) end_threaded_dialog(); + lives_chdir(cwd,FALSE); lives_free(cwd); return TRUE; } @@ -5160,6 +5172,7 @@ } recover_layout_map(MAX_FILES); + lives_chdir(cwd,FALSE); lives_free(cwd); return FALSE; } @@ -5186,9 +5199,9 @@ // if the clip has a frame_index file, then it is CLIP_TYPE_FILE // and we must load the frame_index and locate a suitable decoder plugin - if (load_frame_index(mainw->current_file)) { + if ((maxframe=load_frame_index(mainw->current_file))) { // CLIP_TYPE_FILE - if (!reload_clip(mainw->current_file)) continue; + if (!reload_clip(mainw->current_file,maxframe)) continue; } else { // CLIP_TYPE_DISK if (!check_frame_count(mainw->current_file)) { @@ -7851,15 +7864,38 @@ ||capable->has_mpv #endif ) { + char *com2; + int current_file=mainw->current_file; + + // create temp handle to read file details into (otherwise it can mess up our current clip) + if (!get_temp_handle(mainw->first_free_file,TRUE)) { + d_print_failed(); + mainw->noswitch=FALSE; + if (mainw->multitrack!=NULL) { + mt_sensitise(mainw->multitrack); + mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
View file
LiVES-2.6.3.tar.bz2/src/colourspace.c -> LiVES-2.8.0.tar.bz2/src/colourspace.c
Changed
@@ -10118,14 +10118,14 @@ // otherwise we need to steal or copy the pixel_data - palette=weed_get_int_value(layer,WEED_LEAF_CURRENT_PALETTE,&error); - width=weed_get_int_value(layer,WEED_LEAF_WIDTH,&error); - height=weed_get_int_value(layer,WEED_LEAF_HEIGHT,&error); - irowstride=weed_get_int_value(layer,WEED_LEAF_ROWSTRIDES,&error); + do { - pixel_data=(uint8_t *)weed_get_voidptr_value(layer,WEED_LEAF_PIXEL_DATA,&error); + palette=weed_get_int_value(layer,WEED_LEAF_CURRENT_PALETTE,&error); + width=weed_get_int_value(layer,WEED_LEAF_WIDTH,&error); + height=weed_get_int_value(layer,WEED_LEAF_HEIGHT,&error); + irowstride=weed_get_int_value(layer,WEED_LEAF_ROWSTRIDES,&error); - do { + pixel_data=(uint8_t *)weed_get_voidptr_value(layer,WEED_LEAF_PIXEL_DATA,&error); done=TRUE; switch (palette) { case WEED_PALETTE_RGB24:
View file
LiVES-2.6.3.tar.bz2/src/colourspace.h -> LiVES-2.8.0.tar.bz2/src/colourspace.h
Changed
@@ -4,6 +4,7 @@ // Released under the GPL 3 or later // see file ../COPYING for licensing details + // headers for palette conversions #ifndef HAS_LIVES_COLOURSPACE_H
View file
LiVES-2.6.3.tar.bz2/src/cvirtual.c -> LiVES-2.8.0.tar.bz2/src/cvirtual.c
Changed
@@ -80,64 +80,73 @@ if (retval==LIVES_RESPONSE_CANCEL) return FALSE; - return TRUE; -} + return TRUE; + } -// load frame_index from disk -boolean load_frame_index(int fileno) { - int fd,i; - int retval; - char *fname; - lives_clip_t *sfile=mainw->files[fileno]; + // load frame_index from disk + // returns -1 (error) + // or maxframe pointed to in clip - if (sfile==NULL||sfile->frame_index!=NULL) return FALSE; + int load_frame_index(int fileno) { + lives_clip_t *sfile=mainw->files[fileno]; - lives_freep((void **)&sfile->frame_index); + char *fname; - fname=lives_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL); + int fd; + int retval; + int maxframe=0; - if (!lives_file_test(fname,LIVES_FILE_TEST_EXISTS)) { - lives_free(fname); - return FALSE; - } + register int i; + if (sfile==NULL||sfile->frame_index!=NULL) return -1; - do { - retval=0; + lives_freep((void **)&sfile->frame_index); - fd=lives_open_buffered_rdonly(fname); + fname=lives_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL); - if (fd<0) { - retval=do_read_failed_error_s_with_retry(fname,lives_strerror(errno),NULL); - if (retval==LIVES_RESPONSE_CANCEL) { - lives_free(fname); - return FALSE; - } - } else { + if (!lives_file_test(fname,LIVES_FILE_TEST_EXISTS)) { + lives_free(fname); + return 0; + } - create_frame_index(fileno,FALSE,0,sfile->frames); - mainw->read_failed=FALSE; - for (i=0; i<sfile->frames; i++) { - lives_read_le_buffered(fd,&sfile->frame_index[i],4,FALSE); - if (mainw->read_failed) break; - } + do { + retval=0; - lives_close_buffered(fd); + fd=lives_open_buffered_rdonly(fname); - if (mainw->read_failed) { - mainw->read_failed=FALSE; - retval=do_read_failed_error_s_with_retry(fname,NULL,NULL); - } + if (fd<0) { + retval=do_read_failed_error_s_with_retry(fname,lives_strerror(errno),NULL); + if (retval==LIVES_RESPONSE_CANCEL) { + lives_free(fname); + return -1; + } + } else { - } - } while (retval==LIVES_RESPONSE_RETRY); + create_frame_index(fileno,FALSE,0,sfile->frames); - lives_free(fname); + mainw->read_failed=FALSE; + for (i=0; i<sfile->frames; i++) { + lives_read_le_buffered(fd,&sfile->frame_index[i],4,FALSE); + if (mainw->read_failed) break; + if (sfile->frame_index[i]>maxframe) maxframe=sfile->frame_index[i]; + } - return TRUE; + lives_close_buffered(fd); + + if (mainw->read_failed) { + mainw->read_failed=FALSE; + retval=do_read_failed_error_s_with_retry(fname,NULL,NULL); + } + + } + } while (retval==LIVES_RESPONSE_RETRY); + + lives_free(fname); + + return ++maxframe; }
View file
LiVES-2.6.3.tar.bz2/src/cvirtual.h -> LiVES-2.8.0.tar.bz2/src/cvirtual.h
Changed
@@ -1,6 +1,6 @@ // cvirtual.h // LiVES -// (c) G. Finch 2008 - 2013 <salsaman@gmail.com> +// (c) G. Finch 2008 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -13,7 +13,7 @@ void create_frame_index(int fileno, boolean init, int start_offset, int nframes); boolean save_frame_index(int fileno); -boolean load_frame_index(int fileno) WARN_UNUSED; +int load_frame_index(int fileno) WARN_UNUSED; boolean check_clip_integrity(int fileno, const lives_clip_data_t *cdata); boolean virtual_to_images(int sfileno, int sframe, int eframe, boolean update_progress, LiVESPixbuf **pbr) WARN_UNUSED;
View file
LiVES-2.6.3.tar.bz2/src/effects-weed.c -> LiVES-2.8.0.tar.bz2/src/effects-weed.c
Changed
@@ -9164,6 +9164,15 @@ !all_outs_alpha(weed_filters[idx],TRUE)&&has_video_chans_out(weed_filters[idx],TRUE)) || (enabled_in_channels(weed_filters[idx],FALSE)>0&&has_gen)) return -2; key_to_fx[key][i]=idx; + if (rte_window!=NULL) { + // if rte window is visible add to combo box + char *tmp; + rtew_combo_set_text(key,i,(tmp=rte_keymode_get_filter_name(key+1,i))); + lives_free(tmp); + + // set in ce_thumb combos + if (mainw->ce_thumbs) ce_thumbs_reset_combo(key); + } return i; } } @@ -10130,16 +10139,33 @@ int weed_get_idx_for_hashname(const char *hashname, boolean fullname) { + char *chashname, *chashname2; + register int i; - char *chashname; for (i=0; i<num_weed_filters; i++) { chashname=make_weed_hashname(i,fullname,FALSE); + + //g_print("cf .%s .%s.\n",hashname,chashname); + if (!lives_utf8_strcasecmp(hashname,chashname)) { lives_free(chashname); return i; } + + //try again with spaces converted to "_" + chashname2=subst(chashname," ","_"); + if (strcmp(chashname2,chashname)) { + if (!lives_utf8_strcasecmp(hashname,chashname2)) { + lives_free(chashname2); + lives_free(chashname); + return i; + } + } + + lives_free(chashname2); lives_free(chashname); + if (fullname) { chashname=make_weed_hashname(i,fullname,TRUE); if (!lives_utf8_strcasecmp(hashname,chashname)) {
View file
LiVES-2.6.3.tar.bz2/src/effects.c -> LiVES-2.8.0.tar.bz2/src/effects.c
Changed
@@ -494,7 +494,7 @@ if (!got_no_frames) mainw->current_file=new_file; } else { - char *tfile=make_image_file_name(cfile,cfile->frames,prefs->image_ext); + char *tfile=make_image_file_name(cfile,cfile->frames,get_image_ext_for_type(cfile->img_type)); if (!lives_file_test(tfile, LIVES_FILE_TEST_EXISTS)) { get_frame_count(mainw->current_file);
View file
LiVES-2.6.3.tar.bz2/src/events.c -> LiVES-2.8.0.tar.bz2/src/events.c
Changed
@@ -3498,7 +3498,7 @@ layer=weed_plant_new(WEED_PLANT_CHANNEL); weed_set_int_value(layer,WEED_LEAF_CLIP,mainw->clip_index[scrap_track]); weed_set_int_value(layer,WEED_LEAF_FRAME,mainw->frame_index[scrap_track]); - if (!pull_frame(layer,prefs->image_ext,tc)) { + if (!pull_frame(layer,get_image_ext_for_type(cfile->img_type),tc)) { weed_plant_free(layer); layer=NULL; } @@ -4326,6 +4326,10 @@ cfile->changed=TRUE; mainw->effects_paused=FALSE; + if (new_clip) { + cfile->img_type=IMG_TYPE_BEST; // override the pref + } + prefs->render_audio=rendaud; init_track_decoders(); @@ -4348,8 +4352,6 @@ cfile->start=1; cfile->end=cfile->frames; - cfile->img_type=IMG_TYPE_BEST; // override the pref - set_undoable(NULL,FALSE); add_to_clipmenu(); current_file=mainw->current_file;
View file
LiVES-2.6.3.tar.bz2/src/giw/giwknob.c -> LiVES-2.8.0.tar.bz2/src/giw/giwknob.c
Changed
@@ -326,7 +326,9 @@ stylecon=gtk_style_context_new(); gtk_style_context_set_path(stylecon,gtk_widget_get_path(widget)); gtk_style_context_set_state(stylecon,GTK_STATE_FLAG_ACTIVE); - gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(lives_widget_get_parent(widget))); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS + gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(lives_widget_get_parent(widget))); + G_GNUC_END_IGNORE_DEPRECATIONS #else widget->style = gtk_style_attach(widget->style, lives_widget_get_xwindow(widget)); gtk_style_set_background(widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE); @@ -876,7 +878,9 @@ if (value!=gtk_adjustment_get_value(knob->adjustment)) { knob_set_value(knob, value); g_return_if_fail(knob->adjustment != NULL); +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(knob->adjustment); +#endif } } @@ -908,9 +912,10 @@ (GCallback) giw_knob_adjustment_value_changed, (gpointer) knob); +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(knob->adjustment); - gtk_adjustment_changed(knob->adjustment); +#endif } GtkAdjustment * @@ -1050,7 +1055,9 @@ if (knob->angle != atan2(yc-y, x-xc)) { knob_set_value(knob, knob_calculate_value_with_angle(knob, atan2(yc-y, x-xc))); g_return_if_fail(knob->adjustment != NULL); +#if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_value_changed(knob->adjustment); +#endif } }
View file
LiVES-2.6.3.tar.bz2/src/gui.c -> LiVES-2.8.0.tar.bz2/src/gui.c
Changed
@@ -116,7 +116,6 @@ void add_message_scroller(LiVESWidget *conter) { - LiVESTextBuffer *tbuff=NULL; char *all_text=NULL; if (mainw->textview1!=NULL) { @@ -134,28 +133,16 @@ lives_container_add(LIVES_CONTAINER(conter), mainw->scrolledwindow); - mainw->textview1 = lives_text_view_new(); + mainw->textview1 = lives_standard_text_view_new(all_text,NULL); lives_container_add(LIVES_CONTAINER(mainw->scrolledwindow), mainw->textview1); if (mainw->is_ready) lives_widget_show_all(mainw->scrolledwindow); - tbuff=lives_text_view_get_buffer(LIVES_TEXT_VIEW(mainw->textview1)); - if (tbuff!=NULL && all_text!=NULL) { - lives_text_buffer_set_text(tbuff,all_text,-1); - lives_free(all_text); - lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW(mainw->textview1)); - } + if (all_text!=NULL) lives_free(all_text); lives_widget_set_size_request(mainw->textview1, -1, MSG_AREA_HEIGHT); - lives_text_view_set_editable(LIVES_TEXT_VIEW(mainw->textview1), FALSE); - lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(mainw->textview1), LIVES_WRAP_WORD); - lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(mainw->textview1), FALSE); - - if (palette->style&STYLE_1) { - lives_widget_set_base_color(mainw->textview1, LIVES_WIDGET_STATE_NORMAL, &palette->info_base); - lives_widget_set_text_color(mainw->textview1, LIVES_WIDGET_STATE_NORMAL, &palette->info_text); - } + } @@ -2817,11 +2804,6 @@ lives_widget_show_all(mainw->vbox1); - if (!mainw->foreign&&capable->smog_version_correct) { - splash_msg(_("Loading rendered effect plugins..."),SPLASH_LEVEL_LOAD_RFX); - add_rfx_effects(); - } - lives_widget_show(mainw->LiVES); // this calls the config_event() if (palette->style&STYLE_1) { @@ -4183,18 +4165,21 @@ void add_to_clipmenu(void) { // TODO - indicate "opening" - char *tmp; + char *fname; + +#ifdef TEST_NOTIFY + char *tmp,*detail; +#endif + #ifndef GTK_RADIO_MENU_BUG cfile->menuentry = lives_radio_menu_item_new_with_label(mainw->clips_group, tmp=get_menu_name(cfile)); mainw->clips_group=lives_radio_menu_item_get_group(LIVES_RADIO_MENU_ITEM(cfile->menuentry)); #else - cfile->menuentry = lives_check_menu_item_new_with_label(tmp=get_menu_name(cfile)); + cfile->menuentry = lives_check_menu_item_new_with_label(fname=get_menu_name(cfile)); lives_check_menu_item_set_draw_as_radio(LIVES_CHECK_MENU_ITEM(cfile->menuentry),TRUE); #endif - lives_free(tmp); - lives_widget_show(cfile->menuentry); lives_container_add(LIVES_CONTAINER(mainw->clipsmenu), cfile->menuentry); @@ -4209,6 +4194,16 @@ pthread_mutex_unlock(&mainw->clip_list_mutex); cfile->old_frames=cfile->frames; cfile->ratio_fps=check_for_ratio_fps(cfile->fps); + +#ifdef TEST_NOTIFY + detail=lives_strdup_printf(_("'LiVES opened the file' '%s'"),fname); + tmp=lives_strdup_printf("notify-send %s",detail); + lives_system(tmp,TRUE); + lives_free(tmp); + lives_free(detail); +#endif + + lives_free(fname); } @@ -4220,6 +4215,16 @@ int fileno; #endif +#ifdef TEST_NOTIFY + char *fname=get_menu_name(cfile); + char *detail=lives_strdup_printf(_("'LiVES closed the file' '%s'"),fname); + char *tmp=lives_strdup_printf("notify-send %s",detail); + lives_system(tmp,TRUE); + lives_free(tmp); + lives_free(fname); + lives_free(detail); +#endif + lives_container_remove(LIVES_CONTAINER(mainw->clipsmenu), cfile->menuentry); if (LIVES_IS_WIDGET(cfile->menuentry)) lives_widget_destroy(cfile->menuentry);
View file
LiVES-2.6.3.tar.bz2/src/interface.c -> LiVES-2.8.0.tar.bz2/src/interface.c
Changed
@@ -293,34 +293,21 @@ static LiVESWidget *vid_text_view_new(void) { - LiVESWidget *textview=lives_text_view_new(); - - if (palette->style&STYLE_1) { - lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base); - lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text); - } - + LiVESWidget *textview; + widget_opts.justify=LIVES_JUSTIFY_CENTER; + textview=lives_standard_text_view_new(NULL,NULL); + widget_opts.justify=widget_opts.default_justify; lives_widget_set_size_request(textview, TB_WIDTH, TB_HEIGHT_VID); - lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE); - lives_text_view_set_justification(LIVES_TEXT_VIEW(textview), LIVES_JUSTIFY_CENTER); - lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE); - return textview; } -static LiVESWidget *aud_text_view_new(void) { - LiVESWidget *textview=lives_text_view_new(); - - if (palette->style&STYLE_1) { - lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base); - lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text); - } +static LiVESWidget *aud_text_view_new(void) { + LiVESWidget *textview; + widget_opts.justify=LIVES_JUSTIFY_CENTER; + textview=lives_standard_text_view_new(NULL,NULL); + widget_opts.justify=widget_opts.default_justify; lives_widget_set_size_request(textview, TB_WIDTH, TB_HEIGHT_AUD); - lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE); - lives_text_view_set_justification(LIVES_TEXT_VIEW(textview), LIVES_JUSTIFY_CENTER); - lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE); - return textview; } @@ -349,6 +336,8 @@ filew->dialog = lives_standard_dialog_new(title,FALSE,-1,-1); lives_free(title); + lives_signal_handlers_disconnect_by_func(filew->dialog,return_true,NULL); + accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new()); lives_window_add_accel_group(LIVES_WINDOW(filew->dialog), accel_group); @@ -543,6 +532,8 @@ lives_widget_set_size_request(okbutton,DEF_BUTTON_WIDTH*4,-1); + lives_widget_context_update(); + return filew; } @@ -686,25 +677,19 @@ dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(textwindow->dialog)); + textwindow->textview=textwindow->table=NULL; + + if (textbuffer!=NULL||text!=NULL) textwindow->textview = lives_standard_text_view_new(text,textbuffer); + woat=widget_opts.apply_theme; widget_opts.apply_theme=FALSE; - textwindow->textview=textwindow->table=NULL; - if (textbuffer!=NULL) textwindow->textview = lives_text_view_new_with_buffer(textbuffer); - else if (text!=NULL) textwindow->textview = lives_text_view_new(); if (textwindow->textview!=NULL) { scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H, RFX_WINSIZE_V, textwindow->textview); if (palette->style&STYLE_1) { - lives_widget_set_base_color(textwindow->textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base); - lives_widget_set_text_color(textwindow->textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text); lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(scrolledwindow)), LIVES_WIDGET_STATE_NORMAL, &palette->info_base); } - - if (text!=NULL) { - lives_text_view_set_text(LIVES_TEXT_VIEW(textwindow->textview), text, -1); - } - lives_text_view_set_editable(LIVES_TEXT_VIEW(textwindow->textview), FALSE); - lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textwindow->textview), FALSE); + } else { textwindow->table=lives_table_new(1, 1, FALSE); scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H, RFX_WINSIZE_V, textwindow->table); @@ -771,6 +756,7 @@ _insertw *insertw=(_insertw *)(lives_malloc(sizeof(_insertw))); insertw->insert_dialog = lives_standard_dialog_new(_("Insert"),FALSE,-1,-1); + lives_signal_handlers_disconnect_by_func(insertw->insert_dialog,return_true,NULL); lives_window_add_accel_group(LIVES_WINDOW(insertw->insert_dialog), accel_group); @@ -1040,6 +1026,7 @@ title=lives_strdup(_("Open Youtube Clip")); locw->dialog = lives_standard_dialog_new(title,FALSE,-1,-1); + lives_signal_handlers_disconnect_by_func(locw->dialog,return_true,NULL); lives_free(title); @@ -1213,6 +1200,7 @@ } renamew->dialog = lives_standard_dialog_new(title,FALSE,-1,-1); + lives_signal_handlers_disconnect_by_func(renamew->dialog,return_true,NULL); lives_window_add_accel_group(LIVES_WINDOW(renamew->dialog), accel_group); @@ -1540,6 +1528,7 @@ cd_dialog = lives_standard_dialog_new(title,FALSE,-1,-1); lives_free(title); + lives_signal_handlers_disconnect_by_func(cd_dialog,return_true,NULL); if (prefs->show_gui) { if (type!=LIVES_DEVICE_INTERNAL) { @@ -1830,6 +1819,7 @@ } audd->dialog = lives_standard_dialog_new(title,TRUE,-1,-1); + lives_signal_handlers_disconnect_by_func(audd->dialog,return_true,NULL); lives_free(title); if (prefs->show_gui) { @@ -1925,6 +1915,8 @@ commentsw->comments_dialog = lives_standard_dialog_new(title,TRUE,-1,-1); lives_free(title); lives_free(extrabit); + lives_signal_handlers_disconnect_by_func(commentsw->comments_dialog,return_true,NULL); + if (prefs->show_gui) { lives_window_set_transient_for(LIVES_WINDOW(commentsw->comments_dialog),LIVES_WINDOW(mainw->LiVES)); @@ -2653,7 +2645,7 @@ LiVESTextView *create_output_textview(void) { - LiVESWidget *textview=lives_text_view_new(); + LiVESWidget *textview=lives_standard_text_view_new(NULL,NULL); #ifdef GTK_TEXT_VIEW_DRAW_BUG expt=lives_signal_connect(LIVES_GUI_OBJECT(textview), LIVES_WIDGET_EXPOSE_EVENT, @@ -2661,14 +2653,6 @@ NULL); #endif - lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE); - - if (palette->style&STYLE_1) { - lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base); - lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text); - } - - //lives_object_ref_sink(textview); lives_object_ref(textview); return LIVES_TEXT_VIEW(textview); }
View file
LiVES-2.6.3.tar.bz2/src/liblives.hpp -> LiVES-2.8.0.tar.bz2/src/liblives.hpp
Changed
@@ -1,6 +1,6 @@ // liblives.hpp // LiVES (lives-exe) -// (c) G. Finch <salsaman@gmail.com> 2015 +// (c) G. Finch <salsaman@gmail.com> 2015 - 2016 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -19,12 +19,12 @@ /** Version number minor */ -#define LIVES_VERSION_MINOR 6 +#define LIVES_VERSION_MINOR 8 /** Version number micro */ -#define LIVES_VERSION_MICRO 3 +#define LIVES_VERSION_MICRO 0 /** Macro to check if livesApp version is >= major.minor.micro @@ -148,7 +148,7 @@ Audio sources */ typedef enum { - LIVES_AUDIO_SOURCE_UNKNOWN, ///< Unknown / invalid + LIVES_AUDIO_SOURCE_UNKNOWN=-1, ///< Unknown / invalid LIVES_AUDIO_SOURCE_INTERNAL, ///< Audio source is internal to LiVES LIVES_AUDIO_SOURCE_EXTERNAL ///< Audio source is external to LiVES } lives_audio_source_t; @@ -158,7 +158,7 @@ Audio players */ typedef enum { - LIVES_AUDIO_PLAYER_UNKNOWN, ///< Unknown / invalid + LIVES_AUDIO_PLAYER_UNKNOWN=-1, ///< Unknown / invalid LIVES_AUDIO_PLAYER_PULSE, ///< Audio playback is through PulseAudio LIVES_AUDIO_PLAYER_JACK, ///< Audio playback is thorugh Jack LIVES_AUDIO_PLAYER_SOX, ///< Audio playback is through Sox
View file
LiVES-2.6.3.tar.bz2/src/main.c -> LiVES-2.8.0.tar.bz2/src/main.c
Changed
@@ -391,7 +391,8 @@ mainw=(mainwindow *)(calloc(1,sizeof(mainwindow))); mainw->is_ready=mainw->fatal=FALSE; - + mainw->mgeom=NULL; + // TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") mainw->string_constants[LIVES_STRING_CONSTANT_ANY]=lives_strdup(_("Any")); // TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") @@ -1422,9 +1423,9 @@ LiVESList *ofmt_all=NULL; char **array; if (capable->python_version>=3000000) - lives_snprintf(prefs->encoder.name,64,"%s","multi_encoder3"); + lives_snprintf(prefs->encoder.name,64,"%s",MULTI_ENCODER3_NAME); else - lives_snprintf(prefs->encoder.name,64,"%s","multi_encoder"); + lives_snprintf(prefs->encoder.name,64,"%s",MULTI_ENCODER_NAME); // need to change the output format @@ -1436,16 +1437,16 @@ if (get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|')>2) { array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1); - if (!strcmp(array[0],"hi-theora")) { + if (!strcmp(array[0],HI_THEORA_FORMAT)) { lives_snprintf(prefs->encoder.of_name,64,"%s",array[0]); lives_strfreev(array); break; } - if (!strcmp(array[0],"hi-mpeg")) { + if (!strcmp(array[0],HI_MPEG_FORMAT)) { lives_snprintf(prefs->encoder.of_name,64,"%s",array[0]); - } else if (!strcmp(array[0],"hi_h-mkv")&&strcmp(prefs->encoder.of_name,"hi-mpeg")) { + } else if (!strcmp(array[0],HI_H_MKV_FORMAT)&&strcmp(prefs->encoder.of_name,HI_MPEG_FORMAT)) { lives_snprintf(prefs->encoder.of_name,64,"%s",array[0]); - } else if (!strcmp(array[0],"hi_h-avi")&&strcmp(prefs->encoder.of_name,"hi-mpeg")&&strcmp(prefs->encoder.of_name,"hi_h-mkv")) { + } else if (!strcmp(array[0],HI_H_AVI_FORMAT)&&strcmp(prefs->encoder.of_name,HI_MPEG_FORMAT)&&strcmp(prefs->encoder.of_name,HI_H_MKV_FORMAT)) { lives_snprintf(prefs->encoder.of_name,64,"%s",array[0]); } else if (!strlen(prefs->encoder.of_name)) { lives_snprintf(prefs->encoder.of_name,64,"%s",array[0]); @@ -1845,38 +1846,37 @@ } +static void show_detected_or_not(boolean cap, const char *pname) { + char *msg; + if (cap) msg=lives_strdup_printf(_("%s...detected... "),pname); + else msg=lives_strdup_printf(_("%s...NOT DETECTED... "),pname); + d_print(msg); + lives_free(msg); +} + + void do_start_messages(void) { char *endian; d_print("\n"); - d_print(_("Checking optional dependencies:")); - if (capable->has_mplayer) d_print(_("mplayer...detected...")); - else d_print(_("mplayer...NOT DETECTED...")); - if (capable->has_mplayer2) d_print(_("mplayer2...detected...")); - else d_print(_("mplayer2...NOT DETECTED...")); + d_print(_("Checking optional dependencies: ")); + + + show_detected_or_not(capable->has_mplayer,"mplayer"); + show_detected_or_not(capable->has_mplayer2,"mplayer2"); #ifdef ALLOW_MPV - if (capable->has_mpv) d_print(_("mpv...detected...")); - else d_print(_("mpv...NOT DETECTED...")); + show_detected_or_not(capable->has_mpv,"mpv"); #endif - if (capable->has_convert) d_print(_("convert...detected...")); - else d_print(_("convert...NOT DETECTED...")); - if (capable->has_composite) d_print(_("composite...detected...")); - else d_print(_("composite...NOT DETECTED...")); - if (capable->has_sox_sox) d_print(_("sox...detected\n")); - else d_print(_("sox...NOT DETECTED\n")); - if (capable->has_cdda2wav) d_print(_("cdda2wav/icedax...detected...")); - else d_print(_("cdda2wav/icedax...NOT DETECTED...")); - if (capable->has_jackd) d_print(_("jackd...detected...")); - else d_print(_("jackd...NOT DETECTED...")); - if (capable->has_pulse_audio) d_print(_("pulse audio...detected...")); - else d_print(_("pulse audio...NOT DETECTED...")); - if (capable->has_python) d_print(_("python...detected...")); - else d_print(_("python...NOT DETECTED...")); - if (capable->has_dvgrab) d_print(_("dvgrab...detected...")); - else d_print(_("dvgrab...NOT DETECTED...")); - if (capable->has_xwininfo) d_print(_("xwininfo...detected...")); - else d_print(_("xwininfo...NOT DETECTED...")); + show_detected_or_not(capable->has_convert,"convert"); + show_detected_or_not(capable->has_composite,"composite"); + show_detected_or_not(capable->has_sox_sox,"sox"); + show_detected_or_not(capable->has_cdda2wav,"cdda2wav/icedax"); + show_detected_or_not(capable->has_jackd,"jackd"); + show_detected_or_not(capable->has_pulse_audio,"pulse audio"); + show_detected_or_not(capable->has_python,"python"); + show_detected_or_not(capable->has_dvgrab,"dvgrab"); + show_detected_or_not(capable->has_xwininfo,"xwininfo"); #ifdef GDK_WINDOWING_X11 prefs->wm=lives_strdup(gdk_x11_screen_get_window_manager_name(gdk_screen_get_default())); @@ -2811,6 +2811,11 @@ } } + if (!mainw->foreign&&capable->smog_version_correct) { + splash_msg(_("Loading rendered effect plugins..."),SPLASH_LEVEL_LOAD_RFX); + add_rfx_effects(); + } + if (prefs->startup_interface!=STARTUP_MT) { if (prefs->show_gui) { // mainw->ready gets set here @@ -3069,7 +3074,7 @@ #ifdef GUI_GTK #ifdef LIVES_NO_DEBUG // don't crash on GTK+ fatals - g_log_set_always_fatal((GLogLevelFlags)0); + //g_log_set_always_fatal((GLogLevelFlags)0); //gtk_window_set_interactive_debugging(TRUE); #endif @@ -4457,6 +4462,8 @@ boolean is_png = !png_sig_cmp(buff, 0, bsize); float screen_gamma=SCREEN_GAMMA; + float pref_gamma = SCREEN_GAMMA*1.0; // a larger value is brighter + double file_gamma; int width, height; @@ -4493,14 +4500,14 @@ // progressive read calls png_row_callback on each row if (prog) png_set_read_status_fn(png_ptr, png_row_callback); - + #if PNG_LIBPNG_VER >= 10504 png_set_alpha_mode(png_ptr, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB); #endif if (png_get_gAMA(png_ptr, info_ptr, &file_gamma)) png_set_gamma(png_ptr, screen_gamma, file_gamma); - else - png_set_gamma(png_ptr, screen_gamma, 1.0/screen_gamma); + else + png_set_gamma(png_ptr, pref_gamma, 1./screen_gamma); // read header info png_read_info(png_ptr, info_ptr); @@ -4617,7 +4624,7 @@ float screen_gamma=SCREEN_GAMMA; - int width, height, palette, flags, error; + int width, height, palette, flags=0, error; int rowstride; register int i; @@ -4920,6 +4927,7 @@ clip_type=sfile->clip_type; } + switch (clip_type) { case CLIP_TYPE_DISK: case CLIP_TYPE_FILE: @@ -5007,7 +5015,6 @@ create_empty_pixel_data(layer,FALSE,TRUE); - pixel_data=weed_get_voidptr_array(layer,WEED_LEAF_PIXEL_DATA,&error); rowstrides=weed_get_int_array(layer,WEED_LEAF_ROWSTRIDES,&error); @@ -5701,7 +5708,7 @@ // play preview if (cfile->opening||(cfile->next_event!=NULL&&cfile->proc_ptr==NULL)) { - fname_next=make_image_file_name(cfile,frame+1,prefs->image_ext); + fname_next=make_image_file_name(cfile,frame+1,get_image_ext_for_type(cfile->img_type)); if (!mainw->fs&&prefs->show_framecount&&!mainw->is_rendering) { lives_freep((void **)&framecount); @@ -5728,7 +5735,7 @@ } } else { if (mainw->is_rendering||mainw->is_generating) { - fname_next=make_image_file_name(cfile,frame+1,prefs->image_ext); + fname_next=make_image_file_name(cfile,frame+1,get_image_ext_for_type(cfile->img_type)); } else { if (!mainw->keep_pre) { img_ext=LIVES_FILE_EXT_MGK; @@ -6625,18 +6632,15 @@ QPixmap qp = qscreen->grabWindow(mainw->foreign_id, 0, 0, xwidth, xheight); if (0) { // TODO
View file
LiVES-2.6.3.tar.bz2/src/main.h -> LiVES-2.8.0.tar.bz2/src/main.h
Changed
@@ -194,7 +194,7 @@ #define PLUGIN_COMPOUND_DIR "/share/lives/plugins/" #define PLUGIN_EXEC_DIR "/lives/plugins/" #define ICON_DIR "/share/lives/icons/" -#define DESKTOP_ICON_DIR "/share/app-install/icons/" +#define DESKTOP_ICON_DIR "/share/icons/hicolor/48x48/apps" #define DATA_DIR "/share/lives/" #define LIVES_CONFIG_DIR ".lives-dir/" #define LIVES_TMP_NAME "livestmp" @@ -1027,7 +1027,7 @@ boolean read_file_details(const char *file_name, boolean only_check_for_audio); boolean add_file_info(const char *check_handle, boolean aud_only); boolean save_file_comments(int fileno); -boolean reload_clip(int fileno); +boolean reload_clip(int fileno,int maxframe); void reget_afilesize(int fileno); ulong deduce_file(const char *filename, double start_time, int end); ulong open_file(const char *filename);
View file
LiVES-2.6.3.tar.bz2/src/mainwindow.h -> LiVES-2.8.0.tar.bz2/src/mainwindow.h
Changed
@@ -263,10 +263,10 @@ typedef struct { int style; #define STYLE_PLAIN 0 ///< no theme (theme 'none') -#define STYLE_1 1<<0 ///< turn on theming if set -#define STYLE_2 1<<1 ///< colour the spinbuttons on the front page if set -#define STYLE_3 1<<2 ///< style is lightish - allow themeing of widgets with dark text, otherwise use menu bg -#define STYLE_4 1<<3 ///< separator col. in mt +#define STYLE_1 (1<<0) ///< turn on theming if set +#define STYLE_2 (1<<1) ///< colour the spinbuttons on the front page if set +#define STYLE_3 (1<<2) ///< style is lightish - allow themeing of widgets with dark text, otherwise use menu bg +#define STYLE_4 (1<<3) ///< separator col. in mt LiVESWidgetColor white; LiVESWidgetColor black;
View file
LiVES-2.6.3.tar.bz2/src/merge.c -> LiVES-2.8.0.tar.bz2/src/merge.c
Changed
@@ -94,6 +94,7 @@ width=scrw-SCR_WIDTH_SAFETY; merge_opts->merge_dialog = lives_standard_dialog_new(_("Merge"),FALSE,width,height); + lives_signal_handlers_disconnect_by_func(merge_opts->merge_dialog,return_true,NULL); accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new()); lives_window_add_accel_group(LIVES_WINDOW(merge_opts->merge_dialog), accel_group);
View file
LiVES-2.6.3.tar.bz2/src/multitrack.c -> LiVES-2.8.0.tar.bz2/src/multitrack.c
Changed
@@ -3047,7 +3047,7 @@ mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL); weed_set_int_value(mainw->frame_layer,WEED_LEAF_CLIP,mainw->current_file); weed_set_int_value(mainw->frame_layer,WEED_LEAF_FRAME,actual_frame); - pull_frame(mainw->frame_layer,prefs->image_ext,curr_tc); + pull_frame(mainw->frame_layer,get_image_ext_for_type(cfile->img_type),curr_tc); } else { mainw->is_rendering=TRUE; @@ -9243,6 +9243,7 @@ add_message_scroller(mainw->message_box); if (prefs->show_gui) { + show_lives(); if (lives_window_has_toplevel_focus(LIVES_WINDOW(mt->window))) transfer_focus=TRUE; lives_widget_show(mainw->LiVES); mainw->is_ready=mainw_was_ready;
View file
LiVES-2.6.3.tar.bz2/src/omc-learn.c -> LiVES-2.8.0.tar.bz2/src/omc-learn.c
Changed
@@ -1346,6 +1346,7 @@ winsize_v=scr_height-SCR_HEIGHT_SAFETY; omclw->dialog = lives_standard_dialog_new(_("OMC Learner"),FALSE,winsize_h,winsize_v); + lives_signal_handlers_disconnect_by_func(omclw->dialog,return_true,NULL); omclw->top_vbox = lives_dialog_get_content_area(LIVES_DIALOG(omclw->dialog));
View file
LiVES-2.6.3.tar.bz2/src/osc.c -> LiVES-2.8.0.tar.bz2/src/osc.c
Changed
@@ -314,6 +314,13 @@ if (!strcmp(cname,"LIVES_OSC_NOTIFY_MODE_CHANGED")) return get_value_of((const int)LIVES_OSC_NOTIFY_MODE_CHANGED); + // audio sources + if (!strcmp(cname,"LIVES_AUDIO_SOURCE_INTERNAL")) + return get_value_of((const int)AUDIO_SRC_INT); + if (!strcmp(cname,"LIVES_AUDIO_SOURCE_EXTERNAL")) + return get_value_of((const int)AUDIO_SRC_EXT); + + // generic constants if (!strcmp(cname,"LIVES_FPS_MAX")) return get_value_of((const int)FPS_MAX); @@ -718,9 +725,8 @@ boolean lives_osc_cb_get_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { - if (mainw->ping_pong) lives_status_send(get_omc_const("LIVES_TRUE")); - else lives_status_send(get_omc_const("LIVES_FALSE")); - return TRUE; + if (mainw->ping_pong) return lives_status_send(get_omc_const("LIVES_TRUE")); + return lives_status_send(get_omc_const("LIVES_FALSE")); } @@ -1794,24 +1800,21 @@ } boolean lives_osc_cb_getname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { - lives_status_send(PACKAGE_NAME); - return TRUE; + return lives_status_send(PACKAGE_NAME); } boolean lives_osc_cb_getversion(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { - lives_status_send(VERSION); - return TRUE; + return lives_status_send(VERSION); } boolean lives_osc_cb_getstatus(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { - if (mainw->go_away) lives_status_send(get_omc_const("LIVES_STATUS_NOTREADY")); - if (mainw->playing_file > -1) lives_status_send(get_omc_const("LIVES_STATUS_PLAYING")); - if (mainw->is_processing) lives_status_send(get_omc_const("LIVES_STATUS_PROCESSING")); + if (mainw->go_away) return lives_status_send(get_omc_const("LIVES_STATUS_NOTREADY")); + if (mainw->playing_file > -1) return lives_status_send(get_omc_const("LIVES_STATUS_PLAYING")); + if (mainw->is_processing) return lives_status_send(get_omc_const("LIVES_STATUS_PROCESSING")); if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL&&(!mainw->record|| - mainw->playing_file==-1)))) lives_status_send(get_omc_const("LIVES_STATUS_PREVIEW")); - lives_status_send(get_omc_const("LIVES_STATUS_READY")); - return TRUE; + mainw->playing_file==-1)))) return lives_status_send(get_omc_const("LIVES_STATUS_PREVIEW")); + return lives_status_send(get_omc_const("LIVES_STATUS_READY")); } @@ -1822,8 +1825,7 @@ if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE)) return lives_osc_notify_failure(); lives_osc_parse_string_argument(vargs,cname); retval=get_omc_const(cname); - lives_status_send(retval); - return TRUE; + return lives_status_send(retval); } @@ -1967,7 +1969,7 @@ boolean lives_osc_cb_clip_getframe(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { char *tmp; if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL&&!mainw->record))|| - mainw->playing_file<1) lives_status_send("0"); + mainw->playing_file<1) return lives_status_send("0"); else { lives_status_send((tmp=lives_strdup_printf("%d",mainw->actual_frame))); lives_free(tmp); @@ -2035,7 +2037,7 @@ else if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL&&!mainw->record))|| mainw->playing_file<1) lives_status_send((tmp=lives_strdup_printf("%.4f",1.))); else lives_status_send((tmp=lives_strdup_printf("%.4f",mainw->files[mainw->blend_file]->pb_fps/ - mainw->files[mainw->blend_file]->fps))); + mainw->files[mainw->blend_file]->fps))); lives_free(tmp); return TRUE; } @@ -2046,7 +2048,7 @@ if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL&&!mainw->record))||mainw->playing_file<1|| mainw->blend_file<0|| - mainw->files[mainw->blend_file]==NULL) lives_status_send("0"); + mainw->files[mainw->blend_file]==NULL) return lives_status_send("0"); else { lives_status_send((tmp=lives_strdup_printf("%d",mainw->files[mainw->blend_file]->frameno))); lives_free(tmp); @@ -2070,13 +2072,11 @@ boolean lives_osc_cb_get_amute(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (!is_realtime_aplayer(prefs->audio_player)) { - lives_status_send(get_omc_const("LIVES_FALSE")); - return TRUE; + return lives_status_send(get_omc_const("LIVES_FALSE")); } - if (!mainw->mute) lives_status_send(get_omc_const("LIVES_FALSE")); - else lives_status_send(get_omc_const("LIVES_TRUE")); + if (!mainw->mute) return lives_status_send(get_omc_const("LIVES_FALSE")); + else return lives_status_send(get_omc_const("LIVES_TRUE")); - return TRUE; } @@ -2152,9 +2152,8 @@ boolean lives_osc_cb_getmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { - if (mainw->multitrack!=NULL) lives_status_send(get_omc_const("LIVES_MODE_MULTITRACK")); - else lives_status_send(get_omc_const("LIVES_MODE_CLIPEDIT")); - return TRUE; + if (mainw->multitrack!=NULL) return lives_status_send(get_omc_const("LIVES_MODE_MULTITRACK")); + else return lives_status_send(get_omc_const("LIVES_MODE_CLIPEDIT")); } @@ -2662,8 +2661,7 @@ sfile=mainw->files[clip]; - lives_status_send(sfile->name); - return TRUE; + return lives_status_send(sfile->name); } @@ -2805,9 +2803,8 @@ if (clip>0&&clip<MAX_FILES&&mainw->files[clip]!=NULL&&!(mainw->multitrack!=NULL&&clip==mainw->multitrack->render_file)&& clip!=mainw->scrap_file) - lives_status_send(get_omc_const("LIVES_TRUE")); - else lives_status_send(get_omc_const("LIVES_FALSE")); - return TRUE; + return lives_status_send(get_omc_const("LIVES_TRUE")); + else return lives_status_send(get_omc_const("LIVES_FALSE")); } boolean lives_osc_cb_rte_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { @@ -2879,6 +2876,26 @@ } + +boolean lives_osc_cb_pref_set_audio_source(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { + int val; + + if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure(); + lives_osc_parse_int_argument(vargs,&val); + if (val!=AUDIO_SRC_INT&&val!=AUDIO_SRC_EXT) return lives_osc_notify_failure(); + pref_factory_bool(PREF_REC_EXT_AUDIO,val==AUDIO_SRC_EXT); + return lives_osc_notify_success(NULL); + +} + + + +boolean lives_osc_cb_pref_get_audio_source(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { + if (prefs->audio_src == AUDIO_SRC_EXT) return lives_status_send(get_omc_const("LIVES_AUDIO_SOURCE_EXTERNAL")); + return lives_status_send(get_omc_const("LIVES_AUDIO_SOURCE_INTERNAL")); +} + + boolean lives_osc_cb_freeze(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) { if (mainw->playing_file<1) return lives_osc_notify_failure(); @@ -3823,8 +3840,7 @@ return lives_osc_notify_failure(); } - lives_status_send(retval); - return TRUE; + return lives_status_send(retval); } @@ -3891,8 +3907,7 @@ return lives_osc_notify_failure(); } - lives_status_send(retval); - return TRUE; + return lives_status_send(retval); } @@ -3940,8 +3955,7 @@ return lives_osc_notify_failure(); } - lives_status_send(retval); - return TRUE; + return lives_status_send(retval);
View file
LiVES-2.6.3.tar.bz2/src/plugins.h -> LiVES-2.8.0.tar.bz2/src/plugins.h
Changed
@@ -95,9 +95,9 @@ uint64_t capabilities; -#define VPP_CAN_RESIZE 1<<0 -#define VPP_CAN_RETURN 1<<1 -#define VPP_LOCAL_DISPLAY 1<<2 +#define VPP_CAN_RESIZE (1<<0) +#define VPP_CAN_RETURN (1<<1) +#define VPP_LOCAL_DISPLAY (1<<2) int fwidth,fheight; @@ -138,6 +138,15 @@ // encoder plugins +#define MULTI_ENCODER_NAME "multi_encoder" +#define MULTI_ENCODER3_NAME "multi_encoder3" + +#define HI_THEORA_FORMAT "hi-theora" +#define HI_MPEG_FORMAT "hi-mpg" +#define HI_H_MKV_FORMAT "hi_h-mkv" +#define HI_H_AVI_FORMAT "hi_h-avi" + + void do_plugin_encoder_error(const char *plugin_name_or_null); LiVESList *filter_encoders_by_img_ext(LiVESList *encoders, const char *img_ext); @@ -167,10 +176,10 @@ uint32_t capabilities; -#define HAS_RFX 1<<0 +#define HAS_RFX (1<<0) -#define CAN_ENCODE_PNG 1<<2 -#define ENCODER_NON_NATIVE 1<<3 +#define CAN_ENCODE_PNG (1<<2) +#define ENCODER_NON_NATIVE (1<<3) // current output format char of_name[64];
View file
LiVES-2.6.3.tar.bz2/src/preferences.c -> LiVES-2.8.0.tar.bz2/src/preferences.c
Changed
@@ -590,6 +590,8 @@ // can also be called from other places + if (prefsw!=NULL) + prefsw->ignore_apply=TRUE; if (!strcmp(prefidx,PREF_REC_EXT_AUDIO)) { boolean rec_ext_audio=newval; @@ -597,23 +599,21 @@ prefs->audio_src=AUDIO_SRC_EXT; set_int_pref(PREF_AUDIO_SRC,AUDIO_SRC_EXT); - if (mainw->playing_file==-1) { - if (prefs->audio_player==AUD_PLAYER_JACK) { + if (prefs->audio_player==AUD_PLAYER_JACK) { #ifdef ENABLE_JACK - if (prefs->perm_audio_reader) { - // create reader connection now, if permanent - jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL); - } + if (prefs->perm_audio_reader) { + // create reader connection now, if permanent + jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL); + } #endif - } - if (prefs->audio_player==AUD_PLAYER_PULSE) { + } + if (prefs->audio_player==AUD_PLAYER_PULSE) { #ifdef HAVE_PULSE_AUDIO - if (prefs->perm_audio_reader) { - // create reader connection now, if permanent - pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL); - } + if (prefs->perm_audio_reader) { + // create reader connection now, if permanent + pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL); + } #endif - } } } else if (!rec_ext_audio&&prefs->audio_src==AUDIO_SRC_EXT) { @@ -631,9 +631,12 @@ } } - if (prefsw!=NULL) - lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio),prefs->audio_src==AUDIO_SRC_EXT); - + if (prefsw!=NULL) { + if (prefs->audio_src==AUDIO_SRC_EXT) + lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio),TRUE); + else + lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rintaudio),TRUE); + } } if (!strcmp(prefidx,PREF_SEPWIN_STICKY)) { lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sticky),newval); @@ -645,16 +648,37 @@ } + if (prefsw!=NULL) { + lives_widget_context_update(); + prefsw->ignore_apply=FALSE; + } } void pref_factory_int(const char *prefidx, int newval) { // TODO + if (prefsw!=NULL) + prefsw->ignore_apply=TRUE; + + + + // ... + + + if (prefsw!=NULL) { + lives_widget_context_update(); + prefsw->ignore_apply=FALSE; + } + } void pref_factory_bitmapped(const char *prefidx, int bitfield, boolean newval) { + + if (prefsw!=NULL) + prefsw->ignore_apply=TRUE; + if (!strcmp(prefidx,PREF_MT_EXIT_RENDER)) { if (newval&&!(prefs->audio_opts&bitfield)) prefs->audio_opts&=bitfield; else if (!newval&&(prefs->audio_opts&bitfield)) prefs->audio_opts^=bitfield; @@ -666,6 +690,10 @@ } } + if (prefsw!=NULL) { + lives_widget_context_update(); + prefsw->ignore_apply=FALSE; + } } @@ -901,6 +929,10 @@ char *cdplay_device=lives_filename_from_utf8((char *)lives_entry_get_text(LIVES_ENTRY(prefsw->cdplay_entry)),-1,NULL,NULL,NULL); + + // TODO: move all into pref_factory_* functions + + if (prefsw->theme_style2!=NULL) pstyle2=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->theme_style2)); else @@ -1666,10 +1698,10 @@ if (!use_alsa_midi) { prefs->omc_dev_opts|=OMC_DEV_FORCE_RAW_MIDI; - prefs->use_alsa_midi=TRUE; + prefs->use_alsa_midi=FALSE; } else { prefs->omc_dev_opts^=OMC_DEV_FORCE_RAW_MIDI; - prefs->use_alsa_midi=FALSE; + prefs->use_alsa_midi=TRUE; } set_omc_dev_opts=TRUE; } @@ -2309,14 +2341,15 @@ } } } - lives_widget_queue_draw(prefsw->prefs_dialog); + lives_widget_queue_draw(prefsw->prefs_dialog); } /* * Function makes apply button sensitive */ void apply_button_set_enabled(LiVESWidget *widget, livespointer func_data) { + if (prefsw->ignore_apply) return; lives_widget_set_sensitive(LIVES_WIDGET(prefsw->applybutton), TRUE); lives_widget_set_sensitive(LIVES_WIDGET(prefsw->cancelbutton), TRUE); lives_widget_set_sensitive(LIVES_WIDGET(prefsw->closebutton), FALSE); @@ -2382,7 +2415,6 @@ LiVESWidget *mt_enter_defs; LiVESWidget *advbutton; - LiVESWidget *rbutton; LiVESWidget *sp_red,*sp_green,*sp_blue; @@ -2451,6 +2483,8 @@ else lives_window_set_transient_for(LIVES_WINDOW(prefsw->prefs_dialog),LIVES_WINDOW(mainw->multitrack->window)); } + prefsw->ignore_apply=FALSE; + // Get dialog's vbox and show it dialog_vbox_main = lives_dialog_get_content_area(LIVES_DIALOG(prefsw->prefs_dialog)); lives_widget_show(dialog_vbox_main); @@ -3244,9 +3278,9 @@ lives_box_pack_start(LIVES_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width); add_fill_to_box(LIVES_BOX(hbox)); - rbutton=lives_standard_radio_button_new(_("_Internal"),TRUE,asrc_group,LIVES_BOX(hbox),NULL); + prefsw->rintaudio=lives_standard_radio_button_new(_("_Internal"),TRUE,asrc_group,LIVES_BOX(hbox),NULL); - asrc_group=lives_radio_button_get_group(LIVES_RADIO_BUTTON(rbutton)); + asrc_group=lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->rintaudio)); add_fill_to_box(LIVES_BOX(hbox)); prefsw->rextaudio = lives_standard_radio_button_new(_("_External (requires jack or pulse audio player)"),
View file
LiVES-2.6.3.tar.bz2/src/preferences.h -> LiVES-2.8.0.tar.bz2/src/preferences.h
Changed
@@ -266,9 +266,9 @@ int midi_check_rate; int midi_rpt; -#define OMC_DEV_MIDI 1<<0 -#define OMC_DEV_JS 1<<1 -#define OMC_DEV_FORCE_RAW_MIDI 1<<2 +#define OMC_DEV_MIDI (1<<0) +#define OMC_DEV_JS (1<<1) +#define OMC_DEV_FORCE_RAW_MIDI (1<<2) uint32_t omc_dev_opts; char omc_js_fname[PATH_MAX]; ///< utf8 @@ -469,6 +469,7 @@ LiVESWidget *reffects; LiVESWidget *raudio; LiVESWidget *rextaudio; + LiVESWidget *rintaudio; LiVESWidget *rdesk_audio; LiVESWidget *encoder_combo; LiVESWidget *checkbutton_antialias; @@ -601,6 +602,8 @@ LiVESWidget *frameblank_entry; LiVESWidget *sepimg_entry; LiVESTreeSelection *selection; + + boolean ignore_apply; ///< dont light the apply button when thing changes (for external calls), normally FALSE boolean needs_restart; } _prefsw;
View file
LiVES-2.6.3.tar.bz2/src/resample.c -> LiVES-2.8.0.tar.bz2/src/resample.c
Changed
@@ -1212,6 +1212,7 @@ } resaudw->dialog = lives_standard_dialog_new(title,FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT); + lives_signal_handlers_disconnect_by_func(resaudw->dialog,return_true,NULL); lives_free(title); accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new()); @@ -1639,6 +1640,7 @@ } new_pb_speed = lives_standard_dialog_new(title,FALSE,-1,-1); + lives_signal_handlers_disconnect_by_func(new_pb_speed,return_true,NULL); lives_free(title); accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
View file
LiVES-2.6.3.tar.bz2/src/rfx-builder.c -> LiVES-2.8.0.tar.bz2/src/rfx-builder.c
Changed
@@ -549,6 +549,7 @@ //dialog = lives_standard_dialog_new(title,FALSE,RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4); dialog = lives_standard_dialog_new(title,FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT); //lives_widget_set_size_request(dialog,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT); + lives_signal_handlers_disconnect_by_func(dialog,return_true,NULL); if (title!=NULL) lives_free(title); @@ -4397,7 +4398,7 @@ if (mainw->run_test_rfx_menu!=NULL) lives_widget_destroy(mainw->run_test_rfx_menu); } - if (mainw->is_ready) { + if (mainw->is_ready&&prefs->show_gui) { lives_widget_queue_draw(mainw->effects_menu); lives_widget_context_update(); threaded_dialog_spin(0.); @@ -4682,7 +4683,7 @@ lives_snprintf(txt,61,"_%s",_(rfx->menu_text)); if (rfx->num_params) lives_strappend(txt,64,"..."); menuitem = lives_image_menu_item_new_with_mnemonic(txt); - lives_widget_show(menuitem); + if (prefs->show_gui) lives_widget_show(menuitem); switch (rfx->status) { case RFX_STATUS_BUILTIN: @@ -4709,7 +4710,7 @@ } lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(menuitem), rfx_image); - lives_widget_show(rfx_image); + if (prefs->show_gui) lives_widget_show(rfx_image); #endif if (rfx->params==NULL) { @@ -4729,14 +4730,16 @@ threaded_dialog_spin(0.); // custom effects - if (rc_child>0) { - lives_widget_show(mainw->custom_effects_separator); - lives_widget_show(mainw->custom_effects_menu); - lives_widget_show(mainw->custom_effects_submenu); - } else { - lives_widget_hide(mainw->custom_effects_separator); - lives_widget_hide(mainw->custom_effects_menu); - lives_widget_hide(mainw->custom_effects_submenu); + if (prefs->show_gui) { + if (rc_child>0) { + lives_widget_show(mainw->custom_effects_separator); + lives_widget_show(mainw->custom_effects_menu); + lives_widget_show(mainw->custom_effects_submenu); + } else { + lives_widget_hide(mainw->custom_effects_separator); + lives_widget_hide(mainw->custom_effects_menu); + lives_widget_hide(mainw->custom_effects_submenu); + } } mainw->utilities_menu=lives_menu_new(); @@ -4783,7 +4786,7 @@ if (rfx_slot_count) { for (rfx=&mainw->rendered_fx[(plugin_idx=1)]; plugin_idx<=rfx_slot_count; rfx=&mainw->rendered_fx[++plugin_idx]) { threaded_dialog_spin(0.); - if (mainw->splash_window==NULL) { + if (mainw->splash_window==NULL&&prefs->show_gui) { lives_widget_context_update(); } if ((rfx->props&RFX_PROPS_MAY_RESIZE&&rfx->num_in_channels==1)||rfx->min_frames<0) { @@ -4798,7 +4801,7 @@ lives_snprintf(txt,61,"_%s",_(rfx->menu_text)); if (rfx->num_params) lives_strappend(txt,64,"..."); menuitem = lives_menu_item_new_with_mnemonic(txt); - lives_widget_show(menuitem); + if (prefs->show_gui) lives_widget_show(menuitem); switch (rfx->status) { case RFX_STATUS_BUILTIN: @@ -4806,7 +4809,7 @@ lives_menu_shell_insert(LIVES_MENU_SHELL(mainw->tools_menu), menuitem,tool_posn++); } else { lives_container_add(LIVES_CONTAINER(mainw->utilities_menu), menuitem); - lives_widget_show(mainw->utilities_menu); + if (prefs->show_gui) lives_widget_show(mainw->utilities_menu); } break; case RFX_STATUS_CUSTOM: @@ -4851,12 +4854,12 @@ lives_snprintf(txt,61,"_%s",_(rfx->menu_text)); if (rfx->num_params) lives_strappend(txt,64,"..."); menuitem = lives_menu_item_new_with_mnemonic(txt); - lives_widget_show(menuitem); + if (prefs->show_gui) lives_widget_show(menuitem); switch (rfx->status) { case RFX_STATUS_BUILTIN: lives_container_add(LIVES_CONTAINER(mainw->gens_menu), menuitem); - lives_widget_show(mainw->gens_menu); + if (prefs->show_gui) lives_widget_show(mainw->gens_menu); break; case RFX_STATUS_CUSTOM: lives_container_add(LIVES_CONTAINER(mainw->custom_gens_menu), menuitem); @@ -4883,36 +4886,38 @@ } - threaded_dialog_spin(0.); + if (prefs->show_gui) { + threaded_dialog_spin(0.); - if (mainw->has_custom_tools||mainw->has_custom_utilities) { - lives_widget_show(mainw->custom_tools_separator); - lives_widget_show(mainw->custom_tools_menu); - lives_widget_show(mainw->custom_tools_submenu); - } else { - lives_widget_hide(mainw->custom_tools_separator); - lives_widget_hide(mainw->custom_tools_menu); - lives_widget_hide(mainw->custom_tools_submenu); - } - if (mainw->has_custom_utilities) { - if (mainw->has_custom_tools) { - lives_widget_show(mainw->custom_utilities_separator); + if (mainw->has_custom_tools||mainw->has_custom_utilities) { + lives_widget_show(mainw->custom_tools_separator); + lives_widget_show(mainw->custom_tools_menu); + lives_widget_show(mainw->custom_tools_submenu); + } else { + lives_widget_hide(mainw->custom_tools_separator); + lives_widget_hide(mainw->custom_tools_menu); + lives_widget_hide(mainw->custom_tools_submenu); + } + if (mainw->has_custom_utilities) { + if (mainw->has_custom_tools) { + lives_widget_show(mainw->custom_utilities_separator); + } else { + lives_widget_hide(mainw->custom_utilities_separator); + } + lives_widget_show(mainw->custom_utilities_menu); + lives_widget_show(mainw->custom_utilities_submenu); } else { lives_widget_hide(mainw->custom_utilities_separator); + lives_widget_hide(mainw->custom_utilities_menu); + lives_widget_hide(mainw->custom_utilities_submenu); + } + if (mainw->has_custom_gens) { + lives_widget_show(mainw->custom_gens_menu); + lives_widget_show(mainw->custom_gens_submenu); + } else { + lives_widget_hide(mainw->custom_gens_menu); + lives_widget_hide(mainw->custom_gens_submenu); } - lives_widget_show(mainw->custom_utilities_menu); - lives_widget_show(mainw->custom_utilities_submenu); - } else { - lives_widget_hide(mainw->custom_utilities_separator); - lives_widget_hide(mainw->custom_utilities_menu); - lives_widget_hide(mainw->custom_utilities_submenu); - } - if (mainw->has_custom_gens) { - lives_widget_show(mainw->custom_gens_menu); - lives_widget_show(mainw->custom_gens_submenu); - } else { - lives_widget_hide(mainw->custom_gens_menu); - lives_widget_hide(mainw->custom_gens_submenu); } if (mainw->is_ready) {
View file
LiVES-2.6.3.tar.bz2/src/rte_window.c -> LiVES-2.8.0.tar.bz2/src/rte_window.c
Changed
@@ -103,7 +103,7 @@ } -void ret_set_key_check_state(void) { +void rtew_set_key_check_state(void) { // set (delayed) keycheck state register int i; for (i=0; i<prefs->rte_keys_virtual; i++) { @@ -164,8 +164,7 @@ for (j=modes-1; j>=0; j--) { weed_delete_effectkey(i+1,j); if (rte_window!=NULL) { - lives_entry_set_text(LIVES_ENTRY(combo_entries[i*modes+j]),""); - type_label_set_text(i,j); + rtew_combo_set_text(i,j,""); } } if (mainw->ce_thumbs) ce_thumbs_reset_combo(i); @@ -1544,7 +1543,7 @@ int idx=(key-1)*modes+mode; int fx_idx=rte_keymode_get_filter_idx(key,mode); - lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),(tmp=rte_keymode_get_filter_name(key,mode))); + rtew_combo_set_text(key,mode,(tmp=rte_keymode_get_filter_name(key,mode))); lives_free(tmp); if (fx_idx!=-1) { @@ -1734,19 +1733,15 @@ label = lives_standard_label_new(_("Description: ")); lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_height); - textview = lives_text_view_new(); + textview = lives_standard_text_view_new(filter_description,NULL); if (palette->style&STYLE_1) { lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); } - lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE); - lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(textview), LIVES_WRAP_WORD); - lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE); - - lives_text_view_set_text(LIVES_TEXT_VIEW(textview), filter_description,-1); lives_box_pack_start(LIVES_BOX(hbox), textview, TRUE, TRUE, widget_opts.packing_height); + } if (has_license) { @@ -1833,8 +1828,7 @@ if (rte_window!=NULL) { int fx_idx=rte_keymode_get_filter_idx(key,mode); idx=key*modes+i; - lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),lives_entry_get_text(LIVES_ENTRY(combo_entries[idx+1]))); - type_label_set_text(key,i); + rtew_combo_set_text(key,i,lives_entry_get_text(LIVES_ENTRY(combo_entries[idx+1]))); if (fx_idx!=-1) { char *hashname=(char *)lives_list_nth_data(hash_list,fx_idx); @@ -1848,7 +1842,7 @@ idx++; if (rte_window!=NULL) { - lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),""); + rtew_combo_set_text(key,i,""); lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combos[idx]),"hashname",empty_string); // set parameters button sensitive/insensitive @@ -1981,6 +1975,13 @@ }; +void rtew_combo_set_text(int key, int mode, const char *txt) { + // key is zero based + int key_mode=key*rte_getmodespk()+mode; + lives_entry_set_text(LIVES_ENTRY(combo_entries[key_mode]),txt); + type_label_set_text(key,mode); +} + void fx_changed(LiVESCombo *combo, livespointer user_data) { LiVESTreeIter iter1; @@ -2040,7 +2041,7 @@ model=lives_combo_get_model(combo); lives_tree_model_get(model,&iter1,NAME_COLUMN,&txt,-1); - lives_entry_set_text(LIVES_ENTRY(combo_entries[key_mode]),txt); + rtew_combo_set_text(key,mode,txt); lives_free(txt); lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"hashname",hashname1);
View file
LiVES-2.6.3.tar.bz2/src/rte_window.h -> LiVES-2.8.0.tar.bz2/src/rte_window.h
Changed
@@ -16,8 +16,9 @@ void on_assign_rte_keys_activate(LiVESMenuItem *, livespointer); void on_rte_info_clicked(LiVESButton *, livespointer data); void load_default_keymap(void); +void rtew_combo_set_text(int key, int mode, const char *txt); void rtew_set_keych(int key, boolean on); -void ret_set_key_check_state(void); +void rtew_set_key_check_state(void); void rtew_set_keygr(int key); void rtew_set_mode_radio(int key, int mode); void rtew_set_grab_button(boolean on);
View file
LiVES-2.6.3.tar.bz2/src/saveplay.c -> LiVES-2.8.0.tar.bz2/src/saveplay.c
Changed
@@ -3177,7 +3177,7 @@ mainw->record_paused=mainw->record_starting=FALSE; - if (!mainw->preview&&cfile->clip_type==CLIP_TYPE_GENERATOR) { + if (!mainw->preview&&mainw->current_file>=1&&cfile->clip_type==CLIP_TYPE_GENERATOR) { mainw->osc_block=TRUE; weed_generator_end((weed_plant_t *)cfile->ext_src); mainw->osc_block=FALSE; @@ -5200,15 +5200,16 @@ -boolean reload_clip(int fileno) { +boolean reload_clip(int fileno, int maxframe) { + // reload clip -- for CLIP_TYPE_FILE // cd to clip directory - so decoder plugins can write temp files lives_clip_t *sfile=mainw->files[fileno]; - char *ppath=lives_build_filename(prefs->tmpdir,sfile->handle,NULL); - const lives_clip_data_t *cdata=NULL; + char *ppath=lives_build_filename(prefs->tmpdir,sfile->handle,NULL); + lives_clip_data_t *fake_cdata=(lives_clip_data_t *)lives_calloc(sizeof(lives_clip_data_t),1); boolean was_renamed=FALSE; @@ -5221,7 +5222,7 @@ fake_cdata->URI=lives_strdup(sfile->file_name); fake_cdata->fps=sfile->fps; - fake_cdata->nframes=sfile->frames; + fake_cdata->nframes=maxframe; if ((cdata=get_decoder_cdata(fileno,prefs->disabled_decoders,fake_cdata->fps!=0.?fake_cdata:NULL))==NULL) { if (mainw->error) { @@ -5340,6 +5341,7 @@ int retval; int new_file,clipnum=0; + int maxframe; boolean last_was_normal_file=FALSE; boolean is_scrap; @@ -5559,9 +5561,9 @@ if (mainw->current_file<1) continue; - if (load_frame_index(mainw->current_file)) { + if ((maxframe=load_frame_index(mainw->current_file))) { // CLIP_TYPE_FILE - if (!reload_clip(mainw->current_file)) continue; + if (!reload_clip(mainw->current_file,maxframe)) continue; } else { // CLIP_TYPE_DISK if (is_scrap||!check_frame_count(mainw->current_file)) {
View file
LiVES-2.6.3.tar.bz2/src/stream.h -> LiVES-2.8.0.tar.bz2/src/stream.h
Changed
@@ -1,6 +1,6 @@ // stream.h // LiVES -// (c) G. Finch 2008 - 2013 <salsaman@gmail.com> +// (c) G. Finch 2008 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -36,7 +36,7 @@ #define LIVES_STREAM_TYPE_VIDEO 1 // video stream flags -#define LIVES_VSTREAM_FLAGS_IS_CONTINUATION 1<<0 +#define LIVES_VSTREAM_FLAGS_IS_CONTINUATION (1<<0) // video compression types #define LIVES_VSTREAM_COMPRESSION_NONE 0
View file
LiVES-2.6.3.tar.bz2/src/utils.c -> LiVES-2.8.0.tar.bz2/src/utils.c
Changed
@@ -5433,7 +5433,7 @@ fcount=cfile->frames; for (i=1; i<=fcount; i++) { - fname_next=make_image_file_name(cfile,i,prefs->image_ext); + fname_next=make_image_file_name(cfile,i,get_image_ext_for_type(cfile->img_type)); if (sget_file_size(fname_next)>0) { lives_free(fname_next); maybeok=TRUE;
View file
LiVES-2.6.3.tar.bz2/src/widget-helper.c -> LiVES-2.8.0.tar.bz2/src/widget-helper.c
Changed
@@ -6048,15 +6048,11 @@ LiVESWidget *menuitem=NULL; #ifdef GUI_GTK menuitem=gtk_menu_item_new(); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESMenuItem(mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6067,15 +6063,11 @@ LiVESWidget *menuitem=NULL; #ifdef GUI_GTK menuitem=gtk_menu_item_new_with_mnemonic(label); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESMenuItem(qmake_mnemonic(QString::fromUtf8(label)),mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6086,15 +6078,11 @@ LiVESWidget *menuitem=NULL; #ifdef GUI_GTK menuitem=gtk_menu_item_new_with_label(label); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESMenuItem(QString::fromUtf8(label),mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6108,15 +6096,11 @@ #else menuitem=gtk_image_menu_item_new_with_label(label); #endif - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESMenuItem(QString::fromUtf8(label),mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6130,15 +6114,11 @@ #else menuitem=gtk_image_menu_item_new_with_mnemonic(label); #endif - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESMenuItem(qmake_mnemonic(QString::fromUtf8(label)),mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6148,9 +6128,7 @@ LiVESWidget *menuitem=NULL; #ifdef GUI_GTK menuitem=gtk_radio_menu_item_new_with_label(group,label); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT QActionGroup *qag; @@ -6165,9 +6143,7 @@ xmenuitem->set_group(group); qag->addAction(static_cast<QAction *>(xmenuitem)); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); menuitem = static_cast<LiVESWidget *>(xmenuitem); #endif return menuitem; @@ -6191,15 +6167,11 @@ LiVESWidget *menuitem=NULL; #ifdef GUI_GTK menuitem=gtk_check_menu_item_new_with_label(label); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESCheckMenuItem(QString::fromUtf8(label),mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6210,15 +6182,11 @@ #ifdef GUI_GTK // TODO - deprecated menuitem=gtk_check_menu_item_new_with_mnemonic(label); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT menuitem = new LiVESCheckMenuItem(qmake_mnemonic(QString::fromUtf8(label)),mainw->LiVES); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -6251,9 +6219,7 @@ #else menuitem=gtk_image_menu_item_new_from_stock(stock_id,accel_group); #endif - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif #ifdef GUI_QT char *xstock_id=lives_strdup(stock_id); // need to back this up as we will use translation functions @@ -6271,9 +6237,7 @@ menuitem = static_cast<LiVESWidget *>(xmenuitem); - if (widget_opts.apply_theme) { - lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); - } + lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE, FALSE); #endif return menuitem; } @@ -7479,9 +7443,7 @@ label=lives_label_new(text); - if (widget_opts.apply_theme) { - lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL); - } + lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL); return label; } @@ -7493,9 +7455,7 @@ label=lives_label_new(""); lives_label_set_text_with_mnemonic(LIVES_LABEL(label),text); - if (widget_opts.apply_theme) { - lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL); - } + lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL); if (mnemonic_widget!=NULL) lives_label_set_mnemonic_widget(LIVES_LABEL(label),mnemonic_widget); @@ -7519,9 +7479,7 @@ if (invis) lives_frame_set_shadow_type(LIVES_FRAME(frame), LIVES_SHADOW_NONE); - if (widget_opts.apply_theme) { - lives_widget_apply_theme(frame, LIVES_WIDGET_STATE_NORMAL); - } + lives_widget_apply_theme(frame, LIVES_WIDGET_STATE_NORMAL);
View file
LiVES-2.6.3.tar.bz2/src/widget-helper.h -> LiVES-2.8.0.tar.bz2/src/widget-helper.h
Changed
@@ -151,6 +151,7 @@ #define lives_signal_connect(instance, detailed_signal, c_handler, data) g_signal_connect(instance, detailed_signal, c_handler, data) #define lives_signal_connect_after(instance, detailed_signal, c_handler, data) g_signal_connect_after(instance, detailed_signal, c_handler, data) +#define lives_signal_handlers_disconnect_by_func(instance, func, data) g_signal_handlers_disconnect_by_func(instance, func, data) #define lives_signal_handlers_block_by_func(instance, func, data) g_signal_handlers_block_by_func(instance, func, data) #define lives_signal_handlers_unblock_by_func(instance, func, data) g_signal_handlers_unblock_by_func(instance, func, data) #else @@ -757,6 +758,8 @@ LiVESWidget *lives_standard_color_button_new(LiVESBox *parent, char *name, boolean use_mnemonic, boolean use_alpha, lives_colRGBA64_t *rgba, LiVESWidget **sb_red, LiVESWidget **sb_green, LiVESWidget **sb_blue, LiVESWidget **sb_alpha); +LiVESWidget *lives_standard_text_view_new(const char *text, LiVESTextBuffer *tbuff); + LiVESXCursor *lives_cursor_new_from_pixbuf(LiVESXDisplay *, LiVESPixbuf *, int x, int y); @@ -764,6 +767,7 @@ void lives_widget_apply_theme(LiVESWidget *, LiVESWidgetState state); // normal theme colours void lives_widget_apply_theme2(LiVESWidget *, LiVESWidgetState state, boolean set_fg); // menu and bars colours +void lives_widget_apply_theme3(LiVESWidget *, LiVESWidgetState state); // info base/text boolean global_recent_manager_add(const char *file_name);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.