Skip to content

Commit 76485ec

Browse files
ruixhuangruixhuang
committed
Merge branch 'main' into features/deposit
2 parents 6b0d370 + 2a182dc commit 76485ec

File tree

12 files changed

+62
-17
lines changed

12 files changed

+62
-17
lines changed

‎config/localization/de/app.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "Order-Wert",
278278
"OTHER_DETAILS": "Weitere Details",
279279
"OTHER": "Andere",
280+
"OTHER_TOKENS": "Andere Token",
281+
"OUR_TERMS_AND_CONDITIONS": "Nutzungsbedingungen",
280282
"OVERVIEW": "Übersicht",
281283
"PASTE": "Einfügen",
282284
"PENDING_REWARDS": "Ausstehende Rewards",
@@ -329,6 +331,7 @@
329331
"SELECT": "Auswählen {SELECTION}",
330332
"SELECT_ASSET": "Wählen Sie ein Asset aus",
331333
"SELECT_CHAIN": "Wählen Sie eine Kette",
334+
"SELECT_TOKEN": "Token auswählen",
332335
"SELL": "Verkaufen",
333336
"SEND": "Senden",
334337
"SHARE": "Teilen",
@@ -419,7 +422,8 @@
419422
"YES": "Ja",
420423
"YOU": "Sie",
421424
"YOUR_ACCOUNT": "Ihr Konto",
422-
"YOUR_POSITIONS": "Ihre Positionen"
425+
"YOUR_POSITIONS": "Ihre Positionen",
426+
"YOUR_TOKENS": "Ihre Token"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,7 +1490,8 @@
14861490
"FUNDING_RATE_1H_SHORT": "1h Finanzierung",
14871491
"FUNDING_RATE_DURATION_SHORT": "{DURATION} Finanzierung",
14881492
"FUNDING_RATE": "Geschätzte 1h Finanzierung",
1489-
"GOOD_TIL_DATE_ABBREVIATED": "Good Til",
1493+
"FUNDING_RATE_SHORT": "Finanzierungsrate",
1494+
"GOOD_TIL_DATE_ABBREVIATED": "Gültig bis",
14901495
"GOOD_TIL_DATE": "Gut bis Datum",
14911496
"GOOD_TIL_TIME": "Gut bis Zeit",
14921497
"GOOD_TIL": "Good Til",

‎config/localization/es/app.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,9 @@
277277
"ORDER_VALUE": "Valor de orden",
278278
"OTHER_DETAILS": "Otros detalles",
279279
"OTHER": "Otro",
280-
"OVERVIEW": "Visión general",
280+
"OTHER_TOKENS": "Otros tokens",
281+
"OUR_TERMS_AND_CONDITIONS": "Términos de Uso",
282+
"OVERVIEW": "Resumen General",
281283
"PASTE": "Pegar",
282284
"PENDING_REWARDS": "Recompensas Pendientes",
283285
"PENDING": "Pendiente",
@@ -329,6 +331,7 @@
329331
"SELECT": "Seleccionar {SELECTION}",
330332
"SELECT_ASSET": "Seleccionar un activo",
331333
"SELECT_CHAIN": "Seleccionar una cadena",
334+
"SELECT_TOKEN": "Seleccionar token",
332335
"SELL": "Vender",
333336
"SEND": "Enviar",
334337
"SHARE": "Compartir",
@@ -419,7 +422,8 @@
419422
"YES": "Sí",
420423
"YOU": "Tú",
421424
"YOUR_ACCOUNT": "Tu cuenta",
422-
"YOUR_POSITIONS": "Tus posiciones"
425+
"YOUR_POSITIONS": "Tus posiciones",
426+
"YOUR_TOKENS": "Sus tokens"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,7 +1490,8 @@
14861490
"FUNDING_RATE_1H_SHORT": "Financiación de 1 hora",
14871491
"FUNDING_RATE_DURATION_SHORT": "Financiamiento {DURATION}",
14881492
"FUNDING_RATE": "Financiación estimada de 1 hora",
1489-
"GOOD_TIL_DATE_ABBREVIATED": "Good Til",
1493+
"FUNDING_RATE_SHORT": "Tasa de financiación",
1494+
"GOOD_TIL_DATE_ABBREVIATED": "Con validez hasta",
14901495
"GOOD_TIL_DATE": "Fecha de Good Til",
14911496
"GOOD_TIL_TIME": "Hora de Good Til",
14921497
"GOOD_TIL": "Good Til",

‎config/localization/fr/app.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "Valeur de l'ordre",
278278
"OTHER_DETAILS": "Autres détails",
279279
"OTHER": "Autre",
280+
"OTHER_TOKENS": "Autres chèques cadeaux",
281+
"OUR_TERMS_AND_CONDITIONS": "Conditions d'utilisation",
280282
"OVERVIEW": "Aperçu",
281283
"PASTE": "Coller",
282284
"PENDING_REWARDS": "Récompenses en attente",
@@ -329,6 +331,7 @@
329331
"SELECT": "Sélectionner {SELECTION}",
330332
"SELECT_ASSET": "Sélectionner un actif",
331333
"SELECT_CHAIN": "Sélectionnez une chaîne",
334+
"SELECT_TOKEN": "Sélectionner le chèque cadeau",
332335
"SELL": "Vendre",
333336
"SEND": "Envoyer",
334337
"SHARE": "Partager",
@@ -419,7 +422,8 @@
419422
"YES": "Oui",
420423
"YOU": "Vous",
421424
"YOUR_ACCOUNT": "Votre compte",
422-
"YOUR_POSITIONS": "Vos positions"
425+
"YOUR_POSITIONS": "Vos positions",
426+
"YOUR_TOKENS": "Vos chèques cadeaux"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,6 +1490,7 @@
14861490
"FUNDING_RATE_1H_SHORT": "Financement 1 h",
14871491
"FUNDING_RATE_DURATION_SHORT": "{DURATION} Financement",
14881492
"FUNDING_RATE": "Financement estimé de 1h",
1493+
"FUNDING_RATE_SHORT": "Taux de financement",
14891494
"GOOD_TIL_DATE_ABBREVIATED": "Good Til",
14901495
"GOOD_TIL_DATE": "Good Til Date",
14911496
"GOOD_TIL_TIME": "Good Til Time",

‎config/localization/ja/app.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "注文価値",
278278
"OTHER_DETAILS": "その他の詳細",
279279
"OTHER": "その他",
280+
"OTHER_TOKENS": "その他のトークン",
281+
"OUR_TERMS_AND_CONDITIONS": "利用規約",
280282
"OVERVIEW": "概要",
281283
"PASTE": "ペースト",
282284
"PENDING_REWARDS": "保留中の報酬",
@@ -329,6 +331,7 @@
329331
"SELECT": "{SELECTION}を選択",
330332
"SELECT_ASSET": "資産を選択",
331333
"SELECT_CHAIN": "チェーンを選択",
334+
"SELECT_TOKEN": "トークンを選択",
332335
"SELL": "売り",
333336
"SEND": "送信",
334337
"SHARE": "シェア",
@@ -419,7 +422,8 @@
419422
"YES": "あり",
420423
"YOU": "お客様",
421424
"YOUR_ACCOUNT": "お客様の口座",
422-
"YOUR_POSITIONS": "お客様のポジション"
425+
"YOUR_POSITIONS": "お客様のポジション",
426+
"YOUR_TOKENS": "お客様のトークン"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,6 +1490,7 @@
14861490
"FUNDING_RATE_1H_SHORT": "1時間ファンディング",
14871491
"FUNDING_RATE_DURATION_SHORT": "{DURATION}ファンディング",
14881492
"FUNDING_RATE": "1時間ファンディング見積額",
1493+
"FUNDING_RATE_SHORT": "ファンディングレート",
14891494
"GOOD_TIL_DATE_ABBREVIATED": "有効期限",
14901495
"GOOD_TIL_DATE": "有効期限日",
14911496
"GOOD_TIL_TIME": "指定時間まで有効",

‎config/localization/ko/app.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "주문 값",
278278
"OTHER_DETAILS": "기타 세부 사항",
279279
"OTHER": "기타",
280+
"OTHER_TOKENS": "기타 토큰",
281+
"OUR_TERMS_AND_CONDITIONS": "이용약관",
280282
"OVERVIEW": "개요",
281283
"PASTE": "붙여넣기",
282284
"PENDING_REWARDS": "보류 중인 보상",
@@ -329,6 +331,7 @@
329331
"SELECT": "{SELECTION} 선택",
330332
"SELECT_ASSET": "자산 선택",
331333
"SELECT_CHAIN": "체인 선택",
334+
"SELECT_TOKEN": "토큰 선택",
332335
"SELL": "매도",
333336
"SEND": "전송",
334337
"SHARE": "공유",
@@ -419,7 +422,8 @@
419422
"YES": "예",
420423
"YOU": "귀하",
421424
"YOUR_ACCOUNT": "귀하의 계정",
422-
"YOUR_POSITIONS": "내 포지션"
425+
"YOUR_POSITIONS": "내 포지션",
426+
"YOUR_TOKENS": "귀하의 토큰"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,6 +1490,7 @@
14861490
"FUNDING_RATE_1H_SHORT": "1시간 펀딩",
14871491
"FUNDING_RATE_DURATION_SHORT": "{DURATION} 펀딩",
14881492
"FUNDING_RATE": "예상 1시간 펀딩",
1493+
"FUNDING_RATE_SHORT": "펀딩 비율",
14891494
"GOOD_TIL_DATE_ABBREVIATED": "유효 주문(Good Til)",
14901495
"GOOD_TIL_DATE": "유효 주문 날짜",
14911496
"GOOD_TIL_TIME": "지정일 전 유효 주문",

‎config/localization/pt/app.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "Valor da ordem",
278278
"OTHER_DETAILS": "Outros detalhes",
279279
"OTHER": "Outro",
280+
"OTHER_TOKENS": "Outros tokens",
281+
"OUR_TERMS_AND_CONDITIONS": "Termos de uso",
280282
"OVERVIEW": "Visão geral",
281283
"PASTE": "Colar",
282284
"PENDING_REWARDS": "Recompensas pendentes",
@@ -329,6 +331,7 @@
329331
"SELECT": "Selecione {SELECTION}",
330332
"SELECT_ASSET": "Selecione um ativo",
331333
"SELECT_CHAIN": "Selecione uma cadeia",
334+
"SELECT_TOKEN": "Selecionar token",
332335
"SELL": "Vender",
333336
"SEND": "Enviar",
334337
"SHARE": "Compartilhar",
@@ -419,7 +422,8 @@
419422
"YES": "Sim",
420423
"YOU": "Você",
421424
"YOUR_ACCOUNT": "Sua conta",
422-
"YOUR_POSITIONS": "Suas posições"
425+
"YOUR_POSITIONS": "Suas posições",
426+
"YOUR_TOKENS": "Seus tokens"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,7 +1490,8 @@
14861490
"FUNDING_RATE_1H_SHORT": "Financiamento de 1h",
14871491
"FUNDING_RATE_DURATION_SHORT": "Financiamento de {DURATION}",
14881492
"FUNDING_RATE": "Financiamento estimado em 1h",
1489-
"GOOD_TIL_DATE_ABBREVIATED": "Válido até",
1493+
"FUNDING_RATE_SHORT": "Taxa de financiamento",
1494+
"GOOD_TIL_DATE_ABBREVIATED": "Válida até",
14901495
"GOOD_TIL_DATE": "Data de validade",
14911496
"GOOD_TIL_TIME": "Hora de validade",
14921497
"GOOD_TIL": "Válido até",

‎config/localization/ru/app.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "Стоимость ордера",
278278
"OTHER_DETAILS": "Другие сведения",
279279
"OTHER": "Другое",
280+
"OTHER_TOKENS": "Другие токены",
281+
"OUR_TERMS_AND_CONDITIONS": "Пользовательское соглашение",
280282
"OVERVIEW": "Обзор",
281283
"PASTE": "Вставить",
282284
"PENDING_REWARDS": "Награды, ожидающие получения",
@@ -329,6 +331,7 @@
329331
"SELECT": "Выберите {SELECTION}",
330332
"SELECT_ASSET": "Выберите актив",
331333
"SELECT_CHAIN": "Выберите цепочку",
334+
"SELECT_TOKEN": "Выберите токен",
332335
"SELL": "Продать",
333336
"SEND": "Отправить",
334337
"SHARE": "Поделиться",
@@ -419,7 +422,8 @@
419422
"YES": "Да",
420423
"YOU": "Вы",
421424
"YOUR_ACCOUNT": "Ваш счет",
422-
"YOUR_POSITIONS": "Ваши позиции"
425+
"YOUR_POSITIONS": "Ваши позиции",
426+
"YOUR_TOKENS": "Ваши токены"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,6 +1490,7 @@
14861490
"FUNDING_RATE_1H_SHORT": "Финансирование за 1 ч",
14871491
"FUNDING_RATE_DURATION_SHORT": "Финансирование за {DURATION}",
14881492
"FUNDING_RATE": "Предполагаемое финансирование за 1 ч",
1493+
"FUNDING_RATE_SHORT": "Ставка финансирования",
14891494
"GOOD_TIL_DATE_ABBREVIATED": "Действительно до",
14901495
"GOOD_TIL_DATE": "Действительно до даты",
14911496
"GOOD_TIL_TIME": "Действительно до даты",

‎config/localization/tr/app.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "Emir Değeri",
278278
"OTHER_DETAILS": "Diğer ayrıntılar",
279279
"OTHER": "Diğer",
280+
"OTHER_TOKENS": "Diğer token'lar",
281+
"OUR_TERMS_AND_CONDITIONS": "Kullanım Şartları",
280282
"OVERVIEW": "Genel bakış",
281283
"PASTE": "Yapıştır",
282284
"PENDING_REWARDS": "Bekleyen Ödüller",
@@ -329,6 +331,7 @@
329331
"SELECT": "{SELECTION} seçin",
330332
"SELECT_ASSET": "Bir varlık seçin",
331333
"SELECT_CHAIN": "Bir zincir seçin",
334+
"SELECT_TOKEN": "Token seçin",
332335
"SELL": "Sat",
333336
"SEND": "Gönder",
334337
"SHARE": "Paylaş",
@@ -419,7 +422,8 @@
419422
"YES": "Evet",
420423
"YOU": "Siz",
421424
"YOUR_ACCOUNT": "Hesabınız",
422-
"YOUR_POSITIONS": "Pozisyonlarınız"
425+
"YOUR_POSITIONS": "Pozisyonlarınız",
426+
"YOUR_TOKENS": "Token'larınız"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,6 +1490,7 @@
14861490
"FUNDING_RATE_1H_SHORT": "1 Saatlik Fonlama",
14871491
"FUNDING_RATE_DURATION_SHORT": "{DURATION} Fonlama",
14881492
"FUNDING_RATE": "Tahmini 1 Saatlik Fonlama",
1493+
"FUNDING_RATE_SHORT": "Fonlama Oranı",
14891494
"GOOD_TIL_DATE_ABBREVIATED": "Geçerlilik",
14901495
"GOOD_TIL_DATE": "Geçerlilik Tarihi",
14911496
"GOOD_TIL_TIME": "Geçerlilik Zamanı",

‎config/localization/zh-CN/app.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@
277277
"ORDER_VALUE": "订单价值",
278278
"OTHER_DETAILS": "其他详情",
279279
"OTHER": "其他",
280+
"OTHER_TOKENS": "其他代币",
281+
"OUR_TERMS_AND_CONDITIONS": "使用条款",
280282
"OVERVIEW": "概述",
281283
"PASTE": "粘贴",
282284
"PENDING_REWARDS": "待处理奖励",
@@ -329,6 +331,7 @@
329331
"SELECT": "选择 {SELECTION}",
330332
"SELECT_ASSET": "选择资产",
331333
"SELECT_CHAIN": "选择一条链",
334+
"SELECT_TOKEN": "选择代币",
332335
"SELL": "卖出",
333336
"SEND": "发送",
334337
"SHARE": "共享",
@@ -419,7 +422,8 @@
419422
"YES": "是",
420423
"YOU": "您",
421424
"YOUR_ACCOUNT": "您的账户",
422-
"YOUR_POSITIONS": "你的仓位"
425+
"YOUR_POSITIONS": "你的仓位",
426+
"YOUR_TOKENS": "您的代币"
423427
},
424428
"__ASSETS": {
425429
"ZRX": {
@@ -1486,6 +1490,7 @@
14861490
"FUNDING_RATE_1H_SHORT": "1小时资金费率",
14871491
"FUNDING_RATE_DURATION_SHORT": "{DURATION} 提供资金",
14881492
"FUNDING_RATE": "估计 1 小时资金",
1493+
"FUNDING_RATE_SHORT": "资金费率",
14891494
"GOOD_TIL_DATE_ABBREVIATED": "有效至",
14901495
"GOOD_TIL_DATE": "有效截止日期",
14911496
"GOOD_TIL_TIME": "有效截止时间",

‎config/localizations_native/zh-CN/app.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@
447447
"SETTLEMENT_OUTCOMES_DESCRIPTION": "如果事件发生，市场将自动结算为 1 美元。否则将以约 0 美元结算。 价格相当于结果发生的概率。"
448448
},
449449
"VAULT": {
450-
"LAUNCH_MARKET_LINE1": "添加到 MegaVault {DEPOSIT_AMOUNT}的要求",
450+
"LAUNCH_MARKET_LINE1": "需要将 {DEPOSIT_AMOUNT} 添加到 MegaVault",
451451
"LAUNCH_MARKET_LINE2": "MegaVault 拥有预估{APR}年利率"
452452
},
453453
"SIMPLE_UI": {

0 commit comments

Comments
 (0)