Merge remote-tracking branch 'upstream/master' into no-scaling

7 files changed, 32 insertions, 7 deletions

diff --git a/Emby.Server.Implementations/Localization/Core/de.json b/Emby.Server.Implementations/Localization/Core/de.json
index c81de8218..6ab22b8a4 100644
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -115,5 +115,8 @@
     "TasksLibraryCategory": "Bibliothek",
     "TasksMaintenanceCategory": "Wartung",
     "TaskCleanActivityLogDescription": "Löscht Aktivitätsprotokolleinträge, die älter als das konfigurierte Alter sind.",
-    "TaskCleanActivityLog": "Aktivitätsprotokoll aufräumen"
+    "TaskCleanActivityLog": "Aktivitätsprotokoll aufräumen",
+    "Undefined": "Undefiniert",
+    "Forced": "Erzwungen",
+    "Default": "Standard"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/es-AR.json b/Emby.Server.Implementations/Localization/Core/es-AR.json
index 390074cdd..0d4a14be0 100644
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -113,5 +113,10 @@
     "TasksChannelsCategory": "Canales de internet",
     "TasksApplicationCategory": "Aplicación",
     "TasksLibraryCategory": "Biblioteca",
-    "TasksMaintenanceCategory": "Mantenimiento"
+    "TasksMaintenanceCategory": "Mantenimiento",
+    "TaskCleanActivityLogDescription": "Borrar log de actividades anteriores a la fecha establecida.",
+    "TaskCleanActivityLog": "Borrar log de actividades",
+    "Undefined": "Indefinido",
+    "Forced": "Forzado",
+    "Default": "Por Defecto"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/es.json b/Emby.Server.Implementations/Localization/Core/es.json
index d6af40c40..fe674cf36 100644
--- a/Emby.Server.Implementations/Localization/Core/es.json
+++ b/Emby.Server.Implementations/Localization/Core/es.json
@@ -115,5 +115,8 @@
     "TaskDownloadMissingSubtitles": "Descargar los subtítulos que faltan",
     "TaskDownloadMissingSubtitlesDescription": "Busca en internet los subtítulos que falten en el contenido de tus bibliotecas, basándose en la configuración de los metadatos.",
     "TaskCleanActivityLogDescription": "Elimina todos los registros de actividad anteriores a la fecha configurada.",
-    "TaskCleanActivityLog": "Limpiar registro de actividad"
+    "TaskCleanActivityLog": "Limpiar registro de actividad",
+    "Undefined": "Indefinido",
+    "Forced": "Forzado",
+    "Default": "Predeterminado"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/he.json b/Emby.Server.Implementations/Localization/Core/he.json
index f906d6e11..981e8a06e 100644
--- a/Emby.Server.Implementations/Localization/Core/he.json
+++ b/Emby.Server.Implementations/Localization/Core/he.json
@@ -113,5 +113,10 @@
     "TaskRefreshChannels": "רענן ערוץ",
     "TaskCleanTranscodeDescription": "מחק קבצי transcode שנוצרו מלפני יותר מיום.",
     "TaskCleanTranscode": "נקה תקיית Transcode",
-    "TaskUpdatePluginsDescription": "הורד והתקן עדכונים עבור תוספים שמוגדרים לעדכון אוטומטי."
+    "TaskUpdatePluginsDescription": "הורד והתקן עדכונים עבור תוספים שמוגדרים לעדכון אוטומטי.",
+    "TaskCleanActivityLogDescription": "מחק רשומת פעילות הישנה יותר מהגיל המוגדר.",
+    "TaskCleanActivityLog": "נקה רשומת פעילות",
+    "Undefined": "לא מוגדר",
+    "Forced": "כפוי",
+    "Default": "ברירת מחדל"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/ta.json b/Emby.Server.Implementations/Localization/Core/ta.json
index e8cd23d5d..5fcdb1f74 100644
--- a/Emby.Server.Implementations/Localization/Core/ta.json
+++ b/Emby.Server.Implementations/Localization/Core/ta.json
@@ -114,5 +114,8 @@
     "UserStoppedPlayingItemWithValues": "{0} {2} இல் {1} முடித்துவிட்டது",
     "UserStartedPlayingItemWithValues": "{0} {2}இல் {1} ஐ இயக்குகிறது",
     "TaskCleanActivityLogDescription": "உள்ளமைக்கப்பட்ட வயதை விட பழைய செயல்பாட்டு பதிவு உள்ளீடுகளை நீக்குகிறது.",
-    "TaskCleanActivityLog": "செயல்பாட்டு பதிவை அழி"
+    "TaskCleanActivityLog": "செயல்பாட்டு பதிவை அழி",
+    "Undefined": "வரையறுக்கப்படாத",
+    "Forced": "கட்டாயப்படுத்தப்பட்டது",
+    "Default": "இயல்புநிலை"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/vi.json b/Emby.Server.Implementations/Localization/Core/vi.json
index ba58e4beb..0549995c8 100644
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -114,5 +114,8 @@
     "Application": "Ứng Dụng",
     "AppDeviceValues": "Ứng Dụng: {0}, Thiết Bị: {1}",
     "TaskCleanActivityLogDescription": "Xóa các mục nhật ký hoạt động cũ hơn độ tuổi đã cài đặt.",
-    "TaskCleanActivityLog": "Xóa Nhật Ký Hoạt Động"
+    "TaskCleanActivityLog": "Xóa Nhật Ký Hoạt Động",
+    "Undefined": "Không Xác Định",
+    "Forced": "Bắt Buộc",
+    "Default": "Mặc Định"
 }
diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
index 3ae0fe5e7..12803456e 100644
--- a/Emby.Server.Implementations/Localization/Core/zh-CN.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -115,5 +115,8 @@
     "TasksApplicationCategory": "应用程序",
     "TasksMaintenanceCategory": "维护",
     "TaskCleanActivityLog": "清理程序日志",
-    "TaskCleanActivityLogDescription": "删除早于设置时间的活动日志条目。"
+    "TaskCleanActivityLogDescription": "删除早于设置时间的活动日志条目。",
+    "Undefined": "未定义",
+    "Forced": "强制的",
+    "Default": "默认"
 }