[confluence] changes for new subtitles dialog

55 files changed, 423 insertions, 44 deletions

diff --git a/addons/skin.confluence/720p/DialogSubtitles.xml b/addons/skin.confluence/720p/DialogSubtitles.xml
new file mode 100644
index 0000000000..379f1248ff
--- /dev/null
+++ b/addons/skin.confluence/720p/DialogSubtitles.xml
@@ -0,0 +1,415 @@
+<window type="dialog">
+	<coordinates>
+		<system>1</system>
+		<left>380</left>
+		<top>0</top>
+	</coordinates>
+	<controls>
+		<control type="group" id="250">
+<!--			<animation effect="slide" start="900,0" end="0,0" time="500" delay="800" tween="quadratic" easing="out">WindowOpen</animation> -->
+			<animation effect="slide" start="0,0" end="900,0" time="500" tween="quadratic" easing="out">WindowClose</animation> 
+			<animation type="Conditional" condition="Control.HasFocus(150)" reversible="true">
+				<effect type="slide" end="-250,0" time="400" />
+			</animation>
+			<control type="button" id="8999">
+				<description>Fake button for mouse control</description>
+				<left>880</left>
+				<top>0</top>
+				<width>20</width>
+				<height>720</height>
+				<label>-</label>
+				<font>-</font>
+				<texturenofocus>-</texturenofocus>
+				<texturefocus>-</texturefocus>
+				<visible>true</visible>
+			</control>
+			<control type="image">
+				<description>media info background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>1150</width>
+				<height>720</height>
+				<colordiffuse>BBFFFFFF</colordiffuse>
+				<texture border="20,0,0,0" flipx="true">MediaBladeSub.png</texture>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<left>20</left>
+				<top>0</top>
+				<width>64</width>
+				<height>32</height>
+				<label>-</label>
+				<font>-</font>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>101</onleft>
+				<onright>101</onright>
+				<onup>101</onup>
+				<ondown>101</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
+			<control type="group">
+				<control type="label" id="100">
+					<description>header label</description>
+					<right>880</right>
+					<top>80</top>
+					<width>550</width>
+					<height>30</height>
+					<font>font30_title</font>
+					<align>right</align>
+					<aligny>center</aligny>
+					<textcolor>FFFFFFFF</textcolor>
+					<shadowcolor>FF000000</shadowcolor>
+				</control>
+				<control type="label">
+					<description>Video label</description>
+					<right>880</right>
+					<top>110</top>
+					<width>550</width>
+					<height>30</height>
+					<font>font13_title</font>
+					<label>$INFO[Player.Filename]</label>
+					<align>right</align>
+					<aligny>center</aligny>
+					<textcolor>grey</textcolor>
+					<shadowcolor>FF000000</shadowcolor>
+				</control>
+				<control type="image">
+					<left>30</left>
+					<top>140</top>
+					<width>820</width>
+					<height>4</height>
+					<texture>separator.png</texture>
+				</control>
+				<control type="image" id="110">
+					<description>Service Logo</description>
+					<left>0</left>
+					<top>80</top>
+					<width>250</width>
+					<height>40</height>
+					<aspectratio>keep</aspectratio>
+				</control>
+				<control type="label" id="140">
+					<description>textarea</description>
+					<left>50</left>
+					<top>140</top>
+					<width>780</width>
+					<height>40</height>
+					<font>font13</font>
+					<textcolor>FFFFFFFF</textcolor>
+					<align>center</align>
+					<aligny>center</aligny>
+					<wrapmultiline>true</wrapmultiline>
+				</control>
+				<control type="image">
+					<left>30</left>
+					<top>176</top>
+					<width>820</width>
+					<height>4</height>
+					<texture>separator.png</texture>
+				</control>
+			</control>
+			<!-- ** Required ** Do not change <id>or<type>-->
+			<control type="group">
+				<control type="list" id="120">
+					<left>50</left>
+					<top>206</top>
+					<width>800</width>
+					<height>434</height>
+					<onleft>121</onleft>
+					<onright>150</onright>
+					<onup>120</onup>
+					<ondown>120</ondown>
+					<viewtype label="535">list</viewtype>
+					<pagecontrol>121</pagecontrol>
+					<scrolltime>200</scrolltime>
+					<itemlayout width="800" height="36">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>780</width>
+							<height>38</height>
+							<texture>MenuItemNF.png</texture>
+						</control>
+						<control type="image">
+							<left>5</left>
+							<top>11</top>
+							<width>26</width>
+							<height>17</height>
+							<texture>Subtitles/flags/$INFO[ListItem.Thumb]</texture>
+						</control>
+						<control type="label">
+							<left>40</left>
+							<top>0</top>
+							<width>90</width>
+							<height>38</height>
+							<font>font18</font>
+							<aligny>center</aligny>
+							<textcolor>FFFFFFFF</textcolor>
+							<selectedcolor>FF0084FF</selectedcolor>
+							<align>left</align>
+							<info>ListItem.Label</info>
+						</control>
+						<control type="image">
+							<left>135</left>
+							<top>13</top>
+							<width>20</width>
+							<height>12</height>
+							<texture>Subtitles/icon_close_caption.png</texture>
+							<visible>ListItem.property(hearing_imp)</visible>
+						</control>
+						<control type="image">
+							<left>160</left>
+							<top>13</top>
+							<width>40</width>
+							<height>12</height>
+							<texture>Subtitles/icon_sync.png</texture>
+							<visible>ListItem.property(sync)</visible>
+						</control>
+						<control type="label">
+							<left>205</left>
+							<top>0</top>
+							<width>495</width>
+							<height>38</height>
+							<font>font18</font>
+							<aligny>center</aligny>
+							<textcolor>FFFFFFFF</textcolor>
+							<selectedcolor>FF0084FF</selectedcolor>
+							<align>left</align>
+							<info>ListItem.Label2</info>
+						</control>
+						<control type="image">
+							<left>710</left>
+							<top>11</top>
+							<width>90</width>
+							<height>17</height>
+							<texture>LeftRating/rating$INFO[ListItem.ActualIcon].png</texture>
+						</control>
+					</itemlayout>
+					<focusedlayout width="800" height="36">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>780</width>
+							<height>38</height>
+							<texture>MenuItemNF.png</texture>
+						</control>
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>780</width>
+							<height>38</height>
+							<texture>MenuItemFO.png</texture>
+							<visible>Control.HasFocus(120)</visible>
+						</control>
+						<control type="image">
+							<left>5</left>
+							<top>11</top>
+							<width>26</width>
+							<height>17</height>
+							<texture>Subtitles/flags/$INFO[ListItem.Thumb]</texture>
+						</control>
+						<control type="label">
+							<left>40</left>
+							<top>0</top>
+							<width>90</width>
+							<height>38</height>
+							<font>font18</font>
+							<aligny>center</aligny>
+							<textcolor>FFFFFFFF</textcolor>
+							<selectedcolor>FF0084FF</selectedcolor>
+							<align>left</align>
+							<info>ListItem.Label</info>
+						</control>
+						<control type="image">
+							<left>135</left>
+							<top>13</top>
+							<width>20</width>
+							<height>12</height>
+							<texture>Subtitles/icon_close_caption.png</texture>
+							<visible>ListItem.property(hearing_imp)</visible>
+						</control>
+						<control type="image">
+							<left>160</left>
+							<top>13</top>
+							<width>40</width>
+							<height>12</height>
+							<texture>Subtitles/icon_sync.png</texture>
+							<visible>ListItem.property(sync)</visible>
+						</control>
+						<control type="label">
+							<left>205</left>
+							<top>0</top>
+							<width>495</width>
+							<height>38</height>
+							<font>font18</font>
+							<aligny>center</aligny>
+							<textcolor>FFFFFFFF</textcolor>
+							<selectedcolor>FF0084FF</selectedcolor>
+							<align>left</align>
+							<info>ListItem.Label2</info>
+						</control>
+						<control type="image">
+							<left>710</left>
+							<top>11</top>
+							<width>90</width>
+							<height>17</height>
+							<texture>LeftRating/rating$INFO[ListItem.ActualIcon].png</texture>
+						</control>
+					</focusedlayout>
+				</control>
+				<control type="spincontrol" id="121">
+					<description>Next page button</description>
+					<left>808</left>
+					<top>664</top>
+					<width>20</width>
+					<height>20</height>
+					<font>font13</font>
+					<align>right</align>
+					<aligny>center</aligny>
+					<subtype>page</subtype>
+					<textcolor>FFFFFFFF</textcolor>
+					<onleft>120</onleft>
+					<onright>120</onright>
+					<ondown>120</ondown>
+					<onup>120</onup>
+					<textoffsetx>10</textoffsetx>
+					<textureup>scroll-up.png</textureup>
+					<texturedown>scroll-down.png</texturedown>
+					<textureupfocus>scroll-up-focus.png</textureupfocus>
+					<texturedownfocus>scroll-down-focus.png</texturedownfocus>
+					<showonepage>false</showonepage>
+					<visible>Control.IsVisible(120)</visible>
+				</control>
+				<control type="group" id="130">
+					<control type="grouplist">
+						<left>20</left>
+						<top>660</top>
+						<width>305</width>
+						<height>40</height>
+						<align>right</align>
+						<orientation>horizontal</orientation>
+						<itemgap>5</itemgap>
+						<control type="image">
+							<width>40</width>
+							<height>40</height>
+							<texture>DefaultIconInfo.png</texture>
+						</control>
+						<control type="label">
+							<description>notification</description>
+							<width min="10" max="260">auto</width>
+							<height>40</height>
+							<font>font13</font>
+							<textcolor>FFFFFFFF</textcolor>
+							<label>31413</label>
+							<aligny>center</aligny>
+							<wrapmultiline>true</wrapmultiline>
+						</control>
+					</control>
+				</control>
+				<control type="image">
+					<left>866</left>
+					<top>348</top>
+					<width>24</width>
+					<height>24</height>
+					<texture>scroll-right-focus.png</texture>
+				</control>
+			</control>
+			<control type="group">
+				<control type="image">
+					<description>separator</description>
+					<left>542</left>
+					<top>360</top>
+					<width>720</width>
+					<height>4</height>
+					<texture>separator.png</texture>
+					<animation effect="rotate" start="0" end="90" center="auto" time="0" condition="true">Conditional</animation>		
+				</control>
+				<control type="label">
+					<left>905</left>
+					<top>150</top>
+					<width>240</width>
+					<height>26</height>
+					<label>[B]$LOCALIZE[24018][/B]</label>
+					<font>font13</font>
+					<align>center</align>
+					<aligny>top</aligny>
+					<textcolor>FFEB9E17</textcolor>
+					<shadowcolor>FF000000</shadowcolor>
+					<wrapmultiline>true</wrapmultiline>
+				</control>
+				<control type="image">
+					<description>separator</description>
+					<left>900</left>
+					<top>176</top>
+					<width>240</width>
+					<height>4</height>
+					<texture>separator.png</texture>
+				</control>
+				<control type="list" id="150">
+					<left>900</left>
+					<top>206</top>
+					<width>250</width>
+					<height>434</height>
+					<onleft>120</onleft>
+					<onright>120</onright>
+					<onup>150</onup>
+					<ondown>150</ondown>
+					<viewtype label="535">list</viewtype>
+					<scrolltime>200</scrolltime>
+					<itemlayout width="400" height="36">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>230</width>
+							<height>38</height>
+							<texture>MenuItemNF.png</texture>
+						</control>
+						<control type="label">
+							<left>40</left>
+							<top>0</top>
+							<width>230</width>
+							<height>38</height>
+							<font>font18</font>
+							<aligny>center</aligny>
+							<textcolor>FFFFFFFF</textcolor>
+							<selectedcolor>FF0084FF</selectedcolor>
+							<align>left</align>
+							<info>ListItem.Label</info>
+						</control>
+					</itemlayout>
+					<focusedlayout width="400" height="36">
+						<control type="image">
+							<left>0</left>
+							<top>0</top>
+							<width>230</width>
+							<height>38</height>
+							<texture>MenuItemNF.png</texture>
+						</control>
+						<control type="image">
+							<left>10</left>
+							<top>0</top>
+							<width>230</width>
+							<height>38</height>
+							<texture>MenuItemFO.png</texture>
+							<visible>Control.HasFocus(150)</visible>
+						</control>
+						<control type="label">
+							<left>40</left>
+							<top>0</top>
+							<width>230</width>
+							<height>38</height>
+							<font>font18</font>
+							<aligny>center</aligny>
+							<textcolor>FFFFFFFF</textcolor>
+							<selectedcolor>FF0084FF</selectedcolor>
+							<align>left</align>
+							<info>ListItem.Label</info>
+						</control>
+					</focusedlayout>
+				</control>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml
index 21769fbd78..c847930e0a 100644
--- a/addons/skin.confluence/720p/SkinSettings.xml
+++ b/addons/skin.confluence/720p/SkinSettings.xml
@@ -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>
diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index cbc5c1c492..e0c94d86d5 100644
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -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>
diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po
index 62983b5d6f..68b41804a1 100644
--- a/addons/skin.confluence/language/English/strings.po
+++ b/addons/skin.confluence/language/English/strings.po
@@ -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"
diff --git a/addons/skin.confluence/media/Subtitles/flags/-.gif b/addons/skin.confluence/media/Subtitles/flags/-.gif
new file mode 100644
index 0000000000..a14bb5af20
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/-.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ar.gif b/addons/skin.confluence/media/Subtitles/flags/ar.gif
new file mode 100644
index 0000000000..55463dedb4
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ar.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/bg.gif b/addons/skin.confluence/media/Subtitles/flags/bg.gif
new file mode 100644
index 0000000000..a620896acd
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/bg.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/bs.gif b/addons/skin.confluence/media/Subtitles/flags/bs.gif
new file mode 100644
index 0000000000..2969ce8f17
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/bs.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ca.gif b/addons/skin.confluence/media/Subtitles/flags/ca.gif
new file mode 100644
index 0000000000..8d4124b562
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ca.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/cs.gif b/addons/skin.confluence/media/Subtitles/flags/cs.gif
new file mode 100644
index 0000000000..334c528da8
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/cs.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/da.gif b/addons/skin.confluence/media/Subtitles/flags/da.gif
new file mode 100644
index 0000000000..1d200354c4
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/da.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/de.gif b/addons/skin.confluence/media/Subtitles/flags/de.gif
new file mode 100644
index 0000000000..4a7cff4227
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/de.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/el.gif b/addons/skin.confluence/media/Subtitles/flags/el.gif
new file mode 100644
index 0000000000..b20ce2101d
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/el.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/en.gif b/addons/skin.confluence/media/Subtitles/flags/en.gif
new file mode 100644
index 0000000000..b44b08f69d
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/en.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/es.gif b/addons/skin.confluence/media/Subtitles/flags/es.gif
new file mode 100644
index 0000000000..83c3019c25
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/es.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/et.gif b/addons/skin.confluence/media/Subtitles/flags/et.gif
new file mode 100644
index 0000000000..95c3e98f20
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/et.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/fa.gif b/addons/skin.confluence/media/Subtitles/flags/fa.gif
new file mode 100644
index 0000000000..f1e66af735
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/fa.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/fi.gif b/addons/skin.confluence/media/Subtitles/flags/fi.gif
new file mode 100644
index 0000000000..e3d9574d04
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/fi.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/fo.gif b/addons/skin.confluence/media/Subtitles/flags/fo.gif
new file mode 100644
index 0000000000..3301bc26cf
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/fo.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/fr.gif b/addons/skin.confluence/media/Subtitles/flags/fr.gif
new file mode 100644
index 0000000000..75a234551e
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/fr.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/gl.gif b/addons/skin.confluence/media/Subtitles/flags/gl.gif
new file mode 100644
index 0000000000..686983faed
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/gl.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/he.gif b/addons/skin.confluence/media/Subtitles/flags/he.gif
new file mode 100644
index 0000000000..c6dc6b578a
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/he.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/hi.gif b/addons/skin.confluence/media/Subtitles/flags/hi.gif
new file mode 100644
index 0000000000..a1c16ee41d
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/hi.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/hr.gif b/addons/skin.confluence/media/Subtitles/flags/hr.gif
new file mode 100644
index 0000000000..b4cc470042
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/hr.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/hu.gif b/addons/skin.confluence/media/Subtitles/flags/hu.gif
new file mode 100644
index 0000000000..78a5724dd5
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/hu.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/hy.gif b/addons/skin.confluence/media/Subtitles/flags/hy.gif
new file mode 100644
index 0000000000..1ba4423aa3
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/hy.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/id.gif b/addons/skin.confluence/media/Subtitles/flags/id.gif
new file mode 100644
index 0000000000..8b288fa2ae
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/id.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/is.gif b/addons/skin.confluence/media/Subtitles/flags/is.gif
new file mode 100644
index 0000000000..23e9c6f69f
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/is.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/it.gif b/addons/skin.confluence/media/Subtitles/flags/it.gif
new file mode 100644
index 0000000000..a6c51739f7
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/it.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ja.gif b/addons/skin.confluence/media/Subtitles/flags/ja.gif
new file mode 100644
index 0000000000..b645bc8d8d
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ja.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/kk.gif b/addons/skin.confluence/media/Subtitles/flags/kk.gif
new file mode 100644
index 0000000000..8ff39eb698
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/kk.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ko.gif b/addons/skin.confluence/media/Subtitles/flags/ko.gif
new file mode 100644
index 0000000000..fb33719cd0
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ko.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/lb.gif b/addons/skin.confluence/media/Subtitles/flags/lb.gif
new file mode 100644
index 0000000000..fe9916c434
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/lb.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/lt.gif b/addons/skin.confluence/media/Subtitles/flags/lt.gif
new file mode 100644
index 0000000000..b92b0a62e1
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/lt.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/lv.gif b/addons/skin.confluence/media/Subtitles/flags/lv.gif
new file mode 100644
index 0000000000..9fd8286391
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/lv.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/mk.gif b/addons/skin.confluence/media/Subtitles/flags/mk.gif
new file mode 100644
index 0000000000..a8320ba538
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/mk.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ms.gif b/addons/skin.confluence/media/Subtitles/flags/ms.gif
new file mode 100644
index 0000000000..02cf19d2eb
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ms.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/nl.gif b/addons/skin.confluence/media/Subtitles/flags/nl.gif
new file mode 100644
index 0000000000..1469462051
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/nl.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/no.gif b/addons/skin.confluence/media/Subtitles/flags/no.gif
new file mode 100644
index 0000000000..dbd2cbe715
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/no.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/pb.gif b/addons/skin.confluence/media/Subtitles/flags/pb.gif
new file mode 100644
index 0000000000..361fe5e37a
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/pb.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/pl.gif b/addons/skin.confluence/media/Subtitles/flags/pl.gif
new file mode 100644
index 0000000000..08397c12f2
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/pl.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/pt.gif b/addons/skin.confluence/media/Subtitles/flags/pt.gif
new file mode 100644
index 0000000000..5704a0ce57
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/pt.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ro.gif b/addons/skin.confluence/media/Subtitles/flags/ro.gif
new file mode 100644
index 0000000000..5fdc82c19f
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ro.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/ru.gif b/addons/skin.confluence/media/Subtitles/flags/ru.gif
new file mode 100644
index 0000000000..81c864f01a
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/ru.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/sk.gif b/addons/skin.confluence/media/Subtitles/flags/sk.gif
new file mode 100644
index 0000000000..ea8da1e0f4
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/sk.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/sl.gif b/addons/skin.confluence/media/Subtitles/flags/sl.gif
new file mode 100644
index 0000000000..7401d6df45
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/sl.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/sq.gif b/addons/skin.confluence/media/Subtitles/flags/sq.gif
new file mode 100644
index 0000000000..96be1ade01
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/sq.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/sr.gif b/addons/skin.confluence/media/Subtitles/flags/sr.gif
new file mode 100644
index 0000000000..930f88d1b5
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/sr.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/sv.gif b/addons/skin.confluence/media/Subtitles/flags/sv.gif
new file mode 100644
index 0000000000..4096b9a3da
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/sv.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/tr.gif b/addons/skin.confluence/media/Subtitles/flags/tr.gif
new file mode 100644
index 0000000000..7c4926e063
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/tr.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/uk.gif b/addons/skin.confluence/media/Subtitles/flags/uk.gif
new file mode 100644
index 0000000000..093ada8038
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/uk.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/vi.gif b/addons/skin.confluence/media/Subtitles/flags/vi.gif
new file mode 100644
index 0000000000..a48c11356f
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/vi.gif
diff --git a/addons/skin.confluence/media/Subtitles/flags/zh.gif b/addons/skin.confluence/media/Subtitles/flags/zh.gif
new file mode 100644
index 0000000000..d1c350b083
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/flags/zh.gif
diff --git a/addons/skin.confluence/media/Subtitles/icon_close_caption.png b/addons/skin.confluence/media/Subtitles/icon_close_caption.png
new file mode 100644
index 0000000000..e7f253952f
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/icon_close_caption.png
diff --git a/addons/skin.confluence/media/Subtitles/icon_sync.png b/addons/skin.confluence/media/Subtitles/icon_sync.png
new file mode 100644
index 0000000000..f02ef85d5f
--- /dev/null
+++ b/addons/skin.confluence/media/Subtitles/icon_sync.png