Merge remote-tracking branch 'refs/remotes/origin/master' into develop

This commit is contained in:
angelblue05 2016-07-04 14:22:24 -05:00
commit 15ac7fd0ca
3 changed files with 10 additions and 28 deletions

View file

@ -250,7 +250,7 @@
<string id="33008">Enter password for user:</string>
<string id="33009">Invalid username or password</string>
<string id="33010">Failed to authenticate too many times</string>
<string id="33011">Unable to direct play</string>
<string id="33011">Unable to direct play file</string>
<string id="33012">Direct play failed 3 times. Enabled play from HTTP.</string>
<string id="33013">Choose the audio stream</string>
<string id="33014">Choose the subtitles stream</string>