Merge pull request #22089 from abpframework/auto-merge/rel-9-0/3458

Merge branch rel-9.1 with rel-9.0

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/ar.json

@@ -78,6 +78,7 @@
     "EndDate": "تاريخ الانتهاء",
     "Feature:AuditLoggingGroup": "تدوين التسجيل",
     "Feature:AuditLoggingEnable": "تمكين صفحة تسجيل التدقيق",
-    "Feature:AuditLoggingEnableDescription": "تفعيل صفحة تسجيل التدقيق في التطبيق."
+    "Feature:AuditLoggingEnableDescription": "تفعيل صفحة تسجيل التدقيق في التطبيق.",
+    "TenantId": "معرف المستأجر"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/cs.json

@@ -78,6 +78,7 @@
     "EndDate": "Datum ukončení",
     "Feature:AuditLoggingGroup": "Protokolování auditu",
     "Feature:AuditLoggingEnable": "Povolena stránka protokolování auditu",
-    "Feature:AuditLoggingEnableDescription": "Povolit stránku protokolování auditu v aplikaci."
+    "Feature:AuditLoggingEnableDescription": "Povolit stránku protokolování auditu v aplikaci.",
+    "TenantId": "ID nájemce"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de-DE.json

@@ -77,6 +77,7 @@
     "EndDate": "Endtermin",
     "Feature:AuditLoggingGroup": "Audit-Protokollierung",
     "Feature:AuditLoggingEnable": "Aktivieren Sie die Überwachungsprotokollseite",
-    "Feature:AuditLoggingEnableDescription": "Aktivieren Sie die Überwachungsprotokollseite in der App."
+    "Feature:AuditLoggingEnableDescription": "Aktivieren Sie die Überwachungsprotokollseite in der App.",
+    "TenantId": "Mandanten-ID"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/de.json

@@ -78,6 +78,7 @@
     "EndDate": "Endtermin",
     "Feature:AuditLoggingGroup": "Audit-Protokollierung",
     "Feature:AuditLoggingEnable": "Aktivierte Audit-Logging-Seite",
-    "Feature:AuditLoggingEnableDescription": "Aktivieren Sie die Audit-Logging-Seite in der Anwendung."
+    "Feature:AuditLoggingEnableDescription": "Aktivieren Sie die Audit-Logging-Seite in der Anwendung.",
+    "TenantId": "Mandanten-ID"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/en.json

@@ -93,6 +93,7 @@
     "DisplayName:ExpiredDeleterPeriod": "Expired item deletion period",
     "Description:ExpiredDeleterPeriod": "Set the number of days after which expired items will be automatically deleted.",
     "ExpiredDeleterPeriodUnit": "day(s)",
-    "AuditLogsBeforeXWillBeDeleted": "Audit logs before {0} will be deleted."
+    "AuditLogsBeforeXWillBeDeleted": "Audit logs before {0} will be deleted.",
+    "TenantId": "Tenant Id"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/es.json

@@ -78,6 +78,7 @@
     "EndDate": "Fecha final",
     "Feature:AuditLoggingGroup": "Registros de auditoría",
     "Feature:AuditLoggingEnable": "Habilitar la página de registro de auditoría",
-    "Feature:AuditLoggingEnableDescription": "Habilite la página de registro de auditoría en la aplicación."
+    "Feature:AuditLoggingEnableDescription": "Habilite la página de registro de auditoría en la aplicación.",
+    "TenantId": "ID de inquilino"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/fi.json

@@ -78,6 +78,7 @@
     "EndDate": "Päättymispäivä",
     "Feature:AuditLoggingGroup": "Tarkastusten kirjaaminen",
     "Feature:AuditLoggingEnable": "Aktivoi auditointilokisivu",
-    "Feature:AuditLoggingEnableDescription": "Ota käyttöön tarkastuksen kirjaussivu sovelluksessa."
+    "Feature:AuditLoggingEnableDescription": "Ota käyttöön tarkastuksen kirjaussivu sovelluksessa.",
+    "TenantId": "Vuokralaisen tunnus"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/fr.json

@@ -78,6 +78,7 @@
     "EndDate": "Date de fin",
     "Feature:AuditLoggingGroup": "Journalisation d'audit",
     "Feature:AuditLoggingEnable": "Page de journalisation d'audit activée",
-    "Feature:AuditLoggingEnableDescription": "Activez la page de journalisation d'audit dans l'application."
+    "Feature:AuditLoggingEnableDescription": "Activez la page de journalisation d'audit dans l'application.",
+    "TenantId": "ID du locataire"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/hi.json

@@ -78,6 +78,7 @@
     "EndDate": "समाप्ति तिथि",
     "Feature:AuditLoggingGroup": "ऑडिट लॉगिंग",
     "Feature:AuditLoggingEnable": "सक्षम ऑडिट लॉगिंग पृष्ठ",
-    "Feature:AuditLoggingEnableDescription": "एप्लिकेशन में ऑडिट लॉगिंग पृष्ठ सक्षम करें।"
+    "Feature:AuditLoggingEnableDescription": "एप्लिकेशन में ऑडिट लॉगिंग पृष्ठ सक्षम करें।",
+    "TenantId": "किरायेदार आईडी"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/hr.json

@@ -78,6 +78,7 @@
     "EndDate": "Datum završetka",
     "Feature:AuditLoggingGroup": "Zapisivanje revizije",
     "Feature:AuditLoggingEnable": "Omogućena stranica za bilježenje revizije",
-    "Feature:AuditLoggingEnableDescription": "Omogućite stranicu za bilježenje revizije u aplikaciji."
+    "Feature:AuditLoggingEnableDescription": "Omogućite stranicu za bilježenje revizije u aplikaciji.",
+    "TenantId": "ID stanara"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/hu.json

@@ -78,6 +78,7 @@
     "EndDate": "Befejezés dátuma",
     "Feature:AuditLoggingGroup": "Audit naplózás",
     "Feature:AuditLoggingEnable": "Engedélyezett naplózási oldal",
-    "Feature:AuditLoggingEnableDescription": "Engedélyezze a naplózási oldalt az alkalmazásban."
+    "Feature:AuditLoggingEnableDescription": "Engedélyezze a naplózási oldalt az alkalmazásban.",
+    "TenantId": "Bérlő azonosító"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/is.json

@@ -78,6 +78,7 @@
     "EndDate": "Loka dagsetning",
     "Feature:AuditLoggingGroup": "Endurskoðunarskráning",
     "Feature:AuditLoggingEnable": "Virkjað endurskoðunarskráningarsíða",
-    "Feature:AuditLoggingEnableDescription": "Virkjaðu endurskoðunarskráningarsíðu í forritinu."
+    "Feature:AuditLoggingEnableDescription": "Virkjaðu endurskoðunarskráningarsíðu í forritinu.",
+    "TenantId": "Leigutakaauðkenni"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/it.json

@@ -78,6 +78,7 @@
     "EndDate": "Data di fine",
     "Feature:AuditLoggingGroup": "Registrazione di controllo",
     "Feature:AuditLoggingEnable": "Pagina di registrazione di controllo abilitata",
-    "Feature:AuditLoggingEnableDescription": "Abilita la pagina di registrazione dell'audit nell'applicazione."
+    "Feature:AuditLoggingEnableDescription": "Abilita la pagina di registrazione dell'audit nell'applicazione.",
+    "TenantId": "ID inquilino"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/nl.json

@@ -78,6 +78,7 @@
     "EndDate": "Einddatum",
     "Feature:AuditLoggingGroup": "Auditregistratie",
     "Feature:AuditLoggingEnable": "Pagina voor auditregistratie ingeschakeld",
-    "Feature:AuditLoggingEnableDescription": "Schakel de auditlogboekpagina in de applicatie in."
+    "Feature:AuditLoggingEnableDescription": "Schakel de auditlogboekpagina in de applicatie in.",
+    "TenantId": "Huurder-ID"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/pl-PL.json

@@ -78,6 +78,7 @@
     "EndDate": "Data końcowa",
     "Feature:AuditLoggingGroup": "Rejestrowanie audytu",
     "Feature:AuditLoggingEnable": "Włączono stronę rejestrowania audytu",
-    "Feature:AuditLoggingEnableDescription": "Włącz stronę rejestrowania audytu w aplikacji."
+    "Feature:AuditLoggingEnableDescription": "Włącz stronę rejestrowania audytu w aplikacji.",
+    "TenantId": "Identyfikator najemcy"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/pt-BR.json

@@ -78,6 +78,7 @@
     "EndDate": "Data final",
     "Feature:AuditLoggingGroup": "Registro de auditoria",
     "Feature:AuditLoggingEnable": "Página de registro de auditoria habilitada",
-    "Feature:AuditLoggingEnableDescription": "Habilite a página de registro de auditoria no aplicativo."
+    "Feature:AuditLoggingEnableDescription": "Habilite a página de registro de auditoria no aplicativo.",
+    "TenantId": "ID do inquilino"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/ro-RO.json

@@ -78,6 +78,7 @@
     "EndDate": "Data de încheiere",
     "Feature:AuditLoggingGroup": "Înregistrare de audit",
     "Feature:AuditLoggingEnable": "Pagina de înregistrare a auditului activată",
-    "Feature:AuditLoggingEnableDescription": "Activați pagina de înregistrare a auditului în aplicație."
+    "Feature:AuditLoggingEnableDescription": "Activați pagina de înregistrare a auditului în aplicație.",
+    "TenantId": "ID chiriaș"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/ru.json

@@ -78,6 +78,7 @@
     "EndDate": "Дата окончания",
     "Feature:AuditLoggingGroup": "Ведение журнала аудита",
     "Feature:AuditLoggingEnable": "Включенная страница ведения журнала аудита",
-    "Feature:AuditLoggingEnableDescription": "Включить страницу ведения журнала аудита в приложении."
+    "Feature:AuditLoggingEnableDescription": "Включить страницу ведения журнала аудита в приложении.",
+    "TenantId": "Идентификатор арендатора"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/sk.json

@@ -78,6 +78,7 @@
     "EndDate": "Dátum konca",
     "Feature:AuditLoggingGroup": "Audit logovanie",
     "Feature:AuditLoggingEnable": "Povoliť stránku audit logovania",
-    "Feature:AuditLoggingEnableDescription": "Povolená stránka audit logovania v aplikácii."
+    "Feature:AuditLoggingEnableDescription": "Povolená stránka audit logovania v aplikácii.",
+    "TenantId": "ID nájomníka"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/sl.json

@@ -78,6 +78,7 @@
     "EndDate": "Končni datum",
     "Feature:AuditLoggingGroup": "Revizijsko beleženje",
     "Feature:AuditLoggingEnable": "Omogočena stran za beleženje revizije",
-    "Feature:AuditLoggingEnableDescription": "Omogočite stran za beleženje revizije v aplikaciji."
+    "Feature:AuditLoggingEnableDescription": "Omogočite stran za beleženje revizije v aplikaciji.",
+    "TenantId": "ID najemnika"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/sv.json

@@ -93,6 +93,7 @@
     "DisplayName:ExpiredDeleterPeriod": "Utgången raderingsperiod för objekt",
     "Description:ExpiredDeleterPeriod": "Ställ in antalet dagar efter vilka utgångna objekt automatiskt ska raderas.",
     "ExpiredDeleterPeriodUnit": "dag(ar)",
-    "AuditLogsBeforeXWillBeDeleted": "Granskningsloggar före {0} kommer att raderas."
+    "AuditLogsBeforeXWillBeDeleted": "Granskningsloggar före {0} kommer att raderas.",
+    "TenantId": "Hyresgäst-ID"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/tr.json

@@ -46,7 +46,7 @@
     "Date": "Tarih",
     "Url": "Url",
     "UserName": "Kullanıcı adı",
-    "TenantImpersonator": "Kiracı Taklitçisi",
+    "TenantImpersonator": "Müşteri Taklitçisi",
     "UserImpersonator": "Kullanıcı Taklitçisi",
     "UrlFilter": "Url Filtresi",
     "User": "Kullanıcı",
@@ -78,6 +78,7 @@
     "Feature:AuditLoggingGroup": "İşlem Kayıtları",
     "Feature:AuditLoggingEnable": "İşlem kayıtları sayfasını etkinleştirin",
     "Feature:AuditLoggingEnableDescription": "Uygulamadanızdaki işlem kayıtları sayfasını etkinleştirir.",
-    "MinMaxDuration": "Süre (Min. - Max.)"
+    "MinMaxDuration": "Süre (Min. - Max.)",
+    "TenantId": "Müşteri Id"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/vi.json

@@ -78,6 +78,7 @@
     "EndDate": "Ngày cuối",
     "Feature:AuditLoggingGroup": "Ghi nhật ký kiểm tra",
     "Feature:AuditLoggingEnable": "Đã bật trang ghi nhật ký kiểm tra",
-    "Feature:AuditLoggingEnableDescription": "Kích hoạt trang ghi nhật ký kiểm tra trong ứng dụng."
+    "Feature:AuditLoggingEnableDescription": "Kích hoạt trang ghi nhật ký kiểm tra trong ứng dụng.",
+    "TenantId": "ID người thuê"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/zh-Hans.json

@@ -78,6 +78,7 @@
     "EndDate": "结束日期",
     "Feature:AuditLoggingGroup": "审计日志",
     "Feature:AuditLoggingEnable": "启用审计记录页面",
-    "Feature:AuditLoggingEnableDescription": "在应用程序中启用审计日志页面。"
+    "Feature:AuditLoggingEnableDescription": "在应用程序中启用审计日志页面。",
+    "TenantId": "租户 ID"
   }
 }

modules/audit-logging/src/Volo.Abp.AuditLogging.Domain.Shared/Volo/Abp/AuditLogging/Localization/zh-Hant.json

@@ -78,6 +78,7 @@
     "EndDate": "結束時間",
     "Feature:AuditLoggingGroup": "審計日誌",
     "Feature:AuditLoggingEnable": "啟用審計日誌頁面",
-    "Feature:AuditLoggingEnableDescription": "在應用程序中啟用審計日誌頁面."
+    "Feature:AuditLoggingEnableDescription": "在應用程序中啟用審計日誌頁面.",
+    "TenantId": "租戶 ID"
   }
 }

npm/ng-packs/packages/permission-management/src/lib/components/permission-management.component.html

@@ -40,7 +40,7 @@ <h4>
         </div>
       </div>
       <fieldset class="border rounded-4 p-3">
-        <legend class="px-1 h5 mb-0">{{ 'Permission Group' }}</legend>
+        <legend class="px-1 h5 mb-0">{{ 'AbpPermissionManagement::PermissionGroup' | abpLocalization }}</legend>
         <div class="row">
           <div class="col-md-4">
             <div class="overflow-auto lpx-scroll-pills-container scroll-in-modal">

npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.html

@@ -131,9 +131,11 @@ <h3>{{ 'AbpSettingManagement::SendTestEmail' | abpLocalization }}</h3>
       formName="emailTestForm"
       [disabled]="emailTestForm.invalid && emailTestForm.dirty"
     >
-      <span>{{ 'AbpTenantManagement::Send' | abpLocalization }}</span>
+      <span>{{ 'AbpSettingManagement::Send' | abpLocalization }}</span>
     </abp-button>
 
-    <button type="button" class="btn btn-secondary" abpClose>Close</button>
+    <button type="button" class="btn btn-secondary" abpClose>
+      {{ 'AbpUi::Close' | abpLocalization }}
+    </button>
   </ng-template>
 </abp-modal>