Merge branch 'Leia'

720p/Includes.xml

@@ -500,11 +500,12 @@
 		<value>DialogBack2.png</value>
 	</variable>
 	<variable name="typehackflagging">
-		<value condition="[String.Contains(ListItem.FilenameAndPath,bluray) | String.Contains(ListItem.FilenameAndPath,bdrip) | String.Contains(ListItem.FilenameAndPath,brrip) | String.Contains(ListItem.FilenameAndPath,bd25) | String.Contains(ListItem.FilenameAndPath,bd50)]">bluray</value>
+		<value condition="[String.Contains(ListItem.FilenameAndPath,bluray) | String.Contains(ListItem.FilenameAndPath,bdrip) | String.Contains(ListItem.FilenameAndPath,brrip) | String.Contains(ListItem.FilenameAndPath,bd25) | String.Contains(ListItem.FilenameAndPath,bd50) | String.Contains(ListItem.FilenameAndPath,remux)]">bluray</value>
 		<value condition="String.Contains(ListItem.FilenameAndPath,hddvd)">hddvd</value>
 		<value condition="String.Contains(ListItem.FilenameAndPath,dvd)">dvd</value>
 		<value condition="[String.Contains(ListItem.FilenameAndPath,pdtv) | String.Contains(ListItem.FilenameAndPath,hdtv) | String.Contains(ListItem.FilenameAndPath,dsr)]">TV</value>
 		<value condition="String.Contains(ListItem.FilenameAndPath,vhs)">vhs</value>
+		<value condition="String.Contains(ListItem.FilenameAndPath,webdl) | String.Contains(ListItem.FilenameAndPath,web-dl) | String.Contains(ListItem.FilenameAndPath,webrip)">web</value>
 	</variable>
 	<variable name="rating">
 		<value condition="String.Contains(listitem.mpaa,Rated G)">mpaa_general</value>

language/resource.language.en_gb/strings.po

@@ -16,6 +16,14 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+# [Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file.
+# [Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/
+# For example, prefer wording as "This new string" instead of "This New String".
+# [Referencing] If a suitable string already exists, reuse it, making a note of where it's used!
+# [Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp"
+# When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance.
+# For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word.
+
 msgctxt "#31000"
 msgid "Change your"
 msgstr ""
@@ -110,6 +118,8 @@ msgctxt "#31027"
 msgid "Location"
 msgstr ""
 
+# View Type labels
+
 msgctxt "#31028"
 msgid "Poster wrap"
 msgstr ""
@@ -138,6 +148,8 @@ msgctxt "#31039"
 msgid "Actions"
 msgstr ""
 
+# Extra labels
+
 msgctxt "#31040"
 msgid "Now playing"
 msgstr ""
@@ -183,6 +195,7 @@ msgid "Sort: Descending"
 msgstr ""
 
 # empty strings from id 31052 to 31054
+# Playlist Editor labels
 
 msgctxt "#31055"
 msgid "Open playlist"
@@ -211,6 +224,7 @@ msgid "Current selected"
 msgstr ""
 
 # empty strings from id 31062 to 31100
+# Skin Settings labels
 
 msgctxt "#31101"
 msgid "Home screen options"
@@ -366,6 +380,7 @@ msgid "playlist path"
 msgstr ""
 
 # empty strings from id 31146 to 31199
+# Script labels
 
 msgctxt "#31200"
 msgid "Shortcuts"
@@ -400,6 +415,7 @@ msgid "Hide Master profile main menu buttons"
 msgstr ""
 
 # empty strings from id 31210 to 31299
+# Extra labels
 
 msgctxt "#31300"
 msgid "Current temperature"
@@ -476,6 +492,7 @@ msgid "Album details"
 msgstr ""
 
 # empty strings from id 31332 to 31350
+# Video and Music OSD Labels
 
 msgctxt "#31351"
 msgid "Pause"
@@ -633,6 +650,7 @@ msgid "Channel options"
 msgstr ""
 
 # empty strings from id 31512 to 31900
+# Weather plugin
 
 msgctxt "#31901"
 msgid "36-hour forecast"