diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-26 17:37:30 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-26 17:37:30 -0400 |
| commit | 679f97d5e97d273076d886e99fe997bf8c2cb1b1 (patch) | |
| tree | 422758622b06f437e64b783c9a7c5e8993072c0e /Emby.Server.Implementations/Localization | |
| parent | cabdec87e8e946bfa5de0dd0f97129f1a23e7d98 (diff) | |
| parent | 241dea6706dc79deb80e7416a1b0a1b58e93f403 (diff) | |
Merge remote-tracking branch 'upstream/master' into simplify-https-config
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
Diffstat (limited to 'Emby.Server.Implementations/Localization')
| -rw-r--r-- | Emby.Server.Implementations/Localization/Core/nb.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Localization/Core/nb.json b/Emby.Server.Implementations/Localization/Core/nb.json index e523ae90b..50d0d083c 100644 --- a/Emby.Server.Implementations/Localization/Core/nb.json +++ b/Emby.Server.Implementations/Localization/Core/nb.json @@ -96,5 +96,6 @@ "TasksChannelsCategory": "Internett kanaler", "TasksApplicationCategory": "Applikasjon", "TasksLibraryCategory": "Bibliotek", - "TasksMaintenanceCategory": "Vedlikehold" + "TasksMaintenanceCategory": "Vedlikehold", + "TaskCleanCache": "Tøm buffer katalog" } |