Merge master

strings/en-us.json

@@ -56,6 +56,7 @@
   "HeaderCollection": "Collection",
   "HeaderCollectionItems": "Collection Items",
   "HeaderConnectionStatus": "Connection Status",
+  "HeaderDataSettings": "Data Settings",
   "HeaderDetails": "Details",
   "HeaderDownloads": "Downloads",
   "HeaderEbookFiles": "Ebook Files",
@@ -82,11 +83,13 @@
   "HeaderTableOfContents": "Table of Contents",
   "HeaderUserInterfaceSettings": "User Interface Settings",
   "HeaderYourStats": "Your Stats",
+  "LabelAddToPlaylist": "Add to Playlist",
   "LabelAdded": "Added",
   "LabelAddedAt": "Added At",
-  "LabelAddToPlaylist": "Add to Playlist",
   "LabelAll": "All",
   "LabelAllowSeekingOnMediaControls": "Allow position seeking on media notification controls",
+  "LabelAlways": "Always",
+  "LabelAskConfirmation": "Ask for confirmation",
   "LabelAuthor": "Author",
   "LabelAuthorFirstLast": "Author (First Last)",
   "LabelAuthorLastFirst": "Author (Last, First)",
@@ -98,8 +101,8 @@
   "LabelAutoSleepTimerAutoRewindHelp": "When the auto sleep timer finishes, playing the item again will automatically rewind your position.",
   "LabelAutoSleepTimerHelp": "When playing media between the specified start and end times a sleep timer will automatically start.",
   "LabelBooks": "Books",
-  "LabelChapters": "Chapters",
   "LabelChapterTrack": "Chapter Track",
+  "LabelChapters": "Chapters",
   "LabelClosePlayer": "Close player",
   "LabelCollapseSeries": "Collapse Series",
   "LabelComplete": "Complete",
@@ -119,6 +122,7 @@
   "LabelDisableVibrateOnResetHelp": "When the sleep timer gets reset your device will vibrate. Enable this setting to not vibrate when the sleep timer resets.",
   "LabelDiscover": "Discover",
   "LabelDownload": "Download",
+  "LabelDownloadUsingCellular": "Download using Cellular",
   "LabelDownloaded": "Downloaded",
   "LabelDuration": "Duration",
   "LabelEbook": "Ebook",
@@ -147,8 +151,8 @@
   "LabelHeavy": "Heavy",
   "LabelHigh": "High",
   "LabelHost": "Host",
-  "LabelIncomplete": "Incomplete",
   "LabelInProgress": "In Progress",
+  "LabelIncomplete": "Incomplete",
   "LabelInternalAppStorage": "Internal App Storage",
   "LabelJumpBackwardsTime": "Jump backwards time",
   "LabelJumpForwardsTime": "Jump forwards time",
@@ -171,6 +175,7 @@
   "LabelName": "Name",
   "LabelNarrator": "Narrator",
   "LabelNarrators": "Narrators",
+  "LabelNever": "Never",
   "LabelNewestAuthors": "Newest Authors",
   "LabelNewestEpisodes": "Newest Episodes",
   "LabelNo": "No",
@@ -189,15 +194,15 @@
   "LabelProgress": "Progress",
   "LabelPubDate": "Pub Date",
   "LabelPublishYear": "Publish Year",
-  "LabelRead": "Read",
-  "LabelReadAgain": "Read Again",
-  "LabelRecentlyAdded": "Recently Added",
-  "LabelRecentSeries": "Recent Series",
-  "LabelRemoveFromPlaylist": "Remove from Playlist",
   "LabelRSSFeedCustomOwnerEmail": "Custom owner Email",
   "LabelRSSFeedCustomOwnerName": "Custom owner Name",
   "LabelRSSFeedPreventIndexing": "Prevent Indexing",
   "LabelRSSFeedSlug": "RSS Feed Slug",
+  "LabelRead": "Read",
+  "LabelReadAgain": "Read Again",
+  "LabelRecentSeries": "Recent Series",
+  "LabelRecentlyAdded": "Recently Added",
+  "LabelRemoveFromPlaylist": "Remove from Playlist",
   "LabelScaleElapsedTimeBySpeed": "Scale Elapsed Time by Speed",
   "LabelSeason": "Season",
   "LabelSelectADevice": "Select a device",
@@ -220,6 +225,7 @@
   "LabelStatsMinutes": "minutes",
   "LabelStatsMinutesListening": "Minutes Listening",
   "LabelStatsWeekListening": "Week Listening",
+  "LabelStreamingUsingCellular": "Streaming using Cellular",
   "LabelTag": "Tag",
   "LabelTags": "Tags",
   "LabelTheme": "Theme",
@@ -246,8 +252,10 @@
   "MessageConfirmDeleteLocalEpisode": "Remove local episode \"{0}\" from your device? The file on the server will be unaffected.",
   "MessageConfirmDeleteLocalFiles": "Remove local files of this item from your device? The files on the server and your progress will be unaffected.",
   "MessageConfirmDiscardProgress": "Are you sure you want to reset your progress?",
+  "MessageConfirmDownloadUsingCellular": "You are about to download using cellular data. This may include carrier data charges. Do you wish to continue?",
   "MessageConfirmMarkAsFinished": "Are you sure you want to mark this item as finished?",
   "MessageConfirmRemoveBookmark": "Are you sure you want to remove bookmark?",
+  "MessageConfirmStreamingUsingCellular": "You are about to stream using cellular data. This may include carrier data charges. Do you wish to continue?",
   "MessageDiscardProgress": "Discard Progress",
   "MessageDownloadCompleteProcessing": "Download complete. Processing...",
   "MessageDownloading": "Downloading...",
@@ -287,11 +295,13 @@
   "ToastBookmarkCreateFailed": "Failed to create bookmark",
   "ToastBookmarkRemoveFailed": "Failed to remove bookmark",
   "ToastBookmarkUpdateFailed": "Failed to update bookmark",
+  "ToastDownloadNotAllowedOnCellular": "Downloading is not allowed on cellular data",
   "ToastItemMarkedAsFinishedFailed": "Failed to mark as Finished",
   "ToastItemMarkedAsNotFinishedFailed": "Failed to mark as Not Finished",
   "ToastPlaylistCreateFailed": "Failed to create playlist",
   "ToastPodcastCreateFailed": "Failed to create podcast",
   "ToastPodcastCreateSuccess": "Podcast created successfully",
   "ToastRSSFeedCloseFailed": "Failed to close RSS feed",
-  "ToastRSSFeedCloseSuccess": "RSS feed closed"
+  "ToastRSSFeedCloseSuccess": "RSS feed closed",
+  "ToastStreamingNotAllowedOnCellular": "Streaming is not allowed on cellular data"
 }