Merge branch 'develop' into merge/2024-02-03

# Conflicts: # locales/index.d.ts # packages/backend/src/server/api/EndpointsModule.ts # packages/backend/src/server/api/endpoints.ts # packages/misskey-js/src/autogen/endpoint.ts # sharkey-locales/en-US.yml
2025-02-10 09:52:35 -05:00
parent 9feab58a46 670b1171fb
commit 363111f5de
8 changed files with 132 additions and 0 deletions
@@ -12011,6 +12011,20 @@ export interface Locale extends ILocale {
         */
        "parentDefault": string;
    };
+    /**
+     * Generate Keys
+     */
+    "genKeys": string;
+    "_genKeysDialog": {
+        /**
+         * Are you sure that you want to generate new keys? This will stop push notifications for all users who have already enabled them.
+         */
+        "text": string;
+        /**
+         * Generate new keys
+         */
+        "title": string;
+    };
    /**
     * ID
     */