From 6cbc6f1777d3e9fa63e4316848f32ed63c0275ab Mon Sep 17 00:00:00 2001 From: parfait-ayanou Date: Sat, 6 Aug 2016 07:19:54 +0100 Subject: [PATCH] Sat Aug 06 2016 07:19:53 GMT+0100 (W. Central Africa Standard Time) --- 11/10.txt | 6 +----- 11/12.txt | 6 +----- 11/15.txt | 6 +----- 11/17.txt | 6 +----- 11/21.txt | 6 +----- 11/27.txt | 2 +- 11/30.txt | 2 +- 11/38.txt | 2 +- 11/45.txt | 2 +- 12/01.txt | 2 +- manifest.json | 6 +++++- 11 files changed, 15 insertions(+), 31 deletions(-) diff --git a/11/10.txt b/11/10.txt index 543ef605..4fa646eb 100755 --- a/11/10.txt +++ b/11/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Vɔ nɛle zɔzɔnwɔ le vivitsime lɔ éla klin nu ɖo ŋtsi lɔ kɛnklɛn ŋde lemeo. \v 11 Tsi nu nyɔxɔnwó vɔlɔ, esɔ kpí be: " Mia nɔnvi Lazaro ɖó alɔn dɔdɔn djidjin me, mayi nɛ mavɛ fui. -======= -\v 10 Vɔ nɛle zɔzɔnwɔ le vivitsime lɔ éla klin nu ɖo ŋtsi lɔ kɛnklɛn ŋde lemeo. \v 11 Tsi nu nyɔxɔnwó vɔlɔ, esɔ kpí be: " Mia nɔnvi Lazaro ɖó alɔn dɔdɔn djidjin me, mayi nɛ mavɛ fui. ->>>>>>> 31267ff0d5061c29f7d85dfefc7de7294546f094 +\v 10 Vɔ nɛle zɔzɔnwɔ le vivitsime lɔ éla klin nu ɖo ŋtsi lɔ kɛnklɛn ŋde lemeo. \v 11 Tsi nu nyɔxɔnwó vɔlɔ, esɔ kpí be: " Mia nɔnvi Lazaro ɖó alɔn dɔdɔn djidjin me, mayi nɛ mavɛ fui. \ No newline at end of file diff --git a/11/12.txt b/11/12.txt index 7b29da0e..6ae42e32 100755 --- a/11/12.txt +++ b/11/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Nukplaviawó tonin bé:" Axoétɔ né egɛnɖo alɔn djidjime lɔ elafɔn. \v 13 Yésu nuxo xowɔ nenele Lazaro yo ku ŋtsi,vɔ wɔwó xɔɛse bé ele tótókɔ bé Lazaro le alɔn dɔnkɔ. \v 14 Ke Yésu tó nɔnwó bé Lazaro ku. -======= -\v 12 Nukplaviawó tonin bé: " Axoétɔ né egɛnɖo alɔn djidjime lɔ elafɔn. \v 13 Yésu nuxo xowɔ nenele Lazaro yo ku ŋtsi, vɔ wɔwó xɔɛse bé ele tótókɔ bé Lazaro le alɔn dɔnkɔ.\v 14 Ke Yésu tó nɔnwó bé Lazaro ku. ->>>>>>> 31267ff0d5061c29f7d85dfefc7de7294546f094 +\v 12 Nukplaviawó tonin bé:" Axoétɔ né egɛnɖo alɔn djidjime lɔ elafɔn. \v 13 Yésu nuxo xowɔ nenele Lazaro yo ku ŋtsi,vɔ wɔwó xɔɛse bé ele tótókɔ bé Lazaro le alɔn dɔnkɔ. \v 14 Ke Yésu tó nɔnwó bé Lazaro ku. \ No newline at end of file diff --git a/11/15.txt b/11/15.txt index 110eb3e2..23626d08 100755 --- a/11/15.txt +++ b/11/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 ŋle djidjɔɛ kpɔwɔ le mia ŋtsi bé mi ŋde yio, bé nɛ mia xɔse. Fifiɛ lɔ mía yi. \v 16 Tóma, tsi wóyɔnɔ san bé Djydjime lɔ tonɔ nukplavi kpɛtɛ lɔ bé:" Miva míayi ku Yésune mia ku kui. -======= -\v 15 ŋle djidjɔɛ kpɔwɔ le mia ŋtsi bé mi ŋde yio, bé nɛ mia xɔse. Fifiɛ lɔ mía yi. \v 16 Tóma, tsi wóyɔnɔ san bé Djydjime lɔ tonɔ nukplavi kpɛtɛ lɔ bé:" Miva míayi ku Yésune mia ku kui. ->>>>>>> 31267ff0d5061c29f7d85dfefc7de7294546f094 +\v 15 ŋle djidjɔɛ kpɔwɔ le mia ŋtsi bé mi ŋde yio, bé nɛ mia xɔse. Fifiɛ lɔ mía yi. \v 16 Tóma, tsi wóyɔnɔ san bé Djydjime lɔ tonɔ nukplavi kpɛtɛ lɔ bé:" Miva míayi ku Yésune mia ku kui. \ No newline at end of file diff --git a/11/17.txt b/11/17.txt index fb7b9602..72222210 100755 --- a/11/17.txt +++ b/11/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Etsi Yésu va lɔ enya xoxo bé Lazaro le yɔdome ŋkeke amenɛ ke. \v 18 Betani le kpeti wuiatɔn le Yeluzalɛŋ gbɔ. \v 19 Yudatɔ sugbɔwó va bé yewa fá akɔ nɔ Mata ku Maria ɖó wonɔvia ŋtsi. \v 20 Gatsime Mata se bé Yésu gbɔnɔ lɔ, éyi gógui, vɔ Maria yɛ nɔ axome. -======= -\v 17 Etsi Yésu va lɔ enya xoxo bé Lazaro le yɔdome ŋkeke amenɛ ke. \v 18 Betani le kpeti wuiatɔn le Yeluzalɛŋ gbɔ. \v 19 Yudatɔ sugbɔwó va bé yewa fá akɔ nɔ Mata ku Maria ɖó wonɔvia ŋtsi. \v 20 Gatsime Mata se bé Yésu gbɔnɔ lɔ, éyi gógui, vɔ Maria yɛ nɔ axome. ->>>>>>> 31267ff0d5061c29f7d85dfefc7de7294546f094 +\v 17 Etsi Yésu va lɔ enya xoxo bé Lazaro le yɔdome ŋkeke amenɛ ke. \v 18 Betani le kpeti wuiatɔn le Yeluzalɛŋ gbɔ. \v 19 Yudatɔ sugbɔwó va bé yewa fá akɔ nɔ Mata ku Maria ɖó wonɔvia ŋtsi. \v 20 Gatsime Mata se bé Yésu gbɔnɔ lɔ, éyi gógui, vɔ Maria yɛ nɔ axome. \ No newline at end of file diff --git a/11/21.txt b/11/21.txt index a5b350d5..e89541bf 100755 --- a/11/21.txt +++ b/11/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Mata tonɔ Yésu bé :" \v 22 Axoetɔ,ne ɖeyi wole fiɛ lɔ, nɔvinye ŋda kuo. Vɔ ŋnya bé nutsiwó kɛŋkɛŋ wo biɔ mawu lɔ élana wo. \v 23 Yésu toni bé:" Nɔvio la trɔva agbeme". -======= -\v 21 Mata tonɔ Yésu bé :" Axoetɔ, ne ɖeyi wole fiɛ lɔ, nɔvinye ŋda kuo.\v 22 Vɔ ŋnya bé nutsiwó kɛŋkɛŋ wo biɔ mawu lɔ élana wo.\v 23 Yésu toni bé:" Nɔvio la trɔva agbeme". ->>>>>>> 31267ff0d5061c29f7d85dfefc7de7294546f094 +\v 21 Mata tonɔ Yésu bé :" \v 22 Axoetɔ,ne ɖeyi wole fiɛ lɔ, nɔvinye ŋda kuo. Vɔ ŋnya bé nutsiwó kɛŋkɛŋ wo biɔ mawu lɔ élana wo. \v 23 Yésu toni bé:" Nɔvio la trɔva agbeme". \ No newline at end of file diff --git a/11/27.txt b/11/27.txt index 096fd9b6..6995e014 100755 --- a/11/27.txt +++ b/11/27.txt @@ -1 +1 @@ -\v 27 Etoni bé: "Ɛ, axoetɔ, ŋxɔɛse bé ewo yí nyi kristo, mawuvi tsi va xixeame. \v 28 Tsiyí tonyɔŋɔ vɔ lɔ, etrɔ yi yɔ Maria nɔviɛ va yo axadji. Etoni bé: " Nufiɔtɔ le fiɛ be yea kpɔo.\v 29 Tsiyí Maria se nyɔxɔ lɔ, etsite kaba yi Yésu gbɔ. \ No newline at end of file +\v 27 Etoni bé: "Ɛ, axoetɔ, ŋxɔɛse bé ewo yí nyi kristo, mawuvi tsi va xixeame. \v 28 Tsiyí tonyɔŋɔ vɔ lɔ, etrɔ yi yɔ Maria nɔviɛ va yo axadji. \v 29 Etoni bé: " Nufiɔtɔ le fiɛ be yea kpɔo. Tsiyí Maria se nyɔxɔ lɔ, etsite kaba yi Yésu gbɔ. \ No newline at end of file diff --git a/11/30.txt b/11/30.txt index b6f03ded..83c6b6b5 100755 --- a/11/30.txt +++ b/11/30.txt @@ -1 +1 @@ -\v 30 Fifiɛ lɔ Yésu ŋde kpɔ ɖó kɔxuiameo ɖó etɔte le fitsi Mata doguile lɔ. \v 31 Yudatɔ tsiwó va axoeame be yewoa va fá Maria, tsiwo kpɔɛ yíto le dudji le yiyiwɔ lɔ, wo kplɔɛdo, ɖó wosusui bé ele yɔdo lɔ gbɔ yiwɔ avɛ fanvi.\v 32 Maria yi Yésu gbɔ, ekpɔɛ yí dje anyi ɖó yó fɔnu to bé: " Axoetɔ, ne ɖe wole fiɛ lɔ nɔvinyɛ ŋda kuo." \ No newline at end of file +\v 30 Fifiɛ lɔ Yésu ŋde kpɔ ɖó kɔxuiameo ɖó etɔte le fitsi Mata doguile lɔ. \v 31 Yudatɔ tsiwó va axoeame be yewoa va fá Maria, tsiwo kpɔɛ yíto le dudji le yiyiwɔ lɔ, wo kplɔɛdo, ɖó wosusui bé ele yɔdo lɔ gbɔ yiwɔ avɛ fanvi. \v 32 Maria yi Yésu gbɔ, ekpɔɛ yí dje anyi ɖó yó fɔnu to bé: " Axoetɔ, ne ɖe wole fiɛ lɔ nɔvinyɛ ŋda kuo." \ No newline at end of file diff --git a/11/38.txt b/11/38.txt index a3d9c87e..ffe2e19b 100755 --- a/11/38.txt +++ b/11/38.txt @@ -1 +1 @@ -\v 38 Yésu, kpɔtɔ lé ŋzinzime vɛ ɖo yɔdo lɔ kpɔ edo ku kpe wó we.\v 39 Yésu to bé: " Miɖe kpeɛ djó". Mata, Lazaro yo dada, to nɔ Yésu be: " Axoetɔ, fifiɛ yo ŋtsilan lɔ la tɔ gbelé vɔ, éku lɔ ewɔ ŋkeke ene vɔ. \v 40 Yésu toni bé : " Nye de nu nɔwo bé ne woxɔ djinye lɔ olakpɔ yo ŋtsi kɔkɔɛ lo? \ No newline at end of file +\v 38 Yésu, kpɔtɔ lé ŋzinzime vɛ ɖo yɔdo lɔ kpɔ edo ku kpe wó we. \v 39 Yésu to bé: " Miɖe kpeɛ djó". Mata, Lazaro yo dada, to nɔ Yésu be: " Axoetɔ, fifiɛ yo ŋtsilan lɔ la tɔ gbelé vɔ, éku lɔ ewɔ ŋkeke ene vɔ. \v 40 Yésu toni bé : " Nye de nu nɔwo bé ne woxɔ djinye lɔ olakpɔ yo ŋtsi kɔkɔɛ lo? \ No newline at end of file diff --git a/11/45.txt b/11/45.txt index 680985dd..c35c19e8 100755 --- a/11/45.txt +++ b/11/45.txt @@ -1 +1 @@ -\v 45 Yudatɔ gbógbó tsiwoyi va Maria gbɔlɔwo xɔ Yesu djise gatsimɛ wokpɔ nu tsɛwó.\v 46 Ameɖewó trɔyi Farizitɔwó gbɔ vayi tó nutsiwó Yésu walɔwó. \ No newline at end of file +\v 45 Yudatɔ gbógbó tsiwoyi va Maria gbɔlɔwo xɔ Yesu djise gatsimɛ wokpɔ nu tsɛwó. \v 46 Ameɖewó trɔyi Farizitɔwó gbɔ vayi tó nutsiwó Yésu walɔwó. \ No newline at end of file diff --git a/12/01.txt b/12/01.txt index 40c3a4ac..0c4383bb 100755 --- a/12/01.txt +++ b/12/01.txt @@ -1 +1 @@ -\v 1 Tsi ikpɔtɔ ŋkéké amadɛn né pakizan lɔ Yésu va Bétania lé fitsi Lazaro métsi yí fɔn so amékùkù wo domɛn. \v 2 ó wa ŋȡuȡu ni; Marta nɔ ŋȡuȡu wawɔ vɔ Lazaro nɔ métsiwo lé ékplɔnlɔ ŋtsi kùȡo Yésu domɛn.\v 3 Mariya sɔ anuwatrɛ tsi xɔ ashi kɔȡo dji nɔ Yésu yi ísɔ yó ȡa tùtù afɔ nɛ Yésu;axué lɔ ȡokù anuwatrɛ huɛn-huɛn. \ No newline at end of file +\c 12 \v 1 Tsi ikpɔtɔ ŋkéké amadɛn né pakizan lɔ Yésu va Bétania lé fitsi Lazaro métsi yí fɔn so amékùkù wo domɛn. \v 2 ó wa ŋȡuȡu ni; Marta nɔ ŋȡuȡu wawɔ vɔ Lazaro nɔ métsiwo lé ékplɔnlɔ ŋtsi kùȡo Yésu domɛn. \v 3 Mariya sɔ anuwatrɛ tsi xɔ ashi kɔȡo dji nɔ Yésu yi ísɔ yó ȡa tùtù afɔ nɛ Yésu;axué lɔ ȡokù anuwatrɛ huɛn-huɛn. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8d4e4023..f987fd93 100755 --- a/manifest.json +++ b/manifest.json @@ -238,6 +238,11 @@ "11-03", "11-05", "11-08", + "11-10", + "11-12", + "11-15", + "11-17", + "11-21", "11-24", "11-27", "11-30", @@ -252,7 +257,6 @@ "11-51", "11-54", "11-56", - "12-01", "12-04", "12-07", "12-09",