Merge pull request #3602 from jmarshallnz/broken_vs_deps

[vuplus_xbmc] / language / English / strings.po

diff --git a/language/English/strings.po b/language/English/strings.po
index 6c84e46..5e69781 100755 (executable)
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -5097,7 +5097,7 @@ msgstr ""
 
 #: xbmc\settings\DisplaySettings.cpp
 msgctxt "#13111"
-msgid "Would you like to keep this resolution?"
+msgid "Would you like to keep this change?"
 msgstr ""
 
 #: unknown
@@ -5151,7 +5151,11 @@ msgctxt "#13122"
 msgid "VDPAU Studio level colour conversion"
 msgstr ""
 
-#empty strings from id 13123 to 13129
+msgctxt "#13123"
+msgid "Keep skin?"
+msgstr ""
+
+#empty strings from id 13124 to 13129
 
 #: system/settings/settings.xml
 msgctxt "#13130"
@@ -5991,7 +5995,11 @@ msgctxt "#13439"
 msgid "Allow hardware acceleration (MediaCodec)"
 msgstr ""
 
-#empty strings from id 13440 to 13499
+msgctxt "#13440"
+msgid "Frame Multi Threaded Decoding (less reliable)"
+msgstr ""
+
+#empty strings from id 13441 to 13499
 
 #: system/settings/settings.xml
 msgctxt "#13500"
@@ -7558,7 +7566,20 @@ msgctxt "#19098"
 msgid "Warning"
 msgstr ""
 
-#empty strings from id 19099 to 19101
+#: xbmc/pvr/PVRGUIInfo.cpp
+msgctxt "#19099"
+msgid "Service"
+msgstr ""
+
+#: xbmc/pvr/PVRGUIInfo.cpp
+msgctxt "#19100"
+msgid "Mux"
+msgstr ""
+
+#: xbmc/pvr/PVRGUIInfo.cpp
+msgctxt "#19101"
+msgid "Provider"
+msgstr ""
 
 msgctxt "#19102"
 msgid "Please switch to another channel."
@@ -10955,7 +10976,24 @@ msgctxt "#21469"
 msgid "%s to %s"
 msgstr ""
 
-#empty strings from id 21470 to 21799
+#empty strings from id 21470 to 21599
+
+#: xbmc/cores/dvdplayer/DVDPlayer.cpp
+msgctxt "#21600"
+msgid "Prefer external subtitles"
+msgstr ""
+
+#: system/settings/settings.xml
+msgctxt "#21601"
+msgid "Prefer external subtitles to internal ones"
+msgstr ""
+
+#: xbmc/Util.cpp
+msgctxt "#21602"
+msgid "(External)"
+msgstr ""
+
+#empty strings from id 21603 to 21799
 
 msgctxt "#21800"
 msgid "File name"
@@ -14550,7 +14588,12 @@ msgctxt "#36422"
 msgid "Enable hardware video decode using AMLogic decoder"
 msgstr ""
 
-#empty strings from id 36423 to 36499
+#: system/settings/settings.xml
+msgctxt "#36423"
+msgid "Use ffmpeg frame multiple thread decoding when hardware decoding not working or disabled. (less reliable than default single thread mode)"
+msgstr ""
+
+#empty strings from id 36424 to 36499
 #end reservation
 
 #: system/settings/settings.xml