merge: branch develop

locales/index.d.ts

@@ -549,6 +549,7 @@ export interface Locale {
     "deleteAll": string;
     "showFixedPostForm": string;
     "showFixedPostFormInChannel": string;
+    "withRepliesByDefaultForNewlyFollowed": string;
     "newNoteRecived": string;
     "sounds": string;
     "sound": string;
@@ -1107,6 +1108,10 @@ export interface Locale {
     "installed": string;
     "branding": string;
     "enableServerMachineStats": string;
+    "enableAchievements": string;
+    "turnOffAchievements": string;
+    "enableBotTrending": string;
+    "turnOffBotTrending": string;
     "enableIdenticonGeneration": string;
     "turnOffToImprovePerformance": string;
     "createInviteCode": string;
@@ -1143,6 +1148,7 @@ export interface Locale {
     "pinnedList": string;
     "keepScreenOn": string;
     "clickToOpen": string;
+    "showBots": string;
     "verifiedLink": string;
     "notifyNotes": string;
     "unnotifyNotes": string;
@@ -2079,6 +2085,7 @@ export interface Locale {
         "userLists": string;
         "excludeMutingUsers": string;
         "excludeInactiveUsers": string;
+        "withReplies": string;
     };
     "_charts": {
         "federation": string;