From 1bbd1c74b896bc3c7fe2dc24f0761ed78558f8d1 Mon Sep 17 00:00:00 2001 From: parfait-ayanou Date: Tue, 7 May 2024 03:55:45 -0700 Subject: [PATCH] Tue May 07 2024 03:55:45 GMT-0700 (Pacific Daylight Time) --- 01/01.txt | 6 +----- 01/04.txt | 6 +----- 01/07.txt | 6 +----- 01/title.txt | 6 +----- 02/01.txt | 6 +----- 02/03.txt | 6 +----- 02/05.txt | 6 +----- 02/08.txt | 6 +----- 02/10.txt | 6 +----- 02/13.txt | 6 +----- 02/15.txt | 6 +----- 02/17.txt | 6 +----- 02/title.txt | 6 +----- front/title.txt | 6 +----- manifest.json | 15 +++++++++++++++ 15 files changed, 29 insertions(+), 70 deletions(-) diff --git a/01/01.txt b/01/01.txt index e40a53e..2e742c2 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Polu, nsadi yezu klistu, yandi watelama mukushia kakala n'tumwa, ba ham'bula samu di kulonga tsangu yi nzambi, \v 2 nzambi wusola tuka luyandiku ku ba profeta muna masonama masantu,\v 3 mana matadidi mwana ya ndi(wuna wubutuka mukifundu ki Davidi mu m'suni, -======= -\c 1 \v 1 Poolu, nsadi Yezu Klistu, ban'tela mukusia kakuma n'tumi, ban'sia munkala saamu di m'samu Nzaambi, \v 2 M'samu miamimi ka ndaki mu ntangu yi hioka bahoyi ba propheta mu masonama ma santu. \v 3 Mu mambu matadidi mwana yadni, wuna wubutuka mukikanda ki Davidi mu n'suni. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\c 1 \v 1 Polu, nsadi yezu klistu, yandi watelama mukushia kakala n'tumwa, ba ham'bula samu di kulonga tsangu yi nzambi, \v 2 nzambi wusola tuka luyandiku ku ba profeta muna masonama masantu, \v 3 mana matadidi mwana ya ndi(wuna wubutuka mukifundu ki Davidi mu m'suni, \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index d83dab9..d2b805f 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 utambusama mwana nzambi muna mpeve yibu santu mu lufutumuku ku bafwa) yezu klistu mfumu beto, \v 5 kuyandi tumonga dienga ye mission mikusadila nzambi Samu di nata muzina di yandi kulemvuka kulukwikilu ku ba mpakanu bakulu. \v 6 mukati di bawu venu pe lwene, venu bakatedi Yezu klistu. -======= -\v 4 Ka kumi mwana Nzambi mu ngolo zi mpve santu, mu lufutumuku lu bamvumbi, Yezu Klistu Pfumu betu. \v 5 Samu di yandi, twu mongi mamboti ye kisalu mu nzila kutumakana ku lukwikilu mu mahata maakulu ma tsi n'toto, mu zina di yandi. \v 6 Mukati di mahata, benu phe balutela muku kota muki kanda ki Yezu Klistu. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 4 utambusama mwana nzambi muna mpeve yibu santu mu lufutumuku ku bafwa) yezu klistu mfumu beto, \v 5 kuyandi tumonga dienga ye mission mikusadila nzambi Samu di nata muzina di yandi kulemvuka kulukwikilu ku ba mpakanu bakulu. \v 6 mukati di bawu venu pe lwene, venu bakatedi Yezu klistu. \ No newline at end of file diff --git a/01/07.txt b/01/07.txt index 630b1e3..dff187c 100644 --- a/01/07.txt +++ b/01/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 kubenu kulu, ku Roma, lumonga dienga ye ngemba mu zina di Nzambi tata ye mfumu Yezu klistu! -======= -\v 7 Kwe baakulu ba nabene ku Loma, ba mpangi ba tondama ku Nzaambi, ba batela mukusia bakala ba santu. Mamboti ye ngemba ma kala ye benu mu zina di Nzaambi taata ye Pfumu Yezu Klistu. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 7 kubenu kulu, ku Roma, lumonga dienga ye ngemba mu zina di Nzambi tata ye mfumu Yezu klistu! \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index ae324a9..ee7f4a4 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -KABU -======= -KABU 1 ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +KABU 1 \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 5b8100f..1e292af 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 Nkiakina lolukoko,nge mutu wutangaka bakweno,mû bwabu weke dibedisa ngeyene, Samu nge weke tanga,weke sala bimabiabina.\v 2 Mana ntuzeye ne kusambisa ku Nzambi kwene bwabuna, buna mène samu dibakweno, usala pila yayi yi. -======= -\c 2 \v 1 Hakana lolukoko nge muutu wuna, zolaka kusambisa bakweno, nawekasala bwabuna, nge yene weka di kwatisa. Samu ngeweka sambisa, weka sala mambu piila mosi. \v 2 Kaasi tuzeye na kusambisama ku Nzaambi kwe bwabuna, mu masonga samu di baaba sala bwabuna. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\c 2 \v 1 Nkiakina lolukoko,nge mutu wutangaka bakweno,mû bwabu weke dibedisa ngeyene, Samu nge weke tanga,weke sala bimabiabina. \v 2 Mana ntuzeye ne kusambisa ku Nzambi kwene bwabuna, buna mène samu dibakweno, usala pila yayi yi. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt index eefcfe2..f54fb45 100644 --- a/02/03.txt +++ b/02/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -,,\v 3 Mudiambu diadidi,nge weke tanga bakweno,yindulaka ne Nzambi kakughekeko ndola mutangu yina sala ngeyi pe bwoso bawu? \v 4 N'kanu weke lewula bimvwama bi ma mboti mandi, n'lemvwandi,mbundu'andi kimboma,wekene lala ne n'lemvwandi keke kutuma wubalula mbundu. ? -======= -\v 3 Kaasi samu di mambu ma, ba heka ndola bana basalaka mo, mana weka sala piila mosi ye bawu, weka zaya na sambisamoko kwe Nzaambi? \v 4 To weka bebisa kimvuama ki mbundu bunkete, na kaku hekaku ndola wekazayoko na keka kusidila ntangu mukusia wusoba? ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +,, \v 3 Mudiambu diadidi,nge weke tanga bakweno,yindulaka ne Nzambi kakughekeko ndola mutangu yina sala ngeyi pe bwoso bawu? \v 4 N'kanu weke lewula bimvwama bi ma mboti mandi, n'lemvwandi,mbundu'andi kimboma,wekene lala ne n'lemvwandi keke kutuma wubalula mbundu. ? \ No newline at end of file diff --git a/02/05.txt b/02/05.txt index 7b542eb..fb5ce49 100644 --- a/02/05.txt +++ b/02/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Mana mû kukonda kwaku ku ngindu ye kukola ku mbundu aku wekene dibasisa nkabu zizikutana kilumbu ye n'kanu Nzambi. \v 6 yandi wufuta ku konso mutu mû pila yi kisalu kiandi. \v 7 kubabakangi mbundu mû kusala bisalu bi mboti basosi n'kembo, lukumu lu bunkete ye kubusa voka, luzingu lu mvula yi mvula. -======= -\v 5 Kaasii, samu di mbundu toto weka tombula nkabu samu di kilumbu ki kaku kusambisa Nzaambi. Disongidila, kilumbu ki dimonika kusambisama ku masonga ma Nzaambi. \v 6 Yandi kafuta konso muutu mi bisalu biandi, \v 7 Kwe ba bene ye mwa ndambu bisalu bi bunkeete ba sosi lukumu lu Nzaambi, ye kukonda bwifi, kabaheka luzingu lu mvula ye mvula. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 5 Mana mû kukonda kwaku ku ngindu ye kukola ku mbundu aku wekene dibasisa nkabu zizikutana kilumbu ye n'kanu Nzambi. \v 6 yandi wufuta ku konso mutu mû pila yi kisalu kiandi. \v 7 kubabakangi mbundu mû kusala bisalu bi mboti basosi n'kembo, lukumu lu bunkete ye kubusa voka, luzingu lu mvula yi mvula. \ No newline at end of file diff --git a/02/08.txt b/02/08.txt index 8ed6403..643c394 100644 --- a/02/08.txt +++ b/02/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Mana babazolaka kukaba ye balemvukaku ku masonga, babakabaka makabu ma konda fwanana,ma kmwesa,mû nkabu, mû boma bungolo, \v 9 ye ngiangisiku zikwisa ghana ntandu konso moya wuna wusala mambi,bayandiki la kwe bayuda, Kunima bele ku ba greki ti ba jwifi. -======= -\v 8 Kaasi baana ba kabaku, bakonda tambusila masonga, basala mambu mu masumu, nkabu, kubanga. \v 9 Nzaambi kanata tsaka zi mbi mu konso moyi wuna wusala mambi, nteete ku ba Juifi phe ku ba Greki. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 8 Mana babazolaka kukaba ye balemvukaku ku masonga, babakabaka makabu ma konda fwanana,ma kmwesa,mû nkabu, mû boma bungolo, \v 9 ye ngiangisiku zikwisa ghana ntandu konso moya wuna wusala mambi,bayandiki la kwe bayuda, Kunima bele ku ba greki ti ba jwifi. \ No newline at end of file diff --git a/02/10.txt b/02/10.txt index e22b851..3be6517 100644 --- a/02/10.txt +++ b/02/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Yambula ngemba yi lukumu,lukala ye n'kembo ku bakulu basalaka mambumabunkete,ntete kwe muyuda,ti ba greki. \v 11 Samu Nzambi kahambisaku . \v 12 Diaka bwoso bana babwa mû masumu ma kukonda kuzitisa minsiku, bafwa,pe bana bawu bafwa bwoso mwekene lombila. -======= -\v 10 Yambula ngemba lukumu ye n'kembu di kala muna wuna salaka mamboti; nteete-ntete kwa ba Yuda kunima ku bana bonda mu Yuda. \v 11 Saamu Nzaambi kahambusaku. \v 12 Dihika, bana ba bwisama mukukonda kuzitisa mitsiiku, ba phe bakonda mitsiiku ye ba nababwisama ye mitsiiku han' nwa ba fwa phe ye mitsiiku. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 10 Yambula ngemba yi lukumu,lukala ye n'kembo ku bakulu basalaka mambumabunkete,ntete kwe muyuda,ti ba greki. \v 11 Samu Nzambi kahambisaku . \v 12 Diaka bwoso bana babwa mû masumu ma kukonda kuzitisa minsiku, bafwa,pe bana bawu bafwa bwoso mwekene lombila. \ No newline at end of file diff --git a/02/13.txt b/02/13.txt index 2513e3f..50595fc 100644 --- a/02/13.txt +++ b/02/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Mudiambu keko ne bana bawa minsiku Bakulu bene bakitoko ku meso ma Nzambi,Kasi bana basadila mio. \v 14 Samu ne mipani bazeyeko minsiku, béké sala mambu buna malombidi,mikumi minsiku mi babene. -======= -\v 13 Mudiambu keku na baakulu baba wa mitsiiku na bene ba bunkete ku mesu ma Nzaambi, kaasi bana ba sodila mio. \v 14 Saamu na ba mpani ba zeyoko mi tsiiku, beka sala mambu bina milombidi mitsiku, hana mikumi mitsiiku mi bawene. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 13 Mudiambu keko ne bana bawa minsiku Bakulu bene bakitoko ku meso ma Nzambi,Kasi bana basadila mio. \v 14 Samu ne mipani bazeyeko minsiku, béké sala mambu buna malombidi,mikumi minsiku mi babene. \ No newline at end of file diff --git a/02/15.txt b/02/15.txt index 8d06c65..51fb93f 100644 --- a/02/15.txt +++ b/02/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Mû Bwabuna, ba songidi kisalu ki minsiku, kisonama mû mbundu zibawu si bafunda ne lo zibanwanina kilumbu kina kasambisa Nzambi mambu mana maswama ma batu mû nzila yi nsangu zimboti mû zina di . \v 16 Yandi zeye maswekamu makulu mû nzila ban'longuki bandi mû nzila Yezu Kristu. -======= -\v 15 Mu bwabuna, basongidi na kisalu ki mitsiiku kisonama mu zi mbundu zibaawu. Ye ngindu zi bawu zi bafunda, holo zi babikisa bawene \v 16 Phe kuntwala Nzaambi, mambu mana makuma kilumbu kina kasambisa Nzaambi maswekamu ma baatumu nzila m'samu bunkete, muna Yezu Kristu. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 15 Mû Bwabuna, ba songidi kisalu ki minsiku, kisonama mû mbundu zibawu si bafunda ne lo zibanwanina kilumbu kina kasambisa Nzambi mambu mana maswama ma batu mû nzila yi nsangu zimboti mû zina di . \v 16 Yandi zeye maswekamu makulu mû nzila ban'longuki bandi mû nzila Yezu Kristu. \ No newline at end of file diff --git a/02/17.txt b/02/17.txt index 4a7f8cc..d84f057 100644 --- a/02/17.txt +++ b/02/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Ne weke ditela muyuda,ngeyi landila minsiku ye waka kiesi kingi mû Nzambi, \v 18 Mana wuyaba luzolo lwandi, sadisa bima bwoso kalongaka nsiku. \v 19 Ne weke yindula ne kala kwenati bifwameso, miesi mi bana bene mû piba,\v 20 n'kiesisi nzila samu di mutu wukonda ngindu,kingana Samu dibakw.eno,yindula ne wene ye kuzaya makiedika makulu ma minsiku miandi ? -======= -\v 17 Na weka ditela Muyuda, nge landila mitsiiku ye waka kiesi kingi mu zina di Nzaambi; \v 18 Buna wu yaba luzolu luandi, swasisa bima, bwasu buna bulombi mitsiiku. \v 19 Nawekene yindula na kala n'natisi bifwa meso, miesi mi bana bene mu piipa, \v 20 N'longi mazoba, n'longi wu bana, kene ye kuzaya mitsiiku ye makieleka ma Nzaambi. ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +\v 17 Ne weke ditela muyuda,ngeyi landila minsiku ye waka kiesi kingi mû Nzambi, \v 18 Mana wuyaba luzolo lwandi, sadisa bima bwoso kalongaka nsiku. \v 19 Ne weke yindula ne kala kwenati bifwameso, miesi mi bana bene mû piba, \v 20 n'kiesisi nzila samu di mutu wukonda ngindu,kingana Samu dibakw.eno,yindula ne wene ye kuzaya makiedika makulu ma minsiku miandi ? \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index 95b0e55..0b9b81b 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Kabu dizole -======= -Kabu 2 ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +Kabu 2 \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 708b7d7..84269db 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -LOMAIN -======= -Lomin ->>>>>>> 12c42f6717513ee2e0fe90040ea6673f2fb0ac87 +Lomin \ No newline at end of file diff --git a/manifest.json b/manifest.json index ca71c50..fee31fb 100644 --- a/manifest.json +++ b/manifest.json @@ -47,6 +47,11 @@ "parfait-ayanou" ], "finished_chunks": [ + "front-title", + "01-title", + "01-01", + "01-04", + "01-07", "01-08", "01-11", "01-13", @@ -59,6 +64,16 @@ "01-28", "01-29", "01-32", + "02-title", + "02-01", + "02-03", + "02-08", + "02-13", + "02-17", + "02-21", + "02-23", + "02-25", + "02-28", "03-05", "03-07", "03-09",