From 3add431dba27f9040531c268ba2a14ed32ce0a47 Mon Sep 17 00:00:00 2001 From: sirpy Date: Fri, 11 Oct 2024 20:30:15 +0300 Subject: [PATCH] New Crowdin updates (#4307) * Update source file catalog.json * New translations catalog.json (French) * New translations catalog.json (Spanish) * New translations catalog.json (Arabic) * New translations catalog.json (Italian) * New translations catalog.json (Korean) * New translations catalog.json (Turkish) * New translations catalog.json (Ukrainian) * New translations catalog.json (Chinese Simplified) * New translations catalog.json (Chinese Traditional) * New translations catalog.json (English) * New translations catalog.json (Vietnamese) * New translations catalog.json (Portuguese, Brazilian) * New translations catalog.json (Indonesian) * New translations catalog.json (Bengali) * New translations catalog.json (Hindi) * New translations catalog.json (English, United Kingdom) * New translations catalog.json (Spanish, United States) * New translations catalog.json (Spanish, Latin America) * New translations catalog.json (French) * New translations catalog.json (Spanish) * New translations catalog.json (Arabic) * New translations catalog.json (Italian) * New translations catalog.json (Korean) * New translations catalog.json (Turkish) * New translations catalog.json (Ukrainian) * New translations catalog.json (Chinese Simplified) * New translations catalog.json (Chinese Traditional) * New translations catalog.json (English) * New translations catalog.json (Vietnamese) * New translations catalog.json (Portuguese, Brazilian) * New translations catalog.json (Indonesian) * New translations catalog.json (Bengali) * New translations catalog.json (Hindi) * New translations catalog.json (English, United Kingdom) * New translations catalog.json (Spanish, United States) * New translations catalog.json (Spanish, Latin America) * New translations catalog.json (French) * New translations catalog.json (Spanish) * New translations catalog.json (Arabic) * New translations catalog.json (Italian) * New translations catalog.json (Korean) * New translations catalog.json (Turkish) * New translations catalog.json (Ukrainian) * New translations catalog.json (Chinese Simplified) * New translations catalog.json (Chinese Traditional) * New translations catalog.json (English) * New translations catalog.json (Vietnamese) * New translations catalog.json (Portuguese, Brazilian) * New translations catalog.json (Indonesian) * New translations catalog.json (Bengali) * New translations catalog.json (Hindi) * New translations catalog.json (English, United Kingdom) * New translations catalog.json (Spanish, United States) * New translations catalog.json (Spanish, Latin America) * Update source file catalog.json * New translations catalog.json (French) * New translations catalog.json (Spanish) * New translations catalog.json (Arabic) * New translations catalog.json (Italian) * New translations catalog.json (Korean) * New translations catalog.json (Turkish) * New translations catalog.json (Ukrainian) * New translations catalog.json (Chinese Simplified) * New translations catalog.json (Chinese Traditional) * New translations catalog.json (English) * New translations catalog.json (Vietnamese) * New translations catalog.json (Portuguese, Brazilian) * New translations catalog.json (Indonesian) * New translations catalog.json (Bengali) * New translations catalog.json (Hindi) * New translations catalog.json (English, United Kingdom) * New translations catalog.json (Spanish, United States) * New translations catalog.json (Spanish, Latin America) * Update source file catalog.json * New translations catalog.json (French) * New translations catalog.json (Spanish) * New translations catalog.json (Italian) * New translations catalog.json (Korean) * New translations catalog.json (Turkish) * New translations catalog.json (Ukrainian) * New translations catalog.json (Chinese Simplified) * New translations catalog.json (Chinese Traditional) * New translations catalog.json (English) * New translations catalog.json (Vietnamese) * New translations catalog.json (Portuguese, Brazilian) * New translations catalog.json (Indonesian) * New translations catalog.json (Hindi) * New translations catalog.json (English, United Kingdom) * New translations catalog.json (Spanish, United States) * New translations catalog.json (Spanish, Latin America) * Update source file catalog.json * New translations catalog.json (Korean) * New translations catalog.json (Spanish) * New translations catalog.json (Spanish) * New translations catalog.json (Spanish) * update: gitignore * New translations catalog.json (French) * New translations catalog.json (Spanish) * New translations catalog.json (Arabic) * New translations catalog.json (Italian) * New translations catalog.json (Korean) * New translations catalog.json (Turkish) * New translations catalog.json (Ukrainian) * New translations catalog.json (Chinese Simplified) * New translations catalog.json (Chinese Traditional) * New translations catalog.json (English) * New translations catalog.json (Vietnamese) * New translations catalog.json (Portuguese, Brazilian) * New translations catalog.json (Indonesian) * New translations catalog.json (Bengali) * New translations catalog.json (Hindi) * New translations catalog.json (English, United Kingdom) * New translations catalog.json (Spanish, United States) * New translations catalog.json (Spanish, Latin America) * Update source file catalog.json * New translations catalog.json (Spanish, Latin America) --------- Co-authored-by: LewisB --- src/language/locales/ar/catalog.json | 19 +++++------ src/language/locales/bn/catalog.json | 19 +++++------ src/language/locales/en-gb/catalog.json | 2 +- src/language/locales/es-419/catalog.json | 42 +++++++++++++++++++++++- src/language/locales/es-us/catalog.json | 34 ++++++++++++++++++- src/language/locales/es/catalog.json | 34 ++++++++++++++++++- src/language/locales/fr/catalog.json | 34 ++++++++++++++++++- src/language/locales/hi/catalog.json | 34 ++++++++++++++++++- src/language/locales/id/catalog.json | 34 ++++++++++++++++++- src/language/locales/it/catalog.json | 34 ++++++++++++++++++- src/language/locales/ko/catalog.json | 34 ++++++++++++++++++- src/language/locales/pt-br/catalog.json | 34 ++++++++++++++++++- src/language/locales/tr/catalog.json | 34 ++++++++++++++++++- src/language/locales/uk/catalog.json | 34 ++++++++++++++++++- src/language/locales/vi/catalog.json | 34 ++++++++++++++++++- src/language/locales/zh-tw/catalog.json | 34 ++++++++++++++++++- src/language/locales/zh/catalog.json | 34 ++++++++++++++++++- 17 files changed, 489 insertions(+), 35 deletions(-) diff --git a/src/language/locales/ar/catalog.json b/src/language/locales/ar/catalog.json index a12e6c7183..2f7847a8ed 100644 --- a/src/language/locales/ar/catalog.json +++ b/src/language/locales/ar/catalog.json @@ -1,6 +1,6 @@ { "'Could not send magic-link email. Please try again.": "'لا يمكن إرسال بريد إلكتروني للرابط السحري. الرجاء المحاولة مرة أخرى.", - "* Remind them to claim G$’s so you could earn your reward": "* ذكّرهم بالحصول على G$، حتى تتمكن من كسب مكافأتك", + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -9,7 +9,6 @@ "12-word pass phrase:": "عبارة مرور 12 كلمة:", "<0>Claim cycle restart every day<1>at {claimCycleTime}": "<0>إعادة تشغيل دورة المطالبة كل يوم <1>في {claimCycleTime}", "<0>tALREADY REGISTERED?<1>{0}": "<0>tALREADY REGISTERED?<1>{0}", - "<0>{0}\n<1>{1} {2} <2>{3}": "<0>{0}\n<1>{1} {2} <2>{3}", "<0>{0}\n<1>{1}": "<0>{0}\n<1>{1}", "<0>{0}\n<1>{1}{2}<2>{3}": "<0>{0}\n<1>{1}{2}<2>{3}", "<0>{0}<1>support": "<0>{0}<1>support", @@ -28,6 +27,7 @@ "All": "الكل", "All your information at a glance to easily import GoodDollar to MetaMask": "جميع المعلومات الخاصة بك في نظرة سريعة لاستيراد دولار جميل بسهولة إلى MetaMask", "Allow": "Allow", + "Almost Ready": "Almost Ready", "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "اطلب من دعوتك الحصول على التحقق من خلال المطالبة بأول G$s", @@ -90,7 +90,6 @@ "Copy RPC": "Copy RPC", "Copy address": "Copy address", "Copy all to clipboard": "نسخ الكل إلى الحافظة", - "Copy invite link": "Copy invite link", "Copy link": "Copy link", "Copy the link below": "Copy the link below", "Copy to Clipboard": "نسخ إلى الحافظة", @@ -144,7 +143,7 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "الدولار الجيد هو نظام دفع مع دخل أساسي صغير مدمج بناء على تكنولوجيا البلوكشين.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", - "Help & Feedback": "المساعدة والملاحظات", + "Help & Documentation": "Help & Documentation", "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -175,7 +174,6 @@ "Invalid QR Value:": "Invalid QR Value:", "Invalid wallet address": "Invalid wallet address", "Invite a friend to earn {bounty} G$ after they {0} claim. They will also earn a {1} {2} G$ bonus.": "Invite a friend to earn {bounty} G$ after they {0} claim. They will also earn a {1} {2} G$ bonus.", - "Invite friends": "Invite friends", "Invite friends and earn G$'s": "قم بدعوة الأصدقاء وكسب G$'s", "Invite your friends now": "قم بدعوة أصدقائك الآن", "It keeps saying I have a twin but have never registered before": "It keeps saying I have a twin but have never registered before", @@ -231,6 +229,7 @@ "News": "الأخبار", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -275,7 +274,7 @@ "Please wait": "الرجاء الانتظار", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "الرجاء الانتظار حتى يكتمل التحقق الخاص بك", - "Preparing the wallet": "Preparing the wallet", + "Preparing Your Wallet": "Preparing Your Wallet", "Privacy Policy": "سياسة الخصوصية", "Privacy Policy & Terms": "سياسة الخصوصية و الشروط", "Processing Payment Link...": "جارٍ معالجة رابط الدفع...", @@ -322,7 +321,6 @@ "Settings": "الإعدادات", "Share": "مشاركة", "Share Your Invite Link": "شارك رابط الدعوة الخاص بك", - "Share invite Link": "Share invite Link", "Share it with sender": "Share it with sender", "Share it with your recipient": "Share it with your recipient", "Sign up (one last time, we promise {0})": "قم بالتسجيل (مرة واحدة في المرة الأخيرة، نحن نعد {0})", @@ -350,10 +348,12 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", "Terms of Use": "شروط الاستخدام", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "بفضل ملاحظاتك الرائعة تمكنا من تحسين محفظتنا. نأمل أن تستمتع بها الآن.", "Thanks, we verified your phone.": "شكرًا، قمنا بالتحقق من هاتفك.", "The G$ was sent successfully": "تم إرسال G$ بنجاح", + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", "The backup phrase has been copied to the clipboard": "تم نسخ الجملة الاحتياطية إلى الحافظة", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "لا يمكن إلغاء الدفع في هذا الوقت. الرجاء المحاولة مرة أخرى.", @@ -363,8 +363,8 @@ "There was a problem sending G$. Try again": "حدثت مشكلة في إرسال G$. حاول مرة أخرى", "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", - "This can't be changed later.": "لا يمكن تغيير هذا لاحقاً.", "This delay is to prevent misuse, thanks for understanding!": "هذا التأخير هو منع إساءة الاستخدام، شكرا على التفهم!", + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", "This might take a few seconds...": "قد يستغرق هذا بضع ثوان...", "This transaction failed": "فشلت هذه المعاملة", "This transaction might fail to save gas we recommend not to execute it": "قد تفشل هذه المعاملة في حفظ الغاز الذي نوصي بعدم تنفيذه", @@ -403,7 +403,6 @@ "We sent an email with recovery instructions for your wallet": "لقد أرسلنا رسالة بريد إلكتروني مع تعليمات الاسترداد للمحفظة الخاصة بك", "We sent you an email with your Magic Link": "أرسلنا لك رسالة بريد إلكتروني مع الرابط السحري الخاص بك", "We were unable to load the wallet.": "We were unable to load the wallet.", - "We're Preparing \nYour Wallet": "We're Preparing \nYour Wallet", "We're giving it to you for FREE, FOREVER.": "نحن نعطيه لك مجاناً", "We're sorry.": "نحن آسفون.", "We're sorry.\nThis transaction failed.": "We're sorry.\nThis transaction failed.", @@ -492,4 +491,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/bn/catalog.json b/src/language/locales/bn/catalog.json index 4ee6218896..0652fb144b 100644 --- a/src/language/locales/bn/catalog.json +++ b/src/language/locales/bn/catalog.json @@ -1,6 +1,6 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", - "* Remind them to claim G$’s so you could earn your reward": "* Remind them to claim G$’s so you could earn your reward", + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -9,7 +9,6 @@ "12-word pass phrase:": "12-word pass phrase:", "<0>Claim cycle restart every day<1>at {claimCycleTime}": "<0>Claim cycle restart every day<1>at {claimCycleTime}", "<0>tALREADY REGISTERED?<1>{0}": "<0>tALREADY REGISTERED?<1>{0}", - "<0>{0}\n<1>{1} {2} <2>{3}": "<0>{0}\n<1>{1} {2} <2>{3}", "<0>{0}\n<1>{1}": "<0>{0}\n<1>{1}", "<0>{0}\n<1>{1}{2}<2>{3}": "<0>{0}\n<1>{1}{2}<2>{3}", "<0>{0}<1>support": "<0>{0}<1>support", @@ -28,6 +27,7 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", + "Almost Ready": "Almost Ready", "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -90,7 +90,6 @@ "Copy RPC": "Copy RPC", "Copy address": "Copy address", "Copy all to clipboard": "Copy all to clipboard", - "Copy invite link": "Copy invite link", "Copy link": "Copy link", "Copy the link below": "Copy the link below", "Copy to Clipboard": "Copy to Clipboard", @@ -144,7 +143,7 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", - "Help & Feedback": "Help & Feedback", + "Help & Documentation": "Help & Documentation", "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -175,7 +174,6 @@ "Invalid QR Value:": "Invalid QR Value:", "Invalid wallet address": "Invalid wallet address", "Invite a friend to earn {bounty} G$ after they {0} claim. They will also earn a {1} {2} G$ bonus.": "Invite a friend to earn {bounty} G$ after they {0} claim. They will also earn a {1} {2} G$ bonus.", - "Invite friends": "Invite friends", "Invite friends and earn G$'s": "Invite friends and earn G$'s", "Invite your friends now": "Invite your friends now", "It keeps saying I have a twin but have never registered before": "It keeps saying I have a twin but have never registered before", @@ -231,6 +229,7 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -275,7 +274,7 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", - "Preparing the wallet": "Preparing the wallet", + "Preparing Your Wallet": "Preparing Your Wallet", "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -322,7 +321,6 @@ "Settings": "Settings", "Share": "Share", "Share Your Invite Link": "Share Your Invite Link", - "Share invite Link": "Share invite Link", "Share it with sender": "Share it with sender", "Share it with your recipient": "Share it with your recipient", "Sign up (one last time, we promise {0})": "Sign up (one last time, we promise {0})", @@ -350,10 +348,12 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,8 +363,8 @@ "There was a problem sending G$. Try again": "There was a problem sending G$. Try again", "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", - "This can't be changed later.": "This can't be changed later.", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -403,7 +403,6 @@ "We sent an email with recovery instructions for your wallet": "We sent an email with recovery instructions for your wallet", "We sent you an email with your Magic Link": "We sent you an email with your Magic Link", "We were unable to load the wallet.": "We were unable to load the wallet.", - "We're Preparing \nYour Wallet": "We're Preparing \nYour Wallet", "We're giving it to you for FREE, FOREVER.": "We're giving it to you for FREE, FOREVER.", "We're sorry.": "We're sorry.", "We're sorry.\nThis transaction failed.": "We're sorry.\nThis transaction failed.", @@ -492,4 +491,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/en-gb/catalog.json b/src/language/locales/en-gb/catalog.json index 9801abf60d..457ae77259 100644 --- a/src/language/locales/en-gb/catalog.json +++ b/src/language/locales/en-gb/catalog.json @@ -490,4 +490,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/es-419/catalog.json b/src/language/locales/es-419/catalog.json index 1b6f42ebc6..aa8c0eb30c 100644 --- a/src/language/locales/es-419/catalog.json +++ b/src/language/locales/es-419/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'No se pudo enviar el correo electrónico de enlace mágico. Por favor, inténtalo de nuevo.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* la transacción puede tardar", "* the transaction may take\na few seconds to complete": "* la transacción puede tardar\nunos segundos en completarse", "* works from any device": "* funciona desde cualquier dispositivo", @@ -27,7 +31,11 @@ "All": "Todos", "All your information at a glance to easily import GoodDollar to MetaMask": "Toda tu información de un vistazo para importar GoodDollar fácilmente a MetaMask", "Allow": "Permitir", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "Un problema inesperado durante la API de verifcación facil", "Approve": "Aprobar", "Ask your inviter to get verified by Claiming his first G$s": "Pídele a tu invitador que se verifique reclamando su primer G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar es un sistema de pago con un pequeño ingreso básico incorporado basado en la tecnología blockchain.", "GoodDollars are transferred": "Se transfieren los GoodDollars", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet podría no funcionar correctamente en este navegador\nPara obtener la mejor experiencia de usuario, utilice Chrome, Safari o el navegador nativo de su teléfono", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Ayude a expandir la red invitando a familiares, amigos y colegas a participar y reclamar sus ingresos diarios.\nCuanta más gente se una, más eficaz será GoodDollar para todos.", "Hi {firstName},\nyour wallet was recovered successfully": "Hola {firstName},\ntu billetera fue recuperada con éxito", "Hip hip hooray!\nWe have a new version :)": "¡Hurra!\nTenemos una nueva versión :)", @@ -229,7 +241,11 @@ "News": "Noticias", "Next": "Siguiente", "Next time\nyou can sign in\nfrom any device\nusing your": "La próxima vez\npuedes iniciar sesión\ndesde cualquier dispositivo\nusando tu", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "No Verificado", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "No hay suficiente saldo para ejecutar la transacción. Balance: {balance} Requerido: {gasRequired}", "Note:": "Nota:", @@ -274,7 +290,11 @@ "Please wait": "Por favor espere", "Please wait\nThis might take a few seconds": "Por favor espere, esto puede tardar unos segundos", "Please wait until your verification is completed": "Por favor, espere hasta que se complete su verificación", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Política de privacidad", "Privacy Policy & Terms": "Política de Privacidad y Términos", "Processing Payment Link...": "Procesando enlace de pago...", @@ -321,7 +341,11 @@ "Share": "Compartir", "Share Your Invite Link": "Comparte tu enlace de invitación", "Share it with sender": "Compartir con el remitente", +<<<<<<< HEAD + "Share it with your recipient": "Share it with your recipient", +======= "Share it with your recipient": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Sign up (one last time, we promise {0})": "Regístrate (una última vez, prometemos {0})", "Skip mobile verification": "Omitir verificación móvil", "So, let’s give it another shot...": "Vamos a volver a intentarlo...", @@ -347,12 +371,20 @@ "Switch chain": "Cambiar de blockchain", "Switch to {0}": "Cambiar a {0}", "Switch to {targetNetwork}": "Cambiar a {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Términos de uso", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Gracias a tus impresionantes comentarios hemos sido capaces de mejorar nuestra cartera. Esperamos que ahora disfrutes aún más.", "Thanks, we verified your phone.": "Gracias, hemos verificado tu teléfono.", "The G$ was sent successfully": "El G$ fue enviado con éxito", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "La frase de copia de seguridad ha sido copiada al portapapeles", "The community is depending on you!": "¡La comunidad depende de ti!", "The payment could not be canceled at this time. Please try again.": "El pago no pudo ser cancelado en este momento. Por favor, inténtalo de nuevo.", @@ -363,7 +395,11 @@ "There was a problem sending {token}. Check payment details.": "Hubo un problema al enviar {token}. Compruebe los detalles de pago.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "Este navegador no soporta acceso a la cámara\nen dispositivos iOS. ¡Lo sentimos!", "This delay is to prevent misuse, thanks for understanding!": "Este retraso es para evitar el mal uso, ¡gracias por entender!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "Esto puede tardar unos segundos...", "This transaction failed": "Esta transacción ha fallado", "This transaction might fail to save gas we recommend not to execute it": "Esta transacción podría fallar al ahorrar gas que recomendamos no ejecutarlo", @@ -490,4 +526,8 @@ "{label} RPC Address": "Dirección RPC {label}", "{language}": "{language}", "“Add to home screen\"": "“Añadir a la pantalla de inicio”" -} \ No newline at end of file +<<<<<<< HEAD +} +======= +} +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac diff --git a/src/language/locales/es-us/catalog.json b/src/language/locales/es-us/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/es-us/catalog.json +++ b/src/language/locales/es-us/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/es/catalog.json b/src/language/locales/es/catalog.json index 1b6f42ebc6..08817cbadd 100644 --- a/src/language/locales/es/catalog.json +++ b/src/language/locales/es/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'No se pudo enviar el correo electrónico de enlace mágico. Por favor, inténtalo de nuevo.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* la transacción puede tardar", "* the transaction may take\na few seconds to complete": "* la transacción puede tardar\nunos segundos en completarse", "* works from any device": "* funciona desde cualquier dispositivo", @@ -27,7 +31,11 @@ "All": "Todos", "All your information at a glance to easily import GoodDollar to MetaMask": "Toda tu información de un vistazo para importar GoodDollar fácilmente a MetaMask", "Allow": "Permitir", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "Un problema inesperado durante la API de verifcación facil", "Approve": "Aprobar", "Ask your inviter to get verified by Claiming his first G$s": "Pídele a tu invitador que se verifique reclamando su primer G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar es un sistema de pago con un pequeño ingreso básico incorporado basado en la tecnología blockchain.", "GoodDollars are transferred": "Se transfieren los GoodDollars", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet podría no funcionar correctamente en este navegador\nPara obtener la mejor experiencia de usuario, utilice Chrome, Safari o el navegador nativo de su teléfono", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Ayude a expandir la red invitando a familiares, amigos y colegas a participar y reclamar sus ingresos diarios.\nCuanta más gente se una, más eficaz será GoodDollar para todos.", "Hi {firstName},\nyour wallet was recovered successfully": "Hola {firstName},\ntu billetera fue recuperada con éxito", "Hip hip hooray!\nWe have a new version :)": "¡Hurra!\nTenemos una nueva versión :)", @@ -229,7 +241,11 @@ "News": "Noticias", "Next": "Siguiente", "Next time\nyou can sign in\nfrom any device\nusing your": "La próxima vez\npuedes iniciar sesión\ndesde cualquier dispositivo\nusando tu", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "No Verificado", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "No hay suficiente saldo para ejecutar la transacción. Balance: {balance} Requerido: {gasRequired}", "Note:": "Nota:", @@ -274,7 +290,11 @@ "Please wait": "Por favor espere", "Please wait\nThis might take a few seconds": "Por favor espere, esto puede tardar unos segundos", "Please wait until your verification is completed": "Por favor, espere hasta que se complete su verificación", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Política de privacidad", "Privacy Policy & Terms": "Política de Privacidad y Términos", "Processing Payment Link...": "Procesando enlace de pago...", @@ -347,12 +367,20 @@ "Switch chain": "Cambiar de blockchain", "Switch to {0}": "Cambiar a {0}", "Switch to {targetNetwork}": "Cambiar a {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Términos de uso", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Gracias a tus impresionantes comentarios hemos sido capaces de mejorar nuestra cartera. Esperamos que ahora disfrutes aún más.", "Thanks, we verified your phone.": "Gracias, hemos verificado tu teléfono.", "The G$ was sent successfully": "El G$ fue enviado con éxito", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "La frase de copia de seguridad ha sido copiada al portapapeles", "The community is depending on you!": "¡La comunidad depende de ti!", "The payment could not be canceled at this time. Please try again.": "El pago no pudo ser cancelado en este momento. Por favor, inténtalo de nuevo.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "Hubo un problema al enviar {token}. Compruebe los detalles de pago.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "Este navegador no soporta acceso a la cámara\nen dispositivos iOS. ¡Lo sentimos!", "This delay is to prevent misuse, thanks for understanding!": "Este retraso es para evitar el mal uso, ¡gracias por entender!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "Esto puede tardar unos segundos...", "This transaction failed": "Esta transacción ha fallado", "This transaction might fail to save gas we recommend not to execute it": "Esta transacción podría fallar al ahorrar gas que recomendamos no ejecutarlo", @@ -490,4 +522,4 @@ "{label} RPC Address": "Dirección RPC {label}", "{language}": "{language}", "“Add to home screen\"": "“Añadir a la pantalla de inicio”" -} \ No newline at end of file +} diff --git a/src/language/locales/fr/catalog.json b/src/language/locales/fr/catalog.json index 8e37a8a5da..b661b9dc41 100644 --- a/src/language/locales/fr/catalog.json +++ b/src/language/locales/fr/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "Impossible d'envoyer l'e-mail de lien magique. Veuillez réessayer.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "Tous", "All your information at a glance to easily import GoodDollar to MetaMask": "Toutes vos informations en un coup d'œil pour importer facilement GoodDollar dans MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Demandez à votre invité d'être vérifié en réclamant son premier G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar est un système de paiement avec un petit revenu de base intégré basé sur la technologie blockchain.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip-hanche !\nNous avons une nouvelle version :)", @@ -229,7 +241,11 @@ "News": "Actualités", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Veuillez patienter", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Veuillez patienter jusqu'à ce que votre vérification soit terminée", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Politique de confidentialité", "Privacy Policy & Terms": "Politique de confidentialité et conditions d'utilisation", "Processing Payment Link...": "Traitement du lien de paiement...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Conditions d'utilisation", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Grâce à vos commentaires géniaux, nous avons pu améliorer notre portefeuille. Nous espérons maintenant que vous l'apprécierez encore plus.", "Thanks, we verified your phone.": "Merci, nous avons vérifié votre téléphone.", "The G$ was sent successfully": "Le G$ a été envoyé avec succès", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "La phrase de sauvegarde a été copiée dans le presse-papiers", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "Le paiement n'a pas pu être annulé pour le moment. Veuillez réessayer.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "Ce délai est de prévenir toute utilisation abusive, merci pour votre compréhension!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "Cela peut prendre quelques secondes...", "This transaction failed": "Cette transaction a échoué", "This transaction might fail to save gas we recommend not to execute it": "Cette transaction peut échouer à économiser du gaz, nous vous recommandons de ne pas l'exécuter", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/hi/catalog.json b/src/language/locales/hi/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/hi/catalog.json +++ b/src/language/locales/hi/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/id/catalog.json b/src/language/locales/id/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/id/catalog.json +++ b/src/language/locales/id/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/it/catalog.json b/src/language/locales/it/catalog.json index 6908503f8d..940c982a6f 100644 --- a/src/language/locales/it/catalog.json +++ b/src/language/locales/it/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Impossibile inviare email magic-link. Per favore riprova.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "Tutti", "All your information at a glance to easily import GoodDollar to MetaMask": "Tutte le tue informazioni a colpo d'occhio per importare facilmente GoodDollar in MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Chiedi al tuo invitante di essere verificato rivendicando il suo primo G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar è un sistema di pagamento con un piccolo reddito di base incorporato basato sulla tecnologia blockchain.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Aiutare ad espandere la rete invitando familiari, amici e colleghi a partecipare e rivendicare il loro reddito quotidiano.\nPiù persone si uniscono, più sarà efficace GoodDollar per tutti.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nAbbiamo una nuova versione :)", @@ -229,7 +241,11 @@ "News": "Notizie", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Attendere prego", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Attendere fino al completamento della verifica", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Politica Sulla Privacy", "Privacy Policy & Terms": "Informativa Sulla Privacy & Termini", "Processing Payment Link...": "Elaborazione Collegamento Di Pagamento:", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Termini di utilizzo", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Grazie al tuo fantastico feedback siamo stati in grado di migliorare il nostro portafoglio. Speriamo che ora ti piacerà ancora di più.", "Thanks, we verified your phone.": "Grazie, abbiamo verificato il tuo telefono.", "The G$ was sent successfully": "Il G$ è stato inviato con successo", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "La frase di backup è stata copiata negli appunti", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "Il pagamento non può essere annullato in questo momento. Per favore riprova.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "Questo ritardo è quello di prevenire gli abusi, grazie per la comprensione!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "Questo potrebbe richiedere qualche secondo...", "This transaction failed": "Questa transazione non è riuscita", "This transaction might fail to save gas we recommend not to execute it": "Questa transazione potrebbe non riuscire a salvare gas si consiglia di non eseguirla", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/ko/catalog.json b/src/language/locales/ko/catalog.json index 9a53f82921..8e550e9103 100644 --- a/src/language/locales/ko/catalog.json +++ b/src/language/locales/ko/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "매직 링크 이메일을 보낼 수 없습니다. 다시 시도해 주세요.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/pt-br/catalog.json b/src/language/locales/pt-br/catalog.json index a68b434195..4efa998f3b 100644 --- a/src/language/locales/pt-br/catalog.json +++ b/src/language/locales/pt-br/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Não foi possível enviar e-mail de link mágico. Por favor, tente novamente.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "Todos", "All your information at a glance to easily import GoodDollar to MetaMask": "Todas as suas informações rapidamente para importar facilmente GoodDollar para MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Peça ao seu convidado que seja verificado coletando o seus primeiros G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar é um sistema de pagamento com renda básica embutida construído utilizando tecnologia blockchain.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Ajude a aumentar a rede convidando família, amigos e conhecidos para participar e coletar suas rendas básicas.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nTemos uma nova versão :)", @@ -229,7 +241,11 @@ "News": "Novidades", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Por favor, aguarde", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Por favor aguarde até que a verificação seja concluída", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Política de Privacidade", "Privacy Policy & Terms": "Política de Privacidade e Termos", "Processing Payment Link...": "Processando link de pagamento...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Termos de Uso", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Graças aos seus incríveis comentários, conseguimos melhorar nossa carteira. Esperamos que agora você vai desfrutar ainda mais.", "Thanks, we verified your phone.": "Obrigado, nós verificamos seu telefone.", "The G$ was sent successfully": "Os g$ foram enviados com sucesso", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "A frase de backup foi copiada para a área de transferência", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "O pagamento não pôde ser cancelado neste momento. Por favor, tente novamente.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "Este atraso destina-se a evitar abusos, obrigado por entender!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "Isso pode levar alguns segundos...", "This transaction failed": "Falha na Transação", "This transaction might fail to save gas we recommend not to execute it": "Esta transação pode não conseguir economizar gás. Recomendamos não executá-la.", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/tr/catalog.json b/src/language/locales/tr/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/tr/catalog.json +++ b/src/language/locales/tr/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/uk/catalog.json b/src/language/locales/uk/catalog.json index 0e70e48277..102fe2e731 100644 --- a/src/language/locales/uk/catalog.json +++ b/src/language/locales/uk/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "Не вдається надіслати посилання для відновлення облікового запису на електронну адресу. Будь ласка, спробуйте пізніше.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "Всі", "All your information at a glance to easily import GoodDollar to MetaMask": "Вся ваша інформація за поглядом, щоб легко імпортувати Гуддолар до МетаМаску", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Попросіть вашого запрошення, щоб було перевірено шляхом виконання його першого G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "Гуддолар - це платіжна система з невеликим основним доходом, що базується на технології блокчейнів.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Допоможіть розширити мережу, запросивши сім'ю, друзів та колег до участі та заявляючи про їх щоденний дохід.\nЧим більше людей приєднуються, тим ефективнішим буде Гудляр, для всіх.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "Новини", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Будь ласка, зачекайте", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Будь ласка, зачекайте поки підтвердження не буде завершено", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Політика конфіденційності", "Privacy Policy & Terms": "Політика конфіденційності та умови", "Processing Payment Link...": "Обробка платіжного посилання...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Умови користування", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Завдяки вашому крутому відгуку ми змогли б покращити наш гаманець. Тепер ми сподіваємося, що вам сподобається ще більше.", "Thanks, we verified your phone.": "Дякуємо, ми підтвердили ваш телефон.", "The G$ was sent successfully": "G$ успішно відправлено", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "Фраза резервного копіювання скопійована в буфер обміну", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "Оплата не може бути скасована в даний час. Будь ласка, спробуйте ще раз.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "Ця затримка для запобігання неправильного використання, завдяки для розуміння!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "Це може зайняти кілька секунд...", "This transaction failed": "Ця транзакція не вдалася", "This transaction might fail to save gas we recommend not to execute it": "Ця операція може не змогти зберегти газ, який ми рекомендуємо не виконувати", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/vi/catalog.json b/src/language/locales/vi/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/vi/catalog.json +++ b/src/language/locales/vi/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/zh-tw/catalog.json b/src/language/locales/zh-tw/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/zh-tw/catalog.json +++ b/src/language/locales/zh-tw/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +} diff --git a/src/language/locales/zh/catalog.json b/src/language/locales/zh/catalog.json index 9801abf60d..7d2f1a3d77 100644 --- a/src/language/locales/zh/catalog.json +++ b/src/language/locales/zh/catalog.json @@ -1,6 +1,10 @@ { "'Could not send magic-link email. Please try again.": "'Could not send magic-link email. Please try again.", +<<<<<<< HEAD + "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "* If pending, remind them to claim their UBI so that you can receive your G$ reward.", +======= "* If pending, remind them to claim their UBI so that you can receive your G$ reward.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "* the transaction may take": "* the transaction may take", "* the transaction may take\na few seconds to complete": "* the transaction may take\na few seconds to complete", "* works from any device": "* works from any device", @@ -27,7 +31,11 @@ "All": "All", "All your information at a glance to easily import GoodDollar to MetaMask": "All your information at a glance to easily import GoodDollar to MetaMask", "Allow": "Allow", +<<<<<<< HEAD + "Almost Ready": "Almost Ready", +======= "Almost Ready": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "An unexpected issue during the face verification API call": "An unexpected issue during the face verification API call", "Approve": "Approve", "Ask your inviter to get verified by Claiming his first G$s": "Ask your inviter to get verified by Claiming his first G$s", @@ -143,7 +151,11 @@ "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.", "GoodDollars are transferred": "GoodDollars are transferred", "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser", +<<<<<<< HEAD + "Help & Documentation": "Help & Documentation", +======= "Help & Documentation": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.", "Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully", "Hip hip hooray!\nWe have a new version :)": "Hip hip hooray!\nWe have a new version :)", @@ -229,7 +241,11 @@ "News": "News", "Next": "Next", "Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your", +<<<<<<< HEAD + "No thanks, I’ll keep using this GoodWallet": "No thanks, I’ll keep using this GoodWallet", +======= "No thanks, I’ll keep using this GoodWallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Not Verified": "Not Verified", "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}", "Note:": "Note:", @@ -274,7 +290,11 @@ "Please wait": "Please wait", "Please wait\nThis might take a few seconds": "Please wait\nThis might take a few seconds", "Please wait until your verification is completed": "Please wait until your verification is completed", +<<<<<<< HEAD + "Preparing Your Wallet": "Preparing Your Wallet", +======= "Preparing Your Wallet": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Privacy Policy": "Privacy Policy", "Privacy Policy & Terms": "Privacy Policy & Terms", "Processing Payment Link...": "Processing Payment Link...", @@ -347,12 +367,20 @@ "Switch chain": "Switch chain", "Switch to {0}": "Switch to {0}", "Switch to {targetNetwork}": "Switch to {targetNetwork}", +<<<<<<< HEAD + "TAKE ME TO THE NEW GOODWALLET": "TAKE ME TO THE NEW GOODWALLET", +======= "TAKE ME TO THE NEW GOODWALLET": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "Terms of Use": "Terms of Use", "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.": "Thanks to your awesome feedback we were able to improve our wallet. We hope now you’ll enjoy it even more.", "Thanks, we verified your phone.": "Thanks, we verified your phone.", "The G$ was sent successfully": "The G$ was sent successfully", +<<<<<<< HEAD + "The New GoodWallet allows you to:": "The New GoodWallet allows you to:", +======= "The New GoodWallet allows you to:": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "The backup phrase has been copied to the clipboard": "The backup phrase has been copied to the clipboard", "The community is depending on you!": "The community is depending on you!", "The payment could not be canceled at this time. Please try again.": "The payment could not be canceled at this time. Please try again.", @@ -363,7 +391,11 @@ "There was a problem sending {token}. Check payment details.": "There was a problem sending {token}. Check payment details.", "This browser doesn't support\ncamera access on iOS devices. Sorry!": "This browser doesn't support\ncamera access on iOS devices. Sorry!", "This delay is to prevent misuse, thanks for understanding!": "This delay is to prevent misuse, thanks for understanding!", +<<<<<<< HEAD + "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.", +======= "This is what people will see when you send or receive transactions. You can change it at any time in your Profile.": "", +>>>>>>> 743d4c607bf1cc1a5475fde717055ff1302e79ac "This might take a few seconds...": "This might take a few seconds...", "This transaction failed": "This transaction failed", "This transaction might fail to save gas we recommend not to execute it": "This transaction might fail to save gas we recommend not to execute it", @@ -490,4 +522,4 @@ "{label} RPC Address": "{label} RPC Address", "{language}": "{language}", "“Add to home screen\"": "“Add to home screen\"" -} \ No newline at end of file +}