chore: update .po files

regen-network · Sep 9, 2024 · 5c3fc9b · 5c3fc9b
1 parent 984e173
commit 5c3fc9b
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 150 deletions.
diff --git a/web-marketplace/src/lib/i18n/locales/en.po b/web-marketplace/src/lib/i18n/locales/en.po
@@ -1,18 +1,6 @@
 msgid ""
 msgstr ""
-<<<<<<< HEAD
-<<<<<<< HEAD
-"POT-Creation-Date: 2024-09-09 09:57+0200\n"
-=======
-<<<<<<< HEAD
-"POT-Creation-Date: 2024-09-03 12:33+0100\n"
-=======
-"POT-Creation-Date: 2024-09-02 18:54+0100\n"
->>>>>>> 7d86b1e5d (chore: update lingui catalogs)
->>>>>>> 963088d74 (chore: update lingui catalogs)
-=======
-"POT-Creation-Date: 2024-09-03 13:28+0100\n"
->>>>>>> 7d48504a6 (chore: update .po files)
+"POT-Creation-Date: 2024-09-09 12:29+0100\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -178,7 +166,7 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:34
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:37
 msgid "Advanced settings"
 msgstr ""
 
@@ -472,7 +460,7 @@ msgstr ""
 msgid "buy NCT"
 msgstr ""
 
-#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:18
+#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:20
 #: src/components/organisms/BuyCreditsModal/BuyCreditsModal.tsx:437
 msgid "Buy tradable ecocredits"
 msgstr ""
@@ -482,21 +470,14 @@ msgstr ""
 msgid "Buyer"
 msgstr ""
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 #: src/components/organisms/LoginModal/components/LoginModal.Select.tsx:115
 msgid "By connecting to Regen Marketplace, you agree to our <0>Terms of Service</0> and <1>Privacy Policy</1>"
 msgstr ""
 
-=======
-<<<<<<< HEAD
->>>>>>> 963088d74 (chore: update lingui catalogs)
-=======
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:46
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:49
 msgid "by default the cheapest credit vintage will be purchased first"
 msgstr ""
 
->>>>>>> 7d48504a6 (chore: update .po files)
 #: src/components/organisms/CreditSendForm/CreditSendForm.tsx:135
 msgid "By default these credits are tradable but you may check “retire all credits upon transfer” below to automatically retire them upon sending."
 msgstr ""
@@ -591,7 +572,7 @@ msgstr ""
 msgid "Choose Project"
 msgstr ""
 
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:43
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:46
 msgid "Choose specific credit vintages"
 msgstr ""
 
@@ -821,7 +802,7 @@ msgstr ""
 msgid "credit name"
 msgstr ""
 
-#: src/components/molecules/CreditsAmount/CreditsAmount.tsx:127
+#: src/components/molecules/CreditsAmount/CreditsAmount.tsx:163
 msgid "Credit prices vary. By default the lowest priced credits will be purchased first."
 msgstr ""
 
@@ -856,7 +837,7 @@ msgid "Credits"
 msgstr ""
 
 #: src/components/molecules/CreditsAmount/CreditsAmount.Header.tsx:45
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:67
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:71
 msgid "credits available"
 msgstr ""
 
@@ -884,7 +865,7 @@ msgstr ""
 msgid "Credits issued"
 msgstr ""
 
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.CryptoOptions.tsx:27
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.CryptoOptions.tsx:30
 msgid "Credits purchased with crypto can be purchased in either a retired or tradable state."
 msgstr ""
 
@@ -902,7 +883,7 @@ msgstr ""
 msgid "Cropland"
 msgstr ""
 
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.CryptoOptions.tsx:24
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.CryptoOptions.tsx:27
 msgid "Crypto purchase options"
 msgstr ""
 
@@ -1261,16 +1242,10 @@ msgstr ""
 msgid "If you’d prefer retired credits, please modify your choice on the <0>previous screen.</0>"
 msgstr ""
 
-<<<<<<< HEAD
 #: src/components/organisms/ImpactSection.tsx:37
 msgid "Impact"
 msgstr ""
 
-#: src/components/organisms/DescriptionForm/DescriptionForm.constants.ts:15
-msgid "In one sentence, summarize the story above."
-=======
-=======
->>>>>>> 7d48504a6 (chore: update .po files)
 #: src/components/molecules/CreditsAmount/CreditsAmount.Header.tsx:50
 msgid "in"
 msgstr ""
@@ -1357,14 +1332,11 @@ msgstr ""
 msgid "learn more"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/components/organisms/RegistryLayout/RegistryLayout.Footer.tsx:56
-=======
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.CryptoOptions.tsx:56
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.CryptoOptions.tsx:59
 msgid "Learn more"
 msgstr ""
 
->>>>>>> 963088d74 (chore: update lingui catalogs)
+#: src/components/organisms/RegistryLayout/RegistryLayout.Footer.tsx:56
 #: src/pages/Home/Home.tsx:196
 msgid "Learn More"
 msgstr ""
@@ -1531,17 +1503,13 @@ msgstr ""
 msgid "MsgCreateProject Error"
 msgstr ""
 
-<<<<<<< HEAD
-#: src/components/organisms/EditProfileForm/EditProfileForm.tsx:144
-#: src/components/organisms/RolesForm/components/ProfileModal/ProfileModal.tsx:104
-#: src/pages/ProjectReview/ProjectReview.tsx:189
-=======
 #: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.constants.tsx:10
 msgid "Must be positive"
 msgstr ""
 
-#: src/pages/ProjectReview/ProjectReview.tsx:186
->>>>>>> 7d48504a6 (chore: update .po files)
+#: src/components/organisms/EditProfileForm/EditProfileForm.tsx:144
+#: src/components/organisms/RolesForm/components/ProfileModal/ProfileModal.tsx:104
+#: src/pages/ProjectReview/ProjectReview.tsx:189
 msgid "Name"
 msgstr ""
 
@@ -2085,7 +2053,7 @@ msgstr ""
 msgid "Retire all credits upon transfer"
 msgstr ""
 
-#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:11
+#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:13
 #: src/components/organisms/BuyCreditsModal/BuyCreditsModal.tsx:415
 msgid "Retire credits now"
 msgstr ""
@@ -2485,15 +2453,18 @@ msgstr ""
 msgid "These credits will be a tradable asset. They can be retired later via Regen Marketplace."
 msgstr ""
 
-#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:19
+#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:21
 msgid "These credits will be a tradeable asset. They can be retired later via Regen Marketplace."
 msgstr ""
 
 #: src/components/organisms/BuyCreditsModal/BuyCreditsModal.tsx:418
 msgid "These credits will be retired upon purchase and will not be tradable. Retirement is permanent and non-reversible."
 msgstr ""
 
-<<<<<<< HEAD
+#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:14
+msgid "These credits will be retired upon purchase and will not be tradeable. Retirement is permanent and non-reversible."
+msgstr ""
+
 #: src/components/organisms/RolesForm/components/AdminModal/AdminModal.tsx:71
 msgid "This change will only be made after you save the change and sign the transaction."
 msgstr ""
@@ -2502,18 +2473,6 @@ msgstr ""
 msgid "This code has expired!"
 msgstr ""
 
-#: src/components/molecules/ProjectPageMetadata/ProjectPageMetadata.constants.ts:3
-=======
-#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:19
-msgid "These credits will be a tradeable asset. They can be retired later via Regen Marketplace."
-msgstr ""
-
-=======
->>>>>>> 7d48504a6 (chore: update .po files)
-#: src/components/molecules/CreditsAmount/CreditsAmount.constants.ts:12
-msgid "These credits will be retired upon purchase and will not be tradeable. Retirement is permanent and non-reversible."
-msgstr ""
-
 #: src/components/molecules/ProjectPageMetadata/ProjectPageMetadata.constants.ts:3
 #: src/pages/CreditClassDetails/CreditClassDetails.constants.ts:5
 msgid "This data is on chain or anchored on chain via a content hash."
@@ -2749,26 +2708,16 @@ msgstr ""
 msgid "VIEW ALL SELL ORDERS"
 msgstr ""
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 #: src/components/organisms/PostForm/PostForm.tsx:257
 msgid "View all supported file types»"
 msgstr ""
 
-#: src/components/organisms/Portfolio/Portfolio.constants.ts:3
-msgid "View Certificate"
+#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:79
+msgid "view batch"
 msgstr ""
 
-=======
-<<<<<<< HEAD
->>>>>>> 963088d74 (chore: update lingui catalogs)
-#: src/components/organisms/DetailsSection/DetailsSection.constants.ts:4
-msgid "view credit class doc"
-=======
-=======
->>>>>>> 7d48504a6 (chore: update .po files)
-#: src/components/organisms/ChooseCreditsForm/ChooseCreditsForm.AdvanceSettings.tsx:75
-msgid "view batch"
+#: src/components/organisms/Portfolio/Portfolio.constants.ts:3
+msgid "View Certificate"
 msgstr ""
 
 #: src/components/organisms/DetailsSection/DetailsSection.constants.ts:4