merge: upstream changes

2023-10-18 19:48:03 +02:00
parent c4b0f47ba1 de6e15e36d
commit 4b230d792c
63 changed files with 1250 additions and 830 deletions
@@ -548,6 +548,7 @@ export interface Locale {
    "deleteAll": string;
    "showFixedPostForm": string;
    "showFixedPostFormInChannel": string;
+    "withRepliesByDefaultForNewlyFollowed": string;
    "newNoteRecived": string;
    "sounds": string;
    "sound": string;
@@ -2074,6 +2075,7 @@ export interface Locale {
        "userLists": string;
        "excludeMutingUsers": string;
        "excludeInactiveUsers": string;
+        "withReplies": string;
    };
    "_charts": {
        "federation": string;