aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Localization/Core/en-US.json
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2020-11-21 17:20:31 -0500
committerGitHub <noreply@github.com>2020-11-21 17:20:31 -0500
commitbf54b5579c15bdf8bb6e3dd6934ea23c45a62573 (patch)
tree1b2df4bdf89a70f578b72240969416034afc33db /Emby.Server.Implementations/Localization/Core/en-US.json
parent4a81ee43dc7aed94012c312a8262a1426be9b6d9 (diff)
parentb707d8e09d776a1dd1f0cdd6cf13cd1f3e638028 (diff)
Merge branch 'master' into defer_image_fetching
Diffstat (limited to 'Emby.Server.Implementations/Localization/Core/en-US.json')
-rw-r--r--Emby.Server.Implementations/Localization/Core/en-US.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Localization/Core/en-US.json b/Emby.Server.Implementations/Localization/Core/en-US.json
index 97a843160..f8f595faa 100644
--- a/Emby.Server.Implementations/Localization/Core/en-US.json
+++ b/Emby.Server.Implementations/Localization/Core/en-US.json
@@ -9,14 +9,15 @@
"Channels": "Channels",
"ChapterNameValue": "Chapter {0}",
"Collections": "Collections",
+ "Default": "Default",
"DeviceOfflineWithName": "{0} has disconnected",
"DeviceOnlineWithName": "{0} is connected",
"FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
"Favorites": "Favorites",
"Folders": "Folders",
+ "Forced": "Forced",
"Genres": "Genres",
"HeaderAlbumArtists": "Album Artists",
- "HeaderCameraUploads": "Camera Uploads",
"HeaderContinueWatching": "Continue Watching",
"HeaderFavoriteAlbums": "Favorite Albums",
"HeaderFavoriteArtists": "Favorite Artists",
@@ -78,6 +79,7 @@
"Sync": "Sync",
"System": "System",
"TvShows": "TV Shows",
+ "Undefined": "Undefined",
"User": "User",
"UserCreatedWithName": "User {0} has been created",
"UserDeletedWithName": "User {0} has been deleted",
@@ -96,6 +98,8 @@
"TasksLibraryCategory": "Library",
"TasksApplicationCategory": "Application",
"TasksChannelsCategory": "Internet Channels",
+ "TaskCleanActivityLog": "Clean Activity Log",
+ "TaskCleanActivityLogDescription": "Deletes activity log entries older than the configured age.",
"TaskCleanCache": "Clean Cache Directory",
"TaskCleanCacheDescription": "Deletes cache files no longer needed by the system.",
"TaskRefreshChapterImages": "Extract Chapter Images",