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 32
View file
LiVES.changes
Changed
@@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 1 20:59:07 UTC 2016 - avvissu@yandex.ru + +- Update to 2.6.0: + * see: /usr/share/doc/packages/lives/ChangeLog +- Fix build with gtk2.0 (lives-2.6.0_lcolor.patch) + +------------------------------------------------------------------- Mon Jan 18 16:04:12 UTC 2016 - avvissu@yandex.ru - Update to 2.4.7:
View file
LiVES.spec
Changed
@@ -20,7 +20,7 @@ %define soname 0 Name: LiVES -Version: 2.4.7 +Version: 2.6.0 Release: 0 Summary: Video Editor and VJ Tool License: GPL-2.0+ @@ -29,6 +29,8 @@ Source0: http://lives-video.com/releases/%{name}-%{version}.tar.bz2 Source99: LiVES-rpmlintrc Patch0: LiVES-redefinition_of_typedef.patch +# PATCH-FIX-UPSTREAM lcolor.patch [sf#212] avvissu@yandex.ru -- Fix build with gtk2.0 +Patch1: lives-2.6.0_lcolor.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -143,6 +145,7 @@ %prep %setup -q -n lives-%{version} #%patch0 -p1 +%patch1 -p1 # fix wrong EOL sed -i 's/\r$//' weed-docs/*.txt
View file
lives-2.6.0_lcolor.patch
Added
@@ -0,0 +1,15 @@ +diff -U 3 -dHrN lives-2.6.0.orig/src/widget-helper.c lives-2.6.0/src/widget-helper.c +--- lives-2.6.0.orig/src/widget-helper.c 2016-01-29 21:29:57.000000000 +0300 ++++ lives-2.6.0/src/widget-helper.c 2016-02-03 13:01:09.461220282 +0300 +@@ -8705,7 +8705,11 @@ + lcolor->red=color->red*65535.; + lcolor->green=color->green*65535.; + lcolor->blue=color->blue*65535.; ++#if LIVES_WIDGET_COLOR_HAS_ALPHA + lcolor->alpha=color->alpha*65535.; ++#else ++ lcolor->alpha=65535; ++#endif + return TRUE; + #endif + return FALSE;
View file
LiVES-2.4.7.tar.bz2/ChangeLog -> LiVES-2.6.0.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,37 @@ +Version 2.6.0 (1 Feb 2016) +-------------------------- +Fix crash when applying rendered effects to virtual clips. +Add h264/aac, wmv2, ffv1 and mjpeg encodings to ffmpeg_encoder. +Fix memory leak in new style gdkpixbuf converter. +Fix frame seek bug in avformat decoder with non-zero start time. +Autoscroll "Show details" when encoding. +Work around a gtk+ crash bug in GtkTextView with lots of text. +Show missing libraries in ffmpeg_encoder. +Show time remaining estimate for encoding for most encoder formats. +OK / Cancel in the file chooser should immediately cancel any preview (regression). +Add "Use current clip values" button when entering multitrack. +Fix memory leak in pulseaudio input analysis. +Minor GUI improvements. + + + + + + +Version 2.4.8 (24 Jan 2016) +-------------------------- +Fix hang in merge in Clip Editor (regression). +Fix rendering error in multitrack (wrong clip number). + + + + + + + + + + Version 2.4.7 (18 Jan 2016) --------------------------- Fix regression in "Insert Silence".
View file
LiVES-2.4.7.tar.bz2/LiVES.doxygen -> LiVES-2.6.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.4.7 +PROJECT_NUMBER = 2.6.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.4.7.tar.bz2/README -> LiVES-2.6.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.4.7.tar.bz2 + bzip2 -d LiVES-2.6.0.tar.bz2 or, - gzip -d LiVES-2.4.7.tar.gz + gzip -d LiVES-2.6.0.tar.gz depending on which version you have. Then: - tar xvf LIVES-2.4.7.tar + tar xvf LIVES-2.6.0.tar - cd lives-2.4.7 + cd lives-2.6.0
View file
LiVES-2.4.7.tar.bz2/build-lives-rfx-plugin -> LiVES-2.6.0.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="2.4.7"; +$builder_version="2.6.0"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-2.4.7.tar.bz2/configure -> LiVES-2.6.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.4.7. +# Generated by GNU Autoconf 2.69 for LiVES 2.6.0. # # Report bugs to <https://sourceforge.net/p/lives/bugs/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LiVES' PACKAGE_TARNAME='lives' -PACKAGE_VERSION='2.4.7' -PACKAGE_STRING='LiVES 2.4.7' +PACKAGE_VERSION='2.6.0' +PACKAGE_STRING='LiVES 2.6.0' PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/' PACKAGE_URL='' @@ -1712,7 +1712,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.4.7 to adapt to many kinds of systems. +\`configure' configures LiVES 2.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1783,7 +1783,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 2.4.7:";; + short | recursive ) echo "Configuration of LiVES 2.6.0:";; esac cat <<\_ACEOF @@ -2043,7 +2043,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 2.4.7 +LiVES configure 2.6.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2770,7 +2770,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.4.7, which was +It was created by LiVES $as_me 2.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3751,7 +3751,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='2.4.7' + VERSION='2.6.0' cat >>confdefs.h <<_ACEOF @@ -29686,7 +29686,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LiVES $as_me 2.4.7, which was +This file was extended by LiVES $as_me 2.6.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29743,7 +29743,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LiVES config.status 2.4.7 +LiVES config.status 2.6.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
View file
LiVES-2.4.7.tar.bz2/configure.ac -> LiVES-2.6.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.4.7,https://sourceforge.net/p/lives/bugs/) +AC_INIT(LiVES,2.6.0,https://sourceforge.net/p/lives/bugs/) AC_CANONICAL_HOST AC_CANONICAL_TARGET
View file
LiVES-2.4.7.tar.bz2/liblives.doxygen -> LiVES-2.6.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.4.7 +PROJECT_NUMBER = 2.6.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.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder
Changed
@@ -359,7 +359,7 @@ print 'Creating GIF file' command = """cd %(source_dir)s ; \\ -%(convert)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s \"%(gifv)s\" +%(convert)s -monitor -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s \"%(gifv)s\" """ % all_vars run(command)
View file
LiVES-2.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder3 -> LiVES-2.6.0.tar.bz2/lives-plugins/marcos-encoders/lives_gif_encoder3
Changed
@@ -345,7 +345,7 @@ print('Creating GIF file') command = """cd %(source_dir)s ; \\ -%(convert)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(gifv)s +%(convert)s -monitor -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(gifv)s """ % all_vars run(command)
View file
LiVES-2.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder
Changed
@@ -351,13 +351,13 @@ if os.name == 'nt': command = """cd %(source_dir)s ; \\ -%(convert.exe)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(mngv)s +%(convert.exe)s -monitor -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(mngv)s """ % all_vars else: command = """cd %(source_dir)s ; \\ -%(convert)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(mngv)s +%(convert)s -monitor -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(mngv)s """ % all_vars run(command)
View file
LiVES-2.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder3 -> LiVES-2.6.0.tar.bz2/lives-plugins/marcos-encoders/lives_mng_encoder3
Changed
@@ -345,7 +345,7 @@ print('Creating MNG file') command = """cd %(source_dir)s ; \\ -%(convert)s -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(mngv)s +%(convert)s -monitor -delay %(spf)s %(syml)s%(img_pre)s*%(ext)s %(mngv)s """ % all_vars run(command)
View file
LiVES-2.4.7.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/marcos-encoders/lives_theora_encoder
Changed
@@ -381,7 +381,27 @@ """ Encode a series of images into a Theora movie. """ + if os.name == 'nt': + convert = 'convert.exe' + mplayer = 'mplayer.exe' + mplayer2 = 'mplayer2.exe' + theora_encoder = 'encoder_example.exe' + theora_encoder2 = 'theora_encoder_example.exe' + theora_encoder3 = 'theora_encode.exe' + sox = 'sox.exe' + identify = 'identify.exe' + + else: + convert = 'convert' + mplayer = 'mplayer' + mplayer2 = 'mplayer2' + theora_encoder = 'encoder_example' + theora_encoder2 = 'theora_encoder_example' + theora_encoder3 = 'theora_encode' + sox = 'sox' + identify = 'identify' + if verbose: std = '' std2 = ''
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c
Changed
@@ -1026,6 +1026,8 @@ xtarget_pts=priv->found_pts; else xtarget_pts=target_pts; + xtarget_pts+=priv->ic->start_time; + 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); avcodec_flush_buffers(cc); @@ -1059,7 +1061,7 @@ if (MyPts==-1) { MyPts = priv->packet.pts; MyPts = av_rescale_q(MyPts, s->time_base, AV_TIME_BASE_Q)-priv->ic->start_time; - priv->found_pts=MyPts; + priv->found_pts=MyPts; // PTS of end of frame, set so start_time is zero } #ifdef DEBUG
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/encoders/encodedv_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/encoders/encodedv_encoder
Changed
@@ -17,6 +17,7 @@ # version 2.1 increase quality settings, restrict audio rates. # version 2.11 add package name libdv-bin # version 2.12 allow png encoding; add check for "convert" +# versiob 2.13 verbose mode ####################################################################### @@ -42,7 +43,7 @@ if ($command eq "version") { - print "encodedv encoder plugin v2.12\n"; + print "encodedv encoder plugin v2.13\n"; exit 0; } @@ -88,12 +89,12 @@ # audio types are: 0 - cannot encode audio, 1 - can encode using # mp3, 2 - can encode using pcm, 3 - can encode using pcm and mp3 - print "dv_ntsc_med|dv (NTSC) medium quality|2|size=720x480,fps=30000:1001,arate=48000;44100|dv|\n"; # NTSC - print "dv_pal_med|dv (PAL) medium quality|2|size=720x576,fps=25.000,arate=48000;44100|dv|\n"; # PAL - print "dv_ntsc_medhi|dv (NTSC) medium/high quality|2|size=720x480,fps=30000:1001,arate=48000;44100|dv|\n"; # NTSC - print "dv_pal_medhi|dv (PAL) medium/high quality|2|size=720x576,fps=25.000,arate=48000;44100|dv|\n"; # PAL - print "dv_ntsc_hi|dv (NTSC) high quality|2|size=720x480,fps=30000:1001,arate=48000;44100|dv|\n"; # NTSC - print "dv_pal_hi|dv (PAL) high quality|2|size=720x576,fps=25.000,arate=48000;44100|dv|\n"; # PAL + print "dv_ntsc_med|dv (NTSC) medium quality|2|size=720x480,fps=30000:1001,arate=48000;44100|dv|[|\n"; # NTSC + print "dv_pal_med|dv (PAL) medium quality|2|size=720x576,fps=25.000,arate=48000;44100|dv|[|\n"; # PAL + print "dv_ntsc_medhi|dv (NTSC) medium/high quality|2|size=720x480,fps=30000:1001,arate=48000;44100|dv|[|\n"; # NTSC + print "dv_pal_medhi|dv (PAL) medium/high quality|2|size=720x576,fps=25.000,arate=48000;44100|dv|[|\n"; # PAL + print "dv_ntsc_hi|dv (NTSC) high quality|2|size=720x480,fps=30000:1001,arate=48000;44100|dv|[|\n"; # NTSC + print "dv_pal_hi|dv (PAL) high quality|2|size=720x576,fps=25.000,arate=48000;44100|dv|[|\n"; # PAL exit 0; } @@ -126,10 +127,10 @@ } if (-f $audiofile) { - $syscom="$encoder_command -s 0 -e ".($end-$start)." -p $passes %08d$to_ext -a wav $audiofile > \"$nfile\""; + $syscom="$encoder_command --verbose -s 0 -e ".($end-$start)." -p $passes %08d$to_ext -a wav $audiofile > \"$nfile\""; } else { - $syscom=$encoder_command . " -s 0 -e ".($end-$start)." -p $passes %08d$to_ext > \"$nfile\""; + $syscom=$encoder_command . " --verbose -s 0 -e ".($end-$start)." -p $passes %08d$to_ext > \"$nfile\""; } if (defined($DEBUG_ENCODERS)) {
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/encoders/ffmpeg_encoder
Changed
@@ -19,6 +19,7 @@ # v 2.9 check for avconv, change -quality to -qscale # v 2.10 move -meta options after png/audio # v 2.11 change fussy order of -pass option +# v 2.12 add h264/aac/mp4, wmv2, ffv1 and mjpeg; show missing libraries ####################################################################### if (!defined($standalone)) { @@ -40,7 +41,7 @@ if ($command eq "version") { - print "ffmpeg encoder plugin v2.11\n"; + print "ffmpeg encoder plugin v2.12\n"; exit 0; } @@ -87,16 +88,96 @@ # means "can only encode at xx.yy frames per second", size=x X y, arate=audio rate # - otherwise set it to 'none' + $has_webm=(system("ffmpeg -encoders 2>/dev/null | grep vpx >/dev/null")==0); + $has_wmv2=(system("ffmpeg -encoders 2>/dev/null | grep wmv2 >/dev/null")==0); + $has_ffv1=(system("ffmpeg -encoders 2>/dev/null | grep ffv1 >/dev/null")==0); + $has_mjpeg=(system("ffmpeg -encoders 2>/dev/null | grep mjpeg >/dev/null")==0); + $has_x264=(system("ffmpeg -encoders 2>/dev/null | grep x264 >/dev/null")==0); + $has_flv=(system("ffmpeg -encoders 2>/dev/null | grep flv >/dev/null")==0); + $has_3gp=(system("ffmpeg -encoders 2>/dev/null | grep h263 >/dev/null")==0); - print "webmh|webm high quality|8|none|webm|\n"; - print "webmm|webm medium quality|8|none|webm|\n"; - print "webml|webm low (stream) quality|8|none|webm|\n"; - print "flv|flv|9|arate=44100;22050;11025|flv|\n"; - print "divx|divx (25 fps)|5|fps=25.00|avi|\n"; - print "3gp_h263|3gp (h263)|96|size=176x144,arate=8000|3gp|\n"; - print "3gp_mp4|3gp (mp4)|96|size=176x144,arate=8000|3gp|\n"; - print "flv-youtube|flv (425x318, optimised for youtube)|33|arate=44100;22050;11025,size=425x318|flv|\n"; - print "flv-youtubex|flv (other sizes, optimised for youtube)|33|arate=44100;22050;11025,aspect=1.3333:1|flv|\n"; + $has_aac=(system("ffmpeg -encoders 2>/dev/null | grep aac >/dev/null")==0); + $has_vorbis=(system("ffmpeg -encoders 2>/dev/null | grep vorbis >/dev/null")==0); + $has_amr=(system("ffmpeg -encoders 2>/dev/null | grep amr >/dev/null")==0); + $has_mp3=(system("ffmpeg -encoders 2>/dev/null | grep mp3 >/dev/null")==0); + $has_mp2=(system("ffmpeg -encoders 2>/dev/null | grep mp2 >/dev/null")==0); + $has_wmav2=(system("ffmpeg -encoders 2>/dev/null | grep wmav2 >/dev/null")==0); + + + $errwebm=$errx264=$errflv=$err3gp=$errwmv2=$errffv1=$errmjpeg=""; + + $erraac=$errvorbis=$erramraac=$errmp3aac=$errmp3mp2=$errwmav2=""; + + unless ($has_webm) { + $errwebm=" (MISSING libvxp support) "; + } + + unless ($has_wmv2) { + $errwmv2=" (MISSING wmv2 support) "; + } + + unless ($has_ffv1) { + $errffv1=" (MISSING ffv1 support) "; + } + + unless ($has_mjpeg) { + $errmjpeg=" (MISSING mjpeg support) "; + } + + unless ($has_x264) { + $errx264=" (MISSING libx264 support) "; + } + + unless ($has_flv) { + $errflv=" (MISSING flv support) "; + } + + unless ($has_3gp) { + $err3gp=" (MISSING h263 support) "; + } + + + unless ($has_aac) { + $erraac=" (MISSING aac support) "; + } + + unless ($has_vorbis) { + $errvorbis=" (MISSING libvorbis support) "; + } + + unless ($has_wmav2) { + $errwmav2=" (MISSING wmav2 support) "; + } + + unless ($has_amr || $has_aac) { + $erramraac=" (MISSING amr or aac support) "; + } + + unless ($has_mp3 || $has_aac) { + $errmp3aac=" (MISSING mp3 or aac support) "; + } + + unless ($has_mp3 || $has_mp2) { + $errmp3mp2=" (MISSING mp3 or mp2 audio support) "; + } + + + print "x264|h264/aac/mp4 high quality $errx264$erraac|32|vstep=2,hstep=2|mp4|frame=|\n"; + + print "webmh|webm high quality$errwebm$errvorbis|8|none|webm|frame=|\n"; + print "webmm|webm medium quality$errwebm$errvorbis|8|none|webm|frame=|\n"; + print "webml|webm low (stream) quality$errwebm$errvorbis|8|none|webm|frame=|\n"; + + print "flv|flv$errflv$errmp3aac|33|arate=44100;22050;11025|flv|frame=|\n"; + print "flv-youtubex|flv (optimised for youtube)$errflv$errmp3aac|33|arate=44100;22050;11025,aspect=1.3333:1|flv|frame=|\n"; + print "divx|divx (25 fps)$errflv$errmp3mp2|5|fps=25.00|avi|frame=|\n"; + + print "wmv2|wmv2/wma2/asf (low quality)$errwmv2$errwmav2|256|arate=44100;22050;11025|wmv|frame=|\n"; + print "ffv1|ffv1 (lossless)$errffv1|2|none|avi|frame=|\n"; + print "mjpeg|mjpg$errmjpeg|2|none|avi|frame=|\n"; + + print "3gp_h263|3gp (h263)$err3gp$erramraac|96|size=176x144,arate=8000|3gp|frame=|\n"; + print "3gp_mp4|3gp (mp4)$err3gp$erramraac|96|size=176x144,arate=8000|3gp|frame=|\n"; exit 0; } @@ -239,7 +320,23 @@ elsif ($otype eq "3gp_mp4") { $vcodec="-f mp4"; } - elsif ($otype eq "flv"||$otype eq "flv-youtube"||$otype eq "flv-youtubex") { + elsif ($otype eq "wmv2") { + $vcodec="-vcodec wmv2"; + } + elsif ($otype eq "ffv1") { + if ($img_ext eq ".png") { + $format="bgr24"; + } + else { + #jpeg + $format="yuvj420p"; + } + $vcodec="-vcodec ffv1 -pix_fmt $format"; + } + elsif ($otype eq "mjpeg") { + $vcodec="-vcodec mjpeg"; + } + elsif ($otype eq "flv"||$otype eq "flv-youtubex") { $vcodec="-f flv"; } elsif ($otype eq "webmh") { @@ -251,8 +348,11 @@ elsif ($otype eq "webml") { $vcodec="-f webm -vcodec libvpx -g 60 -qscale 31"; } + elsif ($otype eq "x264") { + $vcodec="-vcodec libx264 -qscale 1"; + } - if ($otype eq "flv-youtube"||$otype eq "flv-youtubex") { + if ($otype eq "flv-youtubex") { $vcodec.=" -b 1024k -bt 256k -maxrate 1024k -minrate 1024k -bufsize 8192k"; } @@ -295,7 +395,7 @@ $audio_com.=" -acodec mp2"; } - if ($otype eq "flv-youtube"||$otype eq "flv-youtubex") { + if ($otype eq "flv-youtubex") { $audio_com.=" -ab 128k -ar $arate"; } elsif ($otype eq "flv") { @@ -304,17 +404,27 @@ elsif ($otype eq "3gp_h263" || $otype eq "3gp_mp4") { $audio_com.=" -ac 1 -ab 12 -ar 8000"; } + elsif ($otype eq "wmv2") { + $audio_com.=" -acodec wmav2"; + } } + + if ($ffver>=52) { + $metadata="-metadata comment=\"$comment\" -metadata author=\"$author\" -metadata title=\"$title\""; + } else { + $metadata="-comment \"$comment\" -author \"$author\" -title \"$title\""; + } + # unfortunately this does not work yet... if ($otype eq "theora") { $syscom="ffmpeg2theora -o \"$nfile\" -f image2 -i %8d$img_ext $audio_com -d off $err"; } elsif ($otype eq "3gp") { - $passfile="passfile"; for $pass (1,2) { - $syscom="$encoder_command -strict 1 -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec -pass $pass \"$nfile\" $err"; + $passf="-pass $pass -passlogfile passfile"; + $syscom="$encoder_command -strict 1 -y -r $fps -f image2 -i %8d$img_ext $audio_com -t $vid_length $vcodec $metadata $passf \"$nfile\" $err"; if (defined($DEBUG_ENCODERS)) { print STDERR "ffmpeg_encoder command is: $syscom\n"; }
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/encoders/multi_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/encoders/multi_encoder
Changed
@@ -31,7 +31,7 @@ -Copyright (C) 2008 - 2015 Salsaman (salsaman@gmail.com) +Copyright (C) 2008 - 2016 Salsaman (salsaman@gmail.com) """ @@ -334,24 +334,24 @@ vb = 'vblock=16' sr = 'arate=32000;44100;48000' if is_installed(mpeg): - specs = '|4|%s,%s,%s,%s,%s|mpg|' % (fps, ar, hb, vb, sr) + specs = '|4|%s,%s,%s,%s,%s|mpg|Pass2|' % (fps, ar, hb, vb, sr) print 'qlo-mpeg|Fast, very low Quality MPG (MPEG-1/MP2)' + specs print 'lo-mpeg|Low Quality MPG (MPEG-1/MP2)' + specs print 'ml-mpeg|Medium-Low Quality MPG (MPEG-1/MP2)' + specs print 'mh-mpeg|Medium-High Quality MPG (MPEG-1/MP2)'+ specs print 'hi-mpeg|High Quality MPG (MPEG-1/MP2)' + specs - specs = '|4|%s,%s,%s,%s,%s|mpg|' % (ntscfps, ar, hb, vb, sr) + specs = '|4|%s,%s,%s,%s,%s|mpg|Pass2|' % (ntscfps, ar, hb, vb, sr) print 'vcd-mpeg|VCD-compatible MPG (NTSC)' + specs print 'svcd-mpeg|SVCD-compatible MPG (NTSC)' + specs # For DVD the encoder will resample the sound rate to 48000 print 'dvd-mpeg|DVD-compatible MPG (NTSC)' + specs - specs = '|2|%s,%s,%s,%s,%s|mpg|' % (ntscfps, ar, hb, vb, sr) + specs = '|2|%s,%s,%s,%s,%s|mpg|Pass2|' % (ntscfps, ar, hb, vb, sr) print 'sdvd-mpeg|Strictly DVD-compatible MPG (NTSC)' + specs - specs = '|4|%s,%s,%s,%s,%s|mpg|' % (palfps, ar, hb, vb, sr) + specs = '|4|%s,%s,%s,%s,%s|mpg|Pass2|' % (palfps, ar, hb, vb, sr) print 'pvcd-mpeg|VCD-compatible MPG (PAL)' + specs - specs = '|2|%s,%s,%s,%s,%s|mpg|' % (palfps, ar, hb, vb, sr) + specs = '|2|%s,%s,%s,%s,%s|mpg|Pass2|' % (palfps, ar, hb, vb, sr) print 'psvcd-mpeg|SVCD-compatible MPG (PAL)' + specs # For DVD the encoder will resample the sound rate to 48000 print 'pdvd-mpeg|DVD-compatible MPG (PAL)' + specs @@ -399,7 +399,7 @@ print 'hi_x-avi|High Quality AVI (XVID/MP3)' + specs if is_installed(ogg): - specs = '|8|%s,%s,%s,%s|ogv|' % (ar, hb, vb, sr) + specs = '|8|%s,%s,%s,%s|ogv|%%V:' % (ar, hb, vb, sr) print 'lo-theora|Low Quality OGG (THEORA/VORBIS)' + specs print 'ml-theora|Medium-Low Quality OGG (THEORA/VORBIS)' + specs print 'mh-theora|Medium-High Quality OGG (THEORA/VORBIS)' + specs @@ -415,8 +415,8 @@ print 'll-dirac|EXP Lossless Dirac (DIRAC/VORBIS/MKV)' + specs if is_installed(mng): - specs = '|0|none|mng|' - print 'hi-mng|MNG (MNG/NONE) format' + specs + specs = '|0|none|mng|mng]:|' + print 'hi-mng|MNG (MNG/NONE) format (not suitable for large files)' + specs if is_installed(gif): specs = '|0|none|gif|' print 'hi-gif|Animated GIF (GIF/NONE) format' + specs @@ -622,4 +622,5 @@ Feb 2010 : 0.2.12 : salsaman - pipe error/info output to stderr Mar 2010 : 0.2.13 : salsaman - remove metd toplevel directory and set outfile mode Jun 2010 : 0.2.14 : change names e.g. dirac_encoder.py -> lives_dirac_encoder +Jan 2016 : 0.2.15 : salsaman - add progress texts """
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3 -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/encoders/multi_encoder3
Changed
@@ -33,7 +33,7 @@ -Copyright (C) 2008 - 2015 Salsaman (salsaman@gmail.com) +Copyright (C) 2008 - 2016 Salsaman (salsaman@gmail.com) """ @@ -335,76 +335,76 @@ vb = 'vblock=16' sr = 'arate=32000;44100;48000' if is_installed(mpeg): - specs = '|4|%s,%s,%s,%s,%s|mpg|' % (fps, ar, hb, vb, sr) - print('qlo-mpeg|Fast, very low Quality MPG (MPEG-1/MP2)' + specs) - print('lo-mpeg|Low Quality MPG (MPEG-1/MP2)' + specs) - print('ml-mpeg|Medium-Low Quality MPG (MPEG-1/MP2)' + specs) - print('mh-mpeg|Medium-High Quality MPG (MPEG-1/MP2)'+ specs) - print('hi-mpeg|High Quality MPG (MPEG-1/MP2)' + specs) - - specs = '|4|%s,%s,%s,%s,%s|mpg|' % (ntscfps, ar, hb, vb, sr) - print('vcd-mpeg|VCD-compatible MPG (NTSC)' + specs) - print('svcd-mpeg|SVCD-compatible MPG (NTSC)' + specs) + specs = '|4|%s,%s,%s,%s,%s|mpg|Pass2|' % (fps, ar, hb, vb, sr) + print 'qlo-mpeg|Fast, very low Quality MPG (MPEG-1/MP2)' + specs + print 'lo-mpeg|Low Quality MPG (MPEG-1/MP2)' + specs + print 'ml-mpeg|Medium-Low Quality MPG (MPEG-1/MP2)' + specs + print 'mh-mpeg|Medium-High Quality MPG (MPEG-1/MP2)'+ specs + print 'hi-mpeg|High Quality MPG (MPEG-1/MP2)' + specs + + specs = '|4|%s,%s,%s,%s,%s|mpg|Pass2|' % (ntscfps, ar, hb, vb, sr) + print 'vcd-mpeg|VCD-compatible MPG (NTSC)' + specs + print 'svcd-mpeg|SVCD-compatible MPG (NTSC)' + specs # For DVD the encoder will resample the sound rate to 48000 - print('dvd-mpeg|DVD-compatible MPG (NTSC)' + specs) - - specs = '|2|%s,%s,%s,%s,%s|mpg|' % (ntscfps, ar, hb, vb, sr) - print('sdvd-mpeg|Strictly DVD-compatible MPG (NTSC)' + specs) - specs = '|4|%s,%s,%s,%s,%s|mpg|' % (palfps, ar, hb, vb, sr) - print('pvcd-mpeg|VCD-compatible MPG (PAL)' + specs) - specs = '|2|%s,%s,%s,%s,%s|mpg|' % (palfps, ar, hb, vb, sr) - print('psvcd-mpeg|SVCD-compatible MPG (PAL)' + specs) + print 'dvd-mpeg|DVD-compatible MPG (NTSC)' + specs + + specs = '|2|%s,%s,%s,%s,%s|mpg|Pass2|' % (ntscfps, ar, hb, vb, sr) + print 'sdvd-mpeg|Strictly DVD-compatible MPG (NTSC)' + specs + specs = '|4|%s,%s,%s,%s,%s|mpg|Pass2|' % (palfps, ar, hb, vb, sr) + print 'pvcd-mpeg|VCD-compatible MPG (PAL)' + specs + specs = '|2|%s,%s,%s,%s,%s|mpg|Pass2|' % (palfps, ar, hb, vb, sr) + print 'psvcd-mpeg|SVCD-compatible MPG (PAL)' + specs # For DVD the encoder will resample the sound rate to 48000 - print('pdvd-mpeg|DVD-compatible MPG (PAL)' + specs) - print('spdvd-mpeg|Strictly DVD-compatible MPG (PAL)' + specs) + print 'pdvd-mpeg|DVD-compatible MPG (PAL)' + specs + print 'spdvd-mpeg|Strictly DVD-compatible MPG (PAL)' + specs sr = 'arate=8000;11025;12000;16000;22050;24000;32000;44100;48000' if is_installed(ogm): specs = '|8|%s,%s,%s,%s|ogm|' % (ar, hb, vb, sr) - print('lo_d-ogm|Low Quality OGM (DIVX 4:5/VORBIS)' + specs) - print('ml_d-ogm|Medium-Low Quality OGM (DIVX 4:5/VORBIS)' + specs) - print('mh_d-ogm|Medium-High Quality OGM (DIVX 4:5/VORBIS)' + specs) - print('hi_d-ogm|High Quality OGM (DIVX 4:5/VORBIS)' + specs) - print('lo_x-ogm|Low Quality OGM (XVID/VORBIS)' + specs) - print('ml_x-ogm|Medium-Low Quality OGM (XVID/VORBIS)' + specs) - print('mh_x-ogm|Medium-High Quality OGM (XVID/VORBIS)' + specs) - print('hi_x-ogm|High Quality OGM (XVID/VORBIS)' + specs) + print 'lo_d-ogm|Low Quality OGM (DIVX 4:5/VORBIS)' + specs + print 'ml_d-ogm|Medium-Low Quality OGM (DIVX 4:5/VORBIS)' + specs + print 'mh_d-ogm|Medium-High Quality OGM (DIVX 4:5/VORBIS)' + specs + print 'hi_d-ogm|High Quality OGM (DIVX 4:5/VORBIS)' + specs + print 'lo_x-ogm|Low Quality OGM (XVID/VORBIS)' + specs + print 'ml_x-ogm|Medium-Low Quality OGM (XVID/VORBIS)' + specs + print 'mh_x-ogm|Medium-High Quality OGM (XVID/VORBIS)' + specs + print 'hi_x-ogm|High Quality OGM (XVID/VORBIS)' + specs if is_installed(mkv): specs = '|8|%s,%s,%s,%s|mkv|' % (ar, hb, vb, sr) - print('lo_d-mkv|Low Quality MKV (DIVX 4:5/VORBIS)' + specs) - print('ml_d-mkv|Medium-Low Quality MKV (DIVX 4:5/VORBIS)' + specs) - print('mh_d-mkv|Medium-High Quality MKV (DIVX 4:5/VORBIS)' + specs) - print('hi_d-mkv|High Quality MKV (DIVX 4:5/VORBIS)' + specs) - print('lo_x-mkv|Low Quality MKV (XVID/VORBIS)' + specs) - print('ml_x-mkv|Medium-Low Quality MKV (XVID/VORBIS)' + specs) - print('mh_x-mkv|Medium-High Quality MKV (XVID/VORBIS)' + specs) - print('hi_x-mkv|High Quality MKV (XVID/VORBIS)' + specs) - print('lo_h-mkv|Low Quality MKV (H.264/VORBIS)' + specs) - print('ml_h-mkv|Medium-Low Quality MKV (H.264/VORBIS)' + specs) - print('mh_h-mkv|Medium-High Quality MKV (H.264/VORBIS)' + specs) - print('hi_h-mkv|High Quality MKV (H.264/VORBIS)' + specs) + print 'lo_d-mkv|Low Quality MKV (DIVX 4:5/VORBIS)' + specs + print 'ml_d-mkv|Medium-Low Quality MKV (DIVX 4:5/VORBIS)' + specs + print 'mh_d-mkv|Medium-High Quality MKV (DIVX 4:5/VORBIS)' + specs + print 'hi_d-mkv|High Quality MKV (DIVX 4:5/VORBIS)' + specs + print 'lo_x-mkv|Low Quality MKV (XVID/VORBIS)' + specs + print 'ml_x-mkv|Medium-Low Quality MKV (XVID/VORBIS)' + specs + print 'mh_x-mkv|Medium-High Quality MKV (XVID/VORBIS)' + specs + print 'hi_x-mkv|High Quality MKV (XVID/VORBIS)' + specs + print 'lo_h-mkv|Low Quality MKV (H.264/VORBIS)' + specs + print 'ml_h-mkv|Medium-Low Quality MKV (H.264/VORBIS)' + specs + print 'mh_h-mkv|Medium-High Quality MKV (H.264/VORBIS)' + specs + print 'hi_h-mkv|High Quality MKV (H.264/VORBIS)' + specs if is_installed(avi): specs = '|1|%s,%s,%s,%s|avi|' % (ar, hb, vb, sr) - print('lo_s-avi|EXP Low Quality AVI (SNOW/MP3)' + specs) - print('ml_s-avi|EXP Medium-Low Quality AVI (SNOW/MP3)' + specs) - print('mh_s-avi|EXP Medium-High Quality AVI (SNOW/MP3)' + specs) - print('hi_s-avi|EXP High Quality AVI (SNOW/MP3)' + specs) - print('lo_h-avi|EXP Low Quality AVI (H.264/MP3)' + specs) - print('ml_h-avi|EXP Medium-Low Quality AVI (H.264/MP3)' + specs) - print('mh_h-avi|EXP Medium-High Quality AVI (H.264/MP3)' + specs) - print('hi_h-avi|EXP High Quality AVI (H.264/MP3)' + specs) - print('lo_x-avi|Low Quality AVI (XVID/MP3)' + specs) - print('ml_x-avi|Medium-Low Quality AVI (XVID/MP3)' + specs) - print('mh_x-avi|Medium-High Quality AVI (XVID/MP3)' + specs) - print('hi_x-avi|High Quality AVI (XVID/MP3)' + specs) + print 'lo_s-avi|EXP Low Quality AVI (SNOW/MP3)' + specs + print 'ml_s-avi|EXP Medium-Low Quality AVI (SNOW/MP3)' + specs + print 'mh_s-avi|EXP Medium-High Quality AVI (SNOW/MP3)' + specs + print 'hi_s-avi|EXP High Quality AVI (SNOW/MP3)' + specs + print 'lo_h-avi|EXP Low Quality AVI (H.264/MP3)' + specs + print 'ml_h-avi|EXP Medium-Low Quality AVI (H.264/MP3)' + specs + print 'mh_h-avi|EXP Medium-High Quality AVI (H.264/MP3)' + specs + print 'hi_h-avi|EXP High Quality AVI (H.264/MP3)' + specs + print 'lo_x-avi|Low Quality AVI (XVID/MP3)' + specs + print 'ml_x-avi|Medium-Low Quality AVI (XVID/MP3)' + specs + print 'mh_x-avi|Medium-High Quality AVI (XVID/MP3)' + specs + print 'hi_x-avi|High Quality AVI (XVID/MP3)' + specs if is_installed(ogg): - specs = '|8|%s,%s,%s,%s|ogg|' % (ar, hb, vb, sr) - print('lo-theora|Low Quality OGG (THEORA/VORBIS)' + specs) - print('ml-theora|Medium-Low Quality OGG (THEORA/VORBIS)' + specs) - print('mh-theora|Medium-High Quality OGG (THEORA/VORBIS)' + specs) - print('hi-theora|High Quality OGG (THEORA/VORBIS)' + specs) + specs = '|8|%s,%s,%s,%s|ogv|%%V:' % (ar, hb, vb, sr) + print 'lo-theora|Low Quality OGG (THEORA/VORBIS)' + specs + print 'ml-theora|Medium-Low Quality OGG (THEORA/VORBIS)' + specs + print 'mh-theora|Medium-High Quality OGG (THEORA/VORBIS)' + specs + print 'hi-theora|High Quality OGG (THEORA/VORBIS)' + specs # EXPERIMENTAL. if is_installed(drc): @@ -413,13 +413,14 @@ print 'ml-dirac|EXP Medium-Low Quality Dirac (DIRAC/VORBIS/MKV)' + specs print 'mh-dirac|EXP Medium-High Quality Dirac (DIRAC/VORBIS/MKV)' + specs print 'hi-dirac|EXP High Quality Dirac (DIRAC/VORBIS/MKV)' + specs + print 'll-dirac|EXP Lossless Dirac (DIRAC/VORBIS/MKV)' + specs if is_installed(mng): - specs = '|0|none|mng|' - print('hi-mng|MNG (MNG/NONE) format' + specs) + specs = '|0|none|mng|mng]:|' + print 'hi-mng|MNG (MNG/NONE) format (not suitable for large files)' + specs if is_installed(gif): specs = '|0|none|gif|' - print('hi-gif|Animated GIF (GIF/NONE) format' + specs) + print 'hi-gif|Animated GIF (GIF/NONE) format' + specs raise SystemExit if dir == 'get_format_request': @@ -607,5 +608,6 @@ Feb 2010 : 0.2.12 : salsaman - pipe error/info output to stderr Mar 2010 : 0.2.13 : salsaman - remove metd toplevel directory and set outfile mode Jun 2010 : 0.2.14 : change names e.g. dirac_encoder.py -> lives_dirac_encoder +Jan 2016 : 0.2.15 : salsaman - add progress texts """
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/encoders/pdf_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/encoders/pdf_encoder
Changed
@@ -6,12 +6,12 @@ # see file COPYING or www.gnu.org for details ####################################################################### -# LiVES pdf plugin v1.2 +# LiVES pdf plugin v1.3 # version 1.0 original - salsaman # version 1.1 - add support for png, correct requires error text # version 1.2 - add support for Win32 - +# version 1.3 - more verbose ####################################################################### if (!defined($standalone)) { @@ -37,7 +37,7 @@ if ($command eq "version") { - print "pdf encoder plugin v1.2\n"; + print "pdf encoder plugin v1.3\n"; exit 0; } @@ -82,7 +82,7 @@ # audio types are: 0 - cannot encode audio, 1 - can encode using # mp3, 2 - can encode using pcm, 3 - can encode using pcm and mp3 - print "pdf|pdf|0|none|pdf|\n"; + print "pdf|pdf|0|none|pdf|converted|\n"; exit 0; } @@ -93,6 +93,7 @@ for ($i=$start;$i<=$end;$i++) { $name=&mkname($i); `convert $name$img_ext $name.pdf`; + print STDERR "converted $i\n"; } if ($^O eq "MSWin32") {
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/encoders/x264_encoder -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/encoders/x264_encoder
Changed
@@ -90,12 +90,13 @@ print "mp4|h264/aac/mp4 (super high quality mp4)|32|none|mp4|\n"; print "divx+|DivX Plus HD|32|fps=24;24000:1001;25;30000:1001;30,hblock=8,vblock=8,minw=320,minh=240,maxw=1920,maxh=1024|mkv|\n"; print "divxh+|DivX Plus HD high framerate|32|fps=50;60000:1001;60,hblock=8,vblock=8,minw=320,minh=240,maxw=1280,maxh=720|mkv|\n"; - print "x264_br_1080p|x264 blu-ray 1080p NTSC (Experimental)|32|size=1920x1080,fps=24000:1001;24|mpg|\n"; # NTSC 1080p - print "x264_br_1080pp|x264 blu-ray 1080p PAL (Experimental)|32|size=1920x1080,fps=25|mpg|\n"; # PAL 1080p - print "x264_br_720p|x264 blu-ray 720p NTSC (Experimental)|32|size=1280x720,fps=60000:1001|mpg|\n"; # 720p - print "x264_br_720pp|x264 blu-ray 720p PAL (Experimental)|32|size=1280x720,fps=50000:1001|mpg|\n"; # 720p - print "x264_br_720p|x264 blu-ray 720p 30 fps NTSC (Experimental)|32|size=1280x720,fps=30|mpg|\n"; # 720p - print "x264_br_720pp|x264 blu-ray 720p 24/25 fps PAL (Experimental)|32|size=1280x720,fps=24;25|mpg|\n"; # 720p + print "x264_br_1080p|x264 blu-ray 1080p NTSC high quality|32|size=1920x1080,fps=24000:1001;24|mpg|\n"; # NTSC 1080p + print "x264_br_1080pp|x264 blu-ray 1080p PAL high quality|32|size=1920x1080,fps=25|mpg|\n"; # PAL 1080p + print "x264_br_720p|x264 blu-ray 720p NTSC 60 fps high quality|32|size=1280x720,fps=60000:1001|mpg|\n"; # 720p + print "x264_br_720pp|x264 blu-ray 720p PAL 50 fps high quality|32|size=1280x720,fps=50000:1001|mpg|\n"; # 720p + print "x264_br_720px|x264 blu-ray 720p NTSC 30 fps high quality|32|size=1280x720,fps=30|mpg|\n"; # 720p + print "x264_br_720ppx|x264 blu-ray 720p PAL 24 or 25 fps high quality|32|size=1280x720,fps=24;25|mpg|\n"; # 720p + exit 0; }
View file
LiVES-2.4.7.tar.bz2/lives-plugins/plugins/playback/video/SDL.c -> LiVES-2.6.0.tar.bz2/lives-plugins/plugins/playback/video/SDL.c
Changed
@@ -93,7 +93,7 @@ return error; } #endif - + render_fn=&render_frame_unknown; RGBimage=NULL; @@ -125,7 +125,7 @@ uint64_t get_capabilities(int palette) { #ifdef HAVE_SDL1 return VPP_CAN_RESIZE|VPP_LOCAL_DISPLAY; -#endif +#endif if (palette==WEED_PALETTE_UYVY8888) { return VPP_CAN_RESIZE|VPP_LOCAL_DISPLAY; } @@ -136,7 +136,7 @@ const char *get_init_rfx(void) { #ifdef HAVE_SDL2 return \ - "<define>\\n\ + "<define>\\n\ |1.7\\n\ </define>\\n\ <language_code>\\n\ @@ -153,7 +153,7 @@ "; #else return \ - "<define>\\n\ + "<define>\\n\ |1.7\\n\ </define>\\n\ <language_code>\\n\ @@ -228,14 +228,14 @@ uint32_t modeopts=0; char tmp[32]; #endif - + int hwaccel=1; int fsover=0; if (argc>0) { hwaccel=atoi(argv[0]); -#ifdef HAVE_SDL2 +#ifdef HAVE_SDL2 fsover=atoi(argv[1]); #else yuvdir=atoi(argv[1]); @@ -259,11 +259,10 @@ return FALSE; } - + if (1||!fullscreen) { window=SDL_CreateWindowFrom((const void *)window_id); - } - else { + } else { if (fsover) fullscreen=FALSE; window=SDL_CreateWindow("",0,0,width,height,SDL_WINDOW_BORDERLESS); } @@ -271,7 +270,7 @@ fprintf(stderr,"SDL2 player : Could not initialize SDL: %s.\n", SDL_GetError()); return FALSE; } - + rflags=(SDL_RENDERER_ACCELERATED*hwaccel); renderer=SDL_CreateRenderer(window,-1,rflags); @@ -290,11 +289,11 @@ } screen=SDL_GetWindowSurface(window); - - + + #else - + snprintf(tmp,32,"%d",yuvdir); my_setenv("SDL_VIDEO_YUV_DIRECT", tmp); @@ -338,12 +337,12 @@ return TRUE; } - + rect->x=rect->y=0; rect->h=height; rect->w=width; #endif - + return TRUE; } @@ -385,14 +384,14 @@ format=SDL_PIXELFORMAT_UYVY; hsize*=2; break; - case WEED_PALETTE_YUYV8888: + case WEED_PALETTE_YUYV8888: format=SDL_PIXELFORMAT_YUY2; hsize*=2; break; - case WEED_PALETTE_YVU420P: + case WEED_PALETTE_YVU420P: format=SDL_PIXELFORMAT_YV12; break; - default: + default: format=SDL_PIXELFORMAT_IYUV; break; } @@ -420,7 +419,7 @@ SDL_RenderCopy(renderer, texture, NULL, NULL); SDL_RenderPresent(renderer); - + #else uint32_t ovtype=SDL_IYUV_OVERLAY; @@ -458,7 +457,7 @@ SDL_DisplayYUVOverlay(overlay,rect); #endif - + is_ready=TRUE; return TRUE; } @@ -496,7 +495,8 @@ SDL_DestroyWindow(window); } #else - } else if (overlay!=NULL) { + } + else if (overlay!=NULL) { SDL_FreeYUVOverlay(overlay); overlay=NULL; } @@ -539,12 +539,12 @@ } if (event.type==SDL_KEYDOWN) { #ifdef HAVE_SDL2 - scancode=event.key.keysym.scancode; + scancode=event.key.keysym.scancode; #else if (!mod_mask) { scancode=event.key.keysym.unicode; } - if (!scancode) { + if (!scancode) { scancode=(uint16_t)event.key.keysym.scancode; mod_mask|=MOD_NEEDS_TRANSLATION; }
View file
LiVES-2.4.7.tar.bz2/lives-plugins/weed-plugins/frei0r.c -> LiVES-2.6.0.tar.bz2/lives-plugins/weed-plugins/frei0r.c
Changed
@@ -98,7 +98,7 @@ if (str1!=NULL) snprintf(target,tlen,"%s",str1); else return 0; return 1; - + } //////////////////////////////////////////////////////////////// @@ -377,15 +377,15 @@ break; } - if (!strlen(vdir1)) { - vdirval++; - continue; - } - + if (!strlen(vdir1)) { + vdirval++; + continue; + } + curvdir=opendir(vdir1); if (curvdir==NULL) { - vdirval++; - continue; + vdirval++; + continue; } }
View file
LiVES-2.4.7.tar.bz2/lives-plugins/weed-plugins/libvis.c -> LiVES-2.6.0.tar.bz2/lives-plugins/weed-plugins/libvis.c
Changed
@@ -287,7 +287,7 @@ char *lpp=getenv("VISUAL_PLUGIN_PATH"); char *vdir; - + // set hints for host weed_set_int_value(in_chantmpls[0],"audio_channels",2); weed_set_int_value(in_chantmpls[0],"audio_rate",44100); @@ -312,10 +312,10 @@ // add lpp paths while (vdir!=NULL) { if (!strlen(vdir)) continue; - + curvdir=opendir(vdir); if (curvdir==NULL) { - continue; + continue; } visual_init_path_add(vdir); @@ -323,7 +323,7 @@ vdir = strtok(NULL, ":"); } - + in_params[1]=NULL; out_chantmpls[1]=NULL;
View file
LiVES-2.4.7.tar.bz2/po/ar.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "الحفاظ على ضبط\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "غيّر حجم" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "غيّر حجم جميع الإطارات" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "أيّ" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "بدون" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "مستحسن" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "معطّل !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**التخطيط الحالي**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "مُضمَّن" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "مخصص" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "اختبار" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_خلفية بيضاء" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "بدء خادوم جاك الصوت..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "بدء خادوم نقل جاك" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "يتصل بخادوم نقل جاك" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "بدء خادوم بالص-اوديو..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "التحقق من إكتشاف التبعيات" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "تم العثور علي mplayer" -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "لم يتم العثور علي mplayer" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "تم العثور علي convert" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "لم يتم العثور علي convert" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "تم العثور علي composite" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "لم يتم العثور علي composite" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "تم العثور على .'sox'\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "لم يتم العثور على .'sox'\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "إكتشاف...'cdda2wav'..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "عدم إكتشاف...'cdda2wav'..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/ca.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Grup de seguretat.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Redimensionat" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "reconfigureu totes les finestres" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "qualsevol" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "Recomanat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "Espatllat" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**El disseny actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Incorporat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personalitzat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Comprova" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Inici" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Carregant connexió d'efectes reals" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Començant connexió de servidor d'audio jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Començant servidor d'audio pulsant..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Comprovant dependències opcionals:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...detectat..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NO S'HA DETECTAT..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "detectat convertidor" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "NO S'HA DETECTAT convertidor" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "detectada composició" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "NO S'HA DETECTAT composició" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detectat...\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NO S'HA DETECTAT...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NO S'HA DETECTAT..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/cs.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -89,80 +89,80 @@ msgid "Preserving set.\n" msgstr "Zachování nastavení.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Měním velikost" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "Změnit velikost všech _snímků" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Libovolný" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Žádný" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "doporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "zakázáno!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Bieżący układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Vestavěno" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Vlastní" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Test" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Prázdné pozadí" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Načítám pluginy pro efekty v reálném času..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Spouštím zvukový server JACK..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -174,126 +174,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Kontrola dodatečných závislostí:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer... nalezen..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer... NENALEZEN..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert... nalezen..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert... NENALEZEN..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite... nalezen..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite... NENALEZEN..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox... nalezen\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox... NENALEZEN\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav... nalezen..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav... NENALEZEN..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/da.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -76,80 +76,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Ændrer størrelse" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Enhver" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Ingen" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "anbefalet" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Indbygget" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Brugerdefineret" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Test" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Start farve" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -161,120 +161,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1847 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1850 +#: src/main.c:1848 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1852 +#: src/main.c:1850 msgid "mpv...detected..." msgstr "" -#: src/main.c:1853 +#: src/main.c:1851 msgid "mpv...NOT DETECTED..." msgstr "" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1861 +#: src/main.c:1859 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1862 +#: src/main.c:1860 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "" -#: src/main.c:1864 +#: src/main.c:1862 msgid "jackd...NOT DETECTED..." msgstr ""
View file
LiVES-2.4.7.tar.bz2/po/de_DE.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -88,79 +88,79 @@ msgid "Preserving set.\n" msgstr "Set wird erhalten.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Skalieren" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "Alle Frames _skalieren" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Beliebig" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Kein(e)" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "empfohlen" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "deaktiviert!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Momentanes Layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Eingebaut" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Benutzerdefiniert" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Test" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Vordergrund" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Hintergrund" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Lade Echtzeit-Effekt Plugins..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Jack Audio Server wird gestartet..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Jack Transport Server wird gestartet..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Verbindung zum Jack Transport Server wird hergestellt..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -181,126 +181,126 @@ "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu " "starten, oder " -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "PulseAudio Server wird gestartet..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Optionale Abhängigkeiten werden überprüft:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...gefunden..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NICHT GEFUNDEN..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...gefunden..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NICHT GEFUNDEN..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...gefunden..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NICHT GEFUNDEN..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...gefunden..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NICHT GEFUNDEN..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...gefunden..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NICHT GEFUNDEN..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...gefunden\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NICHT GEFUNDEN\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...gefunden..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NICHT GEFUNDEN..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd...gefunden..."
View file
LiVES-2.4.7.tar.bz2/po/en_GB.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -95,79 +95,79 @@ msgid "Preserving set.\n" msgstr "Preserving set.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Resizing" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Resize All Frames" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Any" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "None" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recommended" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "disabled !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**The current layout**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Custom" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Test" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Foreground" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Background" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Loading realtime effect plugins..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Starting jack audio server..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Starting jack transport server..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Connecting to jack transport server..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -186,126 +186,126 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Starting pulse audio server..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Checking optional dependencies:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...detected..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detected..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...detected..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NOT DETECTED..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...detected..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NOT DETECTED..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...detected..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NOT DETECTED..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detected\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NOT DETECTED\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detected..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NOT DETECTED..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/es.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -95,79 +95,79 @@ msgid "Preserving set.\n" msgstr "Preservando el conjunto.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Redimensionar todos los cuadros" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Cualquiera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Ninguno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "desactivado" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**La disposición actual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Integrado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Prueba" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Frente" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Fondo" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tiempo real..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Iniciando el servidor de audio jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -179,126 +179,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Iniciando servidor PulseAudio..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Comprobando dependencias opcionales:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer... detectado..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer... NO DETECTADO..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert... Detectado..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert... NO DETECTADO..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite... detectado..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite... NO DETECTADO..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox... detectado\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox... NO DETECTADO\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav... detectado..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav... NO DETECTADO..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd... detectado..."
View file
LiVES-2.4.7.tar.bz2/po/et.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Valiku säilitamine.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Mõõtmete muutmine" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_kõikide kaadrite suuruse muutmine" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Kõik" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Pole" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "soovitatav" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "keelatud !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Praegune skeem**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Sisseehitatud" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Kohandatud" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Testi" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Alusta" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Laen reaalaja efektide pluginaid..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Heli serveri jack käivitamine..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Heli serveri pulse käivitamine..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...tuvastatud..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...ei tuvastatud..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "konverdi...tuvastatud..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "konversioon...ei tuvastatud..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "komposiit...tuvastatud.." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "komposiit...ei tuvastatud..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...tuvastatud\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...ei tuvastatud\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "konverdi...tuvastatud..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "konversioon...ei tuvastatud..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/fi.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -96,80 +96,80 @@ msgid "Preserving set.\n" msgstr "Säilytetään leikesarja.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Koon muutos" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "Muuta kaikkien kuvien k_okoa" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Mikä tahansa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Ei mitään" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "suositeltu" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 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:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Nykyinen asettelu**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Mukauta" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Kokeile" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "P_imennä tausta" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Käynnistetään jack-äänipalvelin..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Käynnistetään jack-välityspalvelin..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Yhdistetään jack-välityspalvelimeen..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -181,126 +181,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Käynnistetään pulse audio -palvelin..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Tarkistetaan valinnaiset riippuvuudet:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...havaittu..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...EI HAVAITTU..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...havaittu..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...EI HAVAITTU..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...havaittu..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...EI HAVAITTU..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...havaittu\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...EI HAVAITTU\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...havaittu..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...EI HAVAITTU..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/fr.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -94,79 +94,79 @@ msgid "Preserving set.\n" msgstr "Marque positionnée.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Recadrage" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Recadre Toutes Les Images" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Tous" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Aucun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recommandé" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "désactivé !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**La configuration actuelle**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Intégré" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personnalisé" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Essai" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Premier plan" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Arrière plan" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Chargement des greffons d'effets en temps réel…" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Démarrage du serveur audio jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Démarrage du serveur de transport jack..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Connexion au serveur de transport jack..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -178,124 +178,124 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Initialisation du serveur audio pulse..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Vérification des dépendances optionnelles :" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer... détecté..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... NON DÉTECTÉ..." -#: src/main.c:1849 +#: src/main.c:1847 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1850 +#: src/main.c:1848 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer... détecté..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer... NON DÉTECTÉ..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert... détecté..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert... NON DÉTECTÉ..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite... détecté..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite... NON DÉTECTÉ..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox... détecté\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox... NON DÉTECTÉ\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav... détecté..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav... NON DÉTECTÉ..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd... détecté..." -#: src/main.c:1864
View file
LiVES-2.4.7.tar.bz2/po/gl.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,79 +90,79 @@ msgid "Preserving set.\n" msgstr "Preservar o conxunto.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Redimensionar todos os fotogramas" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Calquera" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Ningún" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "desactivado !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "** O esquema actual **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Incorporado" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personalizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Proba" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Primeiro plano" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Fondo" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Cargando complementos de efectos en tempo real..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Iniciando o servidor de son jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Iniciando o servidor de transporte jack..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Conectando co servidor de transporte jack..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -174,126 +174,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Comprobando as dependencias opcionais:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON DETECTADO..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NON DETECTADO..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NON DETECTADO..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NON DETECTADO..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...detectados..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NON DETECTADO..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NON DETECTADO\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NON DETECTADO..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd...detectado..."
View file
LiVES-2.4.7.tar.bz2/po/he.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -95,80 +95,80 @@ msgid "Preserving set.\n" msgstr "מתבצע שימור האוסף.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "שינוי גודל" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_שינוי גודל כל השקופיות" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "הכל" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "ללא" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "מומלץ" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "נוטרל !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**הפריסה הנוכחית**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "מובנה" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "מותאם אישית" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "בדיקה" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "רקע _שחור" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "מתבצעת הפעלת שרת השמע jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "מפעיל את שרת התעבורה של jack..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "מתחבר לשרת התעבורה של jack..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -180,126 +180,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "מפעיל את שרת השמע Pulse..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "מתבצעת בדיקת חבילות תלות אפשריות:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...זוהה..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...לא זוהה..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...זוהה..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...לא זוהה..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...זוהה..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...לא זוהה..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...זוהה...\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...לא זוהה...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...זוהה" -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...לא זוהה" -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/hr.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Očuvanje set.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Promjena veličine" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Bilo koji" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Nijedan" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "preporučeno" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "isključeno !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Trenutni izgled**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Zanemari promjene" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Učitavanje stvarnom efekt čep..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Pokrećem jack audio poslužitelj..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Pokrećem jack transport server..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Spajanje na jack transport server..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Pokrećem pulse audio poslužitelj..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Provjera izborno ovisnosti:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...pronađen..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NIJE PRONAĐEN..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...pronađen..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NIJE PRONAĐEN..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...otkriti..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NIJE OTKRIVENA..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...pronađen\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NIJE PRONAĐEN...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...pronađen..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NIJE PRONAĐEN..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/hu.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Tartós beállítás.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Átméretezés" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Minden képkocka átméretezése" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Bármely" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Nincs" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "ajánlott" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "tíltva!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**A jelenlegi kimenet**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Beépített" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Egyéni" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Teszt" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Üres háttér" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Az azonnali effektek betöltése..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Jack audió szerver indítása" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Pulse audio szerver indítása..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Ajánlott függőségek ellenőrzése" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...megtalálva" -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NEM TALÁLOM.." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...megtalálva" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NEM TALÁLOM" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...megtalálva..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NEM TALÁLOM" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...megtalálva\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NEM TALÁLOM\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...megtalálva..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NEM TALÁLOM..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/it.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "Preservazione del set in corso.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Ridimensionamento" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Ridimensiona tutti i fotogrammi" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Qualsiasi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Nessuno" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "consigliato" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "disabilitato !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Il layout corrente**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Integrato" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personalizzato" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Test" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "Sfondo _Vuoto" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Avvio del server audio jack in corso..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Avviando il server audio pulse..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Controllo delle dipendenze opzionali in corso:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...rilevato..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NON RILEVATO..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...rilevato..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NON RILEVATO..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...rilevato..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NON RILEVATO..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...rilevato...\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NON RILEVATO...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...rilevato..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NON RILEVATO..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/ja.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "セットの保護\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "リサイズ" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "全フレームのリサイズ(_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "なし" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "推奨" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "使用不能!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**現在のレイアウト**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "ビルトイン" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "カスタム" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "テスト" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "空白のバックグラウンド(_B)" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "リアルタイムエフェクトプラグインを読み込み中..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "JACKサーバーの音声機能を開始しています..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "JACKサーバーのトランスポート機能を開始しています..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "JACKサーバーのトランスポート機能に接続しています..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "PulseAudioサーバーを開始しています..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "必ずしも必要ではない依存関係を確認しています:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayerが見つかりました..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayerは見つかりませんでした..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convertが見つかりました..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convertは見つかりませんでした..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "compositeが見つかりました..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "compositeは見つかりませんでした..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "soxが見つかりました\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "soxは見つかりませんでした\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wavが見つかりました..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wavは見つかりませんでした..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/lives.pot -> LiVES-2.6.0.tar.bz2/po/lives.pot
Changed
@@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 2.4.7\n" +"Project-Id-Version: lives 2.6.0\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2016-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -75,79 +75,79 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -159,120 +159,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1847 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1850 +#: src/main.c:1848 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1852 +#: src/main.c:1850 msgid "mpv...detected..." msgstr "" -#: src/main.c:1853 +#: src/main.c:1851 msgid "mpv...NOT DETECTED..." msgstr "" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1861 +#: src/main.c:1859 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1862 +#: src/main.c:1860 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "" -#: src/main.c:1864 +#: src/main.c:1862
View file
LiVES-2.4.7.tar.bz2/po/nl_NL.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: \n" @@ -73,80 +73,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Grootte aanpassen" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "Vervagen" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -158,120 +158,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1847 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1850 +#: src/main.c:1848 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1852 +#: src/main.c:1850 msgid "mpv...detected..." msgstr "" -#: src/main.c:1853 +#: src/main.c:1851 msgid "mpv...NOT DETECTED..." msgstr "" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1861 +#: src/main.c:1859 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1862 +#: src/main.c:1860 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "" -#: src/main.c:1864 +#: src/main.c:1862 msgid "jackd...NOT DETECTED..." msgstr ""
View file
LiVES-2.4.7.tar.bz2/po/oc.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -78,80 +78,80 @@ msgid "Preserving set.\n" msgstr "Marca posicionada.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Requadratge" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Requadra Totes Los Imatges" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Quin que siá" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Pas cap" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "desactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**La configuracion actuala**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Integrat" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personalizat" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Testar" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Aviar" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Cargament dels plugins d'efièches en temps real" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Aviada del servidor àudio jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -163,126 +163,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Inicializacion del servidor àudio pulse..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Verificacion de las dependéncias opcionalas :" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer....detectat..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...PAS DETECTAT..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...detectat..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...PAS DETECTAT..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...detectat..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...PAS DETECTAT..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detectat\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...PAS DETECTAT\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...PAS DETECTAT..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/pl.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,80 +90,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Skalowanie" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Skaluj Wszystkie Klatki" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Dowolny" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Brak" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "zalecane" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "niepełnosprawnych !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Obecny układ**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Wbudowane" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Własne" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Przetestuj" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Uruchom" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -175,126 +175,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Uruchamianie serwera pulse audio" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Sprawdzanie zależności opcjonalne:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer... wykryto..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NIE WYKRYTO..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...wykrytych..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NIE WYKRYTO..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...wykrytych..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NIE WYKRYTO..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...wykrytych\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NIE WYKRYTO\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...wykrytych..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NIE WYKRYTO..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/pms.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -90,79 +90,79 @@ msgid "Preserving set.\n" msgstr "Preservassion j'anpostassion\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Ardimensionament" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Ardimension-a tute le curnis" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "qualsëssìa" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Gnun" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "consejà" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "dësativà" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**L'atual formà**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Antregà" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Personaj" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Test" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Prim pian" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Drefond" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Caria dle gionte për j'efet an temp-real..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Andi dël jack audio server..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Andi dël jack transport server..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Conession al jack transport server..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -181,126 +181,126 @@ "\n" "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o " -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Andi dël pulse audio server..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Contròl dependense opsionaj:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...trovà..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...trovà..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...trovà..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NEN TROVÀ" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...trovà..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NEN TROVÀ..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...TROVÀ..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NEN TROVÀ..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...TROVÀ\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NEN TROVÀ\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...TROVÀ..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NEN TROVÀ..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd...TROVÀ..."
View file
LiVES-2.4.7.tar.bz2/po/pt.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -84,80 +84,80 @@ msgid "Preserving set.\n" msgstr "Preservando set.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "A redimensionar" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Redimensionar Todos Frames" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "desactivado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**O layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Teste" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "A carregar plugins de efeito em tempo real..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "A iniciar servidor de jack audio..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -169,126 +169,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "A verificar as dependências opcionais:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NÃO DETECTADO..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...detectado..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NÃO DETECTADO..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NÃO DETECTADO...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NÃO DETECTADO..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/pt_BR.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -87,80 +87,80 @@ msgid "Preserving set.\n" msgstr "Preservando set.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Redimensionando" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Redimensionar Todos Frames" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Qualquer" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Nenhum" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recomendado" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "desativado!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Layout atual**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Builtin" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Customizado" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Teste" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "Fundo _Branco" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Carregando plugins de efeitos em tempo real..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Iniciando servidor de áudio jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Iniciando o servidor jack de transporte..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Conectando ao servidor jack de transporte..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -172,126 +172,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Iniciando o servidor pulse audio..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Checando dependências opcionais:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...detectado..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NÃO DETECTADO..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...detectado..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NÃO DETECTADO..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...detectado..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NÃO DETECTADO..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detectado\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NÃO DETECTADO...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectado..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NÃO DETECTADO..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/ro.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -91,80 +91,80 @@ msgid "Preserving set.\n" msgstr "Păstrarea set.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Redimensionare" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Redimensionarea tuturor cadrelor" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Orice" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Nimic" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "recomandat" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "dezactivat !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "** Structura actuală **" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Ignoră schimbările" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Se incarcă modulele de efecte in timp real..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Pornirea serverului audio jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -176,126 +176,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Pornirea serverului audio pulse..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Verificarea dependenţelor opţionale:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...a fost detectat..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer... nu a fost detectat..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...detectat..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NU A FOST DETECTAT..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...detectat..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NU A FOST DETECTAT..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...detectat\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NU A FOST DETECTAT\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...detectat..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NU A FOST DETECTAT..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/ru.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -95,79 +95,79 @@ msgid "Preserving set.\n" msgstr "Сохранение сборки.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Масштабирование" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Масштабировать все кадры" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Любой" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Нет" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "рекомендуемые" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "отключено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "Текущее размещение" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Встроенный" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Настраиваемый" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Тест" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Передний план" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Фон" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Загрузка плагина эффектов реального времени..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Запуск передающего сервера jack..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Подключение к передающему jack-серверу..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -188,126 +188,126 @@ "Также, вы можете попробовать запустить программу таким образом \"lives -" "jackopts 16\" или " -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Запуск сервера pulse audio..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Проверка опциональных зависимостей:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...обнаружен..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...НЕ ОБНАРУЖЕН..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...обнаружен..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...НЕ ОБНАРУЖЕН..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...обнаружен..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...НЕ ОБНАРУЖЕН..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...обнаружен...\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...НЕ ОБНАРУЖЕН...\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...обнаружен..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...НЕ ОБНАРУЖЕН..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd...обнаружен..."
View file
LiVES-2.4.7.tar.bz2/po/sk.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -95,80 +95,80 @@ msgid "Preserving set.\n" msgstr "Nastavenie zachovania.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Zmena veľkosti" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Zmeniť veľkosť všetkých snímkov" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Ktorýkoľvek" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Žiaden" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "doporučené" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "zakázané !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Súčasné rozloženie**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Vstavané" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Vlastné" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Otestovať" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Prázdne pozadie" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Načítavam efekt rozšírenia v réálnom čase..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Spúšťam zvukový server jack..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -180,126 +180,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Spúšťam pulse audio server..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Kontrola dodatočných záavislostí:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...nájdený..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...NENÁJDENÝ..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...nájdený..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...NENÁJDENÝ..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...nájdený..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...NENÁJDENÝ..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...nájdený\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...NENÁJDENÝ\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...nájdený..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...NENÁJDENÝ..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/te.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -77,80 +77,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "పరిమాణం మార్చుట" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "అన్ని చట్రాల పరిమాణం మార్చు (_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "ఏదైనా" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "ఏదీ వద్దు" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "సిఫారసుచేయబడింది" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "నిర్మితమైన" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "మలచిన" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "పరిశీలన" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_ప్రారంభం" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -162,120 +162,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1847 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1850 +#: src/main.c:1848 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1852 +#: src/main.c:1850 msgid "mpv...detected..." msgstr "" -#: src/main.c:1853 +#: src/main.c:1851 msgid "mpv...NOT DETECTED..." msgstr "" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1861 +#: src/main.c:1859 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1862 +#: src/main.c:1860 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "" -#: src/main.c:1864 +#: src/main.c:1862 msgid "jackd...NOT DETECTED..." msgstr ""
View file
LiVES-2.4.7.tar.bz2/po/tr.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -91,80 +91,80 @@ msgid "Preserving set.\n" msgstr "Koruma ayarları.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Yeniden boyutlandırma" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "Tüm çerçeveleri yeniden boyutlandır" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Herhangi" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Boş" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "tavsiye" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "Engelli!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Mevcut yerleşim düzeni**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Yapısal" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Özel" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Sınama" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "_Boş arkaplan" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Gerçek zaman efekt eklentileri yükleniyor" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Jack audio sunucusu başlıyor..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Jack taşıma sunucusu başlıyor" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Jack taşıma sunucusuna bağlanılıyor" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -176,126 +176,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Pulse audio sunucusu başlıyor" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Isteğe bağlı bağımlılıkları denetleme:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer ... bulundu ..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer ... BULUNAMADI ..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...bulundu..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...BULUNAMADI..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite ... bulundu ..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite ... BULUNAMADI ..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...bulundu\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...BULUNAMADI\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...bulundu..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...BULUNAMADI..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/ug.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -76,80 +76,80 @@ msgid "Preserving set.\n" msgstr "" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "خالىغان" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "يوق" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "تەۋسىيە قىلغان" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "چەكلەنگەن!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "ئىچكى" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "ئىختىيارى" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "سىناق" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "باشلا(_S)" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -161,120 +161,120 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "" -#: src/main.c:1849 +#: src/main.c:1847 msgid "mplayer2...detected..." msgstr "" -#: src/main.c:1850 +#: src/main.c:1848 msgid "mplayer2...NOT DETECTED..." msgstr "" -#: src/main.c:1852 +#: src/main.c:1850 msgid "mpv...detected..." msgstr "" -#: src/main.c:1853 +#: src/main.c:1851 msgid "mpv...NOT DETECTED..." msgstr "" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "" -#: src/main.c:1861 +#: src/main.c:1859 msgid "cdda2wav/icedax...detected..." msgstr "" -#: src/main.c:1862 +#: src/main.c:1860 msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "" -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "" -#: src/main.c:1864 +#: src/main.c:1862 msgid "jackd...NOT DETECTED..." msgstr ""
View file
LiVES-2.4.7.tar.bz2/po/uk.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-0300\n" "PO-Revision-Date: 2013-12-13 17:20+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -96,79 +96,79 @@ msgid "Preserving set.\n" msgstr "Збереження набору.\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Зміна розміру" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "_Змінити розміри всіх кадрів" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Будь-який" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Жодного" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "найліпший" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "вимкнено!" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Поточне компонування**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "Вбудований" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Нетиповий" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Перевірити" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "Передній план" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "Тло" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Завантаження додатків ефектів реального часу…" -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Запуск звукового сервера jack…" -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Запуск сервера передавання даних jack…" -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Встановлення з’єднання з сервером передавання даних jack…" -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -187,126 +187,126 @@ "\n" "Alternatively, try to start lives with either \"lives -jackopts 16\", or " -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Запуск звукового сервера PulseAudio…" -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "Пошук додаткових залежностей:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer… виявлено…" -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer…НЕ ВИЯВЛЕНО…" -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert…виявлено…" -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...НЕ ВИЯВЛЕНО…" -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite…виявлено…" -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite…НЕ ВИЯВЛЕНО…" -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox…виявлено\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox…НЕ ВИЯВЛЕНО\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...виявлено..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...НЕ ВИЯВЛЕНО..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd…виявлено…"
View file
LiVES-2.4.7.tar.bz2/po/uz.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -96,80 +96,80 @@ msgid "Preserving set.\n" msgstr "Йиғилганларни сақлаш\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "Ҳажми ўзгартирилмоқда" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "Барча кадрларнинг _ҳажмини ўзгартириш" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "Исталган" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "Йўқ" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "тавсия қилинди" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "ўчирилди !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**Жорий қатлам**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "Бошқа" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "Синаш" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 #, fuzzy msgid "Background" msgstr "Сўниш" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "Реал вақт эффект плагинлари юкланмоқда..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "Jack аудио сервер ишга туширилмоқда..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "Jack транспорт сервери ишга туширилмоқда..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "Jack транспорт серверига уланмоқда..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -181,126 +181,126 @@ "Alternatively, try to start lives with either \"lives -jackopts 16\", or " msgstr "" -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "Аудио сервер пульси ишга туширилмоқда..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...аниқланди..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...аниқланди..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...аниқланди..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...АНИҚЛАНМАДИ..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "конвертлаш...аниқланди..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "конвертлаш...АНИҚЛАНМАДИ..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...аниқланди..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...АНИҚЛАНМАДИ..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...аниқланди\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...АНИҚЛАНМАДИ\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...аниқланди..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...АНИҚЛАНМАДИ..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..."
View file
LiVES-2.4.7.tar.bz2/po/zh_CN.po -> LiVES-2.6.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-01-18 03:16-0300\n" +"POT-Creation-Date: 2016-02-01 10:22-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" @@ -88,79 +88,79 @@ msgid "Preserving set.\n" msgstr "正在保存场景。\n" -#: src/main.c:700 +#: src/main.c:701 msgid "Resizing" msgstr "正在调整尺寸" -#: src/main.c:707 +#: src/main.c:708 msgid "_Resize All Frames" msgstr "调整所有帧的尺寸(_R)" #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter") -#: src/main.c:957 +#: src/main.c:958 msgid "Any" msgstr "任意" #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified") -#: src/main.c:959 +#: src/main.c:960 msgid "None" msgstr "无" #. TRANSLATORS: text saying "recommended", for plugin names, etc. -#: src/main.c:961 +#: src/main.c:962 msgid "recommended" msgstr "推荐" #. TRANSLATORS: text saying "disabled", (as in "not enabled") -#: src/main.c:963 +#: src/main.c:964 msgid "disabled !" msgstr "已禁用 !" #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected -#: src/main.c:965 +#: src/main.c:966 msgid "**The current layout**" msgstr "**当前的布局**" #. TRANSLATORS: adjective for "Built in" type effects -#: src/main.c:967 +#: src/main.c:968 msgid "Builtin" msgstr "内置" #. TRANSLATORS: adjective for "Custom" type effects -#: src/main.c:969 +#: src/main.c:970 msgid "Custom" msgstr "自定义" #. TRANSLATORS: adjective for "Test" type effects -#: src/main.c:971 +#: src/main.c:972 msgid "Test" msgstr "测试" -#: src/main.c:1116 +#: src/main.c:1117 msgid "Foreground" msgstr "" -#: src/main.c:1117 +#: src/main.c:1118 msgid "Background" msgstr "" -#: src/main.c:1645 +#: src/main.c:1643 msgid "Loading realtime effect plugins..." msgstr "正在加载实时效果插件..." -#: src/main.c:1711 +#: src/main.c:1709 msgid "Starting jack audio server..." msgstr "正在启动 jack 音频服务器..." -#: src/main.c:1713 +#: src/main.c:1711 msgid "Starting jack transport server..." msgstr "正在启动 jack 传输服务器..." -#: src/main.c:1714 +#: src/main.c:1712 msgid "Connecting to jack transport server..." msgstr "正在连接 jack 传输服务器..." -#: src/main.c:1744 +#: src/main.c:1742 #, c-format msgid "" "\n" @@ -179,126 +179,126 @@ "\n" "除此之外,尝试用启动命令行“lives -jackopts 16\"或 " -#: src/main.c:1779 +#: src/main.c:1777 msgid "Starting pulse audio server..." msgstr "正在开启 pulse 音频服务..." -#: src/main.c:1846 +#: src/main.c:1844 msgid "Checking optional dependencies:" msgstr "检查可选的依赖:" -#: src/main.c:1847 +#: src/main.c:1845 msgid "mplayer...detected..." msgstr "mplayer...发现..." -#: src/main.c:1848 +#: src/main.c:1846 msgid "mplayer...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1849 +#: src/main.c:1847 #, fuzzy msgid "mplayer2...detected..." msgstr "mplayer...发现..." -#: src/main.c:1850 +#: src/main.c:1848 #, fuzzy msgid "mplayer2...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1852 +#: src/main.c:1850 #, fuzzy msgid "mpv...detected..." msgstr "mplayer...发现..." -#: src/main.c:1853 +#: src/main.c:1851 #, fuzzy msgid "mpv...NOT DETECTED..." msgstr "mplayer...未发现..." -#: src/main.c:1855 +#: src/main.c:1853 msgid "convert...detected..." msgstr "convert...发现..." -#: src/main.c:1856 +#: src/main.c:1854 msgid "convert...NOT DETECTED..." msgstr "convert...未发现..." -#: src/main.c:1857 +#: src/main.c:1855 msgid "composite...detected..." msgstr "composite...发现..." -#: src/main.c:1858 +#: src/main.c:1856 msgid "composite...NOT DETECTED..." msgstr "composite...未发现..." -#: src/main.c:1859 +#: src/main.c:1857 msgid "sox...detected\n" msgstr "sox...发现\n" -#: src/main.c:1860 +#: src/main.c:1858 msgid "sox...NOT DETECTED\n" msgstr "sox...未发现\n" -#: src/main.c:1861 +#: src/main.c:1859 #, fuzzy msgid "cdda2wav/icedax...detected..." msgstr "cdda2wav...发现..." -#: src/main.c:1862 +#: src/main.c:1860 #, fuzzy msgid "cdda2wav/icedax...NOT DETECTED..." msgstr "cdda2wav...未发现..." -#: src/main.c:1863 +#: src/main.c:1861 msgid "jackd...detected..." msgstr "jackd...发现..."
View file
LiVES-2.4.7.tar.bz2/smogrify -> LiVES-2.6.0.tar.bz2/smogrify
Changed
@@ -1,6 +1,6 @@ #!/usr/bin/perl -# smogrify - Copyright G. Finch (salsaman@gmail.com) 2003 - 2013 +# smogrify - Copyright G. Finch (salsaman@gmail.com) 2003 - 2016 # Released under the GPL 3 or later - see file COPYING or www.gnu.org for details @@ -23,7 +23,7 @@ # Do not change these except for testing ! $background=1; -$version="2.4.7"; +$version="2.6.0"; #$dyneversion="LIVES-20091209"; ################################################################### @@ -1334,7 +1334,11 @@ $audio_play_command=&rc_get("audio_play_command"); - if ($audio_player eq "sox") { + if ($audio_play_command eq "" or $audio_play_command eq '""') { + $time=($audio_end-$audio_start); + select(undef, undef, undef, $time); + } + elsif($audio_player eq "sox") { $audio_effect=&rc_get("audio_effect"); $trimcom=" trim $audio_start"; @@ -1388,7 +1392,8 @@ } else { $syscom2="$audio_play_command $mute -c $achans -r $arate -$signed $aendian -t $aformat -$asamps $audiofile $trimcom $audio_effect"; } - } else { + } + else { # mplayer seemingly has no easy way of playing unsigned or wrong endian $syscom2="$audio_play_command -demuxer rawaudio -rawaudio rate=$arate :channels=$achans:samplesize=$asamps $mute $audiofile -ss ". ($audio_start-1); @@ -3925,11 +3930,11 @@ if ($num_in_channels==2) { # transitions get some extra params - $img_ext2=".".$ARGV[8]; + $img_ext2=".".$ARGV[7]; $img_prefix2=&get_img_prefix($img_ext2); splice(@ARGV,7,1); - $start2=$ARGV[9]; - $clipboard=$ARGV[10]; + $start2=$ARGV[7]; + $clipboard=$ARGV[8]; } $fps=0;
View file
LiVES-2.4.7.tar.bz2/src/callbacks.c -> LiVES-2.6.0.tar.bz2/src/callbacks.c
Changed
@@ -1,6 +1,6 @@ // callbacks.c // LiVES -// (c) G. Finch 2003 - 2015 <salsaman@gmail.com> +// (c) G. Finch 2003 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -81,7 +81,7 @@ mainw->multitrack->idlefunc=0; } - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->toy_type!=LIVES_TOY_NONE) { on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE)); @@ -188,9 +188,9 @@ if (!mainw->leave_recovery) { unlink(mainw->recovery_file); // hide the main window - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_widget_context_update(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (strcmp(future_prefs->tmpdir,prefs->tmpdir)) { @@ -221,7 +221,7 @@ for (i=1; i<=MAX_FILES; i++) { if (mainw->files[i]!=NULL) { mainw->current_file=i; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back); if (cfile->event_list!=NULL) event_list_free(cfile->event_list); @@ -246,10 +246,10 @@ char *ppath=lives_build_filename(prefs->tmpdir,cfile->handle,NULL); lives_chdir(ppath,FALSE); lives_free(ppath); - threaded_dialog_spin(); + threaded_dialog_spin(0.); close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src); mainw->files[i]->ext_src=NULL; - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (mainw->files[i]->frame_index!=NULL) { @@ -294,7 +294,7 @@ lives_free(mainw->files[i]->ext_src); } #endif - threaded_dialog_spin(); + threaded_dialog_spin(0.); #ifdef IS_MINGW // kill any active processes: for other OSes the backend does this // get pid from backend @@ -310,13 +310,13 @@ com=lives_strdup_printf("%s close \"%s\"",prefs->backend,mainw->files[i]->handle); lives_system(com,FALSE); lives_free(com); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } else { - threaded_dialog_spin(); + threaded_dialog_spin(0.); // or just clean them up com=lives_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,mainw->files[i]->handle); lives_system(com,FALSE); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(com); if (mainw->files[i]->frame_index!=NULL) { save_frame_index(i); @@ -352,7 +352,7 @@ #endif lives_free(sdname); lives_system(com,TRUE); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(com); } else { char *dname=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL); @@ -363,7 +363,7 @@ #endif lives_free(dname); lives_system(com,TRUE); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(com); dname=lives_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL); #ifndef IS_MINGW @@ -373,7 +373,7 @@ #endif lives_free(dname); lives_system(com,TRUE); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(com); } lives_free(set_layout_dir); @@ -383,7 +383,7 @@ char *set_lock_file=lives_strdup_printf("%s/%s/lock.%d",prefs->tmpdir,mainw->set_name,capable->mainpid); unlink(set_lock_file); lives_free(set_lock_file); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (mainw->only_close) { @@ -394,7 +394,7 @@ i!=mainw->multitrack->render_file)) { mainw->current_file=i; close_current_file(0); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } } mainw->suppress_dprint=FALSE; @@ -405,7 +405,7 @@ mainw->only_close=FALSE; prefs->crash_recovery=TRUE; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->current_file>-1) sensitize(); lives_widget_queue_draw(mainw->LiVES); d_print_done(); @@ -439,9 +439,9 @@ } if (mainw->sep_win&&(mainw->playing_file>-1||prefs->sepwin_type==SEPWIN_TYPE_STICKY)) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); kill_play_window(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } } @@ -462,10 +462,10 @@ weed_unload_all(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); rfx_free_all(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); #ifdef ENABLE_OSC if (prefs->osc_udp_started) lives_osc_end(); @@ -1550,7 +1550,7 @@ void mt_memory_free(void) { int i; - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->multitrack->no_expose=TRUE; @@ -1578,7 +1578,7 @@ recover_layout_cancelled(FALSE); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } @@ -4684,7 +4684,7 @@ while (cliplist!=NULL) { if (mainw->write_failed) break; - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_widget_context_update(); // TODO - dirsep @@ -4976,7 +4976,7 @@ while (1) { if (prefs->show_gui) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (mainw->cached_list!=NULL) { @@ -5030,9 +5030,9 @@ mainw->current_file=current_file; if (last_file>0) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); switch_to_file(current_file,last_file); - threaded_dialog_spin();
View file
LiVES-2.4.7.tar.bz2/src/colourspace.c -> LiVES-2.6.0.tar.bz2/src/colourspace.c
Changed
@@ -1,6 +1,6 @@ // colourspace.c // LiVES -// (c) G. Finch 2004 - 2015 <salsaman@gmail.com> +// (c) G. Finch 2004 - 2016 <salsaman@gmail.com> // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -8903,7 +8903,7 @@ return FALSE; } if (gusrc_array!=NULL) { - if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) { LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); weed_leaf_delete(layer,"host_pixbuf_src"); lives_object_unref(pixbuf); @@ -9023,7 +9023,7 @@ return FALSE; } if (gusrc_array!=NULL) { - if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) { LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); weed_leaf_delete(layer,"host_pixbuf_src"); lives_object_unref(pixbuf); @@ -9600,7 +9600,7 @@ return FALSE; } if (gusrc_array!=NULL) { - if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) { LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); weed_leaf_delete(layer,"host_pixbuf_src"); lives_object_unref(pixbuf); @@ -9729,7 +9729,7 @@ return FALSE; } if (gusrc_array!=NULL) { - if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) { LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); weed_leaf_delete(layer,"host_pixbuf_src"); lives_object_unref(pixbuf); @@ -9866,7 +9866,7 @@ return FALSE; } if (gusrc!=NULL) { - if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) { LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); weed_leaf_delete(layer,"host_pixbuf_src"); lives_object_unref(pixbuf); @@ -9960,7 +9960,7 @@ pixbuf=lives_pixbuf_new_from_data(buf, has_alpha, width, height, rowstride, (LiVESPixbufDestroyNotify)lives_free_buffer, NULL); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return pixbuf; } @@ -10512,9 +10512,9 @@ // create a new pixbuf pixbuf=layer_to_pixbuf(layer); - threaded_dialog_spin(); + threaded_dialog_spin(0.); new_pixbuf=lives_pixbuf_scale_simple(pixbuf,width,height,interp); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (new_pixbuf!=NULL) { weed_set_int_value(layer,"width",lives_pixbuf_get_width(new_pixbuf)); weed_set_int_value(layer,"height",lives_pixbuf_get_height(new_pixbuf)); @@ -10915,7 +10915,7 @@ if (rowstride==get_last_rowstride_value(width,nchannels)) { in_pixel_data=(void *)lives_pixbuf_get_pixels(pixbuf); weed_set_voidptr_value(layer,"pixel_data",in_pixel_data); - weed_set_boolean_value(layer,"host_pixbuf_src",WEED_TRUE); + weed_set_voidptr_value(layer,"host_pixbuf_src",pixbuf); return TRUE; } #endif @@ -11259,7 +11259,7 @@ weed_leaf_delete(layer,"host_pixel_data_contiguous"); } - if (weed_plant_has_leaf(layer,"host_pixbuf_src")&&weed_get_boolean_value(layer,"host_pixbuf_src",&error)==WEED_TRUE) { + if (weed_plant_has_leaf(layer,"host_pixbuf_src")) { LiVESPixbuf *pixbuf=(LiVESPixbuf *)weed_get_voidptr_value(layer,"host_pixbuf_src",&error); weed_leaf_delete(layer,"host_pixbuf_src"); if (pixbuf!=NULL) lives_object_unref(pixbuf);
View file
LiVES-2.4.7.tar.bz2/src/cvirtual.c -> LiVES-2.6.0.tar.bz2/src/cvirtual.c
Changed
@@ -327,7 +327,7 @@ oname=NULL; if (update_progress) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_widget_context_update(); } @@ -365,7 +365,7 @@ if (update_progress) { // sig_progress... lives_snprintf(mainw->msg,256,"%d",progress++); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_widget_context_update(); } @@ -527,9 +527,9 @@ if (sfile==NULL||sfile->frame_index==NULL) return; for (i=0; i<oldframes; i++) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_widget_context_update(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if ((i<sfile->frames&&sfile->frame_index[i]!=-1)||i>=sfile->frames) { iname=make_image_file_name(sfile,i,get_image_ext_for_type(sfile->img_type));
View file
LiVES-2.4.7.tar.bz2/src/dialogs.c -> LiVES-2.6.0.tar.bz2/src/dialogs.c
Changed
@@ -1,6 +1,6 @@ // dialogs.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2015 +// (c) G. Finch 2003 - 2016 // Released under the GPL 3 or later // see file ../COPYING for licensing details @@ -27,7 +27,7 @@ static double audio_start; static boolean accelerators_swapped; static int frames_done; -static int disp_frames_done; +static double disp_fraction_done; static uint64_t last_open_check_ticks; @@ -72,12 +72,16 @@ LiVESWidget *expander=lives_expander_new_with_mnemonic(_("Show affected _layouts")); LiVESWidget *textview=lives_text_view_new(); - LiVESWidget *label; + LiVESWidget *label,*scrolledwindow; LiVESList *xlist=mainw->xlays; LiVESTextBuffer *textbuffer = lives_text_view_get_buffer(LIVES_TEXT_VIEW(textview)); + scrolledwindow = lives_standard_scrolled_window_new(ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V, LIVES_WIDGET(textview)); + lives_widget_set_size_request(scrolledwindow, ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V); + lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE); - lives_container_add(LIVES_CONTAINER(expander), textview); + + expander=lives_standard_expander_new(_("Show affeced _layouts"),FALSE,LIVES_BOX(box),scrolledwindow); if (palette->style&STYLE_1) { label=lives_expander_get_label_widget(LIVES_EXPANDER(expander)); @@ -88,6 +92,8 @@ 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_widget_set_base_color(scrolledwindow, LIVES_WIDGET_STATE_NORMAL, &palette->info_base); + lives_widget_set_text_color(scrolledwindow, LIVES_WIDGET_STATE_NORMAL, &palette->info_text); } lives_text_buffer_insert_at_cursor(textbuffer,"\n",strlen("\n")); @@ -98,7 +104,7 @@ xlist=xlist->next; } - lives_box_pack_start(box, expander, FALSE, FALSE, widget_opts.packing_height); + lives_widget_show_all(expander); } @@ -775,6 +781,7 @@ // pump data from stdout to textbuffer char *str_return=NULL; size_t retlen=0; + size_t plen; LiVESTextBuffer *optextbuf=lives_text_view_get_buffer(mainw->optextview); #ifdef GUI_GTK @@ -790,9 +797,45 @@ str_return = strdup(qba.constData()); retlen = strlen(str_return); #endif - if (retlen>0) { + // check each line of str_return, if it contains ptext, (whitespace), then number get the number and set percentage + + if (retlen>0&&cfile->proc_ptr!=NULL) { + double max; + LiVESAdjustment *adj=lives_scrolled_window_get_vadjustment(LIVES_SCROLLED_WINDOW(((xprocess *)(cfile->proc_ptr))->scrolledwindow)); lives_text_buffer_insert_at_end(optextbuf,str_return); - lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW(mainw->optextview)); + max=gtk_adjustment_get_upper(adj); + lives_adjustment_set_value(adj,max); + + if ((plen=strlen(prefs->encoder.ptext))>0) { + boolean linebrk=FALSE; + char *cptr=str_return; + int ispct=0; + + if (prefs->encoder.ptext[0]=='%') { + ispct=1; + plen--; + } + + while (cptr<(str_return+retlen-plen)) { + if (!strncmp(cptr,prefs->encoder.ptext+ispct,plen)) { + cptr+=plen; + while (*cptr==' '||*cptr=='\n') { + if (*cptr=='\n') { + linebrk=TRUE; + break; + } + cptr++; + } + if (!linebrk) { + if (ispct) cfile->proc_ptr->frames_done=(int)(strtod(cptr,NULL)*(cfile->progress_end-cfile->progress_start+1.)/100.); + else cfile->proc_ptr->frames_done=atoi(cptr); + } + break; + } + cptr++; + } + + } } if (str_return!=NULL) lives_free(str_return); @@ -982,18 +1025,17 @@ -static void disp_fraction(int done, int start, int end, double timesofar, xprocess *proc) { +static void disp_fraction(double fraction_done, double timesofar, xprocess *proc) { // display fraction done and estimated time remaining char *prog_label; double est_time; - double fraction_done=(done-start)/(end-start+1.); const char *stretch=" "; if (fraction_done>1.) fraction_done=1.; if (fraction_done<0.) fraction_done=0.; - if (done>disp_frames_done) lives_progress_bar_set_fraction(LIVES_PROGRESS_BAR(proc->progressbar),fraction_done); + if (fraction_done>disp_fraction_done) lives_progress_bar_set_fraction(LIVES_PROGRESS_BAR(proc->progressbar),fraction_done); est_time=timesofar/fraction_done-timesofar; prog_label=lives_strdup_printf(_("\n%s%d%% done. Time remaining: %u sec%s\n"),stretch,(int)(fraction_done*100.),(uint32_t)(est_time+.5), @@ -1001,7 +1043,7 @@ if (LIVES_IS_LABEL(proc->label3)) lives_label_set_text(LIVES_LABEL(proc->label3),prog_label); lives_free(prog_label); - disp_frames_done=done; + disp_fraction_done=fraction_done; } @@ -1012,7 +1054,7 @@ #define PROG_LOOP_VAL 200 static void progbar_pulse_or_fraction(lives_clip_t *sfile, int frames_done) { - double timesofar; + double timesofar,fraction_done; if (progress_count++>=PROG_LOOP_VAL) { if (frames_done<=sfile->progress_end&&sfile->progress_end>0&&!mainw->effects_paused&& @@ -1026,8 +1068,9 @@ #endif timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC; - disp_fraction(frames_done,sfile->progress_start,sfile->progress_end, - timesofar,sfile->proc_ptr); + fraction_done=(double)(frames_done-sfile->progress_start)/(double)(sfile->progress_end-sfile->progress_start+1.); + + disp_fraction(fraction_done,timesofar,sfile->proc_ptr); progress_count=0; } else { lives_progress_bar_pulse(LIVES_PROGRESS_BAR(sfile->proc_ptr->progressbar)); @@ -1507,7 +1550,8 @@ event_start=0; audio_start=mainw->play_start; if (visible) accelerators_swapped=FALSE; - frames_done=disp_frames_done=0; + frames_done=0; + disp_fraction_done=0.; mainw->last_display_ticks=0; shown_paused_frames=FALSE; est_time=-1.; @@ -1589,6 +1633,7 @@ return FALSE; } lives_widget_context_update(); + if (cfile->clip_type!=CLIP_TYPE_FILE) break; } cfile->fx_frame_pump+=FX_FRAME_PUMP_VAL>>1; } @@ -1727,7 +1772,6 @@ if (prefs->audio_player==AUD_PLAYER_PULSE&&cfile->achans>0&&cfile->laudio_time>0.&& !mainw->is_rendering&&!(cfile->opening&&!mainw->preview)&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file>-1) { - if (!pulse_audio_seek_frame(mainw->pulsed,mainw->play_start)) { if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,mainw->play_start); } @@ -2813,7 +2857,7 @@ static double sttime; -void threaded_dialog_spin(void) { +void threaded_dialog_spin(double fraction) { double timesofar; int progress; @@ -2824,17 +2868,30 @@ if (procw==NULL||!procw->is_ready) return;
View file
LiVES-2.4.7.tar.bz2/src/effects-weed.c -> LiVES-2.6.0.tar.bz2/src/effects-weed.c
Changed
@@ -4941,7 +4941,7 @@ weed_filters=dupe_weed_filters=NULL; hashnames=dupe_hashnames=NULL; - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_weed_plugin_path=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL); #ifdef DEBUG_WEED @@ -4982,7 +4982,7 @@ next_free_key=FX_KEYS_MAX_VIRTUAL; - threaded_dialog_spin(); + threaded_dialog_spin(0.); weed_p_path=getenv("WEED_PLUGIN_PATH"); if (weed_p_path==NULL) weed_plugin_path=lives_strdup(""); else weed_plugin_path=lives_strdup(weed_p_path); @@ -5003,7 +5003,7 @@ numdirs=get_token_count(weed_plugin_path,';'); dirs=lives_strsplit(weed_plugin_path,";",-1); #endif - threaded_dialog_spin(); + threaded_dialog_spin(0.); for (i=0; i<numdirs; i++) { // get list of all files @@ -5012,7 +5012,7 @@ // parse twice, first we get the plugins, then 1 level of subdirs for (plugin_idx=0; plugin_idx<listlen; plugin_idx++) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); plugin_name=(char *)lives_list_nth_data(weed_plugin_list,plugin_idx); #ifndef IS_MINGW if (!strncmp(plugin_name+strlen(plugin_name)-3,".so",3)) @@ -5028,13 +5028,13 @@ plugin_idx--; listlen--; } - threaded_dialog_spin(); + threaded_dialog_spin(0.); } // get 1 level of subdirs for (subdir_idx=0; subdir_idx<listlen; subdir_idx++) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); subdir_name=(char *)lives_list_nth_data(weed_plugin_list,subdir_idx); subdir_path=lives_build_filename(dirs[i],subdir_name,NULL); if (!lives_file_test(subdir_path, LIVES_FILE_TEST_IS_DIR)||!strcmp(subdir_name,"icons")||!strcmp(subdir_name,"data")) { @@ -5058,7 +5058,7 @@ lives_list_free(weed_plugin_sublist); } lives_free(subdir_path); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (weed_plugin_list!=NULL) { lives_list_free_strings(weed_plugin_list); @@ -5071,11 +5071,11 @@ d_print(_("Successfully loaded %d Weed filters\n"),num_weed_filters); - threaded_dialog_spin(); + threaded_dialog_spin(0.); load_compound_fx(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); make_fx_defs_menu(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (num_weed_dupes>0) merge_dupes(); } @@ -5184,7 +5184,7 @@ nitems=weed_leaf_num_elements(filter,"out_parameter_templates"); if (nitems>0) { plants=weed_get_plantptr_array(filter,"out_parameter_templates",&error); - threaded_dialog_spin(); + threaded_dialog_spin(0.); for (i=0; i<nitems; i++) { if (weed_plant_has_leaf(plants[i],"gui")) weed_plant_free(weed_get_plantptr_value(plants[i],"gui",&error)); weed_plant_free_if_not_in_list(plants[i],freed_ptrs); @@ -5782,7 +5782,7 @@ char *lives_compound_plugin_path,*plugin_name,*plugin_path; - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_compound_plugin_path=lives_build_filename(capable->home_dir,PLUGIN_COMPOUND_EFFECTS_CUSTOM,NULL); compound_plugin_list=get_plugin_list(PLUGIN_COMPOUND_EFFECTS_CUSTOM,TRUE,lives_compound_plugin_path,NULL); @@ -5792,7 +5792,7 @@ plugin_path=lives_build_filename(lives_compound_plugin_path,plugin_name,NULL); load_compound_plugin(plugin_name,plugin_path); lives_free(plugin_path); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (compound_plugin_list!=NULL) { @@ -5800,7 +5800,7 @@ lives_list_free(compound_plugin_list); } - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(lives_compound_plugin_path); lives_compound_plugin_path=lives_build_filename(prefs->prefix_dir,PLUGIN_COMPOUND_DIR,PLUGIN_COMPOUND_EFFECTS_BUILTIN,NULL); @@ -5811,7 +5811,7 @@ plugin_path=lives_build_filename(lives_compound_plugin_path,plugin_name,NULL); load_compound_plugin(plugin_name,plugin_path); lives_free(plugin_path); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } if (compound_plugin_list!=NULL) { @@ -5824,7 +5824,7 @@ } lives_free(lives_compound_plugin_path); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } @@ -5882,7 +5882,7 @@ } dlclose(handle); - threaded_dialog_spin(); + threaded_dialog_spin(0.); handle=NULL; weed_set_voidptr_value(plugin_info,"handle",handle); } @@ -5915,7 +5915,7 @@ lives_free(key_to_instance_copy[i]); } - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->chdir_failed) { char *dirs=lives_strdup(_("Some plugin directories"));
View file
LiVES-2.4.7.tar.bz2/src/events.c -> LiVES-2.6.0.tar.bz2/src/events.c
Changed
@@ -213,11 +213,11 @@ void delete_event(weed_plant_t *event_list, weed_plant_t *event) { // delete event from event_list - threaded_dialog_spin(); + threaded_dialog_spin(0.); unlink_event(event_list,event); if (mainw->multitrack!=NULL) mt_fixup_events(mainw->multitrack,event,NULL); weed_plant_free(event); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } @@ -2914,7 +2914,7 @@ void get_active_track_list(int *clip_index, int num_tracks, weed_plant_t *filter_map) { - // replace entries in mainw->clip_index with 0 if the track is not either the front track or an input to a filter + // replace entries in clip_index with 0 if the track is not either the front track or an input to a filter // TODO *** we should ignore any filter which does not eventually output to the front track, // this involves examining the filter map in reverse order and mapping out_tracks back to in_tracks @@ -3382,7 +3382,6 @@ static weed_plant_t *event,*eventnext; int *in_count=NULL; - int *clip_index,*frame_index; weed_plant_t **source_params,**in_params; weed_plant_t **layers,*layer; @@ -3475,12 +3474,16 @@ int scrap_track=-1; num_tracks=weed_leaf_num_elements(event,"clips"); - clip_index=weed_get_int_array(event,"clips",&weed_error); - frame_index=weed_get_int_array(event,"frames",&weed_error); + + if (mainw->clip_index!=NULL) lives_free(mainw->clip_index); + if (mainw->frame_index!=NULL) lives_free(mainw->frame_index); + + mainw->clip_index=weed_get_int_array(event,"clips",&weed_error); + mainw->frame_index=weed_get_int_array(event,"frames",&weed_error); if (mainw->scrap_file!=-1) { for (i=0; i<num_tracks; i++) { - if (clip_index[i]!=mainw->scrap_file) { + if (mainw->clip_index[i]!=mainw->scrap_file) { scrap_track=-1; break; } @@ -3491,8 +3494,8 @@ if (scrap_track!=-1) { // do not apply fx, just pull frame layer=weed_plant_new(WEED_PLANT_CHANNEL); - weed_set_int_value(layer,"clip",clip_index[scrap_track]); - weed_set_int_value(layer,"frame",frame_index[scrap_track]); + weed_set_int_value(layer,"clip",mainw->clip_index[scrap_track]); + weed_set_int_value(layer,"frame",mainw->frame_index[scrap_track]); if (!pull_frame(layer,prefs->image_ext,tc)) { weed_plant_free(layer); layer=NULL; @@ -3513,10 +3516,10 @@ } for (i=0; i<num_tracks; i++) { - if (clip_index[i]>0&&frame_index[i]>0&&mainw->multitrack!=NULL) is_blank=FALSE; + if (mainw->clip_index[i]>0&&mainw->frame_index[i]>0&&mainw->multitrack!=NULL) is_blank=FALSE; layers[i]=weed_plant_new(WEED_PLANT_CHANNEL); - weed_set_int_value(layers[i],"clip",clip_index[i]); - weed_set_int_value(layers[i],"frame",frame_index[i]); + weed_set_int_value(layers[i],"clip",mainw->clip_index[i]); + weed_set_int_value(layers[i],"frame",mainw->frame_index[i]); weed_set_voidptr_value(layers[i],"pixel_data",NULL); if ((oclip=mainw->old_active_track_list[i])!=(nclip=mainw->active_track_list[i])) { @@ -3526,7 +3529,6 @@ // check if ext_src survives old->new - //// if (oclip>0) { if (mainw->files[oclip]->clip_type==CLIP_TYPE_FILE) { @@ -3575,8 +3577,6 @@ lives_free(layers); } - lives_free(clip_index); - lives_free(frame_index); if (layer!=NULL) { layer_palette=weed_layer_get_palette(layer); @@ -5220,6 +5220,48 @@ +static void rdet_use_current(LiVESButton *button, livespointer user_data) { + char *arate,*achans,*asamps; + int aendian; + + lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_width),cfile->hsize); + lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_height),cfile->vsize); + lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_fps),cfile->fps); + + if (cfile->achans>0) { + rdet->ratio_fps=cfile->ratio_fps; + + arate=lives_strdup_printf("%d",cfile->arate); + lives_entry_set_text(LIVES_ENTRY(resaudw->entry_arate),arate); + lives_free(arate); + + achans=lives_strdup_printf("%d",cfile->achans); + lives_entry_set_text(LIVES_ENTRY(resaudw->entry_achans),achans); + lives_free(achans); + + asamps=lives_strdup_printf("%d",cfile->asampsize); + lives_entry_set_text(LIVES_ENTRY(resaudw->entry_asamps),asamps); + lives_free(asamps); + + aendian=cfile->signed_endian; + + if (aendian&AFORM_UNSIGNED) { + lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned), TRUE); + } else { + lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed), TRUE); + } + + if (aendian&AFORM_BIG_ENDIAN) { + lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend), TRUE); + } else { + lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend), TRUE); + } + } + + lives_widget_queue_draw(rdet->dialog); + +} + @@ -5547,6 +5589,15 @@ lives_widget_set_can_focus(cancelbutton,TRUE); + + if (!(prefs->startup_interface==STARTUP_MT&&!mainw->is_ready)) { + if (mainw->current_file!=-1&&mainw->current_file!=mainw->scrap_file&&mainw->current_file!=mainw->ascrap_file&&type==3) { + rdet->usecur_button=lives_button_new_with_mnemonic(_("_Use current clip values")); + lives_dialog_add_action_widget(LIVES_DIALOG(rdet->dialog), rdet->usecur_button, LIVES_RESPONSE_RESET); + lives_signal_connect(LIVES_COMBO(rdet->usecur_button), LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(rdet_use_current), rdet); + } + } + if (!specified) { rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_OK,NULL); lives_widget_set_size_request(rdet->okbutton, DEF_BUTTON_WIDTH*2, -1);
View file
LiVES-2.4.7.tar.bz2/src/events.h -> LiVES-2.6.0.tar.bz2/src/events.h
Changed
@@ -1,6 +1,6 @@ // events.h // LiVES -// (c) G. Finch 2005 - 2010 <salsaman@gmail.com> +// (c) G. Finch 2005 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -112,6 +112,7 @@ boolean ratio_fps; LiVESWidget *dialog; LiVESWidget *okbutton; + LiVESWidget *usecur_button; LiVESWidget *encoder_combo; LiVESWidget *ofmt_combo; LiVESWidget *acodec_combo;
View file
LiVES-2.4.7.tar.bz2/src/giw/giwtimeline.c -> LiVES-2.6.0.tar.bz2/src/giw/giwtimeline.c
Changed
@@ -711,7 +711,7 @@ #ifdef GTK_RENDER_BACKGROUND_BUG GdkRGBA col; #endif - + if (! gtk_widget_is_drawable(widget)) return; @@ -748,7 +748,7 @@ cairo_rectangle(cr, 0, 0, allocation.width, allocation.height); cairo_fill(cr); #endif - + gtk_render_frame(context, cr, 0, 0, allocation.width, allocation.height); gtk_style_context_get_color(context, gtk_widget_get_state_flags(widget),
View file
LiVES-2.4.7.tar.bz2/src/gui.c -> LiVES-2.6.0.tar.bz2/src/gui.c
Changed
@@ -1,6 +1,6 @@ // gui.c // LiVES -// (c) G. Finch 2004 - 2014 <salsaman@gmail.com> +// (c) G. Finch 2004 - 2016 <salsaman@gmail.com> // Released under the GNU GPL 3 or later // see file ../COPYING for licensing details
View file
LiVES-2.4.7.tar.bz2/src/interface.c -> LiVES-2.6.0.tar.bz2/src/interface.c
Changed
@@ -1,7 +1,6 @@ - // interface.c // LiVES -// (c) G. Finch 2003 - 2015 <salsaman@gmail.com> +// (c) G. Finch 2003 - 2016 <salsaman@gmail.com> // Released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -93,13 +92,14 @@ LiVESWidget *preview_button=NULL; LiVESWidget *fs_label; - mainw->fs_playframe = lives_frame_new(NULL); - mainw->fs_playalign = lives_alignment_new(0.,0.,1.,1.); - mainw->fs_playarea = lives_event_box_new(); - - lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mainw->fs_playarea),"pixbuf",NULL); if (preview_type==LIVES_PREVIEW_TYPE_VIDEO_AUDIO||preview_type==LIVES_PREVIEW_TYPE_RANGE) { + mainw->fs_playframe = lives_frame_new(NULL); + mainw->fs_playalign = lives_alignment_new(0.,0.,1.,1.); + mainw->fs_playarea = lives_event_box_new(); + + lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mainw->fs_playarea),"pixbuf",NULL); + lives_container_set_border_width(LIVES_CONTAINER(mainw->fs_playframe), widget_opts.border_width); widget_opts.justify=LIVES_JUSTIFY_RIGHT; @@ -118,7 +118,8 @@ lives_widget_set_bg_color(mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black); lives_widget_set_bg_color(mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black); - } + } else mainw->fs_playframe = mainw->fs_playalign = mainw->fs_playarea = NULL; // AUDIO_ONLY + if (preview_type==LIVES_PREVIEW_TYPE_VIDEO_AUDIO) { @@ -151,6 +152,8 @@ } + + xprocess *create_processing(const char *text) { LiVESWidget *dialog_vbox; @@ -225,6 +228,7 @@ widget_opts.apply_theme=FALSE; procw->scrolledwindow = lives_standard_scrolled_window_new(ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V, LIVES_WIDGET(mainw->optextview)); lives_widget_set_size_request(procw->scrolledwindow, ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V); + widget_opts.apply_theme=woat; details_arrow=lives_standard_expander_new(_("Show Details"),FALSE,LIVES_BOX(vbox3),procw->scrolledwindow); @@ -2085,6 +2089,10 @@ } +static void chooser_response(LiVESWidget *widget, int response, livespointer udata) { + mainw->fc_buttonresponse=response; +} + char *choose_file(const char *dir, const char *fname, char **const filt, LiVESFileChooserAction act, @@ -2139,11 +2147,6 @@ gtk_file_chooser_set_local_only(LIVES_FILE_CHOOSER(chooser),TRUE); - if (mainw->is_ready && palette->style&STYLE_1) { - lives_widget_set_bg_color(chooser, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); - set_child_colour(chooser,FALSE); - } - if (dir!=NULL) { gtk_file_chooser_set_current_folder(LIVES_FILE_CHOOSER(chooser),dir); gtk_file_chooser_add_shortcut_folder(LIVES_FILE_CHOOSER(chooser),dir,NULL); @@ -2168,6 +2171,23 @@ if (extra_widget!=NULL && extra_widget!=mainw->LiVES) gtk_file_chooser_set_extra_widget(LIVES_FILE_CHOOSER(chooser),extra_widget); + if (palette->style&STYLE_1) { + GtkWidget *parent=lives_widget_get_parent(extra_widget); + + while (parent!=NULL) { + lives_widget_set_fg_color(parent, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); + lives_widget_set_bg_color(parent, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); + parent=lives_widget_get_parent(parent); + } + + } + + if (mainw->is_ready && palette->style&STYLE_1) { + lives_widget_set_bg_color(chooser, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); + set_child_colour(chooser,FALSE); + } + + #endif #ifdef GUI_QT @@ -2249,6 +2269,10 @@ memset(last_good_folder,0,1); + // set this so we know when button is pressed, even if waiting for preview to finish + mainw->fc_buttonresponse=LIVES_RESPONSE_NONE; + lives_signal_connect(chooser, LIVES_WIDGET_RESPONSE_SIGNAL, LIVES_GUI_CALLBACK(chooser_response), NULL); + if (extra_widget==mainw->LiVES) { return (char *)chooser; // kludge to allow custom adding of extra widgets } @@ -2567,8 +2591,57 @@ } + +#ifdef GTK_TEXT_VIEW_DRAW_BUG + +static boolean exposetview(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) { + LiVESWidgetColor fgcol,bgcol; + lives_colRGBA32_t fg,bg; + LingoLayout *layout; + lives_painter_surface_t *surface; + + char *text=lives_text_view_get_text(LIVES_TEXT_VIEW(widget)); + + surface=lives_painter_get_target(cr); + lives_painter_surface_flush(surface); + + lives_widget_get_fg_state_color(widget,lives_widget_get_state(widget),&fgcol); + lives_widget_get_bg_state_color(widget,lives_widget_get_state(widget),&bgcol); + + widget_rgba_to_lives_rgba(&fg,&fgcol); + widget_rgba_to_lives_rgba(&bg,&bgcol); + + // TODO - can we clip cr to visible area ? + + layout=render_text_to_cr(widget,cr,text,"",0.0, + LIVES_TEXT_MODE_FOREGROUND_AND_BACKGROUND,&fg,&bg,FALSE,FALSE,0.,0., + lives_widget_get_allocation_width(widget),lives_widget_get_allocation_height(widget)); + + lives_free(text); + + lingo_painter_show_layout(cr, layout); + + if (layout) lives_object_unref(layout); + + lives_painter_fill(cr); + + return TRUE; +} + + +#endif + + + + + LiVESTextView *create_output_textview(void) { LiVESWidget *textview=lives_text_view_new(); + +#ifdef GTK_TEXT_VIEW_DRAW_BUG + g_signal_connect(textview,"draw",G_CALLBACK(exposetview),NULL); +#endif + lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE); if (palette->style&STYLE_1) {
View file
LiVES-2.4.7.tar.bz2/src/liblives.hpp -> LiVES-2.6.0.tar.bz2/src/liblives.hpp
Changed
@@ -19,12 +19,12 @@ /** Version number minor */ -#define LIVES_VERSION_MINOR 4 +#define LIVES_VERSION_MINOR 6 /** Version number micro */ -#define LIVES_VERSION_MICRO 7 +#define LIVES_VERSION_MICRO 0 /** Macro to check if livesApp version is >= major.minor.micro
View file
LiVES-2.4.7.tar.bz2/src/main.c -> LiVES-2.6.0.tar.bz2/src/main.c
Changed
@@ -1,6 +1,6 @@ // main.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2015 +// (c) G. Finch 2003 - 2016 /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 or higher as published by @@ -553,6 +553,7 @@ set_palette_colours(); + get_pref("cdplay_device",prefs->cdplay_device,256); prefs->warning_mask=(uint32_t)get_int_pref("lives_warning_mask"); @@ -1162,9 +1163,6 @@ prefs->no_bandwidth=FALSE; prefs->ocp=get_int_pref("open_compression_percent"); - lives_color_parse("black", &palette->black); - lives_widget_color_copy(&palette->fade_colour,&palette->black); - // we set the theme here in case it got reset to 'none' set_pref("gui_theme",prefs->theme); lives_snprintf(future_prefs->theme,64,"%s",prefs->theme); @@ -1648,9 +1646,9 @@ // replace any multi choice effects with their delegates replace_with_delegates(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); load_default_keymap(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); prefs->audio_opts=get_int_pref("audio_opts"); #ifdef ENABLE_JACK @@ -1964,6 +1962,8 @@ lives_color_parse("grey25", &palette->grey25); lives_color_parse("grey45", &palette->grey45); + lives_widget_color_copy(&palette->fade_colour,&palette->black); + if (prefs->funky_widgets) { lives_color_parse("grey5", &palette->grey20); lives_color_parse("grey25", &palette->grey60); @@ -2494,6 +2494,7 @@ boolean got_files=FALSE; char *tmp; + if (!mainw->foreign) { if (prefs->show_splash) splash_init(); print_notice(); @@ -2507,6 +2508,9 @@ set_interactive(mainw->interactive); + // needed to avoid priv->pulse2 > priv->pulse1 gtk error + lives_widget_context_update(); + #ifdef GUI_GTK icon=lives_build_filename(prefs->prefix_dir,DESKTOP_ICON_DIR,"lives.png",NULL); gtk_window_set_default_icon_from_file(icon,&gerr); @@ -2602,7 +2606,7 @@ else { if (strlen(capable->startup_msg)) { if (info_only) startup_message_info(capable->startup_msg); - startup_message_nonfatal(capable->startup_msg); + else startup_message_nonfatal(capable->startup_msg); } else { // non-fatal errors if (!capable->has_mplayer&&!capable->has_mplayer2&&!(prefs->warning_mask&WARN_MASK_NO_MPLAYER)) { @@ -2920,7 +2924,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); #endif g_log_set_default_handler(lives_log_handler,NULL); @@ -3783,13 +3787,13 @@ if (mainw->current_file<0||cfile==NULL||frame<1||frame>cfile->frames|| (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (!(mainw->imframe==NULL)) { set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),mainw->imframe,NULL); } else { set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),NULL,NULL); } - threaded_dialog_spin(); + threaded_dialog_spin(0.); #if GTK_CHECK_VERSION(3,0,0) lives_signal_handlers_unblock_by_func(mainw->start_image,(livespointer)expose_sim,NULL); lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT); @@ -3800,7 +3804,7 @@ tc=((frame-1.))/cfile->fps*U_SECL; if (!prefs->ce_maxspect||(mainw->double_size&&mainw->playing_file>-1)) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); // if we are not playing, and it would be slow to seek to the frame, convert it to an image if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&is_virtual_frame(mainw->current_file,frame)&&cfile->ext_src!=NULL) { @@ -3831,7 +3835,7 @@ lives_object_unref(start_pixbuf); } } - threaded_dialog_spin(); + threaded_dialog_spin(0.); #if GTK_CHECK_VERSION(3,0,0) lives_signal_handlers_unblock_by_func(mainw->start_image,(livespointer)expose_sim,NULL); lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT); @@ -3841,7 +3845,7 @@ mainw->noswitch=TRUE; - threaded_dialog_spin(); + threaded_dialog_spin(0.); do { width=cfile->hsize; @@ -3907,7 +3911,7 @@ } while (FALSE); #endif - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->noswitch=noswitch; #if GTK_CHECK_VERSION(3,0,0) @@ -3954,13 +3958,13 @@ if (mainw->current_file<0||cfile==NULL||frame<1||frame>cfile->frames|| (cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (!(mainw->imframe==NULL)) { set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),mainw->imframe,NULL); } else { set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),NULL,NULL); } - threaded_dialog_spin(); + threaded_dialog_spin(0.); #if GTK_CHECK_VERSION(3,0,0) lives_signal_handlers_unblock_by_func(mainw->end_image,(livespointer)expose_eim,NULL); lives_signal_stop_emission_by_name(mainw->end_image,LIVES_WIDGET_EXPOSE_EVENT); @@ -3972,7 +3976,7 @@ tc=((frame-1.))/cfile->fps*U_SECL; if (!prefs->ce_maxspect||(mainw->double_size&&mainw->playing_file>-1)) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); // if we are not playing, and it would be slow to seek to the frame, convert it to an image if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&is_virtual_frame(mainw->current_file,frame)&&cfile->ext_src!=NULL) { @@ -4004,7 +4008,7 @@ lives_object_unref(end_pixbuf); } } - threaded_dialog_spin(); + threaded_dialog_spin(0.); #if GTK_CHECK_VERSION(3,0,0) lives_signal_handlers_unblock_by_func(mainw->end_image,(livespointer)expose_eim,NULL); lives_signal_stop_emission_by_name(mainw->end_image,LIVES_WIDGET_EXPOSE_EVENT); @@ -4014,7 +4018,7 @@ mainw->noswitch=TRUE; - threaded_dialog_spin(); + threaded_dialog_spin(0.); do { width=cfile->hsize; height=cfile->vsize; @@ -4077,7 +4081,7 @@ while (FALSE); #endif - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->noswitch=noswitch; #if GTK_CHECK_VERSION(3,0,0) @@ -4960,11 +4964,11 @@ if (pixbuf!=NULL&&((width!=0&&lives_pixbuf_get_width(pixbuf)!=width) ||(height!=0&&lives_pixbuf_get_height(pixbuf)!=height))) { LiVESPixbuf *pixbuf2; - threaded_dialog_spin(); + threaded_dialog_spin(0.); // TODO - could use resize plugin here pixbuf2=lives_pixbuf_scale_simple(pixbuf,width,height,interp); if (pixbuf!=NULL) lives_object_unref(pixbuf); - threaded_dialog_spin(); + threaded_dialog_spin(0.); pixbuf=pixbuf2; }
View file
LiVES-2.4.7.tar.bz2/src/main.h -> LiVES-2.6.0.tar.bz2/src/main.h
Changed
@@ -1,6 +1,6 @@ // main.h // LiVES -// (c) G. Finch (salsaman@gmail.com) 2003 - 2015 +// (c) G. Finch (salsaman@gmail.com) 2003 - 2016 // see file ../COPYING for full licensing details /* This program is free software; you can redistribute it and/or modify @@ -277,6 +277,20 @@ uint64_t lives_random(void); +typedef struct { + uint16_t red; + uint16_t green; + uint16_t blue; +} lives_colRGB24_t; + +typedef struct { + uint16_t red; + uint16_t green; + uint16_t blue; + uint16_t alpha; +} lives_colRGBA32_t; + + #include "widget-helper.h" typedef void *(*fn_ptr)(void *ptr); @@ -457,20 +471,6 @@ #define AFORM_UNKNOWN 65536 -typedef struct { - uint16_t red; - uint16_t green; - uint16_t blue; -} lives_colRGB24_t; - -typedef struct { - uint16_t red; - uint16_t green; - uint16_t blue; - uint16_t alpha; -} lives_colRGBA32_t; - - typedef enum { LIVES_INTERLACE_NONE=0, LIVES_INTERLACE_BOTTOM_FIRST=1, @@ -962,7 +962,7 @@ boolean process_one(boolean visible); void do_threaded_dialog(char *translated_text, boolean has_cancel); void end_threaded_dialog(void); -void threaded_dialog_spin(void); +void threaded_dialog_spin(double fraction); void response_ok(LiVESButton *button, livespointer user_data); void pump_io_chan(LiVESIOChannel *iochan);
View file
LiVES-2.4.7.tar.bz2/src/mainwindow.h -> LiVES-2.6.0.tar.bz2/src/mainwindow.h
Changed
@@ -1199,6 +1199,8 @@ ulong id; boolean interactive; + + int fc_buttonresponse; //////////////////// } mainwindow;
View file
LiVES-2.4.7.tar.bz2/src/multitrack.c -> LiVES-2.6.0.tar.bz2/src/multitrack.c
Changed
@@ -1,6 +1,6 @@ // multitrack.c // LiVES -// (c) G. Finch 2005 - 2015 <salsaman@gmail.com> +// (c) G. Finch 2005 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING for licensing details @@ -233,7 +233,7 @@ event=get_first_event(event_list); - threaded_dialog_spin(); + threaded_dialog_spin(0.); weed_set_int_value(event_list,"width",cfile->hsize); weed_set_int_value(event_list,"height",cfile->vsize); @@ -298,7 +298,7 @@ if (mem==NULL&&fd<0) return TRUE; - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->write_failed=FALSE; weed_plant_serialise(fd,event_list,mem); @@ -350,7 +350,7 @@ event=get_next_event(event); if (++count==100) { count=0; - threaded_dialog_spin(); + threaded_dialog_spin(0.); } } @@ -1195,7 +1195,7 @@ col_black.red=col_black.green=col_black.blue=0; - layout=render_text_to_cr(cr,fname,sfont,10., + layout=render_text_to_cr(NULL,cr,fname,sfont,10., LIVES_TEXT_MODE_FOREGROUND_ONLY,&col_white,&col_white,FALSE,FALSE,0.2,text_start, text_end-text_start,lives_widget_get_allocation_height(eventbox)); @@ -2827,15 +2827,13 @@ for (i=1; i<=MAX_FILES&&mainw->files[i]!=NULL; i++) { lmap=mainw->files[i]->layout_map; while (lmap!=NULL) { - g_print("VALS2 %d %s %s\n",i,(char *)lmap->data,lfile); // lmap->data starts with layout name if (!strncmp((char *)lmap->data,lfile,strlen(lfile))) { - g_print("VALS %d %s %s\n",i,(char *)lmap->data,lfile); - threaded_dialog_spin(); + threaded_dialog_spin(0.); array=lives_strsplit((char *)lmap->data,"|",-1); - threaded_dialog_spin(); + threaded_dialog_spin(0.); // piece 2 is the clip number rnc=atoi(array[1]); @@ -2844,9 +2842,9 @@ // original fps lfps[i]=strtod(array[3],NULL); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_strfreev(array); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } lmap=lmap->next; } @@ -11157,7 +11155,7 @@ check_encoder_restrictions(FALSE,lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)),TRUE); } } - } while (rdet->suggestion_followed); + } while (rdet->suggestion_followed||response==LIVES_RESPONSE_RESET); xarate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate))); xachans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans))); @@ -17961,9 +17959,13 @@ (!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,0,0) -count_events(mt->event_list,FALSE,0,0))>1000))) if (!do_event_list_warning()) return; + mt_desensitise(mt); + lives_widget_context_update(); elist_dialog=create_event_list_dialog(mt->event_list,0,0); lives_dialog_run(LIVES_DIALOG(elist_dialog)); lives_widget_destroy(elist_dialog); + mt_sensitise(mt); + } @@ -17978,7 +17980,10 @@ (!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,tc_start,tc_end) -count_events(mt->event_list,FALSE,tc_start,tc_end))>1000))) if (!do_event_list_warning()) return; + mt_desensitise(mt); + lives_widget_context_update(); elist_dialog=create_event_list_dialog(mt->event_list,tc_start,tc_end); + mt_sensitise(mt); lives_dialog_run(LIVES_DIALOG(elist_dialog)); lives_widget_destroy(elist_dialog); } @@ -19919,7 +19924,7 @@ elist_errors++; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (tc==-1) xnew=lives_strdup(msg); // missing timecode else { if (num==-1) xnew=lives_strdup_printf("%s at timecode %"PRId64"\n",msg,tc); @@ -19932,7 +19937,7 @@ #endif lives_free(ebuf); lives_free(xnew); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return tmp; } @@ -20502,7 +20507,7 @@ ev_count++; lives_snprintf(mainw->msg,256,"%d|",ev_count); - if ((ev_count%100)==0) threaded_dialog_spin(); + if ((ev_count%100)==0) threaded_dialog_spin(0.); if (weed_get_plant_type(event)!=WEED_PLANT_EVENT) { @@ -21565,7 +21570,6 @@ // audio volume effect changed, so we reset which parameters are viewed lives_list_free(mt->opts.aparam_view_list); mt->opts.aparam_view_list=NULL; - g_print("pt AA\n"); } if (event_list!=NULL) {
View file
LiVES-2.4.7.tar.bz2/src/pangotext.c -> LiVES-2.6.0.tar.bz2/src/pangotext.c
Changed
@@ -135,7 +135,7 @@ -LingoLayout *render_text_to_cr(lives_painter_t *cr, const char *text, const char *fontname, +LingoLayout *render_text_to_cr(LiVESWidget *widget, lives_painter_t *cr, const char *text, const char *fontname, double size, lives_text_mode_t mode, lives_colRGBA32_t *fg, lives_colRGBA32_t *bg, boolean center, boolean rising, double top, int offs_x, int width, int height) { @@ -149,7 +149,7 @@ // aligned to left (offs_x), unless "center" is TRUE #ifdef GUI_GTK - PangoFontDescription *font; + PangoFontDescription *font=NULL; #endif LingoLayout *layout; @@ -167,14 +167,19 @@ if (cr==NULL) return NULL; #ifdef GUI_GTK - layout = pango_cairo_create_layout(cr); - if (layout==NULL) return NULL; - - font = pango_font_description_new(); - pango_font_description_set_family(font, fontname); - pango_font_description_set_absolute_size(font, size*PANGO_SCALE); - - pango_layout_set_font_description(layout, font); + if (widget!=NULL) { + PangoContext *ctx=gtk_widget_get_pango_context(widget); + layout=pango_layout_new(ctx); + } else { + layout = pango_cairo_create_layout(cr); + if (layout==NULL) return NULL; + + font = pango_font_description_new(); + pango_font_description_set_family(font, fontname); + pango_font_description_set_absolute_size(font, size*PANGO_SCALE); + + pango_layout_set_font_description(layout, font); + } pango_layout_set_text(layout, text, -1); #endif @@ -202,7 +207,7 @@ case LIVES_TEXT_MODE_BACKGROUND_ONLY: lingo_layout_set_text(layout, "", -1); case LIVES_TEXT_MODE_FOREGROUND_AND_BACKGROUND: - lives_painter_set_source_rgba(cr,bg->red/66535., bg->green/66535., bg->blue/66535., b_alpha); + lives_painter_set_source_rgba(cr,(double)bg->red/66535., (double)bg->green/66535., (double)bg->blue/66535., b_alpha); fill_bckg(cr, x_pos, y_pos, dwidth, dheight); break; default: @@ -211,14 +216,16 @@ lives_painter_new_path(cr); lives_painter_move_to(cr, x_text, y_text); - lives_painter_set_source_rgba(cr,fg->red/66535., fg->green/66535., fg->blue/66535., f_alpha); + lives_painter_set_source_rgba(cr,(double)fg->red/66535., (double)fg->green/66535., (double)fg->blue/66535., f_alpha); #ifdef GUI_QT lingo_layout_set_coords(layout, x_pos, y_pos, dwidth, dheight); #endif #ifdef GUI_GTK - pango_font_description_free(font); + if (font!=NULL) { + pango_font_description_free(font); + } #endif return layout; @@ -252,7 +259,7 @@ cr=layer_to_lives_painter(layer); if (cr==NULL) return layer; ///< error occured - layout = render_text_to_cr(cr,text,fontname,size,mode,fg_col,bg_col,center,rising,top,0,width,height); + layout = render_text_to_cr(NULL,cr,text,fontname,size,mode,fg_col,bg_col,center,rising,top,0,width,height); lingo_painter_show_layout(cr, layout);
View file
LiVES-2.4.7.tar.bz2/src/pangotext.h -> LiVES-2.6.0.tar.bz2/src/pangotext.h
Changed
@@ -60,7 +60,7 @@ double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col, boolean center, boolean rising, double top); -LingoLayout *render_text_to_cr(lives_painter_t *, const char *text, const char *fontname, +LingoLayout *render_text_to_cr(LiVESWidget *widget, lives_painter_t *, const char *text, const char *fontname, double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col, boolean center, boolean rising, double top, int start, int width, int height);
View file
LiVES-2.4.7.tar.bz2/src/plugins.c -> LiVES-2.6.0.tar.bz2/src/plugins.c
Changed
@@ -1,6 +1,6 @@ // plugins.c // LiVES -// (c) G. Finch 2003 - 2013 <salsaman@gmail.com> +// (c) G. Finch 2003 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -58,7 +58,7 @@ char *com; char buffer[65536]; - threaded_dialog_spin(); + threaded_dialog_spin(0.); #ifndef IS_MINGW outfile=lives_strdup_printf("%s/.smogplugin.%d",prefs->tmpdir,capable->mainpid); @@ -97,17 +97,17 @@ } } lives_free(outfile); - threaded_dialog_spin(); + threaded_dialog_spin(0.); unlink(outfile); return list; } lives_free(com); if (!lives_file_test(outfile, LIVES_FILE_TEST_EXISTS)) { lives_free(outfile); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return NULL; } - threaded_dialog_spin(); + threaded_dialog_spin(0.); do { retval=0; @@ -136,7 +136,7 @@ if (bytes<0) { retval=do_read_failed_error_s_with_retry(outfile,NULL,NULL); } else { - threaded_dialog_spin(); + threaded_dialog_spin(0.); memset(buffer+bytes,0,1); } } @@ -146,7 +146,7 @@ lives_free(outfile); if (retval==LIVES_RESPONSE_CANCEL) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); return list; } @@ -171,7 +171,7 @@ } } lives_strfreev(array); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return list; } @@ -269,7 +269,7 @@ list_plugins=FALSE; reslist=get_plugin_result(com,delim,allow_blanks); lives_free(com); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return reslist; } @@ -326,7 +326,7 @@ pluglist=get_plugin_result(com,"|",FALSE); lives_free(com); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return pluglist; } @@ -1643,12 +1643,17 @@ // TODO - allow lists for size lives_snprintf(prefs->encoder.of_restrict,5,"none"); - if (!((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))==NULL)) { + if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) { // get any restrictions for the current format for (i=0; i<lives_list_length(ofmt_all); i++) { if ((numtok=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],prefs->encoder.of_name)) { + if (numtok>5) { + lives_snprintf(prefs->encoder.ptext,512,"%s",array[5]); + } else { + memset(prefs->encoder.ptext,0,1); + } if (numtok>4) { lives_snprintf(prefs->encoder.of_def_ext,16,"%s",array[4]); } else { @@ -2736,7 +2741,7 @@ return; } - threaded_dialog_spin(); + threaded_dialog_spin(0.); rfx->num_params=lives_list_length(parameter_list); rfx->params=(lives_param_t *)lives_malloc(rfx->num_params*sizeof(lives_param_t)); @@ -2873,7 +2878,7 @@ } lives_list_free_strings(parameter_list); lives_list_free(parameter_list); - threaded_dialog_spin(); + threaded_dialog_spin(0.); }
View file
LiVES-2.4.7.tar.bz2/src/plugins.h -> LiVES-2.6.0.tar.bz2/src/plugins.h
Changed
@@ -1,6 +1,6 @@ // plugins.h // LiVES -// (c) G. Finch 2003-2012 <salsaman@gmail.com> +// (c) G. Finch 2003-2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -180,6 +180,7 @@ int of_allowed_acodecs; char of_restrict[1024]; char of_def_ext[16]; + char ptext[512]; } _encoder;
View file
LiVES-2.4.7.tar.bz2/src/preferences.c -> LiVES-2.6.0.tar.bz2/src/preferences.c
Changed
@@ -1,6 +1,6 @@ // preferences.c // LiVES (lives-exe) -// (c) G. Finch 2004 - 2014 +// (c) G. Finch 2004 - 2016 // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -3128,6 +3128,7 @@ array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1); if (!strcmp(array[0],prefs->encoder.of_name)) { prefs->encoder.of_allowed_acodecs=atoi(array[2]); + lives_snprintf(prefs->encoder.of_restrict,1024,"%s",array[3]); } ofmt = lives_list_append(ofmt, lives_strdup(array[1])); lives_strfreev(array);
View file
LiVES-2.4.7.tar.bz2/src/pulse.c -> LiVES-2.6.0.tar.bz2/src/pulse.c
Changed
@@ -918,7 +918,8 @@ if (pulsed->playing_file==-1||(mainw->record&&mainw->record_paused)) { pa_stream_drop(pulsed->pstream); if (pulsed->playing_file==-1) { - pa_stream_flush(pulsed->pstream,NULL,NULL); // if not recording, flush the rest of audio (to reduce latency) + pa_operation *paop=pa_stream_flush(pulsed->pstream,NULL,NULL); // if not recording, flush the rest of audio (to reduce latency) + pa_operation_unref(paop); } return; }
View file
LiVES-2.4.7.tar.bz2/src/rfx-builder.c -> LiVES-2.6.0.tar.bz2/src/rfx-builder.c
Changed
@@ -3791,11 +3791,11 @@ d_print(_("rebuilding dynamic menu entries...")); lives_widget_context_update(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); add_rfx_effects(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); d_print_done(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); end_threaded_dialog(); lives_widget_queue_draw(mainw->LiVES); @@ -4407,12 +4407,12 @@ if (mainw->rendered_fx!=NULL) { if (mainw->rendered_fx[i].menuitem!=NULL) { lives_widget_destroy(mainw->rendered_fx[i].menuitem); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } } } - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->rte_separator!=NULL) { if (mainw->custom_effects_separator!=NULL) lives_widget_destroy(mainw->custom_effects_separator); @@ -4432,7 +4432,7 @@ lives_widget_queue_draw(mainw->effects_menu); lives_widget_context_update(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->rendered_fx!=NULL) rfx_free_all(); } @@ -4440,7 +4440,7 @@ mainw->num_rendered_effects_builtin=mainw->num_rendered_effects_custom=mainw->num_rendered_effects_test=0; - threaded_dialog_spin(); + threaded_dialog_spin(0.); make_custom_submenus(); @@ -4496,7 +4496,7 @@ rfx_list_length=rfx_builtin_list_length+rfx_custom_list_length+rfx_test_list_length; - threaded_dialog_spin(); + threaded_dialog_spin(0.); rendered_fx=(lives_rfx_t *)lives_malloc((rfx_list_length+1)*sizeof(lives_rfx_t)); @@ -4534,7 +4534,7 @@ for (plugin_idx=0; plugin_idx<rfx_list_length; plugin_idx++) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->splash_window==NULL) { lives_widget_context_update(); } @@ -4643,7 +4643,7 @@ rfx_slot_count--; - threaded_dialog_spin(); + threaded_dialog_spin(0.); // sort menu text by alpha order (apart from [0]) sort_rfx_array(rendered_fx,rfx_slot_count); lives_free(rendered_fx); @@ -4683,16 +4683,16 @@ mainw->custom_effects_separator=lives_menu_add_separator(LIVES_MENU(mainw->effects_menu)); - threaded_dialog_spin(); + threaded_dialog_spin(0.); // now we need to add to the effects menu and set a callback for (rfx=&mainw->rendered_fx[(plugin_idx=1)]; plugin_idx<=rfx_slot_count; rfx=&mainw->rendered_fx[++plugin_idx]) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->splash_window==NULL) { lives_widget_context_update(); } render_fx_get_params(rfx,rfx->name,rfx->status); - threaded_dialog_spin(); + threaded_dialog_spin(0.); rfx->source=NULL; rfx->extra=NULL; rfx->menuitem=NULL; @@ -4760,7 +4760,7 @@ } } - threaded_dialog_spin(); + threaded_dialog_spin(0.); // custom effects if (rc_child>0) { @@ -4808,13 +4808,13 @@ lives_container_add(LIVES_CONTAINER(mainw->custom_tools_menu), mainw->custom_utilities_submenu); - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->resize_menuitem=NULL; 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(); + threaded_dialog_spin(0.); if (mainw->splash_window==NULL) { lives_widget_context_update(); } @@ -4913,7 +4913,7 @@ } - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->has_custom_tools||mainw->has_custom_utilities) { lives_widget_show(mainw->custom_tools_separator);
View file
LiVES-2.4.7.tar.bz2/src/rte_window.c -> LiVES-2.6.0.tar.bz2/src/rte_window.c
Changed
@@ -2794,7 +2794,7 @@ int retval; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (hash_list==NULL) hash_list=weed_get_all_names(FX_LIST_HASHNAME); @@ -2830,7 +2830,7 @@ lives_free(keymap_template); lives_free(dir); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return; } } @@ -2841,5 +2841,5 @@ lives_free(keymap_file); lives_free(keymap_template); lives_free(dir); - threaded_dialog_spin(); + threaded_dialog_spin(0.); }
View file
LiVES-2.4.7.tar.bz2/src/saveplay.c -> LiVES-2.6.0.tar.bz2/src/saveplay.c
Changed
@@ -1,7 +1,6 @@ - // saveplay.c // LiVES (lives-exe) -// (c) G. Finch 2003 - 2015 +// (c) G. Finch 2003 - 2016 // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -180,7 +179,7 @@ return do_progress_dialog(TRUE,TRUE,_("Examining file header")); - threaded_dialog_spin(); + threaded_dialog_spin(0.); do { retval=0; @@ -193,7 +192,7 @@ while (!((infofile=fopen(cfile->info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) { lives_widget_context_update(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_usleep(prefs->sleep_time); } @@ -210,7 +209,7 @@ } } while (retval==LIVES_RESPONSE_RETRY); - threaded_dialog_spin(); + threaded_dialog_spin(0.); return TRUE; } @@ -406,7 +405,7 @@ if (stframe+nframes>maxframe) nframes=maxframe-stframe; if (nframes<=0) break; (dplug->decoder->rip_audio)(cdata,afile,stframe,nframes,NULL); - threaded_dialog_spin(); + threaded_dialog_spin(0.); stframe+=nframes; } while (mainw->cancelled==CANCEL_NONE); @@ -1307,6 +1306,11 @@ add_suffix_check(LIVES_BOX(hbox),prefs->encoder.of_def_ext); lives_widget_show_all(hbox); + if (palette->style&STYLE_1) { + lives_widget_set_fg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore); + lives_widget_set_bg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back); + } + if (filename==NULL) { char *ttl=lives_strdup(_("LiVES: Save Clip as...")); do { @@ -1895,6 +1899,9 @@ if (!mainw->error) { char *pluginstr; + cfile->progress_start=1; + cfile->progress_end=cfile->frames; + not_cancelled=do_progress_dialog(TRUE,TRUE,_("Saving [can take a long time]")); mesg=lives_strdup(mainw->msg); @@ -4232,7 +4239,7 @@ lives_strfreev(array); } - threaded_dialog_spin(); + threaded_dialog_spin(0.); do { retval2=0; @@ -4243,7 +4250,7 @@ lives_free(lives_header); - threaded_dialog_spin(); + threaded_dialog_spin(0.); detail=CLIP_DETAILS_HEADER_VERSION; retval=get_clip_value(mainw->current_file,detail,&cfile->header_version,16); @@ -5321,7 +5328,7 @@ lives_free(ppath); while (1) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); fake_cdata->URI=lives_strdup(sfile->file_name); fake_cdata->fps=sfile->fps; @@ -5405,7 +5412,7 @@ return FALSE; } // got cdata - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (fake_cdata->URI!=NULL) lives_free(fake_cdata->URI); lives_free(fake_cdata); break; @@ -5492,13 +5499,13 @@ mainw->is_ready=FALSE; d_print(_("Recovering files...")); - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->suppress_dprint=TRUE; while (1) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); is_scrap=FALSE; is_ascrap=FALSE; @@ -5517,7 +5524,7 @@ } reset_clipmenu(); lives_widget_context_update(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->read_failed) { do_read_failed_error_s(recovery_file,NULL); @@ -5592,7 +5599,7 @@ // TODO - dirsep if (strstr(buffptr,"/clips/")) { char **array; - threaded_dialog_spin(); + threaded_dialog_spin(0.); array=lives_strsplit(buffptr,"/clips/",-1); mainw->was_set=TRUE; lives_snprintf(mainw->set_name,128,"%s",array[0]); @@ -5603,18 +5610,18 @@ did_set_check=TRUE; } - threaded_dialog_spin(); + threaded_dialog_spin(0.); } last_was_normal_file=TRUE; mainw->current_file=new_file; - threaded_dialog_spin(); + threaded_dialog_spin(0.); cfile=(lives_clip_t *)(lives_malloc(sizeof(lives_clip_t))); lives_snprintf(cfile->handle,256,"%s",buffptr); cfile->clip_type=CLIP_TYPE_DISK; // the default //create a new cfile and fill in the details create_cfile(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (!is_scrap) { if (!is_ascrap) { @@ -5686,15 +5693,15 @@ if (!is_scrap&&!is_ascrap) { // read the playback fps, play frame, and name - threaded_dialog_spin(); + threaded_dialog_spin(0.); open_set_file(mainw->set_name,++clipnum); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->cached_list!=NULL) { - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_list_free_strings(mainw->cached_list); lives_list_free(mainw->cached_list); - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->cached_list=NULL; } @@ -5710,7 +5717,7 @@ } // add to clip menu - threaded_dialog_spin(); + threaded_dialog_spin(0.); add_to_clipmenu(); get_next_free_file(); cfile->start=cfile->frames>0?1:0; @@ -5744,7 +5751,7 @@ mainw->current_file=current_file; } - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,""); } else {
View file
LiVES-2.4.7.tar.bz2/src/stream.c -> LiVES-2.6.0.tar.bz2/src/stream.c
Changed
@@ -110,7 +110,7 @@ mainw->frame_layer=NULL; lives_widget_context_update(); mainw->frame_layer=frame_layer; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->cancelled) return buflen+btoread; lives_usleep(prefs->sleep_time); } @@ -146,7 +146,7 @@ mainw->frame_layer=NULL; lives_widget_context_update(); mainw->frame_layer=frame_layer; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->cancelled) { return -1; } @@ -183,7 +183,7 @@ mainw->frame_layer=NULL; lives_widget_context_update(); mainw->frame_layer=frame_layer; - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (mainw->cancelled) return TRUE; lives_usleep(prefs->sleep_time); }
View file
LiVES-2.4.7.tar.bz2/src/utils.c -> LiVES-2.6.0.tar.bz2/src/utils.c
Changed
@@ -2119,10 +2119,10 @@ capable->mainpid,info_file); unlink(info_file); - threaded_dialog_spin(); + threaded_dialog_spin(0.); mainw->com_failed=FALSE; lives_system(com,FALSE); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(com); clear_mainw_msg(); @@ -2137,9 +2137,9 @@ if (type==0) { msg=lives_strdup_printf(_("Set %s\ncannot be opened, as it is in use\nby another copy of LiVES.\n"),set_name); - threaded_dialog_spin(); + threaded_dialog_spin(0.); do_error_dialog(msg); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } else if (type==1) { msg=lives_strdup_printf (_("\nThe set %s is currently in use by another copy of LiVES.\nPlease choose another set name.\n"),set_name); @@ -3189,7 +3189,7 @@ } } } - threaded_dialog_spin(); + threaded_dialog_spin(0.); } @@ -4385,7 +4385,7 @@ if (!(hfile=fopen(filename,"r"))) return FALSE; while (fgets(buff,65536,hfile)!=NULL) { mainw->cached_list=lives_list_append(mainw->cached_list,lives_strdup(buff)); - threaded_dialog_spin(); + threaded_dialog_spin(0.); } fclose(hfile); return TRUE; @@ -4586,11 +4586,11 @@ val=(char *)lives_malloc(maxlen); memset(val,0,maxlen); - threaded_dialog_spin(); + threaded_dialog_spin(0.); if (lives_system(com,TRUE)) { tempdir_warning(); - threaded_dialog_spin(); + threaded_dialog_spin(0.); lives_free(com); return FALSE; }
View file
LiVES-2.4.7.tar.bz2/src/widget-helper-gtk.h -> LiVES-2.6.0.tar.bz2/src/widget-helper-gtk.h
Changed
@@ -16,6 +16,7 @@ #define GTK_SUBMENU_SENS_BUG // a bug where setting a menuitem insensitive fails if it has a submenu #define GTK_TEXT_VIEW_CSS_BUG // a bug where named textviews cannot be set by CSS #define GTK_RENDER_BACKGROUND_BUG // a bug where bg of custom widgets is not rendered +#define GTK_TEXT_VIEW_DRAW_BUG // a bug where textview crashes if too much text in it #ifndef IS_MINGW @@ -509,7 +510,6 @@ #define LIVES_WIDGET_STATE_BACKDROP (GTK_STATE_INSENSITIVE+3) #endif - typedef int LiVESResponseType; #define LIVES_RESPONSE_NONE GTK_RESPONSE_NONE #define LIVES_RESPONSE_OK GTK_RESPONSE_OK
View file
LiVES-2.4.7.tar.bz2/src/widget-helper.c -> LiVES-2.6.0.tar.bz2/src/widget-helper.c
Changed
@@ -1,6 +1,6 @@ // widget-helper.c // LiVES -// (c) G. Finch 2012 - 2015 <salsaman@gmail.com> +// (c) G. Finch 2012 - 2016 <salsaman@gmail.com> // released under the GNU GPL 3 or later // see file ../COPYING or www.gnu.org for licensing details @@ -7990,6 +7990,8 @@ lives_box_pack_start(parent, expander, FALSE, FALSE, widget_opts.packing_height); lives_container_add(LIVES_CONTAINER(expander), child); + lives_container_set_border_width(LIVES_CONTAINER(expander),widget_opts.border_width); + #endif return expander; @@ -8166,8 +8168,8 @@ -void lives_widget_get_fg_color(LiVESWidget *widget, LiVESWidgetColor *color) { - lives_widget_get_fg_state_color(widget,LIVES_WIDGET_STATE_NORMAL,color); +boolean lives_widget_get_fg_color(LiVESWidget *widget, LiVESWidgetColor *color) { + return lives_widget_get_fg_state_color(widget,LIVES_WIDGET_STATE_NORMAL,color); } void lives_widget_unparent(LiVESWidget *widget) { @@ -8698,3 +8700,16 @@ +LIVES_INLINE boolean widget_rgba_to_lives_rgba(lives_colRGBA32_t *lcolor, LiVESWidgetColor *color) { +#ifdef GUI_GTK + lcolor->red=color->red*65535.; + lcolor->green=color->green*65535.; + lcolor->blue=color->blue*65535.; + lcolor->alpha=color->alpha*65535.; + return TRUE; +#endif + return FALSE; +} + + +
View file
LiVES-2.4.7.tar.bz2/src/widget-helper.h -> LiVES-2.6.0.tar.bz2/src/widget-helper.h
Changed
@@ -92,6 +92,9 @@ boolean widget_helper_init(void); +boolean widget_rgba_to_lives_rgba(lives_colRGBA32_t *, LiVESWidgetColor *); + + // object funcs. livespointer lives_object_ref(livespointer); ///< increase refcount by one @@ -748,7 +751,7 @@ LiVESWidget *lives_menu_add_separator(LiVESMenu *menu); -void lives_widget_get_fg_color(LiVESWidget *, LiVESWidgetColor *); +boolean lives_widget_get_fg_color(LiVESWidget *, LiVESWidgetColor *); void lives_window_center(LiVESWindow *);
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
.