aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations
diff options
context:
space:
mode:
Diffstat (limited to 'Emby.Server.Implementations')
-rw-r--r--Emby.Server.Implementations/Localization/Core/ht.json45
-rw-r--r--Emby.Server.Implementations/Session/SessionManager.cs4
2 files changed, 3 insertions, 46 deletions
diff --git a/Emby.Server.Implementations/Localization/Core/ht.json b/Emby.Server.Implementations/Localization/Core/ht.json
index 82e221fe2b..f1ff775155 100644
--- a/Emby.Server.Implementations/Localization/Core/ht.json
+++ b/Emby.Server.Implementations/Localization/Core/ht.json
@@ -63,48 +63,5 @@
"AuthenticationSucceededWithUserName": "{0} otantifye avèk siksè",
"CameraImageUploadedFrom": "Une nouvelle image de la caméra a été téléchargée depuis {0}",
"Original": "Original",
- "Playlists": "Pleliss",
- "FailedLoginAttemptWithUserName": "",
- "HeaderRecordingGroups": "",
- "HearingImpaired": "",
- "Inherit": "",
- "ItemAddedWithName": "",
- "ItemRemovedWithName": "",
- "LabelIpAddressValue": "",
- "LabelRunningTimeValue": "",
- "MessageNamedServerConfigurationUpdatedWithValue": "",
- "MessageServerConfigurationUpdated": "",
- "NewVersionIsAvailable": "",
- "NotificationOptionApplicationUpdateAvailable": "",
- "NotificationOptionApplicationUpdateInstalled": "",
- "NotificationOptionAudioPlayback": "",
- "NotificationOptionAudioPlaybackStopped": "",
- "NotificationOptionNewLibraryContent": "",
- "NotificationOptionPluginError": "",
- "NotificationOptionPluginInstalled": "",
- "NotificationOptionPluginUninstalled": "",
- "NotificationOptionPluginUpdateInstalled": "",
- "NotificationOptionServerRestartRequired": "",
- "NotificationOptionTaskFailed": "",
- "NotificationOptionUserLockedOut": "",
- "NotificationOptionVideoPlayback": "",
- "NotificationOptionVideoPlaybackStopped": "",
- "Plugin": "",
- "ProviderValue": "",
- "ServerNameNeedsToBeRestarted": "",
- "StartupEmbyServerIsLoading": "",
- "SubtitleDownloadFailureFromForItem": "",
- "Sync": "",
- "Undefined": "",
- "UserLockedOutWithName": "",
- "UserOnlineFromDevice": "",
- "UserPolicyUpdatedWithName": "",
- "ValueHasBeenAddedToLibrary": "",
- "TasksChannelsCategory": "",
- "TaskCleanActivityLog": "",
- "TaskCleanActivityLogDescription": "",
- "TaskCleanCache": "",
- "TaskCleanCacheDescription": "",
- "TaskRefreshChapterImages": "",
- "TaskRefreshChapterImagesDescription": ""
+ "Playlists": "Pleliss"
}
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 1782b53e10..2885b89e3a 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -271,9 +271,9 @@ namespace Emby.Server.Implementations.Session
user.LastActivityDate = activityDate;
await _userManager.UpdateUserAsync(user).ConfigureAwait(false);
}
- catch (DbUpdateConcurrencyException e)
+ catch (DbUpdateConcurrencyException)
{
- _logger.LogDebug(e, "Error updating user's last activity date.");
+ _logger.LogDebug("Error updating user's last activity date due to concurrency conflict. This is an expected event.");
}
}
}