From e7ae80bd7296ef2e461d34ce3e3c1b30eecf9c19 Mon Sep 17 00:00:00 2001 From: parfait-ayanou Date: Mon, 9 Dec 2019 12:12:21 +0000 Subject: [PATCH] Mon Dec 09 2019 12:12:20 GMT+0000 (Greenwich Standard Time) --- 01/08.txt | 6 +----- 01/16.txt | 2 +- 01/19.txt | 6 +----- 02/01.txt | 6 +----- 02/04.txt | 6 +----- 02/07.txt | 6 +----- 02/10.txt | 6 +----- 02/12.txt | 6 +----- manifest.json | 14 ++++++++++++-- 9 files changed, 20 insertions(+), 38 deletions(-) diff --git a/01/08.txt b/01/08.txt index 291217c..4a9f01c 100755 --- a/01/08.txt +++ b/01/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Nin enu xɔwo le mia mɛ yi gbe sein le mia mɛ lɔ,mi ŋda non enu madjeshi le axuetɔ miatɔ Jesu klisto mɛ.\v 9 Vɔ amɛ tsi yi dji enu xɔwo dokpolɔ yi enu tsi yi gogui kpo yidji non lɔ,ŋkuvi gbannyi Y ŋda gbe ɖo ŋkuvi enu vui xoxo wo -======= -\v 8 Nɛn nuxɔnwo lé miamé yi wo lé shinshinwo lé miamé lɔ,mi ŋdá nyi konɔn lé shidjédjé mia Huétɔ Yesu Klisto méo. \v 9 Vɔ metsi shi enuyɛwo ŋdé léolɔ,nyi ŋkuvi gbangbantɔ,ŋdé kpɔnɔn enu lé djidjihoé,yi i ŋlɔnbé yio nuvɔn xóxówó klɔklɔdjó. ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\v 8 Nɛn nuxɔnwo lé miamé yi wo lé shinshinwo lé miamé lɔ,mi ŋdá nyi konɔn lé shidjédjé mia Huétɔ Yesu Klisto méo. \v 9 Vɔ metsi shi enuyɛwo ŋdé léolɔ,nyi ŋkuvi gbangbantɔ,ŋdé kpɔnɔn enu lé djidjihoé,yi i ŋlɔnbé yio nuvɔn xóxówó klɔklɔdjó. \ No newline at end of file diff --git a/01/16.txt b/01/16.txt index a793c6d..32051a6 100755 --- a/01/16.txt +++ b/01/16.txt @@ -1 +1 @@ -\v 16 Ŋdé edru toto yio nyɔn towɔ milé nɔnmi kuȡo mia Huétɔ Yesu Klisto ŋtio,vɔ miɔnŋtɔ mikpɔ yio ŋsɛn dɔwáwá wo. \v 17 Ðo ŋti ŋtilɔ e xɔ ŋtikɔkoɛ kudo bubu só Mawu etɔlɔ gbɔ éyimé égbé ȡéká ȡi so djipo bé''méyɛ yi nyi vinyin lɔnlɔntɔ tsi gbɔ nyɛn ŋdé lɔn nɔn nuléo. \v 18 Mi sé gbéyɛ so djipo etsimé milégbɔ lé etó kɔkoɛ dji. \ No newline at end of file +\v 16 Ŋdé edru toto yio nyɔn towɔ milé nɔnmi kuȡo mia Huétɔ Yesu Klisto ŋtio, vɔ miɔnŋtɔ mikpɔ yio ŋsɛn dɔwáwá wo. \v 17 Ðo ŋti ŋtilɔ e xɔ ŋtikɔkoɛ kudo bubu só Mawu etɔlɔ gbɔ éyimé égbé ȡéká ȡi so djipo bé''méyɛ yi nyi vinyin lɔnlɔntɔ tsi gbɔ nyɛn ŋdé lɔn nɔn nuléo. \v 18 Mi sé gbéyɛ so djipo etsimé milégbɔ lé etó kɔkoɛ dji. \ No newline at end of file diff --git a/01/19.txt b/01/19.txt index edb4a0d..a28e110 100755 --- a/01/19.txt +++ b/01/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Mi ɖo nyɔnunudaɖɛ sugbɔ sugbɔ tsi ŋtsi mia sɔ mi ɖekiwo kplaɖo. Etsi shibe kalingbin tsi wo tɔ ɖo texue vivitsi tɔ ɖe kala dje gatsimɛ yi enukeke la va mio dji womɛ ɖo. \v 20 Mi djeshi enu tsɛwo ŋkɔŋkɔtɔ be nyɔnunudaɖɛ wlɛn wlɛn tsɛwo ŋda so enu nyanyan nyɔnuɖɛ towo mɛ. \v 21 Ɖo nyɔnunudaɖɛ ɖe ŋde so edjro agbetɔ tɔ mɛo vɔeso gbɔngbɔn kɔkɔɛ djo lɔ agbetɔ wo xonuxo sɔ mawu ŋtsi. -======= -\v 19 Mi kanȡo enyɔn nunudaȡɛ lɔ dji,mi ȡo lá kuȡoŋti.eléshigbé kanlingbɛn tsi lé bibiwɔ lé vivitsimé vá ȡó gatsimé enu lá ké ȡó miá djimé. \v 20 Mi nyan eyɛ tutugbɔn bé,enyɔnnunudaȡɛwo ŋdé sonɔn enyɔnnudaȡɛtɔlɔ gbɔ. \v 21 Ðo enyɔnnunudaȡɛ ȡékpikpi ŋdé vanɔn to agbétɔ yio lɔnlɔn nu méo,vɔ gbɔngbɔn kɔkoé yi xonɔn nuxo to amégbétɔ dji lé Mawu yio ŋkɔmé. ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\v 19 Mi kanȡo enyɔn nunudaȡɛ lɔ dji,mi ȡo lá kuȡoŋti.eléshigbé kanlingbɛn tsi lé bibiwɔ lé vivitsimé vá ȡó gatsimé enu lá ké ȡó miá djimé. \v 20 Mi nyan eyɛ tutugbɔn bé,enyɔnnunudaȡɛwo ŋdé sonɔn enyɔnnudaȡɛtɔlɔ gbɔ. \v 21 Ðo enyɔnnunudaȡɛ ȡékpikpi ŋdé vanɔn to agbétɔ yio lɔnlɔn nu méo,vɔ gbɔngbɔn kɔkoé yi xonɔn nuxo to amégbétɔ dji lé Mawu yio ŋkɔmé. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 18ddb6e..405f8ea 100755 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Enyɔnuɖɛ tɔ gblegble wo va non izraɛliviwo, yi enu kplankplan gblegble wo la va miagbɔ.Wo la va ku ayeminnu wawa tsi la gble wo nuwo, yi wo la gbe enukplantɔ tsi trɔva xlɛnwo. \v 2 Amɛ sugbɔ wo la xɔ enu xɔwo se yi sɔ to wodji lɔ emon nyanwo tɔlɔ la gble. \v 3 To enusu ɖuɖu mɛ lɔ wo la ɖuɖo mia dji ku enyɔn amɛ blebletɔ wo.Wo kodjomɛ tsi tsi ŋda gbe djidjiwo . Wo gbangban tsan ŋda gbe danlɔn. -======= -\v 1 Enyɔnnudaȡɛtɔ baȡawo vá izraɛl,yi nufiatɔ baȡawo lá vá mia gbɔ.wo la kplɔ nufiafia gblégbléwo yi lé bébémé,yi wo la gbénu lé ahuétɔ tsi xléwo gbɔ. \v 2 Amesugbɔ lá djé wo yomé,yi to wodjilɔ,wo la to enyɔn baȡa só nyatehué molɔ ŋti. \v 3 To nusuȡuȡu melɔ,wo la ba nuwo lé miashi to enyɔn viviwo mé.wo hoɛ sósó ŋda tsi ŋgbéo;wo gblégblé ŋda dɔn kɔlui ó ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\c 2 \v 1 Enyɔnnudaȡɛtɔ baȡawo vá izraɛl,yi nufiatɔ baȡawo lá vá mia gbɔ.wo la kplɔ nufiafia gblégbléwo yi lé bébémé,yi wo la gbénu lé ahuétɔ tsi xléwo gbɔ. \v 2 Amesugbɔ lá djé wo yomé,yi to wodjilɔ,wo la to enyɔn baȡa só nyatehué molɔ ŋti. \v 3 To nusuȡuȡu melɔ,wo la ba nuwo lé miashi to enyɔn viviwo mé.wo hoɛ sósó ŋda tsi ŋgbéo;wo gblégblé ŋda dɔn kɔlui ó \ No newline at end of file diff --git a/02/04.txt b/02/04.txt index 7f3f6be..ea4e05c 100755 --- a/02/04.txt +++ b/02/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Vɔ mawu ŋde ɖe dɔla tsi wɛ wa enuvui ɖo evo,sɔ wu gan nin nin lɔ etutuwo kaba kaba ɖo ezomɛ non wa non shɛni min kaka non kodjo ɖoɖo,\v 5 tsi ŋde gbe xixe xoxoɔ ɖɛ, vɔ egbe Noe enyɔn djratɔ djɔdjɔɛ kudo amɛ amandrɛ ɖɛ, vɔ yisɔ eshi kɔɖo xixe makɔ makɔ lɔ dji,\v 6 yi sɔ Sodome ku Gomorrhe sɔ trɔ zun afin lɔ yi wo tsi kodjomɛ shibe enu tsi dja va djɔ xa wo kpɔɖoŋtsi xa. -======= -\v 4 Nɛn Mawu ŋdé sɔ ké Mawu dɔlawo tsiwé wa nuvɔn,yi i sɔwo dó ahluimé lé vivitimé sɔna ehoɛ sósó yio gamé. \v 5 Nɛn ŋdé sɔ ké xixé tsi vayió,vɔ ekpɔ Nowa ta,metsi nyi amedjɔdjoɛ kudo amé amadrɛ buwo,yi i sɔ eshiȡɔȡɔ sɔ tsrɔn metsiwo ŋdé vɔn nɔn Mawu. \v 6 Yi i tsrɔn Sodom ku Gomora kudó zó shigbé kpɔȡénu nɔn ŋti djava djɔ. ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\v 4 Nɛn Mawu ŋdé sɔ ké Mawu dɔlawo tsiwé wa nuvɔn,yi i sɔwo dó ahluimé lé vivitimé sɔna ehoɛ sósó yio gamé. \v 5 Nɛn ŋdé sɔ ké xixé tsi vayió,vɔ ekpɔ Nowa ta,metsi nyi amedjɔdjoɛ kudo amé amadrɛ buwo,yi i sɔ eshiȡɔȡɔ sɔ tsrɔn metsiwo ŋdé vɔn nɔn Mawu. \v 6 Yi i tsrɔn Sodom ku Gomora kudó zó shigbé kpɔȡénu nɔn ŋti djava djɔ. \ No newline at end of file diff --git a/02/07.txt b/02/07.txt index 9538ac3..9570b95 100755 --- a/02/07.txt +++ b/02/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Yi rlɛn Lot amɛ djɔdjɔɛ tsi tsaka to walɔ amɛ ma djeshi ese wo le enu djrodjro tɔmɛ.\v 8 Ɖo amɛ djɔdjɔɛ xɔn enon amɛ gblegbleo domɛ, yi le vevi sese ɖokɔ non ekla yetɔ tɛgbɛ ɖo ŋtsiwo kpɔkɔɛ le ku ŋtsiwo sekɔ yi le to wo non non mɛ gblegble wo mɛ ŋtsi. \v 9 Axetɔ nyan le tsi yi laɖe amɛ djɔdjɔɛ to tetekpɔmɛ yigbe nyan le tsi la hin amɛ mdjɔmadjɔ yi la hui le kodjo ɖo zangbe. -======= -\v 7 Yi i ȡé Lɔt tsi nyi amédjɔdjoɛ,tsi tsanɔn ka lé métsiwo shi esé ȡékpikpi ŋdé léo,wo gbénɔnnɔn kudo wo nudjrodjrowo.\v 8 Ðo amedjɔdjoɛ xɔn tsi nɔn metsiwo ŋdé vɔn nɔn Mawu doméo lɔ,yio klá sénɔn vévi gbéshiagbé só ŋtiwo yi kpɔnɔn kudo ŋtiwo yi senɔn. \v 9 Ahuétɔ nya létsi i ȡénɔn amedjɔdjoɛ só dodokpɔ mé,yi i gbé nya letsi i la hin to nɔn amemadjɔmadjoɛ le hoɛ sósó gbe. ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\v 7 Yi i ȡé Lɔt tsi nyi amédjɔdjoɛ,tsi tsanɔn ka lé métsiwo shi esé ȡékpikpi ŋdé léo,wo gbénɔnnɔn kudo wo nudjrodjrowo. \v 8 Ðo amedjɔdjoɛ xɔn tsi nɔn metsiwo ŋdé vɔn nɔn Mawu doméo lɔ,yio klá sénɔn vévi gbéshiagbé só ŋtiwo yi kpɔnɔn kudo ŋtiwo yi senɔn. \v 9 Ahuétɔ nya létsi i ȡénɔn amedjɔdjoɛ só dodokpɔ mé,yi i gbé nya letsi i la hin to nɔn amemadjɔmadjoɛ le hoɛ sósó gbe. \ No newline at end of file diff --git a/02/10.txt b/02/10.txt index b8eb994..bbb030e 100755 --- a/02/10.txt +++ b/02/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Tsɛ nyi nyawo non amɛ tsi wɛ kpɔtɔ le ezannu ɖukɔ le gbazamɛ yi gban esewo . Wo donon ŋsin ku egoyiyi.Wo ŋde vɔn non enyɔn gblegble nunu so ŋtsikɔkɔɛ ŋtsi. \v 11 Ɖola wo ɖo ŋsin ku ŋzɔn non non sugbɔ ganɖɛ ɖeka sɔ hu agbetɔ; vɔ mi ŋgbe sɔ ezun kodjoɖoɖo tɔ ɖoɖa wo tsi le axuetɔ lɔ ŋkɔ. -======= -\v 10 Etsi gbelé veviȡélɔ yi nyi metsiwo zɔn nɔn lé ŋtilan yio djrodjro baȡa mé yi wo donɔn vlo atsɛkpakpawo,wo djenɔn wo ȡokuiwo nu kudo wo manɔn nukpɔnɔn,wo ŋdé vɔnɔn busu nyɔn toto só ŋtikɔkoéwo ŋtio. \v 11 Mawu dɔlawo ȡó ŋsɛn kudo awuyaya sɔ wu amegbetɔwo,vɔ wo ŋdé sɔnɔn hoɛsósó zungbétɔ ȡó woŋti le Ahuétɔ lɔ yio ŋméo. ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\v 10 Etsi gbelé veviȡélɔ yi nyi metsiwo zɔn nɔn lé ŋtilan yio djrodjro baȡa mé yi wo donɔn vlo atsɛkpakpawo,wo djenɔn wo ȡokuiwo nu kudo wo manɔn nukpɔnɔn,wo ŋdé vɔnɔn busu nyɔn toto só ŋtikɔkoéwo ŋtio. \v 11 Mawu dɔlawo ȡó ŋsɛn kudo awuyaya sɔ wu amegbetɔwo,vɔ wo ŋdé sɔnɔn hoɛsósó zungbétɔ ȡó woŋti le Ahuétɔ lɔ yio ŋméo. \ No newline at end of file diff --git a/02/12.txt b/02/12.txt index 7cd83c6..7708494 100755 --- a/02/12.txt +++ b/02/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Vɔ elan maɖo susu xɔn wo lɔ wo ɖo wo nin nin yi la sɔ wo agbe agbe wo.Wo ŋde nyan enu zɔnkɔ ole.Wo la va gbleo.\v 13 Wo la tufin non wo to enu gblegble wo tɔwo mɛ. Wo la non agbe djidjɔɛ tɔ le ŋkekeɛmɛ;wo la gble yi la xodji.Wo la vo le amɛ bleble wo tɔmɛ yi la nyɔn le gbazamɛ ku mi.\v 14 Ŋkuvi wotɔ eɖɔ ku nyɔnu hashiwatɔ yi enu vui ŋde sunwo gbeɖeo . Wo nu non ekla yi ŋde ɖo ŋsin be nin kpɔyɛodo le enu gblegble wawa womɛ yi edji wotɔ eɖo ku enu djrodjeo xɔn yi nyi evi nudotɔ. -======= -Vɔ elanxɔnwo tsiwo shi nunyan ŋdé leolɔ,wo wawo bé waleo yi wa tsrɔnwo ȡo wo djɔdjɔmé ŋti.Woŋdé nya ŋti zunwɔ wo léo.Wo lá tsrɔnwo. Wo djé afɔku ->>>>>>> 50d67d7118c039d682976e1fa7ba2eb1649e7f65 +\v 12 Vɔ elan maɖo susu xɔn wo lɔ wo ɖo wo nin nin yi la sɔ wo agbe agbe wo.Wo ŋde nyan enu zɔnkɔ ole.Wo la va gbleo. \v 13 Wo la tufin non wo to enu gblegble wo tɔwo mɛ. Wo la non agbe djidjɔɛ tɔ le ŋkekeɛmɛ;wo la gble yi la xodji.Wo la vo le amɛ bleble wo tɔmɛ yi la nyɔn le gbazamɛ ku mi. \v 14 Ŋkuvi wotɔ eɖɔ ku nyɔnu hashiwatɔ yi enu vui ŋde sunwo gbeɖeo . Wo nu non ekla yi ŋde ɖo ŋsin be nin kpɔyɛodo le enu gblegble wawa womɛ yi edji wotɔ eɖo ku enu djrodjeo xɔn yi nyi evi nudotɔ. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7e43c83..9b1661a 100755 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,17 @@ "finished_chunks": [ "front-title", "01-title", + "01-08", + "01-10", + "01-12", + "01-16", + "01-19", "02-title", + "02-01", + "02-04", + "02-07", + "02-10", + "02-12", "02-15", "02-17", "02-20", @@ -48,8 +58,8 @@ "03-05", "03-08", "03-10", + "03-11", "03-14", - "03-17", - "03-11" + "03-17" ] } \ No newline at end of file