From 101d92b4c50a831fb00edd65df57de41b408c7b6 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sun, 29 Jan 2017 14:32:03 -0700 Subject: [PATCH] batchrender asset path fix, ru xlat, fixup hevc/h265 opts, expand new bg pngs --- cinelerra-5.1/cinelerra/asset.C | 51 ++- cinelerra-5.1/cinelerra/asset.h | 8 +- cinelerra-5.1/cinelerra/assetedit.C | 2 +- cinelerra-5.1/cinelerra/commercials.C | 2 +- cinelerra-5.1/cinelerra/edit.C | 2 +- cinelerra-5.1/cinelerra/edits.C | 3 +- cinelerra-5.1/cinelerra/ffmpeg.C | 3 +- cinelerra-5.1/cinelerra/mwindow.C | 4 +- cinelerra-5.1/cinelerra/preferencesthread.C | 2 +- cinelerra-5.1/ffmpeg/video/h265.mp4 | 1 + cinelerra-5.1/ffmpeg/video/hevc422p10.m2ts | 2 +- .../plugins/theme_blond/data/new_bg.png | Bin 3349 -> 3265 bytes .../plugins/theme_blond_cv/data/new_bg.png | Bin 8486 -> 8528 bytes .../plugins/theme_blue/data/new_bg.png | Bin 3854 -> 3752 bytes .../plugins/theme_blue_dot/data/new_bg.png | Bin 5618 -> 5609 bytes .../plugins/theme_bright/data/new_bg.png | Bin 2628 -> 2621 bytes .../plugins/theme_hulk/data/new_bg.png | Bin 3922 -> 3827 bytes .../plugins/theme_pinklady/data/new_bg.png | Bin 4055 -> 3947 bytes .../plugins/theme_suv/data/new_bg.png | Bin 2652 -> 2648 bytes .../plugins/theme_unflat/data/new_bg.png | Bin 3219 -> 3125 bytes cinelerra-5.1/po/ru.po | 327 +++++++++++------- 21 files changed, 233 insertions(+), 174 deletions(-) create mode 100644 cinelerra-5.1/ffmpeg/video/h265.mp4 diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C index 9cf4a305..fd17a142 100644 --- a/cinelerra-5.1/cinelerra/asset.C +++ b/cinelerra-5.1/cinelerra/asset.C @@ -25,6 +25,7 @@ #include "bchash.h" #include "bcsignals.h" #include "clip.h" +#include "cstrdup.h" #include "edl.h" #include "file.h" #include "filesystem.h" @@ -319,21 +320,30 @@ char* Asset::get_compression_text(int audio, int video) return 0; } -Asset& Asset::operator=(Asset &asset) +int Asset::equivalent(Asset &asset, int test_audio, int test_video, EDL *edl) { -printf("Asset::operator=\n"); - copy_location(&asset); - copy_format(&asset, 1); - return *this; -} - - -int Asset::equivalent(Asset &asset, - int test_audio, - int test_video) -{ - int result = (!strcmp(asset.path, path) && - format == asset.format); + int result = format == asset.format ? 1 : 0; + if( result && strcmp(asset.path, path) ) { + char *out_path = edl ? FileSystem::basepath(edl->path) : 0; + char *sp = out_path ? strrchr(out_path,'/') : 0; + if( sp ) *++sp = 0; + char *apath = FileSystem::basepath(asset.path); + char *tpath = FileSystem::basepath(this->path); + if( out_path ) { + if( *apath != '/' ) { + char *cp = cstrcat(2, out_path, apath); + delete [] apath; apath = cp; + } + if( *tpath != '/' ) { + char *cp = cstrcat(2, out_path, tpath); + delete [] tpath; tpath = cp; + } + } + if( strcmp(apath, tpath) ) result = 1; + delete [] apath; + delete [] tpath; + delete [] out_path; + } if(result && format == FILE_FFMPEG) result = !strcmp(fformat, asset.fformat); @@ -380,19 +390,6 @@ int Asset::equivalent(Asset &asset, return result; } -int Asset::operator==(Asset &asset) -{ - - return equivalent(asset, - 1, - 1); -} - -int Asset::operator!=(Asset &asset) -{ - return !(*this == asset); -} - int Asset::test_path(const char *path) { if(!strcasecmp(this->path, path)) diff --git a/cinelerra-5.1/cinelerra/asset.h b/cinelerra-5.1/cinelerra/asset.h index 479cccbb..26fbfd70 100644 --- a/cinelerra-5.1/cinelerra/asset.h +++ b/cinelerra-5.1/cinelerra/asset.h @@ -27,6 +27,7 @@ #include "arraylist.h" #include "bcwindowbase.inc" #include "bchash.inc" +#include "edl.inc" #include "filexml.inc" #include "indexable.h" #include "indexfile.inc" @@ -85,12 +86,7 @@ public: // Executed during index building only - int equivalent(Asset &asset, - int test_audio, - int test_video); - Asset& operator=(Asset &asset); - int operator==(Asset &asset); - int operator!=(Asset &asset); + int equivalent(Asset &asset, int test_audio, int test_video, EDL *edl=0); // Return 1 if the paths match int test_path(const char *path); int read(FileXML *file, diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C index 0b77d919..27a5a8db 100644 --- a/cinelerra-5.1/cinelerra/assetedit.C +++ b/cinelerra-5.1/cinelerra/assetedit.C @@ -130,7 +130,7 @@ void AssetEdit::handle_close_event(int result) if(indexable->is_asset) { asset = (Asset*)indexable; - if(!changed_params->equivalent(*asset, 1, 1)) + if(!changed_params->equivalent(*asset, 1, 1, mwindow->edl)) changed = 1; } else diff --git a/cinelerra-5.1/cinelerra/commercials.C b/cinelerra-5.1/cinelerra/commercials.C index a5bc6fea..a81aafe8 100644 --- a/cinelerra-5.1/cinelerra/commercials.C +++ b/cinelerra-5.1/cinelerra/commercials.C @@ -559,7 +559,7 @@ scan_audio(int vstream, double start, double end) Indexable *indexable = edit->get_source(); if( !indexable || !indexable->is_asset ) continue; Asset *asset = (Asset *)indexable; - if( !scan_file->asset->equivalent(*asset,0,0) ) continue; + if( !scan_file->asset->equivalent(*asset,0,0,mwindow->edl) ) continue; if( verify_edit(atrk, edit, start, end) ) continue; next = cut_edit(atrk, edit, atrk->to_units(start,0), diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C index b54da4f5..3658922d 100644 --- a/cinelerra-5.1/cinelerra/edit.C +++ b/cinelerra-5.1/cinelerra/edit.C @@ -282,7 +282,7 @@ void Edit::equivalent_output(Edit *edit, int64_t *result) !transition->identical(edit->transition)) || // Asset changed (asset && edit->asset && - !asset->equivalent(*edit->asset, 1, 1)) || + !asset->equivalent(*edit->asset, 1, 1, edl)) || // Nested EDL changed (nested_edl && edit->nested_edl && strcmp(nested_edl->path, edit->nested_edl->path)) diff --git a/cinelerra-5.1/cinelerra/edits.C b/cinelerra-5.1/cinelerra/edits.C index 9cab7c2a..a8e668f8 100644 --- a/cinelerra-5.1/cinelerra/edits.C +++ b/cinelerra-5.1/cinelerra/edits.C @@ -657,8 +657,7 @@ int Edits::clear_handle(double start, double end, if(current_edit->asset && current_edit->next->asset) { - if(current_edit->asset->equivalent(*current_edit->next->asset, - 0, 0)) { + if(current_edit->asset->equivalent(*current_edit->next->asset, 0, 0, edl)) { // Got two consecutive edits in same source if(edl->equivalent(track->from_units(current_edit->next->startproject), diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C index 60a17ed4..f3f9dcc4 100644 --- a/cinelerra-5.1/cinelerra/ffmpeg.C +++ b/cinelerra-5.1/cinelerra/ffmpeg.C @@ -2051,7 +2051,8 @@ int FFMPEG::encode_activate() for( int i=sizeof(lcode)/sizeof(lcode[0]); --i>=0 && !ep; ) if( !strncmp(lcode[i].lc,lp,2) ) ep = lcode[i].lng; } - char lang[4]; + if( !ep ) ep = "und"; + char lang[5]; strncpy(lang,ep,3); lang[3] = 0; AVStream *st = ffaudio[0]->st; av_dict_set(&st->metadata,"language",lang,0); diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 9f597d27..7b0a52fe 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -3544,7 +3544,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra next_edit = edit->next; if( edit->channel != vstream || !edit->asset || !edit->asset->is_asset || - *asset != *edit->asset ) + !asset->equivalent(*edit->asset,1,1,edl) ) delete edit; } } @@ -3604,7 +3604,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra next_edit = edit->next; if( !((1<channel) & channel_mask) || !edit->asset || !edit->asset->is_asset || - *asset != *edit->asset ) + !asset->equivalent(*edit->asset,1,1,edl) ) delete edit; } if( !track->edits->first ) diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C index 1756a81b..8e52a243 100644 --- a/cinelerra-5.1/cinelerra/preferencesthread.C +++ b/cinelerra-5.1/cinelerra/preferencesthread.C @@ -208,7 +208,7 @@ int PreferencesThread::apply_settings() (preferences->force_uniprocessor != mwindow->preferences->force_uniprocessor) || this_playback_config->active_config != playback_config->active_config || (*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) || - !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1); + !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl); if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 ) mwindow->restart_status = -1; // reload, need new bcresources diff --git a/cinelerra-5.1/ffmpeg/video/h265.mp4 b/cinelerra-5.1/ffmpeg/video/h265.mp4 new file mode 100644 index 00000000..d045e233 --- /dev/null +++ b/cinelerra-5.1/ffmpeg/video/h265.mp4 @@ -0,0 +1 @@ +mp4 libx265 diff --git a/cinelerra-5.1/ffmpeg/video/hevc422p10.m2ts b/cinelerra-5.1/ffmpeg/video/hevc422p10.m2ts index f15e594a..5567f1f5 100644 --- a/cinelerra-5.1/ffmpeg/video/hevc422p10.m2ts +++ b/cinelerra-5.1/ffmpeg/video/hevc422p10.m2ts @@ -1,4 +1,4 @@ -bluray libx265 +mpegts libx265 id=0x1011 #preset=ultrafast,superfast,veryfast,faster,fast, #preset=medium,slow,slower,veryslow,placebo diff --git a/cinelerra-5.1/plugins/theme_blond/data/new_bg.png b/cinelerra-5.1/plugins/theme_blond/data/new_bg.png index 7a47887ee8445d90be36c6441c30b4b50926dd38..3b3ed4fd7615e7745aea6c8dcad79990811a0835 100644 GIT binary patch literal 3265 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 literal 3349 zcmeHKX;f2Z8h%5NPVDJMK&QQvd#Bh3LNaeo|%7>Ke^nz-@81|^FH^I z;pMSiTf;~L0JPn{bo~lIg#e&jQddKFOw!Vs=*xifg&${k6elJek~op!vEjj?F$dUT z7IEx|?guqTP{b-6;kuU-4!a{0=sWhZ>DCOomA#{_gQJZV-P+P>lSYca<3!sFw^!|0)jbg#(7n3$+|@u!a}0JNgqT(|5#oZsKw$_{AxDD79C+3@O? zIGUP~y8J*P?Pb*sdc{wE%k%U%7F$PFQC*$0yV#kbQ~R~Gj*b?sHE{WR@z|>5Ddhnn zz;P?5F$%!pAQe5Je-Emlz6L1pOTOo|;di~oxw6rZhc0J5_N(g4W0_KWe%`6p6T=Wx z-AyT9pYvU6PV~jXhm(h1ZH4^&7MOGwbg0sYthE~|JRvTZ+pGzC+du`rTS@@zRiy*d zkfQ$oTYm}(hnd%1TeTZTj8%L1BUFu^07Qg+wsIsdxL{-hq};R5Zgx?Tww%_Ib}41? z1ymp+dRH)ku$-sWW?ZXhGA8Kgr&5}zqeSGx$|{`E+1T03{cC0Y;I}gZ-n&XsiH~q> zA}~vKUcV^iB&FKF^kqYH*E8qVmLFv|qZv+ukN>NmQQ(*s?gk`E*Q0*7= zZiXxM^0sS>W@y>1+$Z`vND*Tgy=fr2vb&ubZ z{;jcBbnWuaC=`u-V*emTQsr2Je*TXgO-T<*`wmu?p`<~9Q|B2H_s`g-e4Z__IV=6h zblBtSa*6ItnPj3*{B=;r`01v!UCQb`ca;+oUwz%c*t9t9Y_vo0 zstGfA=nm5%LXr3?FF-J&IIt-#^<+Z)M43TECW_|sJ|qTLLt*{BCh^r2-{qN^Ms1-- zPb%*F4G#Xhqp|mwjU1`lt~Iy9>K-b(rxF6qH|{s1UU{^;|BXa^b;dW)qFk$$=5Y$R z+q$|hxNvJOwVtQ7Jo-m$6<>Lf7m#Cd4A$)cm&#_Dn30ztG+5s3qA_IBq5B3E$c)eV zoVc?F_&p8pu9RdoHApig*Xqg?+&z`2P0vfChIjRSIWSP3m7con%|y?e)?*+4Dver7 zY`^U<$dmj{lv^JCbf0B@DN6l~q}gBQi&9H{M~3e#&3atR9xU%u3O0#4W3ze29$x!} zS0?%^_)7-|8tVFFo+(13w2}_=3vr7v;hy#Q?QaQ`!(o!{3#eRQTgaZ;dPO55Uge)1 zFQ>XC{^AEqYUm>)iRL#?DJ{ziYt}(9(a+u$PzbNJEquzed8#g*gH_6d=1r+NEKyBK z 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 N9a|mki#9Wl{R7{44>AA% literal 3854 zcmeHJdpuO@8vbTXlO&X4cAHEmC(ceHwse_jZ=oHc6q0*W5)p=s+jQ5FYUgy@l1_JI zM2*H}qEsrCU5&dz3L6=>W*B4G-@A0q+2`#2*ZKXH$ujn2*YK<>*BGRW_bNxJv2J?cvEgFjs&-&)Hz31J(q|7qQ`B~rAJm+%TcVTZryo#dQADvM?+@^Pr z?>u`>-jf2;vwyQ!9Q0o*TV^&~wcOZPZT|4sQ-{VTvrbuwck+6Ew3gM8rj>p2_)9HA zpJk1DTeT1}-O-bP0jr%u6r{WWkdrS1dzrOyxw{K~k*wAzn~xPx-{>UVpm@ANuj6j; zp>}@{ZJ&fZWAC`Xd$VQ!g3p6b*ph0uEaTpq=0$En4|d;rk>4AExRZX z2#Uhn!$U%SGHZ z-CTKJY@#T!Mc$J=F?MG3;F9r#-jaQV1>T;+sie4J_m&akm8`)I_Q&_rC0)}?w+*cf zf0xIqc*X0asnxmPt-rlm@yn9xnhTn|;`Z3D>VnDr8W$}S zu3X~xN4{!KDA7`zaVQ0EJHQ@%v@@vhbBXlCh&R>Z99pHnbB{n^ylT*9aaFVH`o<*R z08!Lvh~&B5rQ7Ldb~&9MpXe3Wh~i+xi|13wW_FaD+~jN$#7>)Md3d6Qr4=q8532L;S#C zk>1f6!b)zAZfQkMV}+G8Fn(NCRefD_E?dx{-ei43{4%J(awK9M;?}2kinB5jKWq0` zO~_kn6^6l=t;UCzxGK_o=GFB6QuBu0mUpu!BvxB-8`y!5x$V?N*7<%#UP1Qj3qs1H&dh3uu279;tsDodbczIPG z%bkYrX0mF98qPR}>Mft)ffT^Nkq#rSH$@9uv{Hk*HKd|5VrCyl7}n3a36^c@e(G;Bg6uWJqFaDc}{?s)} zDC`U*Jv9yIBF+Xo48*3(xD#LW^C+rFW5*~h5Tb8zvyNT83<)?=15Wl$4v=9j#c|hm zMU#|}O?}1$P;#mq(44)1)7nG1SGENpLwtR@oeTu&Dk-5;%n5p6MHxcQki$Mi9dE7$ zIj(hO>JoYF<5S49q55v|^Q#1EPEm1C7mbF{4|qq_=Z}u5k^GN^P5u{1Exb8{ek) zJTf%Rwt696@+%4|Y`cK~15JL&yH;-XP zTozIZIk}$YkWd>;t)Un9fD%gb2g#jRFgR0pP6l|BN$A-Z`j0TNQcp2!1mUWXn0VB9 z0*do%01U}c_uOR|`1Y zys}>(fUF0@A%F(4*N9jx7_Z-a;{nZwO!3yrAHK1~TN46<55n`u#)-}HA-6+xZC0u; z%*N#gFPy-yghIwlEW`-&EvZyQKY_4H-wN1YU&c2y;kakn)aitEWjo@S(+*7(17NJ$ zD|;!ioK@`RL;}yaT(qTh(vWzi zIw_bJ<0^Nc>88?9^74@wkd7hY7#{I6lK@L~w=4s$=O9nMrSe>yvsC<{2OQR=5RVx> z`Om(%@Mh50JKpG80zsB|D;wS&&2B~LQ5|^1Qz+bnXo@9p@~V51pzdRilTs0F7Od*u z1qg0=q+x*0&wx>R=ES%HV;pB_TW!61asvVLx>sVbY9H8 z9^i}6X?Mu;REANT|tw^4Zu_Ime2At z5~phKhYs9=lJZ|d&*x(B8rNg1)rb)^Ar20(KIOZ5oD=&=C<&TKoz!hC&~qH1Bm|u0LcXSPk~`SUI_+ZXhx`S7tw8pU=kR6c|JZ{@HwDk zO;~MF!{#tN3KyXP*Wn~RMI00wH?p^ckRkpc#9MEMZdzhO{=C;j2OiCTE~y zlMg?#JzOC=H!*6GF@^7Rj=PP!AhfM&@!90jw?2yJp5v=f(>|@_wSv7JwVk1ffrZ`b zeZh-^>KBz#n&|9$9&czueegcflAG!zX}olty}A4!~M?pz^^v&Q^x=R diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/new_bg.png b/cinelerra-5.1/plugins/theme_blue_dot/data/new_bg.png index aac3a476165faf0f327a49759ea0544bab587431..da3bfa03254158e9a915c8ebbf8f1930f81bd9c3 100644 GIT binary patch delta 437 zcmV;m0ZRVzE9oncBtsB%MObuHX>@F5055cHa4&c+aBgQImjayt0016zMObu1VRU5x zQ*~}2N?~pwGC3eIGdeLeIxsXKGB7bW3bI^Z+p%yb6Os{Of5MsQy6&+*0strKL+6N} z4Zv|6fAfa{?nfEeWnBK&@o9VmT#jEeN6gDVEEbD;7>2(5!M^Wfx7)>jzkiSq3w)Sy z9FN9i8Q_2T!yoGZ^kpI49jQxHeUDw5Wy*5F>3F-Sjx~_}9 z@1w4N9Mi8}f4%A>qWYyjXM6)(z7LrrrT`qrF@|A?-EJ4_^*U~DZeqP&N8k4!?~?=X zbhw<~_k9e*5N+E=UDr`nzu11$pEte%F4M1>Bc=cxh9QPwh`#Tm@B7&A_s$8y399Ql znx={6av4q2yjK7k-vBwh?;KHm`Q?|>zdU*JWGrWcN6ME;0!~jE;BDK+ci(;Yp9?UI zZ-6Y`XO1`uz=(*?KKpDe+eIb^I89YmMO9Vt{Q2|uioe462Dp6hGe^7?fB*noHV=XZ flfe+47v}#17j+6GD{EF400000NkvXXu0mjfp}5R) delta 442 zcmV;r0Y(1lEAlIlBup7}MObuHX>@F50D5$2Wo>0&Vr+F~Uu17|E^uyV5_NIX0000U zbVXQnL}7Gg090soAWC6wATl-}F*rIjIXW{jATls9Hwu4RFz~TwCli01iLUD&`y&8w zqCRwv_}Ks)$MH9R7~p=CfnCPsZyle;H^AliHFLzg{KI0gsE1+b%OC9fK6blZ?DzWz z`LMu;8OQNxOqK!uhd=zG{!f3__y)LaA38@&0l3+0`ns-T9LL!2_tAA-tk-K31e}n* z@1yIw==(nE`o}T->eYX%J|e1L`g6uNz~%dpIbsUHaU5e9hS=?Pv0ks^=H@2W>vi;f z|M5OK@J@%z`F-EVFbvVQZPaxgRrQPQH~o3z8{jhinmJ+$z+o6-7>4NkKKj0o{eJJ9 z5S*a8uA^z1ST2{*G|hVjpz#fm!~4z=)t6s>IsMC%Cr`$5HmF8?nIz!!lmXthZG89L zcmKHn!}tcs;(g|bqX3ME`0TUK#xa)8rRRaI0~70;hPf3Nr}jBkL;_davPTLB0F kz-99wXrti|0T<@~0~!4aBzMmqUH||907*qoM6N<$f=ivR7n+inBn8YeY#%W=T#egMLYFfqsQvL0-Dzbf&os3=DE0IhVweREFTvJO!`B zJOv|51w&&iLlY|l69pp!LvyZ8G4Z!I<~?SgT)-A1HRF3~t&2Zj p$HKsH{G+JBW=GaEM)4W@8IC2*xEQth#xJBgVzjyHr;vu s{p%Zd28IHect+;U4_OZ}iqF{3;2JpNV)4yjKA_1Ap00i_>zopr03W0?VE_OC diff --git a/cinelerra-5.1/plugins/theme_hulk/data/new_bg.png b/cinelerra-5.1/plugins/theme_hulk/data/new_bg.png index d5485436ecd187cc976702d318fb55aa88c2b6c1..bb615c8f44468de897efdfe0a60b8108d96eab95 100644 GIT binary patch literal 3827 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 diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/new_bg.png b/cinelerra-5.1/plugins/theme_pinklady/data/new_bg.png index 74291ebe2054084e461ad6aa3518a0c18f850ac5..b2c970ff05200c3fbcfaa3259e00b191ef7c2d89 100644 GIT binary patch literal 3947 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 H^!>j9qraam diff --git a/cinelerra-5.1/plugins/theme_suv/data/new_bg.png b/cinelerra-5.1/plugins/theme_suv/data/new_bg.png index 07a5914820c6795d2b861a9bba86cf37c7ec692c..deade2b29d3714e1f5d882f232aa499ee0346e6b 100644 GIT binary patch delta 138 zcmca3azkW-inBn8YeY#%W=T#egMLYFfqsQvL0-Dzbf&os3=DE0IhVweREFTvJO!`B zJOv|51w&&iLlY|l69pp!LvyZ8G4Z!IX8&cM{DCD#`pn~(CAWU@9^lH6ZHSlKSO5QC p@@sbnh7EG_8#ZrbNoN%M!`s{1)t4G^s2FHEgQu&X%Q~loCIAY}GKc^G delta 138 zcmca1az|u>in~aOYeY#%W=T#eLsdyeYHn(LacP-eL0)?5J!2gP1_n8hyh~z9Dnm#{ zse)Hxo`R8?f}w?#iKUgXp@NZtp*dH5l);CM>3`X!ZRYtcUwfZn&4Fu-Kb}7P{r$cD pwmKFDhSwiCB{nZ)JIpBdhxe3sS6_v!{dSr@}-lBVjO3si#N;1eA4nNwKNv07VHxl$S*?;$<5oj&OvbWwK07 z6A=`TC@^qLLIh-?NQx+>EG7ZtWx#lIV!%egy7!OUAgd4csdM7Pxc_^f`@H;~-}Ael zd(&wq^Onp50GMpt;JFn5JP!ceC881BA*UVifd5Q6>)+$}MsT7SU?u0H*p+*1W23{Z zPvA4*nI$^&4CXMvw)kkurr>CbgA2ue71iF6YUfCCu(Mx1uQ+g5Gqg0vEE()j7FZYa zQ7ntWW;4PlA&C_44-=!JBG}h#+Jykj=Wq0U+jr0D!It`HU%$m^?c3?c=UNj9K6V@8 zjGY(dY`&_=kS#fQEDYF|M@6OYET6NYys^5GOnDeL_&D)3uk=^mv`!9c^yhMi$4B~i z0C2Nu2^U6}ybJJP|3V%B!2}BMIH|~snHX)3amuKdxXc%ao2Q*^tw>xoY6i?13~=uQ z(Re4{9Xn~3N?+j;c!xy}py*2XH)gVgQ=6BC^1s!{xyLo2DQbR9J-r85QJ)GGG15t$!|M|_!gmoYQcwsMzuN-#-mcHdCR@dJk0ki zs$iv>TnV)89~dZTt>pUMuzNT)b^R@$lp&&cUlXgWpeDp8H#c`=SY9{&q}Hm|a;|Ev zpS4Q$q?5X4jq>ObUNli0(*-l@ewsKqG$hHP@o!nqQLU|$7q?dJ+x0+kWps2D?#QgH zLDg9~%m1mmA|WB6Z))L`a5E{RFS2S(Cd zcv%RqXJ%#jF$KwL`3WHncfDGnh-fKe=O&LUa^bfs3Li^=xWqqhb=Aa)(=zV&j0{Lc z*VsMxnsPwWV%(aqJ3Bk~4tITi=v;8>&Ycre9X0b$cp8|m2kGZac0dr4CrA9;9Z1ei zQmH?rjN(CVC?BsZb*Xkfm+!TJL?ZRwch^{OEu0(Vat7JbGTrr^3h1)`c)FbBGVBO6 zPauR;cXv%!8L*Jr8OO6&TNhZlS#V!;Zm8sr5o9YG0`hO%SZ6~P3mh`)BdM8^=F%8< z^%+oM24sQx5UjhQ?J?19{!1p*@ z9()zxKs6Dbl1d~ylD(i9aqd`~0+6=}E$fy;_4|V%U5XzOM*PB^yvm1b^Em~KYK%?PqcpW`I`aql?TwxA@FTfw24JNrWs=SFLo*XF< zOq@Z^k3p=a%f}9M*JikGSULtH$D;6@J5X1^_N5TU4g}*2kk`S3w|{{(ikeaY^#%@O{IXF*tWoz6i;~uvnt5{kpvW+grW9%)whdI-)m) zIjFn7eXh{#&;-~oQyu`7h@I2zyY|5x$a{#|SGp%TGg5%a?g9I(=Rz%d#3}IpPpIGY z5=nHDE&QU+y3Vz(i=7*fZ#`^AAIgaxlx#_?a3MCc>o-6l(WNc6!G4 z9^*o=@!GchdKW1asupE8t!}!YMS%npVEV)JozNFwn1XvIU_Wcyy0`m<=g_)?R3ya$ zkHfg|Cqc2Pp*9Avq3$6LH8^F>WQlINdQW1i5WrmR_A+#diA!w--U#!nZ!9Kd_6J}d z(9c#?e0&12Qn?HVE_OC literal 3219 zcmeHKX;hO}8omiz$_UcVjB?O~%vg0=LBSP5SuBX!GXho=OeF{!c4Z5MRiajCj{;6z zYh}^QOeh8djZuVvpo5G?AQb&Ff-IVXK|zCn5Vp*{Uq}Ml_MAC0KZiej-~H~r@AE$I z^FH_HYag%8W~NrA006VCTRc7ofXD%W@IA>Gj*v66+~B{3tWEwb-*8qG6Qr=hmf>JX>?dQXJe`B^iVqCnsJhRD>nAq7g?dpB2 z(PCdKq`A!p6hyz2&i{3sR00G459^~o&bh`v;+{qtrLFf%G>i@AM9Vf`eNxpQF5oEqGGIFAdyHeZ9byzyL)Q6sJhyD z*plrPS#nmw6k*R_zy86?%j@|-`*rtRqnH=4w4I%dyo(q4@n^GR5^S3=3>y((bh5Rz zj72L^rMW1-RF+OnrDv@7s~C53w#trJ{q2LWwZ(F|e0*xOYs%F^f!zb*ii)BQ(Vb|M zb#O{*YE`~#217nraY)s3?m}Y-j3uK-5|!3%ZEeK^0|Vo|-$h42;YrS|I!2X}ojB?v z7(K6`K$hkr;BvVsZ~AwqtEWa8H|mV(E6*h)Chih2s*CG`x0{%ly!0@tTmsZgNzV_x zL&8F1MoAUs+W%cG+d3UwCOVVeC)D7&Evx87`}<+qiAn zDKtqMcZ1)@qEAdrh=js5!w$gu&!F^fPY<*4*%0lMPxvLa>PJC40tQAY6bhCke!a|= z_X!S3MpIRb<tHeUt@16n%{LT{;Rs8~$9x zkDTBd-!s4vD87l@3lEfJqj_&f!_Al0V?hF7=Tg|hPf-h-i!d?K7<9X8E=La8uv$0y&MgRGw@d4FtGrfNI0i(2Qn5s zQ;W@TAbi>)EU3xv^#Ys@2~KqMdwQT)8@Y#%E|WRvhz_)FA;VyZRKp| zE8K_hT0r8%-z861zqhzT`uJZB@#v8oTo%Ikc(4XfZi^GHy16mPLRdBqq+f9+Rm-n* z9nuS8X01+(zLAaQkjy#7qJ_ZX00{Xc5}OJb=)8{ea|!? z&CLa)t5bDENype8_#I!aBW8s**nwhti~1aQA>){Uci|pDIV%Li+|3Pr7*N+CR-exrs&#iQ+oaw z1~_i-RzjbAoY}mY&ac#RDP7a`4qH1kc7$vKHRaC)#XatO>;mdNRPj=k@hp|#+-krf z_apsCuNu6et77l(?KB$G6&AlqKBfiF;;M_Ft{MC;A@mpU6ZfOhM*3{8h$4_IeXxP0~ZCA~A9@H=Ejk--xV z-gP@$;mIpdcAfC#rVJ}uY`qO?16ZxiM21Sx(Cn(-Gy1Zl>fvEd?$EP>jA?GyD7+y& zeDmfFK5w|eIzv1Je<^tJTE8G0`xp2L7-r5y!2Sw0oZc)oI3|rkKjs(LtCk4?{M)+8 L%cJzuy+{5Hvl;4S diff --git a/cinelerra-5.1/po/ru.po b/cinelerra-5.1/po/ru.po index 18499d22..4302ccfa 100644 --- a/cinelerra-5.1/po/ru.po +++ b/cinelerra-5.1/po/ru.po @@ -7,14 +7,13 @@ msgid "" msgstr "Project-Id-Version: Cinelerra 5.1\n" "Report-Msgid-Bugs-To: cinelerra@lists.cinelerra-cv.org\n" -"POT-Creation-Date: 2016-12-26 20:15+0300\n" -"PO-Revision-Date: 2016-12-26 22:15+0300\n" +"POT-Creation-Date: 2017-01-29 20:15+0300\n" +"PO-Revision-Date: 2017-01-29 22:15+0300\n" "Last-Translator: Igor Vladimirsky aka igor_ubuntu \n" "Language-Team: \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" #: guicast//bcbutton.C:268 guicast//bcbutton.C:276 guicast//bcbutton.C:492 #: cinelerra//preferencesthread.C:630 @@ -137,7 +136,7 @@ msgid "Enter the name of the folder:" msgstr "Введите имя папки:" #: guicast//bcnewfolder.C:62 cinelerra//newfolder.C:62 -#: cinelerra//pluginclient.C:313 +#: cinelerra//pluginclient.C:318 msgid "Untitled" msgstr "Безымянный" @@ -209,6 +208,7 @@ msgid "Hours:Minutes:Seconds:Frames" msgstr "Часы:Мин:Сек:Кадры" #: guicast//units.h:44 cinelerra//patchbay.C:83 +#: plugins/motion51/motionwindow51.C:49 msgid "Samples" msgstr "Сэмплы" @@ -350,7 +350,7 @@ msgstr "" #: cinelerra//apatchgui.C:244 cinelerra//apatchgui.C:251 #: cinelerra//vpatchgui.C:192 cinelerra//vpatchgui.C:199 -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "fade" msgstr "фейд" @@ -392,7 +392,7 @@ msgid "Audio:" msgstr "Аудио:" #: cinelerra//assetedit.C:362 cinelerra//assetedit.C:507 -#: cinelerra//fileexr.C:599 cinelerra//fileffmpeg.C:520 +#: cinelerra//fileexr.C:599 cinelerra//fileffmpeg.C:557 #: cinelerra//filesndfile.C:405 cinelerra//filetga.C:927 #: cinelerra//filetiff.C:612 msgid "Compression:" @@ -745,7 +745,7 @@ msgstr "Правка..." msgid "ladspa" msgstr "ladspa" -#: cinelerra//awindowgui.C:2020 cinelerra//fileffmpeg.C:867 +#: cinelerra//awindowgui.C:2020 cinelerra//fileffmpeg.C:911 msgid "ffmpeg" msgstr "ffmpeg" @@ -823,7 +823,7 @@ msgid "Timed" msgstr "Временной" #: cinelerra//batch.C:141 cinelerra//batchrender.C:958 -#: cinelerra//ffmpeg.C:2181 cinelerra//ffmpeg.C:2291 cinelerra//file.C:1349 +#: cinelerra//ffmpeg.C:2200 cinelerra//ffmpeg.C:2310 cinelerra//file.C:1349 #: cinelerra//file.C:1377 cinelerra//interfaceprefs.C:886 #: cinelerra//interlacemodes.h:34 cinelerra//loadmode.C:93 #: cinelerra//new.C:857 cinelerra//record.C:723 cinelerra//vdeviceprefs.C:638 @@ -940,7 +940,7 @@ msgstr "Удалить" #: cinelerra//batchrender.C:1100 msgid "Save Jobs" -msgstr "" +msgstr "Сохранить список" #: cinelerra//batchrender.C:1103 msgid "Save a Batch Render List" @@ -952,11 +952,11 @@ msgstr "Сохранение списка пакетного рендеринг #: cinelerra//batchrender.C:1147 msgid "Enter a Batch Render filename to save as:" -msgstr "Введите имя файла для сохранения списка пак. рендеринга:" +msgstr "Введите имя файла для сохран-я списка пак. рендеринга:" #: cinelerra//batchrender.C:1180 msgid "Load Jobs" -msgstr "" +msgstr "Загрузить список" #: cinelerra//batchrender.C:1184 msgid "Load a previously saved Batch Render List" @@ -969,7 +969,7 @@ msgstr "Загрузка списка пакетного рендеринга" #: cinelerra//batchrender.C:1225 msgid "Enter a Batch Render filename to load from:" -msgstr "Введите имя загружаемого файла списка пакет. рендеринга:" +msgstr "Введите имя загруж. файла списка пакет. рендеринга:" #: cinelerra//batchrender.C:1256 msgid "Use Current EDL" @@ -1145,7 +1145,7 @@ msgstr "В окне" #: cinelerra//canvas.C:1069 msgid "Zoom 25%" -msgstr "Zoom 25%" +msgstr "Масштаб 25%" #msgstr "Масштаб 25%" #: cinelerra//canvas.C:1070 @@ -1603,7 +1603,7 @@ msgstr ": " #: cinelerra//colorpicker.C:69 msgid "Color Picker" -msgstr "Пипетка" +msgstr "Выбор цвета" #: cinelerra//colorpicker.C:128 msgid "Hue" @@ -1805,7 +1805,7 @@ msgstr "Обрезка слоя или вывода" #: cinelerra//cpanel.C:283 msgid "Get color" -msgstr "Получить цвет" +msgstr "Пипетка" #: cinelerra//cpanel.C:307 msgid "Show tool info" @@ -2518,127 +2518,127 @@ msgstr "can't clone input file\n" msgid "av_buffersrc_add_frame_flags failed\n" msgstr "av_buffersrc_add_frame_flags failed\n" -#: cinelerra//ffmpeg.C:1306 +#: cinelerra//ffmpeg.C:1325 #, c-format msgid "options open failed %s\n" msgstr "options open failed %s\n" -#: cinelerra//ffmpeg.C:1310 +#: cinelerra//ffmpeg.C:1329 #, c-format msgid "format/codec not found %s\n" msgstr "format/codec not found %s\n" -#: cinelerra//ffmpeg.C:1362 +#: cinelerra//ffmpeg.C:1381 #, c-format msgid "err reading %s: line %d\n" msgstr "err reading %s: line %d\n" -#: cinelerra//ffmpeg.C:1445 +#: cinelerra//ffmpeg.C:1464 #, c-format msgid "vid%d (%d), id 0x%06x:\n" msgstr "vid%d (%d), id 0x%06x:\n" -#: cinelerra//ffmpeg.C:1467 +#: cinelerra//ffmpeg.C:1486 #, c-format msgid "aud%d (%d), id 0x%06x:\n" msgstr "aud%d (%d), id 0x%06x:\n" -#: cinelerra//ffmpeg.C:1555 +#: cinelerra//ffmpeg.C:1574 #, c-format msgid "can't stat file: %s\n" msgstr "can't stat file: %s\n" -#: cinelerra//ffmpeg.C:1647 +#: cinelerra//ffmpeg.C:1666 #, c-format msgid "bad file path: %s\n" msgstr "bad file path: %s\n" -#: cinelerra//ffmpeg.C:1653 +#: cinelerra//ffmpeg.C:1672 #, c-format msgid "bad file format: %s\n" msgstr "bad file format: %s\n" -#: cinelerra//ffmpeg.C:1657 +#: cinelerra//ffmpeg.C:1676 #, c-format msgid "mismatch audio/video file format: %s\n" msgstr "mismatch audio/video file format: %s\n" -#: cinelerra//ffmpeg.C:1664 +#: cinelerra//ffmpeg.C:1683 #, c-format msgid "failed: %s\n" msgstr "failed: %s\n" -#: cinelerra//ffmpeg.C:1689 +#: cinelerra//ffmpeg.C:1708 #, c-format msgid "get_encoder failed %s:%s\n" msgstr "get_encoder failed %s:%s\n" -#: cinelerra//ffmpeg.C:1705 +#: cinelerra//ffmpeg.C:1724 #, c-format msgid "cant find codec %s:%s\n" msgstr "cant find codec %s:%s\n" -#: cinelerra//ffmpeg.C:1711 +#: cinelerra//ffmpeg.C:1730 #, c-format msgid "unknown codec %s:%s\n" msgstr "unknown codec %s:%s\n" -#: cinelerra//ffmpeg.C:1718 +#: cinelerra//ffmpeg.C:1737 #, c-format msgid "cant create stream %s:%s\n" msgstr "cant create stream %s:%s\n" -#: cinelerra//ffmpeg.C:1727 +#: cinelerra//ffmpeg.C:1746 #, c-format msgid "duplicate audio %s:%s\n" msgstr "duplicate audio %s:%s\n" -#: cinelerra//ffmpeg.C:1733 +#: cinelerra//ffmpeg.C:1752 #, c-format msgid "bad audio options %s:%s\n" msgstr "bad audio options %s:%s\n" -#: cinelerra//ffmpeg.C:1754 +#: cinelerra//ffmpeg.C:1773 #, c-format msgid "check_sample_rate failed %s\n" msgstr "check_sample_rate failed %s\n" -#: cinelerra//ffmpeg.C:1770 +#: cinelerra//ffmpeg.C:1789 #, c-format msgid "duplicate video %s:%s\n" msgstr "duplicate video %s:%s\n" -#: cinelerra//ffmpeg.C:1776 +#: cinelerra//ffmpeg.C:1795 #, c-format msgid "bad video options %s:%s\n" msgstr "bad video options %s:%s\n" -#: cinelerra//ffmpeg.C:1813 +#: cinelerra//ffmpeg.C:1832 #, c-format msgid "check_frame_rate failed %s\n" msgstr "check_frame_rate failed %s\n" -#: cinelerra//ffmpeg.C:1822 +#: cinelerra//ffmpeg.C:1841 #, c-format msgid "not audio/video, %s:%s\n" msgstr "not audio/video, %s:%s\n" -#: cinelerra//ffmpeg.C:1833 +#: cinelerra//ffmpeg.C:1852 #, c-format msgid "open failed %s:%s\n" msgstr "open failed %s:%s\n" -#: cinelerra//ffmpeg.C:2482 +#: cinelerra//ffmpeg.C:2501 #, c-format msgid "av_frame_alloc failed\n" msgstr "av_frame_alloc failed\n" -#: cinelerra//ffmpeg.C:2497 +#: cinelerra//ffmpeg.C:2516 #, c-format msgid "codec open failed\n" msgstr "codec open failed\n" -#: cinelerra//ffmpeg.C:2510 +#: cinelerra//ffmpeg.C:2529 msgid "over 100 read_frame errs\n" msgstr "over 100 read_frame errs\n" @@ -2704,7 +2704,7 @@ msgstr "Lo Hi" msgid "Hi Lo" msgstr "Hi Lo" -#: cinelerra//file.C:1598 +#: cinelerra//file.C:1599 msgid "UNKNOWN" msgstr "Неизвестно" @@ -2807,185 +2807,185 @@ msgstr "Нет опций видео для этого формата" msgid "Use alpha" msgstr "Использ. альфа-канал" -#: cinelerra//fileffmpeg.C:147 +#: cinelerra//fileffmpeg.C:163 #, c-format msgid "file path: %s\n" msgstr "путь к файлу: %s\n" -#: cinelerra//fileffmpeg.C:151 +#: cinelerra//fileffmpeg.C:167 #, c-format msgid " err: %s\n" msgstr " err: %s\n" -#: cinelerra//fileffmpeg.C:155 +#: cinelerra//fileffmpeg.C:171 #, c-format msgid " %jd bytes\n" msgstr " %jd bytes\n" -#: cinelerra//fileffmpeg.C:160 +#: cinelerra//fileffmpeg.C:176 #, c-format msgid "info:\n" msgstr "info:\n" -#: cinelerra//fileffmpeg.C:164 +#: cinelerra//fileffmpeg.C:180 #, c-format msgid "== open failed\n" msgstr "== open failed\n" -#: cinelerra//fileffmpeg.C:349 +#: cinelerra//fileffmpeg.C:384 msgid ": Audio Preset" msgstr ": Предустановки аудио" -#: cinelerra//fileffmpeg.C:401 +#: cinelerra//fileffmpeg.C:436 msgid "Preset:" msgstr "Предустановки" -#: cinelerra//fileffmpeg.C:407 cinelerra//fileffmpeg.C:556 +#: cinelerra//fileffmpeg.C:442 cinelerra//fileffmpeg.C:593 #: cinelerra//filempeg.C:2027 cinelerra//fileogg.C:2166 msgid "Bitrate:" msgstr "Битрейт:" -#: cinelerra//fileffmpeg.C:412 +#: cinelerra//fileffmpeg.C:447 msgid "Audio Options:" msgstr "Аудиоопции:" -#: cinelerra//fileffmpeg.C:417 cinelerra//fileffmpeg.C:571 +#: cinelerra//fileffmpeg.C:452 cinelerra//fileffmpeg.C:608 msgid "view" msgstr "обзор" -#: cinelerra//fileffmpeg.C:492 +#: cinelerra//fileffmpeg.C:529 msgid ": Video Preset" msgstr ": Предустановки видео" -#: cinelerra//fileffmpeg.C:560 cinelerra//filejpeg.C:318 +#: cinelerra//fileffmpeg.C:597 cinelerra//filejpeg.C:318 #: cinelerra//filejpeglist.C:170 cinelerra//fileogg.C:2171 #: cinelerra//formatwindow.C:108 msgid "Quality:" msgstr "Качество:" -#: cinelerra//fileffmpeg.C:566 +#: cinelerra//fileffmpeg.C:603 msgid "Video Options:" msgstr "Видеоопции:" -#: cinelerra//fileffmpeg.C:704 cinelerra//filempeg.C:822 +#: cinelerra//fileffmpeg.C:748 cinelerra//filempeg.C:822 #, c-format msgid "Creating %s\n" msgstr "Создание %s\n" -#: cinelerra//fileffmpeg.C:744 +#: cinelerra//fileffmpeg.C:788 msgid "option" msgstr "Опция" -#: cinelerra//fileffmpeg.C:744 plugins/bluebanana/bluebananawindow.C:2005 +#: cinelerra//fileffmpeg.C:788 plugins/bluebanana/bluebananawindow.C:2086 msgid "value" msgstr "Значение" -#: cinelerra//fileffmpeg.C:866 +#: cinelerra//fileffmpeg.C:910 msgid "codec" msgstr "кодек" -#: cinelerra//fileffmpeg.C:944 cinelerra//fileffmpeg.C:1343 +#: cinelerra//fileffmpeg.C:988 cinelerra//fileffmpeg.C:1387 #: cinelerra//pluginfclient.C:208 cinelerra//pluginfclient.C:471 #: cinelerra//pluginfclient.C:497 cinelerra//preferencesthread.C:606 #: cinelerra//preferencesthread.C:608 cinelerra//setformat.C:891 msgid "Apply" msgstr "Применить" -#: cinelerra//fileffmpeg.C:1172 +#: cinelerra//fileffmpeg.C:1216 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1173 +#: cinelerra//fileffmpeg.C:1217 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1174 +#: cinelerra//fileffmpeg.C:1218 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1175 +#: cinelerra//fileffmpeg.C:1219 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1176 +#: cinelerra//fileffmpeg.C:1220 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1177 +#: cinelerra//fileffmpeg.C:1221 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1178 +#: cinelerra//fileffmpeg.C:1222 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1179 +#: cinelerra//fileffmpeg.C:1223 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1180 +#: cinelerra//fileffmpeg.C:1224 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1181 +#: cinelerra//fileffmpeg.C:1225 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1182 +#: cinelerra//fileffmpeg.C:1226 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1183 +#: cinelerra//fileffmpeg.C:1227 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1184 +#: cinelerra//fileffmpeg.C:1228 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1185 +#: cinelerra//fileffmpeg.C:1229 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1186 +#: cinelerra//fileffmpeg.C:1230 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1187 +#: cinelerra//fileffmpeg.C:1231 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1188 +#: cinelerra//fileffmpeg.C:1232 msgid "" msgstr "" -#: cinelerra//fileffmpeg.C:1308 +#: cinelerra//fileffmpeg.C:1352 msgid ": Options" msgstr ": Опции" -#: cinelerra//fileffmpeg.C:1323 +#: cinelerra//fileffmpeg.C:1367 msgid "Format: " msgstr "Формат:" -#: cinelerra//fileffmpeg.C:1327 +#: cinelerra//fileffmpeg.C:1371 msgid "Codec: " msgstr "Кодек:" -#: cinelerra//fileffmpeg.C:1332 cinelerra//pluginfclient.C:456 +#: cinelerra//fileffmpeg.C:1376 cinelerra//pluginfclient.C:456 #, c-format msgid "Type: " msgstr "Тип:" -#: cinelerra//fileffmpeg.C:1336 cinelerra//pluginfclient.C:461 +#: cinelerra//fileffmpeg.C:1380 cinelerra//pluginfclient.C:461 #, c-format msgid "Range: " msgstr "Диапазон:" -#: cinelerra//fileffmpeg.C:1349 +#: cinelerra//fileffmpeg.C:1393 msgid "Kind:" msgstr "Вид:" -#: cinelerra//fileffmpeg.C:1535 cinelerra//fileffmpeg.C:1564 +#: cinelerra//fileffmpeg.C:1579 cinelerra//fileffmpeg.C:1608 #, c-format msgid "no codec named: %s: %s" msgstr "no codec named: %s: %s" @@ -3526,7 +3526,7 @@ msgstr "Error while opening \"%s\" for writing. %m\n" #: cinelerra//fileogg.C:267 msgid "WARNING: Encoding theora when width or height are not dividable by 16 is suboptimal\n" msgstr "Предупреждение: Кодирование в Theora - не лучший выбор,\n" -"если ширина или высота не делимы на 16\n" +"если ширина или высота не кратны 16\n" #: cinelerra//fileogg.C:316 msgid "(FileOGG:file_open) initialization of theora codec failed\n" @@ -3567,7 +3567,7 @@ msgstr "FileOGG: End of file while searching for codec headers.\n" #, c-format msgid "Frame content is %dx%d with offset (%d,%d), We do not support this yet. You will get black border.\n" msgstr "Содержимое кадра - %dx%d со смещением (%d,%d).\n" -"Мы пока не поддерживаем это. Вы получите чёрные края.\n" +"На данный момент мы ещё не поддерживаем это. Вы получите чёрные края.\n" #: cinelerra//fileogg.C:659 #, c-format @@ -3859,7 +3859,7 @@ msgstr "Перезапись проекта результатами вывод #: cinelerra//formattools.C:903 msgid "Create new file at each label" -msgstr "Создавать отдельный файл для каждой метки" +msgstr "Создавать отдельный файл на каждую метку" #: cinelerra//formatwindow.C:29 cinelerra//formatwindow.C:90 msgid ": File format" @@ -4135,11 +4135,11 @@ msgstr "Ошибка !" #: cinelerra//interlacemodes.h:26 msgid "Manual compensation using selection" -msgstr "" +msgstr "Компенсирование в ручном режиме" #: cinelerra//interlacemodes.h:28 msgid "Automatic compensation using modes" -msgstr "" +msgstr "Компенсирование в автомат. режиме" #: cinelerra//interlacemodes.h:37 msgid "Top Fields First" @@ -4176,15 +4176,15 @@ msgstr "Неизвестно" #: cinelerra//interlacemodes.h:66 msgid "non-interlaced, progressive frame" -msgstr "" +msgstr "нечересстрочный, прогрессивный кадр" #: cinelerra//interlacemodes.h:67 msgid "interlaced, top-field first" -msgstr "" +msgstr "чересстрочный; верхн. поле первое" #: cinelerra//interlacemodes.h:68 msgid "interlaced, bottom-field first" -msgstr "" +msgstr "чересстрочный; нижн. поле первое" #: cinelerra//interlacemodes.h:69 msgid "mixed, \"refer to frame header\"" @@ -4730,7 +4730,7 @@ msgstr "Вставить субтитры" #: cinelerra//mainmenu.C:1245 msgid "Set background rendering" -msgstr "" +msgstr "Фоновый рендеринг" #: cinelerra//mainmenu.C:1263 msgid "Edit labels" @@ -5015,7 +5015,8 @@ msgstr "Загрузка %s" msgid "" "%s's resolution is %dx%d.\n" "Images with odd dimensions may not decode properly." -msgstr "" +msgstr "Изображение %s имеет размер %dx%d (в пикселях).\n" +"Изображения с нечётными размерами не могут быть декодированы должным образом." #: cinelerra//mwindow.C:1370 #, c-format @@ -5040,7 +5041,7 @@ msgid "" "XML file %s\n" " not from cinelerra." msgstr "XML-файл %s\n" -" не из cinelerra." +" создан не в cinelerra." #: cinelerra//mwindow.C:1521 #, c-format @@ -5052,7 +5053,7 @@ msgstr "Неизвестно %s" msgid "" "Warning: XML from cinelerra version %s\n" "Session data may be incompatible." -msgstr "Предупреждение: XML-файл - из cinelerra версии %s.\n" +msgstr "Предупреждение: XML-файл был создан в cinelerra версии %s.\n" "Сессионные данные могут быть несовместимы." #: cinelerra//mwindow.C:1722 @@ -6095,7 +6096,7 @@ msgstr "Лицензия: %s" msgid "%s took %s" msgstr "%s закончен %s" -#: cinelerra//pluginclient.C:826 cinelerra//pluginclient.C:838 +#: cinelerra//pluginclient.C:839 cinelerra//pluginclient.C:851 msgid "tweek" msgstr "настройка" @@ -6120,14 +6121,15 @@ msgid "Attach single standlone and share others" msgstr "Применить как общий к остальным трекам." #: cinelerra//pluginfclient.C:146 cinelerra//pluginfclient.C:465 -#: cinelerra//pluginfclient.C:494 plugins/bluebanana/bluebananawindow.C:1373 -#: plugins/bluebanana/bluebananawindow.C:1381 -#: plugins/bluebanana/bluebananawindow.C:1389 -#: plugins/bluebanana/bluebananawindow.C:1397 -#: plugins/bluebanana/bluebananawindow.C:1405 -#: plugins/bluebanana/bluebananawindow.C:1413 -#: plugins/bluebanana/bluebananawindow.C:1421 -#: plugins/bluebanana/bluebananawindow.C:2048 +#: cinelerra//pluginfclient.C:494 plugins/bluebanana/bluebananawindow.C:1422 +#: plugins/bluebanana/bluebananawindow.C:1430 +#: plugins/bluebanana/bluebananawindow.C:1438 +#: plugins/bluebanana/bluebananawindow.C:1446 +#: plugins/bluebanana/bluebananawindow.C:1454 +#: plugins/bluebanana/bluebananawindow.C:1462 +#: plugins/bluebanana/bluebananawindow.C:1470 +#: plugins/bluebanana/bluebananawindow.C:1478 +#: plugins/bluebanana/bluebananawindow.C:2129 #: plugins/color3way/color3waywindow.C:638 #: plugins/colorbalance/colorbalancewindow.C:216 plugins/graphic/graphic.C:681 #: plugins/histogram/histogramwindow.C:672 @@ -6458,7 +6460,7 @@ msgstr "Монитор аудио" #: cinelerra//recordgui.C:821 msgid "Audio meters" -msgstr "" +msgstr "Шкала уровней звука" #: cinelerra//recordgui.C:968 msgid "Stopped" @@ -6851,7 +6853,7 @@ msgstr "Сохранить проект" #: cinelerra//savefile.C:113 cinelerra//savefile.C:220 #, c-format msgid "\"%s\" %dC written" -msgstr "\"%s\" %dC записан" +msgstr "\"%s\" %dC записан." #: cinelerra//savefile.C:133 msgid "Save as..." @@ -7701,71 +7703,75 @@ msgstr "Internal error; pattern array overflow\n" msgid "Bluebanana: Unable to create Frame for slider\n" msgstr "Bluebanana: Unable to create Frame for slider\n" -#: plugins/bluebanana/bluebananawindow.C:1346 -#: plugins/bluebanana/bluebananawindow.C:1354 -#: plugins/bluebanana/bluebananawindow.C:1362 -#: plugins/bluebanana/bluebananawindow.C:2049 +#: plugins/bluebanana/bluebananawindow.C:1395 +#: plugins/bluebanana/bluebananawindow.C:1403 +#: plugins/bluebanana/bluebananawindow.C:1411 +#: plugins/bluebanana/bluebananawindow.C:2130 msgid "Pick" msgstr "Выбор" -#: plugins/bluebanana/bluebananawindow.C:1757 +#: plugins/bluebanana/bluebananawindow.C:1843 msgid " End Mask" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:1840 +#: plugins/bluebanana/bluebananawindow.C:1923 msgid " Mask Selection" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:1912 +#: plugins/bluebanana/bluebananawindow.C:1992 #, c-format msgid "Unknown colormodel in BluebananaA2Sel:update()\n" msgstr "Unknown colormodel in BluebananaA2Sel:update()\n" -#: plugins/bluebanana/bluebananawindow.C:1985 +#: plugins/bluebanana/bluebananawindow.C:2066 msgid "Color Selection" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:1986 +#: plugins/bluebanana/bluebananawindow.C:2067 msgid " Mark Selected Areas" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "hue" msgstr "Оттенок" -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "saturation" msgstr "Насыщ-ть" -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "fill" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "red" msgstr "Красный" -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "green" msgstr "Зелёный" -#: plugins/bluebanana/bluebananawindow.C:2005 +#: plugins/bluebanana/bluebananawindow.C:2086 msgid "blue" msgstr "Синий" -#: plugins/bluebanana/bluebananawindow.C:2018 +#: plugins/bluebanana/bluebananawindow.C:2086 +msgid "alpha" +msgstr "" + +#: plugins/bluebanana/bluebananawindow.C:2099 msgid "pre-erode" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:2095 +#: plugins/bluebanana/bluebananawindow.C:2176 msgid " Invert Selection" msgstr "" -#: plugins/bluebanana/bluebananawindow.C:2256 +#: plugins/bluebanana/bluebananawindow.C:2345 msgid "Color Adjustment" msgstr "Настройки цвета" -#: plugins/bluebanana/bluebananawindow.C:2257 +#: plugins/bluebanana/bluebananawindow.C:2346 msgid " Filter Active" msgstr "Активировать фильтры" @@ -9141,13 +9147,14 @@ msgstr "Число шагов поиска:" msgid "Translation direction:" msgstr "Направление перемещения:" -#: plugins/motion/motionwindow.C:111 plugins/motion-cv/motionwindow-cv.C:104 +#: plugins/motion/motionwindow.C:111 plugins/motion51/motionwindow51.C:92 +#: plugins/motion-cv/motionwindow-cv.C:104 msgid "Tracking file:" msgstr "Файл координат:" #: plugins/motion/motionwindow.C:124 plugins/motion-hv/motionwindow-hv.C:145 msgid "Rotation center:" -msgstr "Центр вращения:" +msgstr "" #: plugins/motion/motionwindow.C:129 plugins/motion-hv/motionwindow-hv.C:154 msgid "Maximum angle offset:" @@ -9173,17 +9180,18 @@ msgstr "" msgid "Frame number:" msgstr "№ кадра:" -#: plugins/motion/motionwindow.C:179 plugins/motion-cv/motionwindow-cv.C:157 +#: plugins/motion/motionwindow.C:179 plugins/motion51/motionwindow51.C:105 +#: plugins/motion-cv/motionwindow-cv.C:157 msgid "" "For best results\n" " Set: Play every frame\n" " Preferences-> Playback-> Video Out" -msgstr "" -"Для достижения наилучших результатов\n" +msgstr "Для достижения наилучших результатов\n" "включите опцию 'Воспр-ть каждый кадр'\n" "в Параметры->Воспр-ние->Настр. видео (выход)" -#: plugins/motion/motionwindow.C:182 plugins/motion-cv/motionwindow-cv.C:160 +#: plugins/motion/motionwindow.C:182 plugins/motion51/motionwindow51.C:108 +#: plugins/motion-cv/motionwindow-cv.C:160 msgid "Currently using: Play every frame" msgstr "Опция 'Воспроизводить каждый кадр'\n" "включена" @@ -9220,6 +9228,7 @@ msgid "Track rotation" msgstr "Вращение" #: plugins/motion/motionwindow.C:563 plugins/motion2point/motionwindow.C:558 +#: plugins/motion51/motionwindow51.C:222 #: plugins/motion-cv/motionwindow-cv.C:447 #: plugins/motion-hv/motionwindow-hv.C:724 msgid "Draw vectors" @@ -9396,6 +9405,62 @@ msgstr "Сохранить координаты в /tmp" msgid "Load coords from /tmp" msgstr "Загрузить координаты из /tmp" +#: plugins/motion51/motion51.C:123 +msgid "Motion51" +msgstr "" + +#: plugins/motion51/motionwindow51.C:52 +msgid "Sample Radius%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:57 +msgid "Center X%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:60 +msgid "Center Y%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:64 +msgid "Search W%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:67 +msgid "Search H%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:72 +msgid "Horiz shake limit%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:75 +msgid "Shake fade%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:79 +msgid "Vert shake limit%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:83 +msgid "Twist limit%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:86 +msgid "Twist fade%" +msgstr "" + +#: plugins/motion51/motionwindow51.C:237 +msgid "Reset defaults" +msgstr "" + +#: plugins/motion51/motionwindow51.C:252 +msgid "Reset Tracking" +msgstr "" + +#: plugins/motion51/motionwindow51.C:270 +msgid "Enable Tracking" +msgstr "" + #: plugins/motionblur/motionblur.C:315 msgid "Motion Blur" msgstr "Размытие - Камера X/Y" -- 2.26.2