merge main

DimensionDev · Sep 30, 2024 · e6aaa06 · e6aaa06
2 parents ecfec8a + a598359
commit e6aaa06
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 50 deletions.
diff --git a/packages/plugins/FriendTech/src/locale/en-US.json b/packages/plugins/FriendTech/src/locale/en-US.json
@@ -18,7 +18,7 @@
                 }
             ]
         ],
-        "dII/Xz": [["ownCount", "plural", { "one": ["#", " Key"], "other": ["#", " Keys"] }]],
+        "dII/Xz": "<<<<<<< HEAD",
         "30X+Oq": [
             [
                 "shareAmount",

diff --git a/packages/plugins/FriendTech/src/locale/en-US.po b/packages/plugins/FriendTech/src/locale/en-US.po
@@ -27,7 +27,7 @@ msgstr ""
 
 #: src/SiteAdaptor/components/UserProfile.tsx:187
 msgid "{ownCount, plural, one {# Key} other {# Keys}}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/SiteAdaptor/components/HistoryList.tsx:113
 msgid "{shareAmount, plural, one {{0} bought {shareAmount} <0>{1}</0> key} other {{2} bought {shareAmount} <1>{3}</1> keys}}"

diff --git a/packages/plugins/FriendTech/src/locale/ja-JP.json b/packages/plugins/FriendTech/src/locale/ja-JP.json
@@ -18,7 +18,7 @@
                 }
             ]
         ],
-        "dII/Xz": [["ownCount", "plural", { "one": ["#", " Key"], "other": ["#", " Keys"] }]],
+        "dII/Xz": "<<<<<<< HEAD",
         "30X+Oq": [
             [
                 "shareAmount",

diff --git a/packages/plugins/FriendTech/src/locale/ja-JP.po b/packages/plugins/FriendTech/src/locale/ja-JP.po
@@ -32,7 +32,7 @@ msgstr ""
 
 #: src/SiteAdaptor/components/UserProfile.tsx:187
 msgid "{ownCount, plural, one {# Key} other {# Keys}}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/SiteAdaptor/components/HistoryList.tsx:113
 msgid "{shareAmount, plural, one {{0} bought {shareAmount} <0>{1}</0> key} other {{2} bought {shareAmount} <1>{3}</1> keys}}"

diff --git a/packages/plugins/FriendTech/src/locale/ko-KR.json b/packages/plugins/FriendTech/src/locale/ko-KR.json
@@ -18,7 +18,7 @@
                 }
             ]
         ],
-        "dII/Xz": [["ownCount", "plural", { "one": ["#", " Key"], "other": ["#", " Keys"] }]],
+        "dII/Xz": "<<<<<<< HEAD",
         "30X+Oq": [
             [
                 "shareAmount",

diff --git a/packages/plugins/FriendTech/src/locale/ko-KR.po b/packages/plugins/FriendTech/src/locale/ko-KR.po
@@ -32,7 +32,7 @@ msgstr ""
 
 #: src/SiteAdaptor/components/UserProfile.tsx:187
 msgid "{ownCount, plural, one {# Key} other {# Keys}}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/SiteAdaptor/components/HistoryList.tsx:113
 msgid "{shareAmount, plural, one {{0} bought {shareAmount} <0>{1}</0> key} other {{2} bought {shareAmount} <1>{3}</1> keys}}"

diff --git a/packages/plugins/FriendTech/src/locale/zh-CN.json b/packages/plugins/FriendTech/src/locale/zh-CN.json
@@ -18,7 +18,7 @@
                 }
             ]
         ],
-        "dII/Xz": [["ownCount", "plural", { "one": ["#", " Key"], "other": ["#", " Keys"] }]],
+        "dII/Xz": "<<<<<<< HEAD",
         "30X+Oq": [
             [
                 "shareAmount",

diff --git a/packages/plugins/FriendTech/src/locale/zh-CN.po b/packages/plugins/FriendTech/src/locale/zh-CN.po
@@ -32,7 +32,7 @@ msgstr ""
 
 #: src/SiteAdaptor/components/UserProfile.tsx:187
 msgid "{ownCount, plural, one {# Key} other {# Keys}}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/SiteAdaptor/components/HistoryList.tsx:113
 msgid "{shareAmount, plural, one {{0} bought {shareAmount} <0>{1}</0> key} other {{2} bought {shareAmount} <1>{3}</1> keys}}"

diff --git a/packages/plugins/FriendTech/src/locale/zh-TW.json b/packages/plugins/FriendTech/src/locale/zh-TW.json
@@ -18,7 +18,7 @@
                 }
             ]
         ],
-        "dII/Xz": [["ownCount", "plural", { "one": ["#", " Key"], "other": ["#", " Keys"] }]],
+        "dII/Xz": "<<<<<<< HEAD",
         "30X+Oq": [
             [
                 "shareAmount",

diff --git a/packages/plugins/FriendTech/src/locale/zh-TW.po b/packages/plugins/FriendTech/src/locale/zh-TW.po
@@ -32,7 +32,7 @@ msgstr ""
 
 #: src/SiteAdaptor/components/UserProfile.tsx:187
 msgid "{ownCount, plural, one {# Key} other {# Keys}}"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/SiteAdaptor/components/HistoryList.tsx:113
 msgid "{shareAmount, plural, one {{0} bought {shareAmount} <0>{1}</0> key} other {{2} bought {shareAmount} <1>{3}</1> keys}}"

diff --git a/packages/shared/src/locale/en-US.json b/packages/shared/src/locale/en-US.json
@@ -1,9 +1,9 @@
 {
     "messages": {
-        "m/TPEz": "(beta)",
+        "m/TPEz": "<<<<<<< HEAD",
         "b/mMOj": [["0"], " ", ["1"], " approval successfully."],
         "BFhvNB": [["0"], " ", ["1"], " NFT contract successfully."],
-        "87Poy7": [["0"], " ", ["1"], " NFT contract."],
+        "87Poy7": "=======>>>>>>> main",
         "yHppI0": [["0"], " network is not added in the wallet. Please add and try it again."],
         "+A4TPN": [["0"], " NFT contract"],
         "iCG3eU": [["0"], " were successfully claimed"],
@@ -256,9 +256,9 @@
         "hzTib5": "Select an NFT Contract Operator",
         "bLJivk": "Select an NFT Contract Owner",
         "Xftpm5": "Select Collection",
-        "JlFcis": "Send",
+        "JlFcis": "<<<<<<< HEAD",
         "R9aEN5": ["Send ", ["0"]],
-        "MF5Dpb": ["Send ", ["0"], " successfully."],
+        "MF5Dpb": "=======>>>>>>> main",
         "xNR7Cd": "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again.",
         "Z8lGw6": "Share",
         "ZIsLZh": "Size limit: 10 MB",

diff --git a/packages/shared/src/locale/en-US.po b/packages/shared/src/locale/en-US.po
@@ -16,7 +16,7 @@ msgstr ""
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:178
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:216
 msgid "(beta)"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:141
 msgid "{0} {1} approval successfully."
@@ -28,7 +28,7 @@ msgstr ""
 
 #: src/UI/translate.ts:159
 msgid "{0} {1} NFT contract."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/ChainBoundary/index.tsx:113
 msgid "{0} network is not added in the wallet. Please add and try it again."
@@ -1107,15 +1107,15 @@ msgstr ""
 #: src/UI/components/AssetsManagement/CollectionList.tsx:286
 #: src/UI/components/VerifyNextIDDialog/index.tsx:295
 msgid "Send"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:149
 msgid "Send {0}"
 msgstr ""
 
 #: src/UI/translate.ts:119
 msgid "Send {0} successfully."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/VerifyNextIDDialog/index.tsx:237
 msgid "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again."

diff --git a/packages/shared/src/locale/ja-JP.json b/packages/shared/src/locale/ja-JP.json
@@ -1,9 +1,9 @@
 {
     "messages": {
-        "m/TPEz": "(beta)",
+        "m/TPEz": "<<<<<<< HEAD",
         "b/mMOj": [["0"], " ", ["1"], " approval successfully."],
         "BFhvNB": [["0"], " ", ["1"], " NFT contract successfully."],
-        "87Poy7": [["0"], " ", ["1"], " NFT contract."],
+        "87Poy7": "=======>>>>>>> main",
         "yHppI0": [["0"], " network is not added in the wallet. Please add and try it again."],
         "+A4TPN": [["0"], " NFT contract"],
         "iCG3eU": [["0"], " were successfully claimed"],
@@ -256,9 +256,9 @@
         "hzTib5": "NFT コントラクトのオペレーターを選択",
         "bLJivk": "NFT コントラクト所有者を選択",
         "Xftpm5": "コレクションを選択",
-        "JlFcis": "送信",
+        "JlFcis": "送信<<<<<<< HEAD",
         "R9aEN5": ["Send ", ["0"]],
-        "MF5Dpb": ["Send ", ["0"], " successfully."],
+        "MF5Dpb": "=======>>>>>>> main",
         "xNR7Cd": "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again.",
         "Z8lGw6": "シェア",
         "ZIsLZh": "サイズ制限：10 MB",

diff --git a/packages/shared/src/locale/ja-JP.po b/packages/shared/src/locale/ja-JP.po
@@ -21,7 +21,7 @@ msgstr ""
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:178
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:216
 msgid "(beta)"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:141
 msgid "{0} {1} approval successfully."
@@ -33,7 +33,7 @@ msgstr ""
 
 #: src/UI/translate.ts:159
 msgid "{0} {1} NFT contract."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/ChainBoundary/index.tsx:113
 msgid "{0} network is not added in the wallet. Please add and try it again."
@@ -1112,15 +1112,15 @@ msgstr "コレクションを選択"
 #: src/UI/components/AssetsManagement/CollectionList.tsx:286
 #: src/UI/components/VerifyNextIDDialog/index.tsx:295
 msgid "Send"
-msgstr "送信"
+msgstr "送信<<<<<<< HEAD"
 
 #: src/UI/translate.ts:149
 msgid "Send {0}"
 msgstr ""
 
 #: src/UI/translate.ts:119
 msgid "Send {0} successfully."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/VerifyNextIDDialog/index.tsx:237
 msgid "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again."

diff --git a/packages/shared/src/locale/ko-KR.json b/packages/shared/src/locale/ko-KR.json
@@ -1,9 +1,9 @@
 {
     "messages": {
-        "m/TPEz": "(beta)",
+        "m/TPEz": "<<<<<<< HEAD",
         "b/mMOj": [["0"], " ", ["1"], " approval successfully."],
         "BFhvNB": [["0"], " ", ["1"], " NFT contract successfully."],
-        "87Poy7": [["0"], " ", ["1"], " NFT contract."],
+        "87Poy7": "=======>>>>>>> main",
         "yHppI0": [["0"], " 네트워크 월렛에 추가되지 않습니다. 추가하고 다시 시도하세요."],
         "+A4TPN": [["0"], " NFT contract"],
         "iCG3eU": [["0"], " were successfully claimed"],
@@ -256,9 +256,9 @@
         "hzTib5": "NFT 컨트렉트 오퍼레이터",
         "bLJivk": "NFT 컨트렉트 소유자를 선택하세요.",
         "Xftpm5": "Select Collection",
-        "JlFcis": "발송",
+        "JlFcis": "발송<<<<<<< HEAD",
         "R9aEN5": ["Send ", ["0"]],
-        "MF5Dpb": ["Send ", ["0"], " successfully."],
+        "MF5Dpb": "=======>>>>>>> main",
         "xNR7Cd": "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again.",
         "Z8lGw6": "공유",
         "ZIsLZh": "사이즈 한계: 10 MB",

diff --git a/packages/shared/src/locale/ko-KR.po b/packages/shared/src/locale/ko-KR.po
@@ -21,7 +21,7 @@ msgstr ""
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:178
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:216
 msgid "(beta)"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:141
 msgid "{0} {1} approval successfully."
@@ -33,7 +33,7 @@ msgstr ""
 
 #: src/UI/translate.ts:159
 msgid "{0} {1} NFT contract."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/ChainBoundary/index.tsx:113
 msgid "{0} network is not added in the wallet. Please add and try it again."
@@ -1112,15 +1112,15 @@ msgstr ""
 #: src/UI/components/AssetsManagement/CollectionList.tsx:286
 #: src/UI/components/VerifyNextIDDialog/index.tsx:295
 msgid "Send"
-msgstr "발송"
+msgstr "발송<<<<<<< HEAD"
 
 #: src/UI/translate.ts:149
 msgid "Send {0}"
 msgstr ""
 
 #: src/UI/translate.ts:119
 msgid "Send {0} successfully."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/VerifyNextIDDialog/index.tsx:237
 msgid "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again."

diff --git a/packages/shared/src/locale/zh-CN.json b/packages/shared/src/locale/zh-CN.json
@@ -1,9 +1,9 @@
 {
     "messages": {
-        "m/TPEz": "(beta)",
+        "m/TPEz": "<<<<<<< HEAD",
         "b/mMOj": [["0"], " ", ["1"], " approval successfully."],
         "BFhvNB": [["0"], " ", ["1"], " NFT contract successfully."],
-        "87Poy7": [["0"], " ", ["1"], " NFT contract."],
+        "87Poy7": "=======>>>>>>> main",
         "yHppI0": [["0"], " network is not added in the wallet. Please add and try it again."],
         "+A4TPN": [["0"], " NFT contract"],
         "iCG3eU": [["0"], " were successfully claimed"],
@@ -256,9 +256,9 @@
         "hzTib5": "选择 NFT 合约持有者",
         "bLJivk": "选择 NFT 合约持有者",
         "Xftpm5": "Select Collection",
-        "JlFcis": "发送",
+        "JlFcis": "发送<<<<<<< HEAD",
         "R9aEN5": ["Send ", ["0"]],
-        "MF5Dpb": ["Send ", ["0"], " successfully."],
+        "MF5Dpb": "=======>>>>>>> main",
         "xNR7Cd": "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again.",
         "Z8lGw6": "分享",
         "ZIsLZh": "大小限制：10 MB",

diff --git a/packages/shared/src/locale/zh-CN.po b/packages/shared/src/locale/zh-CN.po
@@ -21,7 +21,7 @@ msgstr ""
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:178
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:216
 msgid "(beta)"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:141
 msgid "{0} {1} approval successfully."
@@ -33,7 +33,7 @@ msgstr ""
 
 #: src/UI/translate.ts:159
 msgid "{0} {1} NFT contract."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/ChainBoundary/index.tsx:113
 msgid "{0} network is not added in the wallet. Please add and try it again."
@@ -1112,15 +1112,15 @@ msgstr ""
 #: src/UI/components/AssetsManagement/CollectionList.tsx:286
 #: src/UI/components/VerifyNextIDDialog/index.tsx:295
 msgid "Send"
-msgstr "发送"
+msgstr "发送<<<<<<< HEAD"
 
 #: src/UI/translate.ts:149
 msgid "Send {0}"
 msgstr ""
 
 #: src/UI/translate.ts:119
 msgid "Send {0} successfully."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/VerifyNextIDDialog/index.tsx:237
 msgid "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again."

diff --git a/packages/shared/src/locale/zh-TW.json b/packages/shared/src/locale/zh-TW.json
@@ -1,9 +1,9 @@
 {
     "messages": {
-        "m/TPEz": "(beta)",
+        "m/TPEz": "<<<<<<< HEAD",
         "b/mMOj": [["0"], " ", ["1"], " approval successfully."],
         "BFhvNB": [["0"], " ", ["1"], " NFT contract successfully."],
-        "87Poy7": [["0"], " ", ["1"], " NFT contract."],
+        "87Poy7": "=======>>>>>>> main",
         "yHppI0": [["0"], " network is not added in the wallet. Please add and try it again."],
         "+A4TPN": [["0"], " NFT contract"],
         "iCG3eU": [["0"], " were successfully claimed"],
@@ -256,9 +256,9 @@
         "hzTib5": "选择 NFT 合约持有者",
         "bLJivk": "选择 NFT 合约持有者",
         "Xftpm5": "Select Collection",
-        "JlFcis": "发送",
+        "JlFcis": "<<<<<<< HEAD",
         "R9aEN5": ["Send ", ["0"]],
-        "MF5Dpb": ["Send ", ["0"], " successfully."],
+        "MF5Dpb": "=======>>>>>>> main",
         "xNR7Cd": "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again.",
         "Z8lGw6": "分享",
         "ZIsLZh": "大小限制：10 MB",

diff --git a/packages/shared/src/locale/zh-TW.po b/packages/shared/src/locale/zh-TW.po
@@ -21,7 +21,7 @@ msgstr ""
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:178
 #: src/UI/components/CompositionDialog/PluginEntryRender.tsx:216
 msgid "(beta)"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:141
 msgid "{0} {1} approval successfully."
@@ -33,7 +33,7 @@ msgstr ""
 
 #: src/UI/translate.ts:159
 msgid "{0} {1} NFT contract."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/ChainBoundary/index.tsx:113
 msgid "{0} network is not added in the wallet. Please add and try it again."
@@ -1112,15 +1112,15 @@ msgstr ""
 #: src/UI/components/AssetsManagement/CollectionList.tsx:286
 #: src/UI/components/VerifyNextIDDialog/index.tsx:295
 msgid "Send"
-msgstr ""
+msgstr "<<<<<<< HEAD"
 
 #: src/UI/translate.ts:149
 msgid "Send {0}"
 msgstr ""
 
 #: src/UI/translate.ts:119
 msgid "Send {0} successfully."
-msgstr ""
+msgstr "=======>>>>>>> main"
 
 #: src/UI/components/VerifyNextIDDialog/index.tsx:237
 msgid "Sent verification post successfully.<0/> <1/>You could check the verification result on Mask Pop-up after few minutes. If failed, try sending verification post again."