merge: upstream

2023-11-22 23:40:27 +01:00
parent 81c36908d9 04709cf256
commit 42bf8e5e76
86 changed files with 3938 additions and 2258 deletions
@@ -1317,6 +1317,8 @@ export interface Locale {
        "shortName": string;
        "shortNameDescription": string;
        "fanoutTimelineDescription": string;
+        "fanoutTimelineDbFallback": string;
+        "fanoutTimelineDbFallbackDescription": string;
    };
    "_accountMigration": {
        "moveFrom": string;
@@ -1982,6 +1984,15 @@ export interface Locale {
        "yearsAgo": string;
        "invalid": string;
    };
+    "_timeIn": {
+        "seconds": string;
+        "minutes": string;
+        "hours": string;
+        "days": string;
+        "weeks": string;
+        "months": string;
+        "years": string;
+    };
    "_time": {
        "second": string;
        "minute": string;