[pull] master from nounsDAO:master

packages/nouns-webapp/src/components/Footer.tsx

@@ -32,6 +32,10 @@ export const Footer = () => {
           label: t`Forks`,
           url: '/fork',
         },
+        {
+          label: t`Map`,
+          url: 'https://nounspot.com',
+        },
       ],
     },
     {

packages/nouns-webapp/src/components/NounsIntroSection/NounsIntroSection.module.css

@@ -127,3 +127,34 @@
 .nounsIntroLinks:hover {
   color: #d63c5e;
 }
+
+.nounspotContainer {
+  margin-top: 2rem;
+  margin-bottom: 2rem;
+  position: relative;
+}
+
+.nounspotContainer iframe {
+  width: 100%;
+  height: 500px;
+  border: 0;
+  border-radius: 0px;
+  overflow: hidden;
+}
+
+.nounspotContainer .videoSubtitle {
+  position: absolute;
+  top: 520px;
+}
+
+@media (max-width: 992px) {
+  .nounspotContainer {
+    padding: 0 2rem;
+  }
+
+  .nounspotContainer .videoSubtitle {
+    position: static;
+    margin-top: 1rem;
+    padding: 0;
+  }
+}

packages/nouns-webapp/src/components/NounsIntroSection/index.tsx

@@ -1,7 +1,8 @@
 import { Trans } from '@lingui/react/macro';
 import { Col, Nav } from 'react-bootstrap';
 import { Link } from 'react-router';
 
+import LinkComponent from '@/components/Link';
 import Section from '@/layout/Section';
 
 import classes from './NounsIntroSection.module.css';
@@ -25,7 +26,7 @@
           </div>
         </Col>
         <Col lg={6} className={classes.youtubeEmbedContainer}>
           <iframe
             src="https://www.youtube.com/embed/lOzCA7bZG_k"
             title="YouTube video player"
             allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
@@ -48,7 +49,7 @@
       </Section>
       <Section fullWidth={false} className={classes.videoSection}>
         <Col lg={6} className={`${classes.youtubeEmbedContainer} order-lg-1 order-2`}>
           <iframe
             src="https://www.youtube.com/embed/oa79nN4gMPs"
             title="YouTube video player"
             allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
@@ -79,6 +80,45 @@
           </div>
         </Col>
       </Section>
+      <Section fullWidth={false} className={classes.videoSection}>
+        <Col lg={12}>
+          <div className={classes.textWrapper}>
+            <h1>
+              <Trans>Nouns is a global community.</Trans>
+            </h1>
+            <p>
+              <Trans>
+                From a school in Uganda to a coffee shop in LA, from a crypto hub in São Paulo to a
+                deli in Melbourne, Nouns lives wherever creative people bring ideas to life. Explore
+                nounish people, places, and things with{' '}
+                <LinkComponent
+                  text={<Trans>Nounspot</Trans>}
+                  url="https://nounspot.com"
+                  leavesPage={true}
+                />
+                .
+              </Trans>
+            </p>
+          </div>
+        </Col>
+        <Col lg={12} className={classes.nounspotContainer}>
+          <iframe
+            src="https://nounspot.com/embed?sidebar=true&toggle=true&addspot=true&header=true&fullpage=true"
+            width="100%"
+            height="500px"
+            allow="geolocation"
+            loading="lazy"
+            referrerPolicy="no-referrer-when-downgrade"
+            title="Nounspot Map"
+          ></iframe>
+          <small className={`${classes.videoSubtitle} text-muted`}>
+            Built by{' '}
+            <Nav.Link as="a" href="https://x.com/playdna_" target="_blank" rel="noreferrer">
+              PlayDNA
+            </Nav.Link>
+          </small>
+        </Col>
+      </Section>
     </>
   );
 };

packages/nouns-webapp/src/locales/en-US.po

@@ -116,6 +116,10 @@ msgstr "sponsored votes"
 msgid "Add Function Call Arguments"
 msgstr "Add Function Call Arguments"
 
+#: src/components/NounsIntroSection/index.tsx
+msgid "From a school in Uganda to a coffee shop in LA, from a crypto hub in São Paulo to a deli in Melbourne, Nouns lives wherever creative people bring ideas to life. Explore nounish people, places, and things with <0/>."
+msgstr "From a school in Uganda to a coffee shop in LA, from a crypto hub in São Paulo to a deli in Melbourne, Nouns lives wherever creative people bring ideas to life. Explore nounish people, places, and things with <0/>."
+
 #: src/pages/Governance/index.tsx
 #: src/components/Footer.tsx
 #: src/components/NavBarTreasury/index.tsx
@@ -193,6 +197,10 @@ msgstr "Delegate {availableVotes} Votes"
 msgid "Learn more about the DUNA"
 msgstr "Learn more about the DUNA"
 
+#: src/components/Footer.tsx
+msgid "Map"
+msgstr "Map"
+
 #: src/components/Documentation/index.tsx
 msgid "Nouns are generated randomly based Ethereum block hashes. There are no 'if' statements or other rules governing Noun trait scarcity, which makes all Nouns equally rare. As of this writing, Nouns are made up of:"
 msgstr "Nouns are generated randomly based Ethereum block hashes. There are no 'if' statements or other rules governing Noun trait scarcity, which makes all Nouns equally rare. As of this writing, Nouns are made up of:"
@@ -1042,6 +1050,10 @@ msgstr "Candidate updated!"
 msgid "Queue"
 msgstr "Queue"
 
+#: src/components/NounsIntroSection/index.tsx
+msgid "Nouns is a global community."
+msgstr "Nouns is a global community."
+
 #: src/components/Documentation/index.tsx
 msgid "CryptoPunks"
 msgstr "CryptoPunks"
@@ -1461,6 +1473,10 @@ msgstr "Deploying Nouns fork and beginning the forking period"
 msgid "Your <0>{availableVotes}</0> votes are being delegated to a new account."
 msgstr "Your <0>{availableVotes}</0> votes are being delegated to a new account."
 
+#: src/components/NounsIntroSection/index.tsx
+msgid "Nounspot"
+msgstr "Nounspot"
+
 #: src/components/NounInfoCard.tsx
 msgid "Bid history"
 msgstr "Bid history"

packages/nouns-webapp/src/locales/ja-JP.po

@@ -121,6 +121,10 @@ msgstr "スポンサー付き投票"
 msgid "Add Function Call Arguments"
 msgstr "関数呼び出し引数を追加"
 
+#: src/components/NounsIntroSection/index.tsx
+msgid "From a school in Uganda to a coffee shop in LA, from a crypto hub in São Paulo to a deli in Melbourne, Nouns lives wherever creative people bring ideas to life. Explore nounish people, places, and things with <0/>."
+msgstr "ウガンダの学校からロサンゼルスのカフェ、サンパウロのクリプトハブからメルボルンのデリまで。Nouns は創造的な人々がアイデアを形にする場所ならどこにでも存在しています。Nounspot で nounish な人、場所、モノを探索しよう。"
+
 #: src/pages/Governance/index.tsx
 #: src/components/Footer.tsx
 #: src/components/NavBarTreasury/index.tsx
@@ -153,6 +157,7 @@ msgstr "無効な引数"
 msgid "Winner"
 msgstr "落札者"
 
+#: src/components/NavBar/index.tsx
 #: src/components/NavBar/index.tsx
 msgid "Candidates"
 msgstr "候補者"
@@ -197,6 +202,10 @@ msgstr "{availableVotes}票を委任する"
 msgid "Learn more about the DUNA"
 msgstr "DUNAについて詳しく学ぶ"
 
+#: src/components/Footer.tsx
+msgid "Map"
+msgstr "地図"
+
 #: src/components/Documentation/index.tsx
 msgid "Nouns are generated randomly based Ethereum block hashes. There are no 'if' statements or other rules governing Noun trait scarcity, which makes all Nouns equally rare. As of this writing, Nouns are made up of:"
 msgstr "Nounsは、イーサリアムのブロックハッシュに基づいてランダムに生成されます。Nounの特徴の希少性を管理する「if」ステートメントやその他のルールは存在しないため、すべてのNounが等しく希少となります。現時点では、Nounsは以下のもので構成されています："
@@ -217,6 +226,7 @@ msgstr "Nounsで構築。資金を獲得。"
 msgid "Making a proposal requires {threshold} votes"
 msgstr "提案を行うには{threshold}票が必要です"
 
+#: src/pages/Fork/WithdrawNounsButton.tsx
 #: src/pages/Fork/WithdrawNounsButton.tsx
 msgid "Withdraw Nouns from escrow"
 msgstr "エスクローからNounsを引き出す"
@@ -233,6 +243,7 @@ msgstr "<0>提案者: </0><1>{proposer}</1><2>{transactionLink}</2>"
 msgid "3.5 artists, 6.5 technologists"
 msgstr "3.5アーティスト、6.5技術者"
 
+#: src/components/NavBar/index.tsx
 #: src/components/NavBar/index.tsx
 msgid "Proposals"
 msgstr "提案"
@@ -419,6 +430,7 @@ msgstr "提案がキャンセルされました！"
 #: src/pages/Governance/index.tsx
 #: src/components/Footer.tsx
 #: src/components/NavBar/index.tsx
+#: src/components/NavBar/index.tsx
 msgid "Nouns"
 msgstr "Nouns"
 
@@ -428,6 +440,9 @@ msgstr "Nouns"
 msgid "You already have an active or pending proposal"
 msgstr "すでに有効または保留中の提案があります"
 
+#: src/components/ProposalActionsModal/steps/FunctionCallReviewStep/index.tsx
+#: src/components/ProposalActionsModal/steps/FunctionCallReviewStep/index.tsx
+#: src/components/ProposalActionsModal/steps/FunctionCallReviewStep/index.tsx
 #: src/components/ProposalActionsModal/steps/FunctionCallReviewStep/index.tsx
 msgid "None"
 msgstr "なし"
@@ -595,8 +610,10 @@ msgstr "成功しました"
 msgid "Proposal Executed!"
 msgstr "提案が実行されました！"
 
+#: src/pages/EditProposal/index.tsx
 #: src/pages/EditProposal/index.tsx
 #: src/pages/EditCandidate/index.tsx
+#: src/pages/EditCandidate/index.tsx
 #: src/pages/CreateProposal/index.tsx
 #: src/pages/CreateCandidate/index.tsx
 msgid "Note"
@@ -628,6 +645,7 @@ msgstr "コミュニティメンバーが提出した提案はここに表示さ
 msgid "'Nounders' are the group of ten builders that initiated Nouns. Here are the Nounders:"
 msgstr "「Nounders」とはNounsの創業に携わった10人の創業者のことであり、以下の人物で構成されています："
 
+#: src/components/AuctionTimer/index.tsx
 #: src/components/AuctionTimer/index.tsx
 msgid "Auction ended"
 msgstr "オークションが終了しました"
@@ -650,6 +668,7 @@ msgstr "{0} 年分のナウンを生成しました"
 msgid "Select Language"
 msgstr "言語を選択"
 
+#: src/components/NavBar/index.tsx
 #: src/components/NavBar/index.tsx
 msgid "DAO"
 msgstr "DAO"
@@ -951,6 +970,8 @@ msgstr "あなたにのみ表示されます"
 msgid "Add Action Details"
 msgstr "アクションの詳細を追加"
 
+#: src/components/Proposals/index.tsx
+#: src/components/Proposals/index.tsx
 #: src/components/Proposals/index.tsx
 msgid "Delegate"
 msgstr "投票を委任する"
@@ -1034,6 +1055,10 @@ msgstr "候補が更新されました！"
 msgid "Queue"
 msgstr "キュー"
 
+#: src/components/NounsIntroSection/index.tsx
+msgid "Nouns is a global community."
+msgstr "Nouns は世界的なコミュニティです"
+
 #: src/components/Documentation/index.tsx
 msgid "CryptoPunks"
 msgstr "クリプトパンクス"
@@ -1056,6 +1081,7 @@ msgstr "<0>{numVotesForProp}</0>のNounで投票"
 msgid "Body"
 msgstr "体"
 
+#: src/components/VoteSignals/VoteSignals.tsx
 #: src/components/VoteSignals/VoteSignals.tsx
 msgid "Nouns voters can cast voting signals to give proposers of pending proposals an idea of how they intend to vote and helpful guidance on proposal changes to change their vote."
 msgstr "Nounsの投票者は、保留中の提案の提案者に対して、どのように投票するつもりかのアイデアを提供し、提案の変更に関する有益なガイダンスを提供するために投票シグナルを送ることができます。"
@@ -1135,6 +1161,7 @@ msgstr "署名者がアクティブまたは保留中の提案を持っている
 msgid "There's a way for everyone to get involved with Nouns. From whimsical endeavors like naming a frog, to ambitious projects like constructing a giant float for the Rose Parade, or even crypto infrastructure like Prop House. Nouns funds projects of all sizes and domains."
 msgstr "Nounsには誰もが関与できる方法があります。カエルに名前を付けるような気まぐれな試みから、ローズパレードのための巨大なフロートを作るような野心的なプロジェクト、さらにはProp Houseのような暗号インフラまで。Nounsはあらゆる規模と分野のプロジェクトに資金を提供します。"
 
+#: src/components/StreamWithdrawModal/index.tsx
 #: src/components/StreamWithdrawModal/index.tsx
 msgid "Withdraw from Stream"
 msgstr "ストリームから引き出す"
@@ -1211,18 +1238,35 @@ msgid "The Nounders"
 msgstr "Nounders"
 
 #: src/pages/Vote/index.tsx
+#: src/pages/Vote/index.tsx
+#: src/pages/Fork/WithdrawNounsButton.tsx
+#: src/pages/Fork/WithdrawNounsButton.tsx
 #: src/pages/Fork/WithdrawNounsButton.tsx
+#: src/pages/Fork/WithdrawNounsButton.tsx
+#: src/pages/Fork/DeployForkButton.tsx
+#: src/pages/Fork/DeployForkButton.tsx
 #: src/pages/Fork/DeployForkButton.tsx
+#: src/pages/Fork/DeployForkButton.tsx
+#: src/pages/EditProposal/index.tsx
+#: src/pages/EditProposal/index.tsx
+#: src/pages/EditProposal/index.tsx
 #: src/pages/EditProposal/index.tsx
 #: src/pages/EditCandidate/index.tsx
 #: src/pages/CreateProposal/index.tsx
 #: src/pages/CreateCandidate/index.tsx
 #: src/components/VoteSignals/VoteSignals.tsx
 #: src/components/VoteModal/index.tsx
+#: src/components/VoteModal/index.tsx
+#: src/components/CandidateSponsors/SubmitUpdateProposal.tsx
 #: src/components/CandidateSponsors/SubmitUpdateProposal.tsx
 #: src/components/CandidateSponsors/SelectSponsorsToPropose.tsx
+#: src/components/CandidateSponsors/SelectSponsorsToPropose.tsx
+#: src/components/Bid/index.tsx
 #: src/components/Bid/index.tsx
 #: src/components/AddNounsToForkModal/index.tsx
+#: src/components/AddNounsToForkModal/index.tsx
+#: src/components/AddNounsToForkModal/index.tsx
+#: src/components/AddNounsToForkModal/index.tsx
 msgid "Please try again."
 msgstr "もう一度やり直してください。"
 
@@ -1411,6 +1455,8 @@ msgstr "提案前のフィードバック"
 msgid "Nouns are stored directly on Ethereum and do not utilize pointers to other networks such as IPFS. This is possible because Noun parts are compressed and stored on-chain using a custom run-length encoding (RLE), which is a form of lossless compression."
 msgstr "NounはEthereum上に直接保存されるため、IPFSのような他のネットワークへのポインタを利用することはありません。これは、Nounのパーツが可逆圧縮の一種であるカスタムのランレングス圧縮 (RLE) を使用してオンチェーンで圧縮・保存されていることから実現したものです。"
 
+#: src/components/Proposals/index.tsx
+#: src/components/Proposals/index.tsx
 #: src/components/Proposals/index.tsx
 msgid "Submit Proposal"
 msgstr "提案を提出"
@@ -1432,6 +1478,10 @@ msgstr "Nounsフォークをデプロイし、フォーク期間を開始"
 msgid "Your <0>{availableVotes}</0> votes are being delegated to a new account."
 msgstr "あなたは<0>{availableVotes}</0>アカウントに委任されています"
 
+#: src/components/NounsIntroSection/index.tsx
+msgid "Nounspot"
+msgstr "Nounspot"
+
 #: src/components/NounInfoCard.tsx
 msgid "Bid history"
 msgstr "入札履歴"
@@ -1520,6 +1570,7 @@ msgstr "オンチェーンアートワークから組み立てられた無限の
 msgid "Withdraw from Stream <0/>"
 msgstr "ストリームから引き出す<0/>"
 
+#: src/pages/Vote/index.tsx
 #: src/pages/Vote/index.tsx
 msgid "Threshold"
 msgstr "しきい値"
@@ -1558,6 +1609,7 @@ msgstr "1日1つのNoun、永遠に。"
 #: src/pages/TraitsPage.tsx
 #: src/components/Footer.tsx
 #: src/components/NavBar/index.tsx
+#: src/components/NavBar/index.tsx
 msgid "Traits"
 msgstr "特性"
 
@@ -1582,6 +1634,7 @@ msgstr "棄権"
 
 #. placeholder {0}: filteredDelegateGroupedVoteData.length
 #: src/components/VoteCard/index.tsx
+#: src/components/VoteCard/index.tsx
 msgid "{0, plural, one {voter} other {voters}}"
 msgstr "{0, plural, one {投票者} other {投票者}}"
 
@@ -1656,6 +1709,8 @@ msgstr "Nounsを作る"
 msgid "Each time an auction is settled, the settlement transaction will also cause a new Noun to be minted and a new 24 hour auction to begin. "
 msgstr "オークションが成立するたびに、決済取引によって新しいNounが発行され、新しい24時間オークションが開始されます。"
 
+#: src/pages/EditProposal/index.tsx
+#: src/pages/EditProposal/index.tsx
 #: src/pages/EditProposal/index.tsx
 msgid "Proposal Updated!"
 msgstr "提案が更新されました！"
@@ -1735,6 +1790,7 @@ msgstr "ウォレットへの引き出し中にエラーが発生しました。
 #: src/components/ProposalActionsModal/steps/SelectProposalActionStep/index.tsx
 #: src/components/CurrentDelegatePannel/index.tsx
 #: src/components/ChangeDelegatePanel/index.tsx
+#: src/components/ChangeDelegatePanel/index.tsx
 msgid "Close"
 msgstr "近い"