fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

french translation conflict fixed

Browse Source
This commit is contained in:
thaissmolina75 committed 2021-06-24 12:06:31 -04:00
1 parent 2eb8e76000
commit 9d8ab73c29
1 file changed
+3 -26
Download Patch File Download Diff File Expand all files Collapse all files
Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
+3 -26
View File
@@ -31,12 +31,8 @@
{
"language": "FR",
"text": "Lorsque vous exécutez le frontend, utilisez Chrome, ou Safari sur Mac, nous ne faisons pas de tests sur d'autres navigateurs !",
<<<<<<< HEAD:Projects/Superalgos/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
"updated": 1623950198517,
"style": "Definition"
=======
"updated": 1623950198517
>>>>>>> 5d109c271da2e554958b5bf4e5c8a5b3a1893517:Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
}
]
},
@@ -63,16 +59,13 @@
"updated": 1614712436380,
"style": "Text"
},
{
{
"language": "FR",
"text": "Il est connu que les navigateurs se comportent différemment, et nous connaissons certaines fonctionnalités qui fonctionnent sur certains mais pas d'autres... Si vous êtes sur Chrome ou Safari, cliquez sur Suivant et continuez. Sinon, procédez comme suit :",
<<<<<<< HEAD:Projects/Superalgos/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
"updated": 1623950316276,
"updated": 1624490502941,
"style": "Text"
=======
"updated": 1623950316276
>>>>>>> 5d109c271da2e554958b5bf4e5c8a5b3a1893517:Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
}
]
},
{
@@ -101,12 +94,8 @@
{
"language": "FR",
"text": "copier le current URL",
<<<<<<< HEAD:Projects/Superalgos/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
"updated": 1623950336897,
"style": "List"
=======
"updated": 1623950336897
>>>>>>> 5d109c271da2e554958b5bf4e5c8a5b3a1893517:Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
}
]
},
@@ -136,12 +125,8 @@
{
"language": "FR",
"text": "fermer le present navigateur, sans user le tutoriel",
<<<<<<< HEAD:Projects/Superalgos/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
"updated": 1623950409166,
"style": "List"
=======
"updated": 1623950409166
>>>>>>> 5d109c271da2e554958b5bf4e5c8a5b3a1893517:Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
}
]
},
@@ -171,12 +156,8 @@
{
"language": "FR",
"text": "Ouvrez Chrome/Safari et coller l'URL ; le tutoriel devrait apparaître à cette étape une fois chargé !",
<<<<<<< HEAD:Projects/Superalgos/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
"updated": 1623950524635,
"style": "List"
=======
"updated": 1623950524635
>>>>>>> 5d109c271da2e554958b5bf4e5c8a5b3a1893517:Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
}
]
},
@@ -205,12 +186,8 @@
{
"language": "FR",
"text": "Nous offrons une assistance en ligne, mais nous ne pouvons pas vous aider avec un autre navigateur !",
<<<<<<< HEAD:Projects/Superalgos/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
"updated": 1623950564757,
"style": "Warning"
=======
"updated": 1623950564757
>>>>>>> 5d109c271da2e554958b5bf4e5c8a5b3a1893517:Projects/Foundations/Schemas/Docs-Tutorials/W/Welcome/Welcome-to-Superalgos/welcome-to-superalgos-004-tutorial-step-use-chrome-or-safari.json
}
]
}