From 1aa60435ee08513da5c74bb7ac8fa79b627a185c Mon Sep 17 00:00:00 2001 From: Francesco Ceruti Date: Sat, 11 Jan 2025 18:40:29 +0100 Subject: [PATCH] Improve error message, update ts files --- lisp/application.py | 10 +-- lisp/i18n/ts/en/action_cues.ts | 44 +++++------ lisp/i18n/ts/en/cart_layout.ts | 82 ++++++++++---------- lisp/i18n/ts/en/controller.ts | 53 ++++++++----- lisp/i18n/ts/en/gst_backend.ts | 94 +++++++++++------------ lisp/i18n/ts/en/lisp.ts | 76 +++++++++--------- lisp/i18n/ts/en/list_layout.ts | 136 ++++++++++++++++----------------- lisp/i18n/ts/en/midi.ts | 20 ++--- lisp/i18n/ts/en/replay_gain.ts | 32 ++++---- 9 files changed, 285 insertions(+), 262 deletions(-) diff --git a/lisp/application.py b/lisp/application.py index 1fad5a5b1..a62c47681 100644 --- a/lisp/application.py +++ b/lisp/application.py @@ -206,13 +206,13 @@ def __save_to_file(self, session_file): logger.exception( translate( "ApplicationError", - """ - Error while writing the session file "{}"\n - Due to bad data, the session cannot be saved. - Please check any recent changes to cue pipelines. - """, + "Saving your session failed due to bad data.\n" + "The file still contains your last successful save and has not been overwritten.\n\n" + "This is likely because of corrupted data from a plugin." + " Try to revert recent changes to cues or settings, and save the file again.", ).format(session_file) ) + else: with open(session_file, mode="w", encoding="utf-8") as file: file.write(session_json) diff --git a/lisp/i18n/ts/en/action_cues.ts b/lisp/i18n/ts/en/action_cues.ts index 285e0bcfd..7b060254e 100644 --- a/lisp/i18n/ts/en/action_cues.ts +++ b/lisp/i18n/ts/en/action_cues.ts @@ -4,22 +4,22 @@ CollectionCue - + Add Add - + Remove Remove - + Cue Cue - + Action Action @@ -65,7 +65,7 @@ CueCategory - + Action cues @@ -82,26 +82,26 @@ Collection Cue Collection Cue - - - Stop-All - Stop-All - Command Cue Command Cue - - Volume Control - Volume Control + + Stop-All + Stop-All Index Action Index Action + + + Volume Control + Volume Control + IndexActionCue @@ -172,30 +172,30 @@ Seek Settings - + Edit Collection Edit Collection - - - Stop Settings - Stop Settings - Command Command - - Volume Settings - Volume Settings + + Stop Settings + Stop Settings Action Settings Action Settings + + + Volume Settings + Volume Settings + StopAll diff --git a/lisp/i18n/ts/en/cart_layout.ts b/lisp/i18n/ts/en/cart_layout.ts index 22a7b1af7..69ddac62e 100644 --- a/lisp/i18n/ts/en/cart_layout.ts +++ b/lisp/i18n/ts/en/cart_layout.ts @@ -4,48 +4,68 @@ CartLayout - - Reset volume + + Default behaviors (applied to new sessions) - - Add page + + Countdown mode - - Add pages + + Show seek-bars - - Remove current page + + Show dB-meters - - Countdown mode + + Show accurate time - - Show seek-bars + + Show volume - - Show dB-meters + + Grid size - - Show volume + + Number of columns: - - Show accurate time + + Number of rows: + + + + + Reset volume + + + + + Add page + + + + + Add pages + + + + + Remove current page @@ -59,17 +79,17 @@ - + Warning - + Every cue in the page will be lost. - + Are you sure to continue? @@ -88,26 +108,6 @@ Stop - - - Default behaviors (applied to new sessions) - - - - - Grid size - - - - - Number of columns: - - - - - Number of rows: - - LayoutDescription diff --git a/lisp/i18n/ts/en/controller.ts b/lisp/i18n/ts/en/controller.ts index 9506a1dfa..c7a06d585 100644 --- a/lisp/i18n/ts/en/controller.ts +++ b/lisp/i18n/ts/en/controller.ts @@ -4,10 +4,15 @@ Controller - + Cannot load controller protocol: "{}" + + + Unrecognized layout action: "{}" + + ControllerKeySettings @@ -178,12 +183,12 @@ do not forget to edit the path later. ControllerSettings - + Add Add - + Remove Remove @@ -191,55 +196,65 @@ do not forget to edit the path later. GlobalAction - + Go - + Reset - + Stop all cues - + Pause all cues - + Resume all cues - + Interrupt all cues - + Fade-out all cues - + Fade-in all cues - + Move standby forward - + Move standby back + + + Switch to previous page + + + + + Switch to next page + + Osc Cue @@ -280,9 +295,9 @@ do not forget to edit the path later. - - Keyboard Shortcuts - Keyboard Shortcuts + + OSC Controls + @@ -290,9 +305,9 @@ do not forget to edit the path later. MIDI Controls - - OSC Controls - + + Keyboard Shortcuts + Keyboard Shortcuts \ No newline at end of file diff --git a/lisp/i18n/ts/en/gst_backend.ts b/lisp/i18n/ts/en/gst_backend.ts index 322e0e7cc..c88c299bd 100644 --- a/lisp/i18n/ts/en/gst_backend.ts +++ b/lisp/i18n/ts/en/gst_backend.ts @@ -230,25 +230,35 @@ Speed Speed + + + Custom Element + Custom Element + dB Meter dB Meter - - Audio Pan - Audio Pan + + Preset Input + Preset Input - - Volume - Volume + + System Out + System Out - - URI Input - URI Input + + System Input + System Input + + + + ALSA Out + ALSA Out @@ -261,24 +271,19 @@ PulseAudio Out - - System Out - System Out - - - - Compressor/Expander - Compressor/Expander + + 10 Bands Equalizer + 10 Bands Equalizer - - Custom Element - Custom Element + + Audio Pan + Audio Pan - - Preset Input - Preset Input + + URI Input + URI Input @@ -286,19 +291,14 @@ Pitch - - 10 Bands Equalizer - 10 Bands Equalizer - - - - System Input - System Input + + Compressor/Expander + Compressor/Expander - - ALSA Out - ALSA Out + + Volume + Volume @@ -324,16 +324,16 @@ SettingsPageName - - - Media Settings - Media Settings - GStreamer + + + Media Settings + Media Settings + ALSA Default Device @@ -351,42 +351,42 @@ UriInputSettings - + Source Source - + Find File Find File - + Buffering Buffering - + Use Buffering Use Buffering - + Attempt download on network streams Attempt download on network streams - + Buffer size (-1 default value) Buffer size (-1 default value) - + Choose file Choose file - + All files All files diff --git a/lisp/i18n/ts/en/lisp.ts b/lisp/i18n/ts/en/lisp.ts index 53e353295..2a1e33792 100644 --- a/lisp/i18n/ts/en/lisp.ts +++ b/lisp/i18n/ts/en/lisp.ts @@ -129,12 +129,20 @@ - + + Saving your session failed due to bad data. +The file still contains your last successful save and has not been overwritten. + +This is likely because of corrupted data from a plugin. Try to revert recent changes to cues or settings, and save the file again. + + + + Error while reading the session file "{}" - + Unable to create the cue "{}" @@ -525,6 +533,16 @@ Logging + + + Linux Show Player - Log Viewer + + + + + Showing {} of {} records + + Dismiss all @@ -635,16 +653,6 @@ Exception info - - - Linux Show Player - Log Viewer - - - - - Showing {} of {} records - - MainWindow @@ -848,6 +856,11 @@ PluginsError + + + Cannot satisfy dependencies for plugin: "{}" + + A plugin by the name of "{}" already exists. @@ -868,22 +881,17 @@ Failed to terminate plugin: "{}" - - - Cannot satisfy dependencies for plugin: "{}" - - PluginsInfo - - Plugin terminated: "{}" + + Plugin loaded: "{}" - - Plugin loaded: "{}" + + Plugin terminated: "{}" @@ -939,14 +947,9 @@ SettingsPageName - - Plugins - - - - - General - General + + Cue Settings + Cue Settings @@ -954,13 +957,13 @@ - - Cue Settings - Cue Settings + + General + General - - Media Cue + + Plugins @@ -988,5 +991,10 @@ Appearance Appearance + + + Media Cue + + \ No newline at end of file diff --git a/lisp/i18n/ts/en/list_layout.ts b/lisp/i18n/ts/en/list_layout.ts index 2e06206a4..a30c2d009 100644 --- a/lisp/i18n/ts/en/list_layout.ts +++ b/lisp/i18n/ts/en/list_layout.ts @@ -38,90 +38,30 @@ ListLayout - - Show dB-meters + + Default behaviors (applied to new sessions) - - Show seek-bars + + Show dB-meters - + Show accurate time - - Show index column + + Show seek-bars - + Auto-select next cue - - - Selection mode - - - - - Show resize handles - - - - - Restore default size - - - - - Disable GO Key While Playing - - - - - Edit cue - - - - - Edit selected - - - - - Clone cue - - - - - Clone selected - - - - - Remove cue - - - - - Remove selected - - - - - Copy of {} - - - - - Default behaviors (applied to new sessions) - - Enable selection mode @@ -212,6 +152,66 @@ Fade-In all + + + Show index column + + + + + Selection mode + + + + + Show resize handles + + + + + Restore default size + + + + + Disable GO Key While Playing + + + + + Edit cue + + + + + Edit selected + + + + + Clone cue + + + + + Clone selected + + + + + Remove cue + + + + + Remove selected + + + + + Copy of {} + + ListLayoutHeader diff --git a/lisp/i18n/ts/en/midi.ts b/lisp/i18n/ts/en/midi.ts index d0c85f3d1..388098f26 100644 --- a/lisp/i18n/ts/en/midi.ts +++ b/lisp/i18n/ts/en/midi.ts @@ -32,6 +32,11 @@ MIDIError + + + Cannot create ALSA-MIDI port monitor, MIDI connections/disconnections will not be detected. + + Cannot connect to MIDI output port '{}'. @@ -42,11 +47,6 @@ Cannot connect to MIDI input port '{}'. - - - Cannot create ALSA-MIDI port monitor, MIDI connections/disconnections will not be detected. - - MIDIInfo @@ -207,15 +207,15 @@ SettingsPageName - - - MIDI settings - MIDI settings - MIDI Settings + + + MIDI settings + MIDI settings + \ No newline at end of file diff --git a/lisp/i18n/ts/en/replay_gain.ts b/lisp/i18n/ts/en/replay_gain.ts index b6563abd1..470aea62b 100644 --- a/lisp/i18n/ts/en/replay_gain.ts +++ b/lisp/i18n/ts/en/replay_gain.ts @@ -4,25 +4,10 @@ ReplayGain - + ReplayGain / Normalization ReplayGain / Normalization - - - Calculate - Calculate - - - - Reset all - Reset all - - - - Reset selected - Reset selected - Threads number @@ -48,6 +33,21 @@ Processing files ... Processing files ... + + + Calculate + Calculate + + + + Reset all + Reset all + + + + Reset selected + Reset selected + ReplayGainDebug