diff options
| author | ronie <ronie@poedel.net> | 2015-03-13 21:01:30 +0100 |
|---|---|---|
| committer | ronie <ronie@poedel.net> | 2015-03-13 21:01:30 +0100 |
| commit | f796d1d2ce961ace3d452553dccff96c79870d11 (patch) | |
| tree | 9575bcc5fedcececbd0398affd702cb14850f4d4 | |
| parent | dbf316231398c4424e53513b0da853e848bc78ca (diff) | |
| parent | d5a238ce46288c2e61c78e0c075ddf5b1425e80a (diff) | |
Merge pull request #6705 from ksooo/fix-confluence-pvrsideblade-epg-label
[confluence] Consistent usage of same string resource for "EPG".
| -rw-r--r-- | addons/resource.language.en_gb/resources/strings.po | 8 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/IncludesHomeMenuItems.xml | 4 | ||||
| -rw-r--r-- | system/settings/settings.xml | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index be8a0da172..4bf8263899 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -7936,7 +7936,7 @@ msgctxt "#19068" msgid "This recording could not be deleted. Check the log for details." msgstr "" -#: system/settings/settings.xml +#. Electronic program guide. used by ? msgctxt "#19069" msgid "EPG" msgstr "" @@ -12099,8 +12099,10 @@ msgctxt "#22019" msgid "Recordings by title" msgstr "" -#. Electronic program guide, used as label in the menu of the PVR section -#: addons/skin/confluence +#. Electronic program guide, used as label in the menu of the PVR settings section and by confluence and other skins +#: system/settings/settings.xml +#: addons/skin.confluence/720p/IncludesPVR.xml +#: addons/skin.confluence/720p/IncludesHomeMenuItems.xml msgctxt "#22020" msgid "Guide" msgstr "" diff --git a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml index 1019cc7e17..70e95fbb83 100644 --- a/addons/skin.confluence/720p/IncludesHomeMenuItems.xml +++ b/addons/skin.confluence/720p/IncludesHomeMenuItems.xml @@ -259,7 +259,7 @@ </control> <control type="button" id="90144"> <include>ButtonHomeSubCommonValues</include> - <label>19069</label> + <label>22020</label> <onclick>ActivateWindow(TVGuide)</onclick> </control> <control type="button" id="90145"> @@ -296,7 +296,7 @@ </control> <control type="button" id="90244"> <include>ButtonHomeSubCommonValues</include> - <label>19069</label> + <label>22020</label> <onclick>ActivateWindow(RadioGuide)</onclick> </control> <control type="button" id="90245"> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index e2ceec3645..22852a2006 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -1298,7 +1298,7 @@ </setting> </group> </category> - <category id="epg" label="19069" help="36218"> + <category id="epg" label="22020" help="36218"> <group id="1"> <setting id="epg.daystodisplay" type="integer" label="19182" help="36220"> <level>2</level> |