Skip to content

Commit 3803e71

Browse files
vassboyurividaljzongkerAnoian
authored
1.5.6 (#2699)
* fix: first slide thumbnails incorrect after template changes (#2677) Wait for DOM updates before autosize calculation to prevent measuring stale dimensions when templates change. Also improve cache invalidation by including template ID and box dimensions in cache signature. Fixes issue where first slides showed oversized text after switching between templates, especially from scripture mode to lower-third layouts. * Updated Chinese language * Status indicator * Updated Norwegian language * Closing indicator * Project updates * Verse of the Day * Set media type on folder level #2572 * Fixed media issue * Updated Dutch language * Fix duplicate font-family in template editor CSS (#2679) Fixed bug where changing font-family in template editor with multiple lines would add a new font-family property instead of replacing the old one. Replaced forEach with splice approach (which had index-skipping issues) with a filter method to properly remove old style properties. * More auto-size fixes (#2681) * fix(textbox): ensure thumbnails resize correctly on template change using DOM measurements in cache signature * fix(textbox): resolve stuck hidden text on output template change with safety timeout and logic fix * Fixed select all media not working #2683 - Updated Hungarian language * Copied/pasted toast - Small tweaks * Fixed message/metadata fade transition - Quick edit message/metadata templates * Applied token validation improvements from Amazing Life * Updated languages * Fixed scripture search sometimes incorrect #2689 * Fixed project files with large media not imported #2688 * Tweaks * Profile updates * Profile updates * fix: Fix can't rename groups (#2694) Closes #2680 * Fix OpenSong importer: trim whitespace from section tags (#2696) * Fixes * Outset text outline #2692 * Version update --------- Co-authored-by: Yuri Vidal <yurividal@users.noreply.github.com> Co-authored-by: Jeremy Zongker <jeremy@zongker.net> Co-authored-by: Fabian Letsch <28201880+Anoian@users.noreply.github.com>
1 parent 6ad1f69 commit 3803e71

File tree

89 files changed

+1257
-494
lines changed

Some content is hidden

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

89 files changed

+1257
-494
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.6-beta.3",
3+
"version": "1.5.6",
44
"private": true,
55
"main": "build/electron/index.js",
66
"description": "Show song lyrics and more for free!",

public/lang/en.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,9 @@
638638
"redo": "Redo",
639639
"cut": "Cut",
640640
"copy": "Copy",
641+
"copied": "Copied",
641642
"paste": "Paste",
643+
"pasted": "Pasted",
642644
"pasteAndMatchStyle": "Paste And Match Style",
643645
"selectAll": "Select All",
644646
"remove_selection": "Remove selection",
@@ -859,7 +861,6 @@
859861
"info": "Sync files to the cloud for backups or to access between multiple computers.",
860862
"enable": "Automatic sync on startup and close",
861863
"read_only": "Read-only",
862-
"media_folder": "Cloud media folder",
863864
"reconnect": "Reconnect",
864865
"sync": "Sync now",
865866
"change_team": "Change team",
@@ -1384,8 +1385,10 @@
13841385
"write": "Write",
13851386
"set_active": "Set as active",
13861387
"choose_profile": "Choose a profile",
1388+
"change_profile": "Change profile",
13871389
"choose_admin": "Only continue if you know what you are doing. Choose admin profile?",
1388-
"locked": "Your selected profile has restricted access to this!"
1390+
"locked": "Your selected profile has restricted access to this!",
1391+
"auto_open_last_used": "Auto open last used profile on startup"
13891392
},
13901393
"sort": {
13911394
"sort_by": "Sort by",

public/lang/en_GB.json

Lines changed: 58 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,18 @@
7575
"slide": "Edit current slide.",
7676
"filters": "Change the look of the selected element.",
7777
"options": "More options.",
78-
"scripture": "Hold Ctrl/Cmd or Shift to select multiple verses."
78+
"scripture": "Hold Ctrl/Cmd or Shift to select multiple verses.",
79+
"context_cut_in_half": "Split the first textbox into two slides.",
80+
"context_merge": "Merge selected slides into one.",
81+
"context_capitalize": "Make first letter of each line uppercase.",
82+
"context_trim": "Trim whitespace and punctuation from start/end of each line, and remove double spaces."
7983
},
8084
"tips": {
8185
"trigger": "Triggers are commonly used to send an HTTP request to change the preset of cameras.",
82-
"global_options": "These options are applied globally."
86+
"global_options": "These options are applied globally.",
87+
"consider_templates": "You made the same changes to multiple slides. Consider using a template.",
88+
"style_template_active": "A style in the output is set to override the show template.",
89+
"group_numbers": "Numbers are auto assigned, so you don't need to add numbers to group names."
8390
},
8491
"setup": {
8592
"good_luck": "We hope you find this software useful. Good luck with the presentation! :)",
@@ -205,19 +212,23 @@
205212
"blur_fill": "Blur fill",
206213
"cover": "Cover",
207214
"online": "Online",
215+
"downloading": "Downloading",
208216
"recommended": "Recommended",
217+
"media_sync_folder": "Media sync folder",
218+
"media_sync_folder_tip": "Copy all used media files continuously into one shared folder. Any custom sync provider can be pointed to that folder.",
209219
"bundle_media_files": "Bundle all media files",
210-
"bundle_media_files_tip": "Copy the media files from all shows into one folder"
220+
"bundle_media_files_tip": "Copy the media files from all shows and projects into one folder"
211221
},
212222
"audio": {
213223
"settings": "Audio settings",
214224
"playlists": "Playlists",
215225
"playlist_settings": "Playlist settings",
226+
"open_audio_folder": "Open related audio folder",
227+
"create_audio_folder": "Create audio folder",
216228
"custom_output": "Custom audio output",
217229
"mute_when_video_plays": "Mute when video plays",
218230
"allow_gaining": "Allow gaining",
219231
"allow_gaining_tip": "Allow setting volume above 100% (May cause distortion)",
220-
"pre_fader_volume_meter": "Pre fader volume meter",
221232
"mixer": "Mixer",
222233
"equalizer": "Equaliser",
223234
"preset": "Preset",
@@ -317,7 +328,6 @@
317328
"autofill": "Autofill",
318329
"message": "Message",
319330
"message_tip": "Display something on all slides",
320-
"auto_media": "Get meta from media content",
321331
"override_output": "Override output style",
322332
"display_metadata": "Display metadata",
323333
"meta_template": "Metadata template",
@@ -356,6 +366,7 @@
356366
"inputs": {
357367
"name": "Name",
358368
"url": "URL",
369+
"group": "Group",
359370
"method": "Method",
360371
"contentType": "Content Type",
361372
"payload": "Payload",
@@ -400,7 +411,8 @@
400411
"offers": "Offers",
401412
"notice": "Notice",
402413
"visuals": "Visuals",
403-
"action_tip": "An action that triggers each time a show with this category is presented."
414+
"action_tip": "An action that triggers each time a show with this category is presented.",
415+
"create_nonexistent": "Create non-existent categories"
404416
},
405417
"groups": {
406418
"current": "Current",
@@ -434,6 +446,7 @@
434446
"variable": "Variable",
435447
"trigger": "Trigger",
436448
"audio_stream": "Audio stream",
449+
"now_playing": "Now playing file",
437450
"aspect_ratio": "Change aspect ratio",
438451
"max_lines": "Set max lines",
439452
"transition": "Transition",
@@ -447,6 +460,7 @@
447460
"choose_output": "Choose output type",
448461
"choose_style": "Choose style preset",
449462
"change_output_values": "Change output values",
463+
"output_selector": "Output selector",
450464
"choose_chord": "Choose chord",
451465
"set_time": "Set time",
452466
"assign_shortcut": "Assign shortcut",
@@ -476,6 +490,7 @@
476490
"slide_midi": "Slide MIDI input",
477491
"user_data_overwrite": "Found existing data",
478492
"connect": "Connect",
493+
"cloud_sync": "Cloud sync",
479494
"cloud_update": "Syncing with cloud",
480495
"cloud_method": "Data location",
481496
"shortcuts": "Shortcuts",
@@ -485,14 +500,16 @@
485500
"manage_colors": "Manage colours",
486501
"manage_metadata": "Manage metadata",
487502
"manage_dynamic_values": "Manage dynamic values",
503+
"template_style_overrides": "Style overwrites",
488504
"choose_camera": "Choose camera",
489505
"manage_tags": "Manage tags",
490-
"sync_categories": "Select categories to sync",
506+
"sync_categories": "Sync categories",
491507
"effect_items": "Effect items",
492508
"initialize": "Welcome to FreeShow",
493509
"unsaved": "Are you sure you want to quit?",
494510
"cancel": "Cancel",
495511
"continue": "Continue",
512+
"restore": "Restore backup",
496513
"reset_all": "Reset everything",
497514
"reset_all_confirm": "Are you sure you want to reset everything?",
498515
"reset_all_action": "This will reset the whole program, but not delete the .show files in your \"Shows\"-folder.",
@@ -637,6 +654,7 @@
637654
"reset": "Reset",
638655
"create_template": "Create template",
639656
"project_template_tip": "Create a new project from this template",
657+
"import_project_file": "Found a new project file. Would you like to import it?",
640658
"pdf_single_page": "Render as one document",
641659
"convert_to_images": "Convert to images",
642660
"converting": "Converting...",
@@ -765,6 +783,7 @@
765783
"start_playlist": "Start playlist",
766784
"playlist_next": "Next track in playlist",
767785
"start_metronome": "Start metronome",
786+
"start_audio_effect": "Start audio effect",
768787
"id_start_timer": "Start timer",
769788
"start_slide_timers": "Start timers on active slide",
770789
"id_select_output_style": "Select output style",
@@ -784,6 +803,7 @@
784803
"override_category_action": "Override category action",
785804
"activate_on_startup": "Activate on startup",
786805
"activate_save": "Activate on save",
806+
"activate_output_changed": "Activate when output changes",
787807
"activate_slide_clicked": "Activate on slide click",
788808
"activate_group_start": "Activate when group is started",
789809
"activate_video_starting": "Activate when video is starting",
@@ -797,7 +817,9 @@
797817
"activate_background_cleared": "Activate when background is cleared",
798818
"activate_show_created": "Activate when show is created",
799819
"activate_show_opened": "Activate when show is opened",
800-
"activate_audio_playlist_ended": "Activate when audio playlist has ended"
820+
"activate_audio_playlist_ended": "Activate when audio playlist has ended",
821+
"mark_played": "Mark as played",
822+
"mark_not_played": "Mark as not played"
801823
},
802824
"conditions": {
803825
"show_item": "Show item if",
@@ -834,22 +856,20 @@
834856
"seconds": "seconds"
835857
},
836858
"cloud": {
837-
"info": "Sync files with Google Drive for backups, or if you work on multiple computers.",
838-
"tip_api": "You have to provide your own free Google API key so the program can automatically upload files to your Google Drive.",
839-
"tip_how": "Don't know how to get one?",
840-
"tip_guide": "Click here for a guide.",
859+
"info": "Sync files to the cloud for backups or to access between multiple computers.",
841860
"enable": "Automatic sync on startup and close",
842-
"disable_upload": "Disable uploading data",
843-
"media_id": "Media path ID",
844-
"google_drive_api": "Google API service account key",
845-
"select_key": "Import keys file",
846-
"update_key": "Update keys file",
847-
"enable_custom_folder_id": "Use custom folder ID",
848-
"main_folder": "Set main folder manually",
861+
"read_only": "Read-only",
849862
"media_folder": "Cloud media folder",
850863
"reconnect": "Reconnect",
851864
"sync": "Sync now",
852-
"choose_method_tip": "There is existing data in the cloud. Please choose to either upload from local or download from cloud. The other location will be overwritten.",
865+
"change_team": "Change team",
866+
"choose_method_tip": "There is existing data in the cloud. What would you like to do?",
867+
"merge_tip": "Keep the latest changes from both local and cloud data.",
868+
"readonly_tip": "Merge cloud data with local data, but never upload local changes.",
869+
"upload": "Upload",
870+
"upload_tip": "Replace cloud data with local data initially, merge normally afterwards.",
871+
"replace": "Download",
872+
"replace_tip": "Replace local data with cloud data initially, merge normally afterwards.",
853873
"local": "Local",
854874
"syncing": "Syncing to cloud",
855875
"sync_complete": "Sync completed"
@@ -949,6 +969,8 @@
949969
"max_lines_per_slide": "Max lines per slide",
950970
"break_long_lines": "Break long lines",
951971
"break_long_lines_tip": "Break line if longer than the set words",
972+
"style_overrides_tip": "Automatically restyle matching words.",
973+
"style_override_pattern": "Word or /regex/",
952974
"skip_virtual_breaks": "Skip virtual breaks",
953975
"media_fit": "Media fit",
954976
"cropping": "Cropping",
@@ -989,8 +1011,8 @@
9891011
"_title_top": "Align top",
9901012
"_title_bottom": "Align bottom",
9911013
"align_center": "Centred",
992-
"align_start": "Start",
993-
"align_end": "End",
1014+
"align_start": "Top",
1015+
"align_end": "Bottom",
9941016
"outline": "Outline",
9951017
"shadow": "Shadow",
9961018
"shadow_inset": "Shadow inset",
@@ -1114,10 +1136,10 @@
11141136
"seconds": "Seconds",
11151137
"from": "From",
11161138
"to": "To",
1139+
"warn_early": "Early warning",
1140+
"warn_offset": "Seconds before end",
11171141
"overflow": "Overflow when reached end",
1118-
"overflow_color": "Overflow colour",
1119-
"overflow_blink": "Blink when overflowing",
1120-
"overflow_blink_offset": "Start blinking early",
1142+
"flash": "Flash",
11211143
"preview": "Preview",
11221144
"clock": "Clock",
11231145
"event": "Event",
@@ -1208,7 +1230,8 @@
12081230
"source_output": "Source output",
12091231
"auto_stretch": "Auto stretch content",
12101232
"labels": "Show labels",
1211-
"label_color": "Label colour"
1233+
"label_color": "Label colour",
1234+
"create_stage_output": "Create stage output"
12121235
},
12131236
"settings": {
12141237
"general": "General",
@@ -1264,7 +1287,9 @@
12641287
"disable_labels": "Disable labels",
12651288
"group_numbers": "Group numbers",
12661289
"auto_group_numbers": "Auto assign group numbers",
1290+
"shortcuts_on_slides": "Display shortcuts on slides",
12671291
"transparent_slides": "Transparent slide preview",
1292+
"style_template_preview": "Use style template as slide preview",
12681293
"full_colors": "High contrast group colours",
12691294
"next_item_on_last_slide": "Arrow left/right changes project item on first/last slide",
12701295
"slide_number_keys": "Play slides with number keys",
@@ -1296,14 +1321,11 @@
12961321
"add": "Add",
12971322
"remove": "Remove",
12981323
"change_name": "Change name",
1299-
"show_location": "Show location",
13001324
"data_location": "Data location",
1301-
"user_data_location": "Save user settings at 'Data location'",
1302-
"user_data_exists": "Found existing data at custom location, would you like to overwrite it?",
1303-
"user_data_yes": "Yes, keep current data",
1304-
"user_data_no": "No, import existing data",
13051325
"auto_locate_missing_media_files": "Auto locate missing media files",
13061326
"popup_before_close": "Enable close confirmation popup",
1327+
"log_song_usage": "Log song usage to a file",
1328+
"auto_error_reporting": "Auto error reporting",
13071329
"disable_hardware_acceleration": "Disable hardware acceleration",
13081330
"restart_for_change": "You have to restart the program for the change to take effect!",
13091331
"font": "Font",
@@ -1327,6 +1349,7 @@
13271349
"restart": "Restart servers",
13281350
"connect_to": "Connect to $1",
13291351
"disconnect_from": "Disconnect from $1",
1352+
"sync_categories_tip": "Select which categories to upload as songs",
13301353
"reset_all": "Reset everything",
13311354
"reset_theme": "Reset theme",
13321355
"reset_themes": "Reset themes",
@@ -1350,7 +1373,8 @@
13501373
},
13511374
"output": {
13521375
"state_inactive": "Inactive",
1353-
"state_locked": "Locked"
1376+
"state_locked": "Locked",
1377+
"disabled_layers": "Disabled layers"
13541378
},
13551379
"profile": {
13561380
"profiles_hint": "Create multiple profiles/roles to limit certain users access to control/edit chosen parts of the program.",
@@ -1412,13 +1436,15 @@
14121436
"verse_numbers": "Verse numbers",
14131437
"verses_on_individual_lines": "Verses on individual lines",
14141438
"divide_long_verses": "Split long verses",
1439+
"split_long_verses_suffix": "Show letter suffix",
14151440
"version": "Show version",
14161441
"reference": "Show reference",
14171442
"split_reference": "Split reference",
14181443
"combine_with_text": "Combine with text",
14191444
"first_slide_reference": "Reference on first slide",
14201445
"reference_at_bottom": "Move to bottom",
14211446
"red_jesus": "Jesus words in red",
1447+
"show_all": "Show all",
14221448
"search": "Search in the Bible"
14231449
},
14241450
"filter": {

0 commit comments

Comments
 (0)