diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/welcome-to-superalgos-002-tutorial-step-use-chrome-or-safari.json b/Projects/Superalgos/Schemas/Docs-Tutorials/welcome-to-superalgos-002-tutorial-step-use-chrome-or-safari.json index 0ab3012b0..5b51fd8de 100644 --- a/Projects/Superalgos/Schemas/Docs-Tutorials/welcome-to-superalgos-002-tutorial-step-use-chrome-or-safari.json +++ b/Projects/Superalgos/Schemas/Docs-Tutorials/welcome-to-superalgos-002-tutorial-step-use-chrome-or-safari.json @@ -11,15 +11,13 @@ "updated": 1610612226890, "translations": [ { -<<<<<<< HEAD "language": "ID", "text": "Saat menjalankan frontend ini, gunakan Chrome, atau Safari di Mac!. Kami developer tidak mencoba aplikasi ini di browser lain.", "updated": 1614417282628 -======= + },{ "language": "ES", "text": "Cuando ejecute el frontend, utilice Chrome o Safari en Mac. No hemos testeado otros navegadores\n", "updated": 1613594870172 ->>>>>>> 6feb21102a21798288ca4a695c443533363dc39b } ] }, @@ -29,15 +27,13 @@ "text": "It is a well-known fact that browsers behave differently, and we do know of features that do not work on other browsers. If you are on Chrome or Safari, click Next and continue. If not, do the following:", "translations": [ { -<<<<<<< HEAD "language": "ID", "text": "Sudah menjadi hal yang lumrah bahwa setiap browser berbeda, dan kami tentu saja tidak mengetahui fitur yang berfungsi di browser lain. Jika kamu menggunakan Chrome atau Safari, klik Next dan lanjutkan. Jika tidak, lakukan hal berikut:", "updated": 1614417395532 -======= + },{ "language": "ES", "text": "Sabemos que los navegadores se comportan de manera diferente, y sabemos de características que no funcionan en otros navegadores. Si está en Chrome o Safari, haga clic en Siguiente y continúe. Si no es así, haga lo siguiente:", "updated": 1613594916732 ->>>>>>> 6feb21102a21798288ca4a695c443533363dc39b } ] }, @@ -47,15 +43,13 @@ "updated": 1611086562247, "translations": [ { -<<<<<<< HEAD "language": "ID", "text": "Copy url diatas", "updated": 1614417516319 -======= + },{ "language": "ES", "text": "Copie la URL actual;", "updated": 1613594931424 ->>>>>>> 6feb21102a21798288ca4a695c443533363dc39b } ] }, @@ -65,15 +59,13 @@ "updated": 1611086588055, "translations": [ { -<<<<<<< HEAD "language": "ID", "text": "Tutup browser ini dan jangan tutup tutorialnya", "updated": 1614417498228 -======= + },{ "language": "ES", "text": "Cierre este navegador tal cual; no cierre el tutorial...", "updated": 1613594962637 ->>>>>>> 6feb21102a21798288ca4a695c443533363dc39b } ] }, @@ -83,15 +75,13 @@ "updated": 1611086617811, "translations": [ { -<<<<<<< HEAD "language": "ID", "text": "Buka Chrome/Safari dan salin url yang sudah dicopy. Kamu akan secepatnya kembali ke tutorial ini.", "updated": 1614417589615 -======= + },{ "language": "ES", "text": "Abra Chrome/Safari y pega la URL; ¡El tutorial debería estar abierto en este paso cuando vuelvas!", "updated": 1613595008059 ->>>>>>> 6feb21102a21798288ca4a695c443533363dc39b } ] }, @@ -100,17 +90,15 @@ "text": "We offer online support, but we can't help you with any other browser!", "translations": [ { -<<<<<<< HEAD "language": "ID", "text": "Kami memberikan bantuan online, tetapi kami tidak bisa membantumu dengan browser berbeda!", "updated": 1614417653352 -======= + },{ "language": "ES", "text": "Ofrecemos asistencia en línea, pero no podemos ayudarte otros navegadores.", "updated": 1613595041161 ->>>>>>> 6feb21102a21798288ca4a695c443533363dc39b } ] } ] -} \ No newline at end of file +}