merge from misskey-develop

packages/frontend/src/utility/autogen/settings-search-index.ts

@@ -37,6 +37,11 @@ export const searchIndexes: SearchIndexItem[] = [
 				label: i18n.ts.themeForDarkMode,
 				keywords: ['dark', 'theme'],
 			},
+			{
+				id: 'jwW5HULqA',
+				label: i18n.ts._settings.enableSyncThemesBetweenDevices,
+				keywords: ['sync', 'themes', 'devices'],
+			},
 		],
 		label: i18n.ts.theme,
 		keywords: ['theme'],

packages/frontend/src/utility/get-note-menu.ts

@@ -342,7 +342,7 @@ export function getNoteMenu(props: {
 				},
 			});
 		} else {
-			menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode));
+			menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
 		}
 
 		if (isSupportShare()) {
@@ -506,7 +506,7 @@ export function getNoteMenu(props: {
 				},
 			});
 		} else {
-			menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode));
+			menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.embed));
 		}
 	}
 

packages/frontend/src/utility/get-user-menu.ts

@@ -197,7 +197,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 	} else {
 		menuItems.push({
 			icon: 'ti ti-code',
-			text: i18n.ts.genEmbedCode,
+			text: i18n.ts.embed,
 			type: 'parent',
 			children: [{
 				text: i18n.ts.noteOfThisUser,