Merge branch 'main' into sync-722b5464

Author: Zorig

patches/@codemirror+lang-javascript+0.19.6.patch

@@ -62,13 +62,10 @@ function SendFeedback({onSubmit}: {onSubmit: () => void}) {
   const [isSubmitted, setIsSubmitted] = useState(false);
   return (
     <div className="max-w-xs w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex">
-<<<<<<< HEAD
-      <p className="w-full font-bold text-primary dark:text-primary-dark text-lg mr-4">
-        {isSubmitted ? 'Санал өгсөнд баярлалаа!' : 'Энэ хуудас хэрэг болж байна уу?'}
-=======
       <p className="w-full font-bold text-primary dark:text-primary-dark text-lg me-4">
-        {isSubmitted ? 'Thank you for your feedback!' : 'Is this page useful?'}
->>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252
+        {isSubmitted
+          ? 'Санал өгсөнд баярлалаа!'
+          : 'Энэ хуудас хэрэг болж байна уу?'}
       </p>
       {!isSubmitted && (
         <button

patches/@lezer+javascript+0.15.2.patch

@@ -319,9 +319,7 @@ export function Footer() {
           <FooterLink href="/community/docs-contributors">
             Docs Contributors
           </FooterLink>
-          <FooterLink href="/community/acknowledgements">
-            Талархал
-          </FooterLink>
+          <FooterLink href="/community/acknowledgements">Талархал</FooterLink>
         </div>
         <div className="flex flex-col">
           <FooterLink isHeader={true}>Илүү их</FooterLink>

patches/next+13.4.1.patch

@@ -374,18 +374,10 @@ export function HomeContent() {
                           </Link>{' '}
                           болон{' '}
                           <Link href="https://github.com/expo/expo">Expo</Link>{' '}
-<<<<<<< HEAD
                           нь Android, iOS болон бусад платформд зориулан яг л
                           платформын өөрийнх нь апп шиг <i>апп</i> бүтээх боломж
                           олгодог. Android болон iOS дээр вэб дуудаж рендер хийж
                           байгаа зүйл биш юм.
-=======
-                          let you build apps in React for Android, iOS, and
-                          more. They look and feel native because their UIs{' '}
-                          <i>are</i> truly native. It’s not a web view—your
-                          React components render real Android and iOS views
-                          provided by the platform.
->>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252
                         </p>
                       </div>
                     </div>
@@ -412,13 +404,8 @@ export function HomeContent() {
         <Section background="right-card">
           <div className="max-w-7xl mx-auto flex flex-col lg:flex-row px-5">
             <div className="max-w-3xl lg:max-w-7xl gap-5 flex flex-col lg:flex-row lg:px-5">
-<<<<<<< HEAD
               <div className="w-full lg:w-6/12 max-w-3xl flex flex-col items-start justify-start lg:pl-5 lg:pr-10">
                 <Header>Бэлэн болсон үед л шинэчил</Header>
-=======
-              <div className="w-full lg:w-6/12 max-w-3xl flex flex-col items-start justify-start lg:ps-5 lg:pe-10">
-                <Header>Upgrade when the future is ready</Header>
->>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252
                 <Para>
                   React өөрчлөлтүүдэд болгоомжтой ханддаг. React-ын commit бүр
                   нь тэрбум гаран хэрэглэгчтэй бизнесс дээр туршигдаж, Meta -д
@@ -502,13 +489,8 @@ export function HomeContent() {
           <div className="mt-20 px-5 lg:px-0 mb-6 max-w-4xl text-center text-opacity-80">
             <Logo className="text-link dark:text-link-dark w-24 lg:w-28 mb-10 lg:mb-8 mt-12 h-auto mx-auto self-start" />
             <Header>
-<<<<<<< HEAD
-              React-ын нэгдэлд <br className="" />
+              React-ын нэгдэлд <br className="hidden lg:inline" />
               тавтай морилно уу
-=======
-              Welcome to the <br className="hidden lg:inline" />
-              React community
->>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252
             </Header>
             <ButtonLink
               href={'/learn'}

src/components/Layout/Feedback.tsx

@@ -70,13 +70,8 @@ function ExpandableExample({children, excerpt, type}: ExpandableExampleProps) {
           })}>
           {isDeepDive && (
             <>
-<<<<<<< HEAD
-              <IconDeepDive className="inline mr-2 dark:text-purple-30 text-purple-40" />
-              Гүн шумбах
-=======
               <IconDeepDive className="inline me-2 dark:text-purple-30 text-purple-40" />
-              Deep Dive
->>>>>>> 722b54640ea8ef146ef59558100819a6bb31c252
+              Гүнзгий үзэцгээе
             </>
           )}
           {isExample && (