diff options
author | ksooo <3226626+ksooo@users.noreply.github.com> | 2024-06-25 20:28:21 +0200 |
---|---|---|
committer | ksooo <3226626+ksooo@users.noreply.github.com> | 2024-06-26 09:24:50 +0200 |
commit | b0e549f806425eb15526373d3689866cf9852b78 (patch) | |
tree | 44c87e37beecc06c12e576a07600def3ab14c7aa | |
parent | 0a110e007bc981fb3d01751b9352e12583d47a4c (diff) |
[addons] Global strings.po: Remove user unfriendly/not helpful/irritating 'Check log for more information about this message.' text from PVR error messages.
-rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 26 | ||||
-rw-r--r-- | xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp | 20 | ||||
-rw-r--r-- | xbmc/pvr/guilib/PVRGUIActionsChannels.cpp | 6 | ||||
-rw-r--r-- | xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp | 9 | ||||
-rw-r--r-- | xbmc/pvr/guilib/PVRGUIActionsRecordings.cpp | 15 | ||||
-rw-r--r-- | xbmc/pvr/guilib/PVRGUIActionsTimers.cpp | 48 |
6 files changed, 44 insertions, 80 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index df6abe2714..d40e277e7b 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -9146,8 +9146,8 @@ msgctxt "#16028" msgid "Enter value" msgstr "" -#. PVR error messages dialog text. -#: xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp +#. General error messages dialog text. +#: xbmc/cores/VideoPlayer/VideoPlayer.cpp msgctxt "#16029" msgid "Check the log for more information about this message." msgstr "" @@ -9774,12 +9774,12 @@ msgstr "" #. message box text stating that a pvr channel could not be played. #: xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp msgctxt "#19035" -msgid "{0:s} can't be played. Check the log for more information about this message." +msgid "{0:s} can't be played." msgstr "" #: @@@ unused? msgctxt "#19036" -msgid "This recording can't be played. Check the log for more information about this message." +msgid "This recording can't be played." msgstr "" #. pvr settings "show signal quality" label @@ -9825,12 +9825,12 @@ msgstr "" #: @@@ unused? msgctxt "#19044" -msgid "Please check your configuration. Check the log for more information about this message." +msgid "Please check your configuration." msgstr "" #: @@@ unused? msgctxt "#19045" -msgid "No PVR clients have been started yet. Wait for the PVR clients to start up. Check the log for more information about this message." +msgid "No PVR clients have been started yet. Wait for the PVR clients to start up." msgstr "" #: @@@ unused? @@ -10236,19 +10236,19 @@ msgstr "" #. message box text stating that a timer could not be saved #: xbmc/pvr/guilib/PVRGUIActionsTimers.cpp msgctxt "#19109" -msgid "Could not save the timer. Check the log for more information about this message." +msgid "Could not save the timer." msgstr "" #. message box text stating that a timer could not be deleted #: xbmc/pvr/guilib/PVRGUIActionsTimers.cpp msgctxt "#19110" -msgid "Could not delete the timer. Check the log for more information about this message." +msgid "Could not delete the timer." msgstr "" #. message box text stating that a PVR backend error occurred #: xbmc/pvr/guilib/PVRGUIActionsRecordings.cpp msgctxt "#19111" -msgid "PVR backend error. Check the log for more information about this message." +msgid "PVR backend error." msgstr "" #. delete recordings confirmation message box text @@ -10558,7 +10558,7 @@ msgstr "" #. error box text stating that recording could not be started #: xbmc/pvr/guilib/PVRGUIActionsTimers.cpp msgctxt "#19164" -msgid "Could not start recording. Check the log for more information about this message." +msgid "Could not start recording." msgstr "" #. Label for "switch to channel" button"" @@ -10597,7 +10597,7 @@ msgstr "" #. error box text stating that recording could not be stopped #: xbmc/pvr/guilib/PVRGUIActionsTimers.cpp msgctxt "#19170" -msgid "Could not stop recording. Check the log for more information about this message." +msgid "Could not stop recording." msgstr "" #. pvr settings "start playback full screen" setting label @@ -10741,7 +10741,7 @@ msgstr "" #. error message box text stating that a given pvr channel could not be played #: xbmc/pvr/guilib/PVRGUIActionsChannels.cpp msgctxt "#19193" -msgid "The channel scan can't be started. Check the log for more information about this message." +msgid "The channel scan can't be started." msgstr "" #. unused? @@ -11149,7 +11149,7 @@ msgstr "" #. message box text stating that a timer could not be updated #: xbmc/pvr/guilib/PVRGUIActionsTimers.cpp msgctxt "#19263" -msgid "Could not update the timer. Check the log for more information about this message." +msgid "Could not update the timer." msgstr "" #. label for 'incorrect pin' error dialog header diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp index b601c63985..d6ed495ab1 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp @@ -577,10 +577,8 @@ bool CGUIDialogPVRChannelManager::OnClickButtonNewChannel() HELPERS::ShowOKDialogText( CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." else - HELPERS::ShowOKDialogText( - CVariant{2103}, - CVariant{ - 16029}); // "Add-on error", "Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{2103}, + CVariant{19111}); // "Add-on error", "PVR backend error." } return true; } @@ -749,10 +747,8 @@ bool CGUIDialogPVRChannelManager::OnContextButton(int itemNumber, CONTEXT_BUTTON HELPERS::ShowOKDialogText( CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." else - HELPERS::ShowOKDialogText( - CVariant{2103}, - CVariant{ - 16029}); // "Add-on error", "Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{2103}, + CVariant{19111}); // "Add-on error", "PVR backend error." } else if (button == CONTEXT_BUTTON_DELETE) { @@ -788,10 +784,8 @@ bool CGUIDialogPVRChannelManager::OnContextButton(int itemNumber, CONTEXT_BUTTON CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." else - HELPERS::ShowOKDialogText( - CVariant{2103}, - CVariant{ - 16029}); // "Add-on error", "Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{2103}, + CVariant{19111}); // "Add-on error", "PVR backend error." } } } @@ -958,7 +952,7 @@ void CGUIDialogPVRChannelManager::RenameChannel(const CFileItemPtr& pItem) const std::shared_ptr<CPVRClient> client = CServiceBroker::GetPVRManager().GetClient(*pItem); if (!client || (client->RenameChannel(channel) != PVR_ERROR_NO_ERROR)) HELPERS::ShowOKDialogText(CVariant{2103}, - CVariant{16029}); // Add-on error;Check the log file for details. + CVariant{19111}); // "Add-on error", "PVR backend error." } } diff --git a/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp b/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp index 262841be9a..f13d331318 100644 --- a/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp +++ b/xbmc/pvr/guilib/PVRGUIActionsChannels.cpp @@ -311,10 +311,8 @@ bool CPVRGUIActionsChannels::StartChannelScan(int clientId) /* do the scan */ if (scanClient->StartChannelScan() != PVR_ERROR_NO_ERROR) - HELPERS::ShowOKDialogText( - CVariant{257}, // "Error" - CVariant{ - 19193}); // "The channel scan can't be started. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, // "Error" + CVariant{19193}); // "The channel scan can't be started." auto end = std::chrono::steady_clock::now(); auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start); diff --git a/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp b/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp index a0bc877a60..954b46eb5e 100644 --- a/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp +++ b/xbmc/pvr/guilib/PVRGUIActionsPlayback.cpp @@ -321,9 +321,8 @@ bool CPVRGUIActionsPlayback::SwitchToChannel(const CFileItem& item, bool bCheckR { const std::string channelName = channel ? channel->ChannelName() : g_localizeStrings.Get(19029); // Channel - const std::string msg = StringUtils::Format( - g_localizeStrings.Get(19035), - channelName); // CHANNELNAME could not be played. Check the log for details. + const std::string msg = StringUtils::Format(g_localizeStrings.Get(19035), + channelName); // CHANNELNAME could not be played. CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Error, g_localizeStrings.Get(19166), msg); // PVR information @@ -407,9 +406,7 @@ bool CPVRGUIActionsPlayback::SwitchToChannel(PlaybackType type) const g_localizeStrings.Get(19166), // PVR information StringUtils::Format( g_localizeStrings.Get(19035), - g_localizeStrings.Get( - bIsRadio ? 19021 - : 19020))); // Radio/TV could not be played. Check the log for details. + g_localizeStrings.Get(bIsRadio ? 19021 : 19020))); // Radio/TV could not be played. return false; } diff --git a/xbmc/pvr/guilib/PVRGUIActionsRecordings.cpp b/xbmc/pvr/guilib/PVRGUIActionsRecordings.cpp index 9609617be9..316b8a896b 100644 --- a/xbmc/pvr/guilib/PVRGUIActionsRecordings.cpp +++ b/xbmc/pvr/guilib/PVRGUIActionsRecordings.cpp @@ -256,10 +256,7 @@ bool CPVRGUIActionsRecordings::DeleteRecording(const CFileItem& item) const if (!AsyncDeleteRecording().Execute(item)) { - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19111}); // "Error", "PVR backend error. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, CVariant{19111}); // "Error", "PVR backend error." return false; } @@ -289,10 +286,7 @@ bool CPVRGUIActionsRecordings::DeleteWatchedRecordings(const CFileItem& item) co if (!AsyncDeleteRecording(true).Execute(item)) { - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19111}); // "Error", "PVR backend error. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, CVariant{19111}); // "Error", "PVR backend error." return false; } @@ -333,10 +327,7 @@ bool CPVRGUIActionsRecordings::UndeleteRecording(const CFileItem& item) const if (!AsyncUndeleteRecording().Execute(item)) { - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19111}); // "Error", "PVR backend error. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, CVariant{19111}); // "Error", "PVR backend error." return false; } diff --git a/xbmc/pvr/guilib/PVRGUIActionsTimers.cpp b/xbmc/pvr/guilib/PVRGUIActionsTimers.cpp index 9391cc62df..570249b12a 100644 --- a/xbmc/pvr/guilib/PVRGUIActionsTimers.cpp +++ b/xbmc/pvr/guilib/PVRGUIActionsTimers.cpp @@ -82,10 +82,8 @@ private: if (CServiceBroker::GetPVRManager().Timers()->UpdateTimer(m_newTimer)) return; - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19263}); // "Error", "Could not update the timer. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19263}); // "Error", "Could not update the timer." m_success = false; return; } @@ -266,10 +264,8 @@ bool CPVRGUIActionsTimers::AddTimer(const std::shared_ptr<CPVRTimerInfoTag>& ite if (!item->Channel() && !item->GetTimerType()->IsEpgBasedTimerRule()) { CLog::LogF(LOGERROR, "No channel given"); - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19109}); // "Error", "Could not save the timer. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19109}); // "Error", "Could not save the timer." return false; } @@ -287,10 +283,8 @@ bool CPVRGUIActionsTimers::AddTimer(const std::shared_ptr<CPVRTimerInfoTag>& ite if (!CServiceBroker::GetPVRManager().Timers()->AddTimer(item)) { - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19109}); // "Error", "Could not save the timer. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19109}); // "Error", "Could not save the timer" return false; } @@ -574,10 +568,8 @@ bool CPVRGUIActionsTimers::SetRecordingOnChannel(const std::shared_ptr<CPVRChann bReturn = CServiceBroker::GetPVRManager().Timers()->AddTimer(newTimer); if (!bReturn) - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19164}); // "Error", "Could not start recording. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19164}); // "Error", "Could not start recording." } else if (!bOnOff && CServiceBroker::GetPVRManager().Timers()->IsRecordingOnChannel(*channel)) { @@ -586,10 +578,8 @@ bool CPVRGUIActionsTimers::SetRecordingOnChannel(const std::shared_ptr<CPVRChann CServiceBroker::GetPVRManager().Timers()->DeleteTimersOnChannel(channel, true, true); if (!bReturn) - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19170}); // "Error", "Could not stop recording. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19170}); // "Error", "Could not stop recording." } } @@ -627,10 +617,8 @@ bool CPVRGUIActionsTimers::ToggleTimerState(const CFileItem& item) const if (CServiceBroker::GetPVRManager().Timers()->UpdateTimer(timer)) return true; - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19263}); // "Error", "Could not update the timer. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19263}); // "Error", "Could not update the timer." return false; } @@ -727,10 +715,8 @@ bool CPVRGUIActionsTimers::DeleteTimer(const CFileItem& item, TimerOperationResult::OK) return true; - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19170}); // "Error", "Could not stop recording. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19170}); // "Error", "Could not stop recording." return false; } } @@ -773,10 +759,8 @@ bool CPVRGUIActionsTimers::DeleteTimer(const std::shared_ptr<CPVRTimerInfoTag>& } case TimerOperationResult::FAILED: { - HELPERS::ShowOKDialogText( - CVariant{257}, - CVariant{ - 19110}); // "Error", "Could not delete the timer. Check the log for more information about this message." + HELPERS::ShowOKDialogText(CVariant{257}, + CVariant{19110}); // "Error", "Could not delete the timer." return false; } default: |