Merge branch 'main' into add-etke-server-commands

src/components/UserImport.tsx

@@ -558,7 +558,7 @@ const FilePicker = () => {
       </CardActions>
     );
 
-  const allCards: JSX.Element[] = [];
+  const allCards: React.JSX.Element[] = [];
   if (uploadCard) allCards.push(uploadCard);
   if (errorCards) allCards.push(errorCards);
   if (conflictCards) allCards.push(conflictCards);

src/i18n/de.ts

@@ -12,6 +12,10 @@ const fixedGermanMessages = {
       clear_filters: "Alle Filter entfernen",
       add_filter: "Filter hinzufügen",
     },
+    auth: {
+      ...formalGermanMessages.ra.auth,
+      email: "E-Mail",
+    },
     action: {
       ...formalGermanMessages.ra.action,
       update_application: "Anwendung aktualisieren",

src/i18n/zh.ts

@@ -11,6 +11,10 @@ const fixedChineseMessages = {
       no_filtered_results: "没有结果",
       clear_filters: "清除所有过滤器",
     },
+    auth: {
+      ...chineseMessages.ra.auth,
+      email: "邮箱",
+    },
     action: {
       ...chineseMessages.ra.action,
       update_application: "更新应用",