Merge remote-tracking branch 'origin/master' into fadein

src/strings/en-us.json

@@ -161,6 +161,7 @@
     "Continuing": "Continuing",
     "CopyStreamURL": "Copy Stream URL",
     "CopyStreamURLSuccess": "URL copied successfully.",
+    "CopyStreamURLError": "There was an error copying the URL.",
     "CriticRating": "Critic rating",
     "CustomDlnaProfilesHelp": "Create a custom profile to target a new device or override a system profile.",
     "DateAdded": "Date added",
@@ -948,6 +949,7 @@
     "MessageAlreadyInstalled": "This version is already installed.",
     "MessageAreYouSureDeleteSubtitles": "Are you sure you wish to delete this subtitle file?",
     "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
+    "MessageConfirmAppExit": "Do you want to exit?",
     "MessageConfirmDeleteGuideProvider": "Are you sure you wish to delete this guide provider?",
     "MessageConfirmDeleteTunerDevice": "Are you sure you wish to delete this device?",
     "MessageConfirmProfileDeletion": "Are you sure you wish to delete this profile?",
@@ -1106,7 +1108,6 @@
     "OptionEnableAccessFromAllDevices": "Enable access from all devices",
     "OptionEnableAccessToAllChannels": "Enable access to all channels",
     "OptionEnableAccessToAllLibraries": "Enable access to all libraries",
-    "OptionEnableAutomaticServerUpdates": "Enable automatic server updates",
     "OptionEnableExternalContentInSuggestions": "Enable external content in suggestions",
     "OptionEnableExternalContentInSuggestionsHelp": "Allow internet trailers and live TV programs to be included within suggested content.",
     "OptionEnableForAllTuners": "Enable for all tuner devices",