diff --git a/02/01.txt b/02/01.txt index 4cbbf66..fc5fdb7 100755 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 ŋɖo le ɖekinyé me be ŋdele-djatrɔva mia gbɔn le nu xaxa yio nɔnɔmé mɛn. \v 2 Ne ŋɖomi nuxaxaɖé, meŋ déla tɛnkpɔ djidjɔɛ soŋtsinyɛ. -======= -\v 1 ŋȡui le nyɛntɔ ahun ta mɛ bé nye dateŋ trɔva miagbɔ le ŋshishi me o. \v 2 Ne nyi bé ŋdomi ŋshishitɔ ȡé, me ȡé la teŋ do djidjɔ nun ne nyi bé amɛ yi nɛ tsi nushishi mɛ to djinyɛn. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\c 2 \v 1 ŋɖo le ɖekinyé me be ŋdele-djatrɔva mia gbɔn le nu xaxa yio nɔnɔmé mɛn. \v 2 Ne ŋɖomi nuxaxaɖé, meŋ déla tɛnkpɔ djidjɔɛ soŋtsinyɛ. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index 6df3786..b17b82a 100755 --- a/02/03.txt +++ b/02/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 ŋ ŋɛn ne mi be amɛtiwo la kpdioɛ leŋtsi nyɛ, nowo gbenɔ nuxaxa,mewo ne ŋtrovawó. ŋkanɖe mia kpata kpadji be ayiun enyi déka djidjɔlɔ le mia kpakpame. \v 3 Yi ŋLɛ ne mi le yaya ɖu gandemé kuɖo édji yewo veve sese ɖeɖeme, kudo ɖasi gbogbo ɖe fanfanme. ŋde be na domi nuxaxame, vɔlɔ nɛ mia nya lɔnɔlɔn gangan tsi ŋɖo nemi. -======= -\v 3 ŋ ŋluɛn shigbe letsi ŋwɛ, bé né ŋgbé vá vá miá gbɔ lɔ, ne nye ŋgbe tsi ŋshishi mɛ, so mɛtsiwó ȡo la do djidjɔɛ nun gbɔ o. ŋkanȡo miáwó keŋkeŋ dji, yí ahun djidjɔ sɔ ku miá tɔ.\v 4 Ðo ŋluɛn nu nɔn mi le vévésésé gan ȡé kúȡo dji gbangban kú ȡashiwó, ŋdé nyi bé má sɔ do mi ŋshishi mɛ o. vɔ miá nyan lɔnlɔn tsi ŋȡo nɔn mi yo goglo me. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 3 ŋ ŋɛn ne mi be amɛtiwo la kpdioɛ leŋtsi nyɛ, nowo gbenɔ nuxaxa,mewo ne ŋtrovawó. ŋkanɖe mia kpata kpadji be ayiun enyi déka djidjɔlɔ le mia kpakpame. \v 4 Yi ŋLɛ ne mi le yaya ɖu gandemé kuɖo édji yewo veve sese ɖeɖeme, kudo ɖasi gbogbo ɖe fanfanme. ŋde be na domi nuxaxame, vɔlɔ nɛ mia nya lɔnɔlɔn gangan tsi ŋɖo nemi. \ No newline at end of file diff --git a/02/05.txt b/02/05.txt index 27530b0..74613cf 100755 --- a/02/05.txt +++ b/02/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Ne nyi be ameɖeɖo nuxaxa me va yi, vɔlɔ ŋde nɔɛn nyɛ dekawo, le alpaɖewome, ne mi ŋgbetoé kaka glowó, ne mia kpata yɔ. \v 6 Tɔhɛn kɛn,tsiwo omavo so nenewo améa esu. \v 7 Fifiɛ lɔ, tsi mi la ɖe tɔhɛnhɛn sɔ tsi, miɖo sɔke kudo mia doé ŋsɛn. Ne vevesésé ŋgbe sougbɔ ɖo djiwo. -======= -\v 5 Nɛ amɛȡé nyi ŋshishi yió djɔsoxoé lɔ, ŋdé nyi nɛ nyɛn ȡékɛ, vɔ le nɔnɔnme ȡéwó me, ne nyɛn ŋgbe nui akpao lɔ, ne miáwó kpata wɔ. \v 6 To dɔndɔn tsi va nɛnɛ meɛ dji to amɛ akpagantɔwó dji lɔ sun.\v 7 So xɔn dji lɔ, tovo nɔn tohɛnhɛn lɔ, miȡo la sɔki, yí miá dui ŋsɛn, bé né vévésésé yió gban ŋgbe wúi gan. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 5 Ne nyi be ameɖeɖo nuxaxa me va yi, vɔlɔ ŋde nɔɛn nyɛ dekawo, le alpaɖewome, ne mi ŋgbetoé kaka glowó, ne mia kpata yɔ. \v 6 Tɔhɛn kɛn,tsiwo omavo so nenewo améa esu. \v 7 Fifiɛ lɔ, tsi mi la ɖe tɔhɛnhɛn sɔ tsi, miɖo sɔke kudo mia doé ŋsɛn. Ne vevesésé ŋgbe sougbɔ ɖo djiwo. \ No newline at end of file diff --git a/02/08.txt b/02/08.txt index 965ca5e..d36b031 100755 --- a/02/08.txt +++ b/02/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Fifiɛ le ŋsɛn domi be mia ɖé mia lɔnlɔn fia le amówo domé. \v 9 ŋ ŋlɛn ne mi be masɔ domigbɔ kpɔnɔ nɔ bé mi ɖonɔ role enuwo kpatame mɛ -======= -\v 8 Ke ŋdo ŋsɛn mi bé miá ȡe gbefan lɔnlɔn tsi mi ȡo ni lɔ le dukɔn domɛ. \v 9 ŋ ŋluɛn nu nɔn mi bé má dómi kpɔ, bé né má nyan nɛn mi nyi nutéxoéwoatɔwó le nushianu mɛn. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 8 Fifiɛ le ŋsɛn domi be mia ɖé mia lɔnlɔn fia le amówo domé. \v 9 ŋ ŋlɛn ne mi be masɔ domigbɔ kpɔnɔ nɔ bé mi ɖonɔ role enuwo kpatame mɛ \ No newline at end of file diff --git a/02/10.txt b/02/10.txt index ac5d42e..5b5a5b6 100755 --- a/02/10.txt +++ b/02/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Ne misɔke ameɖea nyé tsan nasɔke neneya yi amɛa enutsi, ne ŋsɔ enuɖe kea; sɔsɔké yinyi , né ŋsɔke am ɖelɔ, ŋsɔké améa le mian ŋtsi le klistɔ yiwo ŋmɛn. \v 11 Nɛŋ mi ŋgbe ɖasi mia dekui wó ne santana, eyɛŋɛŋtsilɔ migbe xlɔbe yɛwó ɖoɖowó. -======= -\v 10 Ne mi sɔke amɛ ȡe lɔ, nyɛn tsan ŋsɔke ameɛ lɔ, enu tsi ŋsɔke lɔ, ne ŋsɔ ŋȡe ke lɔ, é nyi sɔsɔke ȡo miá tá le Yesu yo ŋmɛn. \v 11 Ne mi ŋgbe va tatsi miá ȡekiwó nɔn santana o, ȡo nutsi ŋtj lɔ mi djeshi yió mɔnwó. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 10 Ne misɔke ameɖea nyé tsan nasɔke neneya yi amɛa enutsi, ne ŋsɔ enuɖe kea; sɔsɔké yinyi , né ŋsɔke am ɖelɔ, ŋsɔké améa le mian ŋtsi le klistɔ yiwo ŋmɛn. \v 11 Nɛŋ mi ŋgbe ɖasi mia dekui wó ne santana, eyɛŋɛŋtsilɔ migbe xlɔbe yɛwó ɖoɖowó. \ No newline at end of file diff --git a/02/12.txt b/02/12.txt index cc57944..e75324a 100755 --- a/02/12.txt +++ b/02/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Ŋde kpekpe tsi axetɔ hun nuwɔn gatsime ŋvaɖo troasi be matɔ klistɔ yewó nya, \v 13 ŋɖo gbɔngbɔnmɛ ŋtsi fafa enuŋtsilɔ nyŋde kpɔ nɔvinyɛ titɔ .Ɖowa, ŋɖasiwo yi wo trɔdjoyi masédoni (masédoine) -======= -\v 12 Ðekpikpi ȡe yí nyia, axoétɔ hun mɔn nun gatsime ŋ va Troas, vá kakan Kristo yo nyɔn nyuiɛ lɔ. \v 13 Ahun gbɔngbɔn ŋde kpɔ ŋtifafáa, ȡo nu yiŋtsia nyɛn ŋde kpɔ nɔvinyɛn Tito. Nɛnɛ nu lɔ ŋtatsiwó, trɔ djó yi Makedoni. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 12 Ŋde kpekpe tsi axetɔ hun nuwɔn gatsime ŋvaɖo troasi be matɔ klistɔ yewó nya, \v 13 ŋɖo gbɔngbɔnmɛ ŋtsi fafa enuŋtsilɔ nyŋde kpɔ nɔvinyɛ titɔ .Ɖowa, ŋɖasiwo yi wo trɔdjoyi masédoni (masédoine) \ No newline at end of file diff --git a/02/14.txt b/02/14.txt index 0de1c3a..9c7a2c3 100755 --- a/02/14.txt +++ b/02/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 Vɔlɔ misɔ amnuvévé na Mawu ;tsi lé Klistɔmɛ kplɔnɔmi gasiagamɛ le djiɖumɛtɔ mia dji, le afishiafi ɖenɔ yiwo nunyanwo hlɛnhlɛn . \v 15 ɖawa mi nyi Mawutɔ Klistotɔ yewo hlɛnhlɛn nyí le ametsiwo kpɔɖeɖe dome kudo ametsiwo le trɔtrɔwɔ. -======= -\v 14 vɔ wóa sɔ akpedodowó nɔn Mawu tsi kplɔnɔn mi kokoko le djiȡuȡu mɛ le Kristo mɛ, yi to miá dji kakan yo nunyan o hɔnhuɛn nyuitɔ le afishiafi. \v 15 Ðo, miɔnwoe nyi Krito yo hɔnhuɛn nyui nɔn Mawu le amɛtsi kpɔ xɔxɔ kú amɛtsiwó tsrɔn lɔ domɛ. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 14 Vɔlɔ misɔ amnuvévé na Mawu ;tsi lé Klistɔmɛ kplɔnɔmi gasiagamɛ le djiɖumɛtɔ mia dji, le afishiafi ɖenɔ yiwo nunyanwo hlɛnhlɛn . \v 15 ɖawa mi nyi Mawutɔ Klistotɔ yewo hlɛnhlɛn nyí le ametsiwo kpɔɖeɖe dome kudo ametsiwo le trɔtrɔwɔ. \ No newline at end of file diff --git a/02/16.txt b/02/16.txt index 775c60a..12fe449 100755 --- a/02/16.txt +++ b/02/16.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 16 Neŋ ametsiwɛ le trɔtrɔwɔ éku yiwo hleɛhlen tsi le éku tsi nawɔ. Nɛŋ ametsiwo la kpɔɖeɖea, agbé yiwo hlɛnhlɛn tsi na agbé. Tsi djénɛŋnɛŋ yawó nuwó? \v 17 Ɖomiawó mi ŋdé lé amɛtsiwó sanɔ Mawu nyan ɖo viɖeɖe ŋtsiwó. Tsi la nyí étsɛlɔ, vɔlɔ vevedonu kɔkɔɛ , shibé mawu mɛdɔdɔ enɛŋ axonuxó lé klistomɛ. -======= -\v 16 Nɛ amɛtsiwó le tsɔntstɔnwɔ lɔ, ekú yo hɔnhuɛn tsi nanɔn ekú, yi nyi nɔnwó. Nɛ ametsiwó la kpɔ xɔxɔ lɔ, agbe yo hɔnhuɛn tsi nanɔn agbe yɔ. Mɛȡe dje nɔn nuxɔnwó. Ðo miɔn miŋde nyi mɛtsiwó sá nɔn Mawu nyɔn ȡo viȡe kpɔkpɔ ŋtsio. \v 17 Le exɔn texoé lɔ, mi le nuxoxowɔ le Kristo mɛn, kúdo tamesúsú kɔkɔɛ tsi so Mawu gbɔ. ->>>>>>> 09c85c1b9c62a07f228d26ce6cff232376a8e654 +\v 16 Neŋ ametsiwɛ le trɔtrɔwɔ éku yiwo hleɛhlen tsi le éku tsi nawɔ. Nɛŋ ametsiwo la kpɔɖeɖea, agbé yiwo hlɛnhlɛn tsi na agbé. Tsi djénɛŋnɛŋ yawó nuwó? \v 17 Ɖomiawó mi ŋdé lé amɛtsiwó sanɔ Mawu nyan ɖo viɖeɖe ŋtsiwó. Tsi la nyí étsɛlɔ, vɔlɔ vevedonu kɔkɔɛ , shibé mawu mɛdɔdɔ enɛŋ axonuxó lé klistomɛ. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4346cef..5d28aca 100755 --- a/manifest.json +++ b/manifest.json @@ -48,6 +48,14 @@ "01-19", "01-21", "01-23", + "02-01", + "02-03", + "02-05", + "02-08", + "02-10", + "02-12", + "02-14", + "02-16", "03-01", "03-04", "03-07",