Permalink
Browse files

[confluence] changes for new subtitles dialog

  • Loading branch information...
1 parent bc7fb1f commit 4baf2c0d0e7711dd779197230c2fd82f49b5b93e Jonathan Marshall committed Nov 3, 2013
Showing with 423 additions and 44 deletions.
  1. +415 −0 addons/skin.confluence/720p/DialogSubtitles.xml
  2. +0 −34 addons/skin.confluence/720p/SkinSettings.xml
  3. +2 −6 addons/skin.confluence/720p/VideoOSD.xml
  4. +6 −4 addons/skin.confluence/language/English/strings.po
  5. BIN addons/skin.confluence/media/Subtitles/flags/-.gif
  6. BIN addons/skin.confluence/media/Subtitles/flags/ar.gif
  7. BIN addons/skin.confluence/media/Subtitles/flags/bg.gif
  8. BIN addons/skin.confluence/media/Subtitles/flags/bs.gif
  9. BIN addons/skin.confluence/media/Subtitles/flags/ca.gif
  10. BIN addons/skin.confluence/media/Subtitles/flags/cs.gif
  11. BIN addons/skin.confluence/media/Subtitles/flags/da.gif
  12. BIN addons/skin.confluence/media/Subtitles/flags/de.gif
  13. BIN addons/skin.confluence/media/Subtitles/flags/el.gif
  14. BIN addons/skin.confluence/media/Subtitles/flags/en.gif
  15. BIN addons/skin.confluence/media/Subtitles/flags/es.gif
  16. BIN addons/skin.confluence/media/Subtitles/flags/et.gif
  17. BIN addons/skin.confluence/media/Subtitles/flags/fa.gif
  18. BIN addons/skin.confluence/media/Subtitles/flags/fi.gif
  19. BIN addons/skin.confluence/media/Subtitles/flags/fo.gif
  20. BIN addons/skin.confluence/media/Subtitles/flags/fr.gif
  21. BIN addons/skin.confluence/media/Subtitles/flags/gl.gif
  22. BIN addons/skin.confluence/media/Subtitles/flags/he.gif
  23. BIN addons/skin.confluence/media/Subtitles/flags/hi.gif
  24. BIN addons/skin.confluence/media/Subtitles/flags/hr.gif
  25. BIN addons/skin.confluence/media/Subtitles/flags/hu.gif
  26. BIN addons/skin.confluence/media/Subtitles/flags/hy.gif
  27. BIN addons/skin.confluence/media/Subtitles/flags/id.gif
  28. BIN addons/skin.confluence/media/Subtitles/flags/is.gif
  29. BIN addons/skin.confluence/media/Subtitles/flags/it.gif
  30. BIN addons/skin.confluence/media/Subtitles/flags/ja.gif
  31. BIN addons/skin.confluence/media/Subtitles/flags/kk.gif
  32. BIN addons/skin.confluence/media/Subtitles/flags/ko.gif
  33. BIN addons/skin.confluence/media/Subtitles/flags/lb.gif
  34. BIN addons/skin.confluence/media/Subtitles/flags/lt.gif
  35. BIN addons/skin.confluence/media/Subtitles/flags/lv.gif
  36. BIN addons/skin.confluence/media/Subtitles/flags/mk.gif
  37. BIN addons/skin.confluence/media/Subtitles/flags/ms.gif
  38. BIN addons/skin.confluence/media/Subtitles/flags/nl.gif
  39. BIN addons/skin.confluence/media/Subtitles/flags/no.gif
  40. BIN addons/skin.confluence/media/Subtitles/flags/pb.gif
  41. BIN addons/skin.confluence/media/Subtitles/flags/pl.gif
  42. BIN addons/skin.confluence/media/Subtitles/flags/pt.gif
  43. BIN addons/skin.confluence/media/Subtitles/flags/ro.gif
  44. BIN addons/skin.confluence/media/Subtitles/flags/ru.gif
  45. BIN addons/skin.confluence/media/Subtitles/flags/sk.gif
  46. BIN addons/skin.confluence/media/Subtitles/flags/sl.gif
  47. BIN addons/skin.confluence/media/Subtitles/flags/sq.gif
  48. BIN addons/skin.confluence/media/Subtitles/flags/sr.gif
  49. BIN addons/skin.confluence/media/Subtitles/flags/sv.gif
  50. BIN addons/skin.confluence/media/Subtitles/flags/tr.gif
  51. BIN addons/skin.confluence/media/Subtitles/flags/uk.gif
  52. BIN addons/skin.confluence/media/Subtitles/flags/vi.gif
  53. BIN addons/skin.confluence/media/Subtitles/flags/zh.gif
  54. BIN addons/skin.confluence/media/Subtitles/icon_close_caption.png
  55. BIN addons/skin.confluence/media/Subtitles/icon_sync.png

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -723,40 +723,6 @@
<enable>!IsEmpty(Skin.String(LyricScript_Path))</enable>
<onclick>Addon.OpenSettings($INFO[Skin.String(LyricScript_Path)])</onclick>
</control>
- <control type="label" id="457">
- <width>750</width>
- <height>45</height>
- <font>font13_title</font>
- <label>31141</label>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <align>left</align>
- <aligny>center</aligny>
- </control>
- <control type="button" id="458">
- <width>750</width>
- <height>40</height>
- <font>font13</font>
- <label>$LOCALIZE[31133]</label>
- <label2>[COLOR=selected]$INFO[system.addontitle(Skin.String(SubtitleScript_Path))][/COLOR]</label2>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
- <onclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</onclick>
- </control>
- <control type="button" id="459">
- <width>750</width>
- <height>40</height>
- <font>font13</font>
- <label>- $LOCALIZE[24020]</label>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
- <enable>!IsEmpty(Skin.String(SubtitleScript_Path))</enable>
- <onclick>Addon.OpenSettings($INFO[Skin.String(SubtitleScript_Path)])</onclick>
- </control>
<control type="label" id="410">
<width>750</width>
@@ -544,12 +544,8 @@
<alttexturefocus border="25,5,25,5">SubMenuBack-MiddleFO.png</alttexturefocus>
<alttexturenofocus border="25,5,25,5">SubMenuBack-MiddleNF.png</alttexturenofocus>
<onclick>Close</onclick>
- <onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
- <altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
- <altclick>Close</altclick>
- <altclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</altclick>
- <usealttexture>IsEmpty(Skin.String(SubtitleScript_Path))</usealttexture>
- <pulseonselect>false</pulseonselect>
+ <onclick>Dialog.Close(VideoOSD)</onclick>
+ <onclick>ActivateWindow(SubtitleSearch)</onclick>
</control>
<control type="button" id="402">
<height>40</height>
@@ -282,9 +282,7 @@ msgctxt "#31132"
msgid "Lyrics Add-on"
msgstr ""
-msgctxt "#31133"
-msgid "Subtitle Add-on"
-msgstr ""
+#empty string with id 31133
msgctxt "#31134"
msgid "Home Page Videos Sub-menu"
@@ -555,7 +553,11 @@ msgctxt "#31412"
msgid "This tab signifies that there is a menu off to the side of this window that contains extra options for this section. To access the menu, navigate to the left with your remote control or keyboard or place your mouse pointer over the tab. [CR][CR]Click \"Ok\" to close this dialogue. It will not appear again."
msgstr ""
-#empty strings from id 31413 to 31420
+msgctxt "#31413"
+msgid "Local subtitle available"
+msgstr ""
+
+#empty strings from id 31414 to 31420
msgctxt "#31421"
msgid "Select your XBMC user Profile[CR]to login and continue"
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.

0 comments on commit 4baf2c0

Please sign in to comment.