merge: timeline 1

2023-10-03 20:26:11 +09:00
parent fe4345d191
commit f6ba5cfaf4
84 changed files with 1898 additions and 947 deletions
@@ -1129,6 +1129,8 @@ export interface Locale {
    "notificationRecieveConfig": string;
    "mutualFollow": string;
    "fileAttachedOnly": string;
+    "showRepliesToOthersInTimeline": string;
+    "hideRepliesToOthersInTimeline": string;
    "_announcement": {
        "forExistingUsers": string;
        "forExistingUsersDescription": string;
@@ -1719,11 +1721,6 @@ export interface Locale {
        "muteWords": string;
        "muteWordsDescription": string;
        "muteWordsDescription2": string;
-        "softDescription": string;
-        "hardDescription": string;
-        "soft": string;
-        "hard": string;
-        "mutedNotes": string;
    };
    "_instanceMute": {
        "instanceMuteDescription": string;