Skip to content

Commit 231b093

Browse files
vassbojzongkergladsonsam
authored
1.5.2 (#2325)
* Replaced all Chums references with ChurchApps (#2319) * Replaced CSS zoom with transform-based scaling (#2320) * Set next timer on PDF * Code fixes * Changed extra lang category * Fixed next scripture verse not showing on stage display - Focus mode remembers last slide on clear all * Fixed HTML Bible styling missing in the output - Context menu opened in output will auto close * Tweaks - Remove mark as played on startup - Fixed some items applied twice from template * Template background is applied when creating scripture show - Alert on beta updates disabled in beta versions - Shows list updated if duplicated while searching - Fixed global transition popup sometimes changing other transitions - Fixed focus mode reloading list when marking as played - Focus mode auto scroll works better * Scripture subverses fixes - Rounded selections * Amazing life (#2324) * Fixed freeze on startup if song number was not a string value - Fixed show not loading in output if presented before loaded * Fixed stage editor freezing with some old items * Partial implmentation of AmazingLife. Fixed truncted media names. * Cache list and use video download urls * Added decryptionKey to ContentFile. Will populate later. * Online media download encryption/decryption * Re-download when failed - Use machine specific key * Removed qs from file extension check. Renamed Amazing Life to APlay * Removed bad code * Added oAuth * Added authentication for amazing life * Commented out aPlay UI for now --------- Co-authored-by: Kristoffer <kristoffervassbo@gmail.com> * Fixed usage log reset not working * Fixed some pro6 files not importing - Updated Norwegian language * Linting * Multichannel audio * Version update --------- Co-authored-by: Jeremy Zongker <jeremy@zongker.net> Co-authored-by: Gladson Sam <115465353+gladsonsam@users.noreply.github.com>
1 parent d51401b commit 231b093

File tree

107 files changed

+1285
-765
lines changed

Some content is hidden

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

107 files changed

+1285
-765
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "freeshow",
3-
"version": "1.5.2-beta.1",
3+
"version": "1.5.2",
44
"private": true,
55
"main": "build/electron/index.js",
66
"description": "Show song lyrics and more for free!",

public/lang/cs_CZ.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"manage_dynamic_values": "Spravovat dynamické hodnoty",
488488
"choose_camera": "Vybrat kameru",
489489
"manage_tags": "Spravovat štítky",
490-
"chums_sync_categories": "Vybrat kategorie k synchronizaci",
490+
"sync_categories": "Vybrat kategorie k synchronizaci",
491491
"effect_items": "Efektové předměty",
492492
"initialize": "Vítejte ve FreeShow",
493493
"unsaved": "Opustit FreeShow?",
@@ -1623,9 +1623,5 @@
16231623
"translation_description_multiline": "Přidá všechny jazyky do jednoho textového pole na střídající se řádky. (Podobně jako v SongBeameru)",
16241624
"translation_description_textboxes": "Přidá každý jazyk jako samostatné textové pole na snímek.",
16251625
"translation_description_layouts": "Vytvoří jedinečnou sadu snímků a rozvržení pro každý jazyk."
1626-
},
1627-
"chums": {
1628-
"sync_categories": "Synchronizovat kategorie",
1629-
"sync_categories_description": "Zvolit kategorie k synchronizaci jako písně s Chums"
16301626
}
16311627
}

public/lang/de.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@
484484
"manage_dynamic_values": "Dynamische Werte verwalten",
485485
"choose_camera": "Kamera auswählen",
486486
"manage_tags": "Verwalte Tags",
487-
"chums_sync_categories": "Kategorien für die Synchronisierung auswählen",
487+
"sync_categories": "Kategorien für die Synchronisierung auswählen",
488488
"effect_items": "Effektelemente",
489489
"initialize": "Willkommen bei FreeShow",
490490
"unsaved": "Programm beenden?",
@@ -1615,9 +1615,5 @@
16151615
"translation_description_multiline": "Fügt alle Sprachen in eine einzelne Textbox in abwechselnden Zeilen ein. (Wie in Songbeamer)",
16161616
"translation_description_textboxes": "Fügt jede Sprache in eine separate Textbox auf der Folie ein.",
16171617
"translation_description_layouts": "Erstellt für jede Sprache eigene Folien und ein eigenes Layout nur für diese Sprache."
1618-
},
1619-
"chums": {
1620-
"sync_categories": "Kategorien synchronisieren",
1621-
"sync_categories_description": "Auswählen, welche Kategorien als Lieder mit Chums synchronisiert werden"
16221618
}
16231619
}

public/lang/en.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@
486486
"manage_dynamic_values": "Manage dynamic values",
487487
"choose_camera": "Choose camera",
488488
"manage_tags": "Manage tags",
489-
"chums_sync_categories": "Select categories to sync",
489+
"sync_categories": "Sync categories",
490490
"effect_items": "Effect items",
491491
"initialize": "Welcome to FreeShow",
492492
"unsaved": "Are you sure you want to quit?",
@@ -1329,6 +1329,7 @@
13291329
"restart": "Restart servers",
13301330
"connect_to": "Connect to $1",
13311331
"disconnect_from": "Disconnect from $1",
1332+
"sync_categories_tip": "Select which categories to upload as songs",
13321333
"reset_all": "Reset everything",
13331334
"reset_theme": "Reset theme",
13341335
"reset_themes": "Reset themes",
@@ -1625,9 +1626,5 @@
16251626
"translation_description_multiline": "Adds all languages in a single textbox in alternating lines. (Like in Songbeamer)",
16261627
"translation_description_textboxes": "Adds every language as a separate textbox to the slide.",
16271628
"translation_description_layouts": "Creates a unique set of slides and a layout for every language."
1628-
},
1629-
"chums": {
1630-
"sync_categories": "Sync categories",
1631-
"sync_categories_description": "Select which categories to sync as songs with Chums"
16321629
}
16331630
}

public/lang/en_GB.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"manage_dynamic_values": "Manage dynamic values",
488488
"choose_camera": "Choose camera",
489489
"manage_tags": "Manage tags",
490-
"chums_sync_categories": "Select categories to sync",
490+
"sync_categories": "Select categories to sync",
491491
"effect_items": "Effect items",
492492
"initialize": "Welcome to FreeShow",
493493
"unsaved": "Are you sure you want to quit?",
@@ -1623,9 +1623,5 @@
16231623
"translation_description_multiline": "Adds all languages in a single textbox in alternating lines. (Like in Songbeamer)",
16241624
"translation_description_textboxes": "Adds every language as a separate textbox to the slide.",
16251625
"translation_description_layouts": "Creates a unique set of slides and a layout for every language."
1626-
},
1627-
"chums": {
1628-
"sync_categories": "Sync categories",
1629-
"sync_categories_description": "Select which categories to sync as songs with Chums"
16301626
}
16311627
}

public/lang/en_ZM.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"manage_dynamic_values": "Manage dynamic values",
488488
"choose_camera": "Choose camera",
489489
"manage_tags": "Manage tags",
490-
"chums_sync_categories": "Select categories to sync",
490+
"sync_categories": "Select categories to sync",
491491
"effect_items": "Effect items",
492492
"initialize": "Welcome to FreeShow",
493493
"unsaved": "Are you sure you want to quit?",
@@ -1623,9 +1623,5 @@
16231623
"translation_description_multiline": "Adds all languages in a single textbox in alternating lines. (Like in Songbeamer)",
16241624
"translation_description_textboxes": "Adds every language as a separate textbox to the slide.",
16251625
"translation_description_layouts": "Creates a unique set of slides and a layout for every language."
1626-
},
1627-
"chums": {
1628-
"sync_categories": "Sync categories",
1629-
"sync_categories_description": "Select which categories to sync as songs with Chums"
16301626
}
16311627
}

public/lang/es.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"manage_dynamic_values": "Gestionar valores dinámicos",
488488
"choose_camera": "Elegir cámara",
489489
"manage_tags": "Gestionar etiquetas",
490-
"chums_sync_categories": "Elige las categorías a sincronizar",
490+
"sync_categories": "Elige las categorías a sincronizar",
491491
"effect_items": "Elementos de efecto",
492492
"initialize": "Bienvenido a FreeShow",
493493
"unsaved": "¿Seguro que desea salir?",
@@ -1623,9 +1623,5 @@
16231623
"translation_description_multiline": "Agregar todos los idiomas en un único cuadro de texto en líneas alternas. (Como en Songbeamer)",
16241624
"translation_description_textboxes": "Agregar cada idioma como un cuadro de texto separado a la diapositiva.",
16251625
"translation_description_layouts": "Crear un conjunto único de diapositivas y un diseño para cada idioma."
1626-
},
1627-
"chums": {
1628-
"sync_categories": "Sincronizar categorías",
1629-
"sync_categories_description": "Seleccionar qué categorías sincronizar como canciones con Chums"
16301626
}
16311627
}

public/lang/fr_FR.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"manage_dynamic_values": "Gérer les valeurs dynamiques",
488488
"choose_camera": "Choisir la caméra",
489489
"manage_tags": "Gérer les tags",
490-
"chums_sync_categories": "Sélectionner les catégories à synchroniser",
490+
"sync_categories": "Sélectionner les catégories à synchroniser",
491491
"effect_items": "Éléments d'effet",
492492
"initialize": "Bienvenue sur FreeShow",
493493
"unsaved": "Vous n'avez pas encore sauvergardé ! Êtes-vous sur de vouloir quitter ?",
@@ -1623,9 +1623,5 @@
16231623
"translation_description_multiline": "Ajoute toutes les langues dans une seule zone de texte, en alternance de lignes. (Comme dans Songbeamer)",
16241624
"translation_description_textboxes": "Ajoute chaque langue dans une zone de texte distincte à la diapositive.",
16251625
"translation_description_layouts": "Crée un ensemble unique de diapos et une mise en page pour chaque langue."
1626-
},
1627-
"chums": {
1628-
"sync_categories": "Synchroniser les catégories",
1629-
"sync_categories_description": "Sélectionnez les catégories à synchroniser avec Chums"
16301626
}
16311627
}

public/lang/hu.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@
487487
"manage_dynamic_values": "Dinamikus értékek kezelése",
488488
"choose_camera": "Kamera kiválasztása",
489489
"manage_tags": "Címkék kezelése",
490-
"chums_sync_categories": "Szinkronizálandó kategóriák kijelölése",
490+
"sync_categories": "Szinkronizálandó kategóriák kijelölése",
491491
"effect_items": "Effektus elemek",
492492
"initialize": "Üdvözöljük a FreeShow-ban",
493493
"unsaved": "Biztosan ki szeretne léptni?",
@@ -1623,9 +1623,5 @@
16231623
"translation_description_multiline": "Hozzáadja az összes nyelvet egyetlen szövegdobozban, váltakozó sorokban (úgy, mint a Songbeamerben)",
16241624
"translation_description_textboxes": "Minden nyelvet külön szövegdobozként ad hozzá a diához.",
16251625
"translation_description_layouts": "Minden nyelvhez egyedi diakészletet és elrendezést hoz létre."
1626-
},
1627-
"chums": {
1628-
"sync_categories": "Kategóriák szinkronizálása",
1629-
"sync_categories_description": "Jelölje ki, mely kategóriákat szeretné dalként szinkronizálni a Chums alkalmazással."
16301626
}
16311627
}

0 commit comments

Comments
 (0)