merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -882,7 +882,7 @@
"ButtonGuide": "Guide",
"ButtonRecordedTv": "Recorded TV",
"HeaderDisconnectFromPlayer": "Disconnect from Player",
"ConfirmEndPlayerSession": "Would you like to shutdown the app on the remote device?",
"ConfirmEndPlayerSession": "Would you like to close Emby on the device?",
"ButtonYes": "Yes",
"ButtonNo": "No",
"ButtonRestorePreviousPurchase": "Restore Purchase",