mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-26 23:54:50 -05:00
parent 9990981bbf
commit f785a759d9
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/strings/javascript/javascript.json
View file

@ -838,7 +838,7 @@
"ErrorGettingTvLineups": "There was an error downloading tv lineups. Please ensure your information is correct and try again.", "ErrorGettingTvLineups": "There was an error downloading tv lineups. Please ensure your information is correct and try again.",
"MessageCreateAccountAt": "Create an account at {0}", "MessageCreateAccountAt": "Create an account at {0}",
"ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.", "ErrorPleaseSelectLineup": "Please select a lineup and try again. If no lineups are available, then please check that your username, password, and postal code is correct.",
"HeaderEmbyPremiere": "Try Emby Premiere", "HeaderTryEmbyPremiere": "Try Emby Premiere",
"ButtonBecomeSupporter": "Get Emby Premiere", "ButtonBecomeSupporter": "Get Emby Premiere",
"ButtonClosePlayVideo": "Close and play my media", "ButtonClosePlayVideo": "Close and play my media",
"MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?", "MessageDidYouKnowCinemaMode": "Did you know that with Emby Premiere, you can enhance your experience with features like Cinema Mode?",