diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-12-06 18:50:26 +0100 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-12-06 18:50:26 +0100 |
| commit | cf39a9cecf32e3fef653f21f0b7656dcd93f33ec (patch) | |
| tree | 17735fbce31bf0b4b3f9dc2f43dbedf2389a2d39 | |
| parent | dd312f2b74a6d2d2b4227a1d420be27c3ce5ca42 (diff) | |
| parent | 0f092998bcf423d2856cbebaace4b72161435d98 (diff) | |
Merge pull request #8493 from MartijnKaijser/strings
[pvr] fix incorrect string usage after combining multiple strings
| -rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 7 | ||||
| -rw-r--r-- | xbmc/pvr/PVRManager.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index a28496c28f..832d955d2a 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -9259,12 +9259,17 @@ msgctxt "#19185" msgid "Clear data" msgstr "" +#: xbmc/pvr/PVRManager.cpp msgctxt "#19186" msgid "All your TV related data (channels, groups, guide) will be cleared. Are you sure?" msgstr "" -#empty string with id 19187 +#: xbmc/pvr/PVRManager.cpp +msgctxt "#19187" +msgid "Clearing all related data." +msgstr "" +#: xbmc/pvr/PVRManager.cpp msgctxt "#19188" msgid "All your guide data will be cleared. Are you sure?" msgstr "" diff --git a/xbmc/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp index a5f90b4d86..8ae26e54d6 100644 --- a/xbmc/pvr/PVRManager.cpp +++ b/xbmc/pvr/PVRManager.cpp @@ -754,7 +754,7 @@ void CPVRManager::ResetDatabase(bool bResetEPGOnly /* = false */) CGUIDialogProgress* pDlgProgress = (CGUIDialogProgress*)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS); pDlgProgress->SetLine(0, CVariant{""}); - pDlgProgress->SetLine(1, CVariant{g_localizeStrings.Get(19186)}); // All data in the PVR database is being erased + pDlgProgress->SetLine(1, CVariant{g_localizeStrings.Get(19187)}); // All data in the PVR database is being erased pDlgProgress->SetLine(2, CVariant{""}); pDlgProgress->Open(); pDlgProgress->Progress(); |