diff --git a/packages/docusaurus-theme-classic/codeTranslations/base.json b/packages/docusaurus-theme-classic/codeTranslations/base.json
new file mode 100644
index 0000000000000..8441c16f43717
--- /dev/null
+++ b/packages/docusaurus-theme-classic/codeTranslations/base.json
@@ -0,0 +1,41 @@
+{
+  "theme.NotFound.title": "Page Not Found",
+  "theme.NotFound.p1": "We could not find what you were looking for.",
+  "theme.NotFound.p2": "Please contact the owner of the site that linked you to the original URL and let them know their link is broken.",
+  "theme.AnnouncementBar.closeButtonAriaLabel": "Close",
+  "theme.blog.paginator.navAriaLabel": "Blog list page navigation",
+  "theme.blog.paginator.newerEntries": "Newer Entries",
+  "theme.blog.paginator.olderEntries": "Older Entries",
+  "theme.blog.post.paginator.navAriaLabel": "Blog post page navigation",
+  "theme.blog.post.paginator.newerPost": "Newer Post",
+  "theme.blog.post.paginator.olderPost": "Older Post",
+  "theme.blog.post.readMore": "Read More",
+  "theme.blog.tags": "Tags:",
+  "theme.CodeBlock.copyButtonAriaLabel": "Copy code to clipboard",
+  "theme.CodeBlock.copied":  "Copied",
+  "theme.CodeBlock.copy": "Copy",
+  "theme.docs.paginator.navAriaLabel":  "Docs pages navigation",
+  "theme.docs.paginator.previous": "Previous",
+  "theme.docs.paginator.next":  "Next",
+  "theme.docs.sidebar.expandButtonTitle":"Expand sidebar",
+  "theme.docs.sidebar.expandButtonAriaLabel": "Expand sidebar",
+  "theme.docs.sidebar.responsiveCloseButtonLabel": "Close menu",
+  "theme.docs.sidebar.responsiveOpenButtonLabel": "Open menu",
+  "theme.docs.sidebar.collapseButtonTitle":  "Collapse sidebar",
+  "theme.docs.sidebar.collapseButtonAriaLabel": "Collapse sidebar",
+  "theme.common.editThisPage": "Edit this page",
+  "theme.common.skipToMainContent": "Skip to main content",
+  "theme.SearchPage.existingResultsTitle": "Search results for",
+  "theme.SearchPage.emptyResultsTitle": "Search the documentation",
+  "theme.SearchPage.inputPlaceholder": "Type your search here",
+  "theme.SearchPage.inputLabel": "Search",
+  "theme.SearchPage.algoliaLabel":  "Search by Algolia",
+  "theme.SearchPage.noResultsText":  "No results were found",
+  "theme.SearchPage.fetchingNewResults": "Fetching new results...",
+  "theme.SearchBar.label": "Search",
+  "theme.PwaReloadPopup.info": "New version available",
+  "theme.PwaReloadPopup.refreshButtonText": "Refresh",
+  "theme.PwaReloadPopup.closeButtonAriaLabel": "Close",
+  "theme.Playground.liveEditor": "Live Editor",
+  "theme.Playground.result": "Result"
+}
diff --git a/packages/docusaurus-theme-classic/codeTranslations/fr.json b/packages/docusaurus-theme-classic/codeTranslations/fr.json
index e0a625fe911e6..6e84a3722acec 100644
--- a/packages/docusaurus-theme-classic/codeTranslations/fr.json
+++ b/packages/docusaurus-theme-classic/codeTranslations/fr.json
@@ -2,17 +2,40 @@
   "theme.NotFound.title": "Page introuvable",
   "theme.NotFound.p1": "Nous n'avons pas trouvé ce que vous recherchez.",
   "theme.NotFound.p2": "Veuillez contacter le propriétaire du site qui vous a lié à l'URL d'origine et leur faire savoir que leur lien est cassé.",
-  "theme.BlogListPaginator.newerEntries": "Nouvelles entrées",
-  "theme.BlogListPaginator.olderEntries": "Anciennes entrées",
-  "theme.BlogPostItem.readMore": "Lire plus",
-  "theme.BlogPostPaginator.newerPost": "Article plus récent",
-  "theme.BlogPostPaginator.olderPost": "Article plus ancien",
+  "theme.AnnouncementBar.closeButtonAriaLabel": "Close",
+  "theme.blog.paginator.navAriaLabel": "Blog list page navigation",
+  "theme.blog.paginator.newerEntries": "Nouvelles entrées",
+  "theme.blog.paginator.olderEntries": "Anciennes entrées",
+  "theme.blog.post.paginator.navAriaLabel": "Blog post page navigation",
+  "theme.blog.post.paginator.newerPost": "Article plus récent",
+  "theme.blog.post.paginator.olderPost": "Article plus ancien",
+  "theme.blog.post.readMore": "Lire plus",
+  "theme.blog.tags": "Tags:",
+  "theme.CodeBlock.copyButtonAriaLabel": "Copy code to clipboard",
   "theme.CodeBlock.copied": "Copié",
   "theme.CodeBlock.copy": "Copier",
-  "theme.DocPaginator.previous": "Précédent",
-  "theme.DocPaginator.next": "Suivant",
-  "theme.EditThisPage.editThisPage": "Éditer cette page",
-  "theme.SkipToContent.skipToMainContent": "Aller au contenu principal",
+  "theme.docs.paginator.navAriaLabel":  "Docs pages navigation",
+  "theme.docs.paginator.previous": "Précédent",
+  "theme.docs.paginator.next":  "Suivant",
+  "theme.docs.sidebar.expandButtonTitle":"Expand sidebar",
+  "theme.docs.sidebar.expandButtonAriaLabel": "Expand sidebar",
+  "theme.docs.sidebar.responsiveCloseButtonLabel": "Close menu",
+  "theme.docs.sidebar.responsiveOpenButtonLabel": "Open menu",
+  "theme.docs.sidebar.collapseButtonTitle":  "Collapse sidebar",
+  "theme.docs.sidebar.collapseButtonAriaLabel": "Collapse sidebar",
+  "theme.common.editThisPage": "Éditer cette page",
+  "theme.common.skipToMainContent": "Aller au contenu principal",
+  "theme.SearchPage.existingResultsTitle": "Search results for",
+  "theme.SearchPage.emptyResultsTitle": "Search the documentation",
+  "theme.SearchPage.inputPlaceholder": "Type your search here",
+  "theme.SearchPage.inputLabel": "Search",
+  "theme.SearchPage.algoliaLabel":  "Search by Algolia",
+  "theme.SearchPage.noResultsText":  "No results were found",
+  "theme.SearchPage.fetchingNewResults": "Fetching new results...",
+  "theme.SearchBar.label": "Search",
+  "theme.PwaReloadPopup.info": "New version available",
+  "theme.PwaReloadPopup.refreshButtonText": "Refresh",
+  "theme.PwaReloadPopup.closeButtonAriaLabel": "Close",
   "theme.Playground.liveEditor": "Éditeur en direct",
   "theme.Playground.result": "Résultat"
 }
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.tsx
index 02b1636067f6a..5e46342d638e9 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.tsx
@@ -18,7 +18,7 @@ function BlogListPaginator(props: {readonly metadata: Metadata}): JSX.Element {
     <nav
       className="pagination-nav"
       aria-label={translate({
-        id: 'theme.BlogListPaginator.navAriaLabel',
+        id: 'theme.blog.paginator.navAriaLabel',
         message: 'Blog list page navigation',
         description: 'The ARIA label for the blog pagination',
       })}>
@@ -28,7 +28,7 @@ function BlogListPaginator(props: {readonly metadata: Metadata}): JSX.Element {
             <div className="pagination-nav__label">
               &laquo;{' '}
               <Translate
-                id="theme.BlogListPaginator.newerEntries"
+                id="theme.blog.paginator.newerEntries"
                 description="The label used to navigate to the newer blog posts page (previous page)">
                 Newer Entries
               </Translate>
@@ -41,7 +41,7 @@ function BlogListPaginator(props: {readonly metadata: Metadata}): JSX.Element {
           <Link className="pagination-nav__link" to={nextPage}>
             <div className="pagination-nav__label">
               <Translate
-                id="theme.BlogListPaginator.olderEntries"
+                id="theme.blog.paginator.olderEntries"
                 description="The label used to navigate to the older blog posts page (next page)">
                 Older Entries
               </Translate>{' '}
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
index 58717141a814c..00482610b6e2e 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
@@ -119,7 +119,7 @@ function BlogPostItem(props: Props): JSX.Element {
               <div className="col">
                 <strong>
                   <Translate
-                    id="theme.common.tags"
+                    id="theme.blog.tags"
                     description="The label used during output tags list">
                     Tags:
                   </Translate>
@@ -141,7 +141,7 @@ function BlogPostItem(props: Props): JSX.Element {
                   aria-label={`Read more about ${title}`}>
                   <strong>
                     <Translate
-                      id="theme.BlogPostItem.readMore"
+                      id="theme.blog.post.readMore"
                       description="The label used in blog post item excerpts to link to full blog posts">
                       Read More
                     </Translate>
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.tsx
index 06b5c700dcf1c..525cf80a2a324 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.tsx
@@ -17,7 +17,7 @@ function BlogPostPaginator(props: Props): JSX.Element {
     <nav
       className="pagination-nav"
       aria-label={translate({
-        id: 'theme.BlogPostPaginator.navAriaLabel',
+        id: 'theme.blog.post.paginator.navAriaLabel',
         message: 'Blog post page navigation',
         description: 'The ARIA label for the blog posts pagination',
       })}>
@@ -26,7 +26,7 @@ function BlogPostPaginator(props: Props): JSX.Element {
           <Link className="pagination-nav__link" to={prevItem.permalink}>
             <div className="pagination-nav__sublabel">
               <Translate
-                id="theme.BlogPostPaginator.newerPost"
+                id="theme.blog.post.paginator.newerPost"
                 description="The blog post button label to navigate to the newer/previous post">
                 Newer Post
               </Translate>
@@ -42,7 +42,7 @@ function BlogPostPaginator(props: Props): JSX.Element {
           <Link className="pagination-nav__link" to={nextItem.permalink}>
             <div className="pagination-nav__sublabel">
               <Translate
-                id="theme.BlogPostPaginator.olderPost"
+                id="theme.blog.post.paginator.olderPost"
                 description="The blog post button label to navigate to the older/next post">
                 Older Post
               </Translate>
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
index 8a342a9216744..7a758674a17fd 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
@@ -95,13 +95,13 @@ function DocPageContent({
               <div
                 className={styles.collapsedDocSidebar}
                 title={translate({
-                  id: 'theme.docs.expandButtonTitle',
+                  id: 'theme.docs.sidebar.expandButtonTitle',
                   message: 'Expand sidebar',
                   description:
                     'The ARIA label and title attribute for expand button of doc sidebar',
                 })}
                 aria-label={translate({
-                  id: 'theme.docs.expandButtonAriaLabel',
+                  id: 'theme.docs.sidebar.expandButtonAriaLabel',
                   message: 'Expand sidebar',
                   description:
                     'The ARIA label and title attribute for expand button of doc sidebar',
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.tsx
index a9306942055c3..19e5e70135970 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.tsx
@@ -17,7 +17,7 @@ function DocPaginator(props: Props): JSX.Element {
     <nav
       className="pagination-nav"
       aria-label={translate({
-        id: 'theme.DocPaginator.navAriaLabel',
+        id: 'theme.docs.paginator.navAriaLabel',
         message: 'Docs pages navigation',
         description: 'The ARIA label for the docs pagination',
       })}>
@@ -28,7 +28,7 @@ function DocPaginator(props: Props): JSX.Element {
             to={metadata.previous.permalink}>
             <div className="pagination-nav__sublabel">
               <Translate
-                id="theme.DocPaginator.previous"
+                id="theme.docs.paginator.previous"
                 description="The label used to navigate to the previous doc">
                 Previous
               </Translate>
@@ -44,7 +44,7 @@ function DocPaginator(props: Props): JSX.Element {
           <Link className="pagination-nav__link" to={metadata.next.permalink}>
             <div className="pagination-nav__sublabel">
               <Translate
-                id="theme.DocPaginator.next"
+                id="theme.docs.paginator.next"
                 description="The label used to navigate to the next doc">
                 Next
               </Translate>
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx
index ebb16dd4db9be..644dc32432aa9 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx
@@ -233,13 +233,13 @@ function DocSidebar({
           aria-label={
             showResponsiveSidebar
               ? translate({
-                  id: 'theme.DocSidebar.responsiveCloseButtonLabel',
+                  id: 'theme.docs.sidebar.responsiveCloseButtonLabel',
                   message: 'Close menu',
                   description:
                     'The ARIA label for close button of mobile doc sidebar',
                 })
               : translate({
-                  id: 'theme.DocSidebar.responsiveOpenButtonLabel',
+                  id: 'theme.docs.sidebar.responsiveOpenButtonLabel',
                   message: 'Open menu',
                   description:
                     'The ARIA label for open button of mobile doc sidebar',
@@ -286,13 +286,13 @@ function DocSidebar({
         <button
           type="button"
           title={translate({
-            id: 'theme.docs.collapseButtonTitle',
+            id: 'theme.docs.sidebar.collapseButtonTitle',
             message: 'Collapse sidebar',
             description:
               'The ARIA label and title attribute for collapse button of doc sidebar',
           })}
           aria-label={translate({
-            id: 'theme.docs.collapseButtonAriaLabel',
+            id: 'theme.docs.sidebar.collapseButtonAriaLabel',
             message: 'Collapse sidebar',
             description:
               'The ARIA label and title attribute for collapse button of doc sidebar',
diff --git a/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx
index c437a54d0a29e..8b02281ca41cb 100644
--- a/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx
@@ -16,7 +16,7 @@ export default function EditThisPage({editUrl}: Props): JSX.Element {
     <a href={editUrl} target="_blank" rel="noreferrer noopener">
       <IconEdit />
       <Translate
-        id="theme.EditThisPage.editThisPage"
+        id="theme.common.editThisPage"
         description="The link label to edit the current page">
         Edit this page
       </Translate>
diff --git a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
index 3b5d053fbd63c..5c830fd042fdf 100644
--- a/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/SkipToContent/index.tsx
@@ -42,7 +42,7 @@ function SkipToContent(): JSX.Element {
     <div ref={containerRef}>
       <a href="#main" className={styles.skipToContent} onClick={handleSkip}>
         <Translate
-          id="theme.SkipToContent.skipToMainContent"
+          id="theme.common.skipToMainContent"
           description="The skip to content label used for accessibility, allowing to rapidly navigate to main content with keyboard tab/enter navigation">
           Skip to main content
         </Translate>