Sun Apr 14 2024 20:28:17 GMT+0200 (Central Africa Time)

01/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \c 1 \v 1 Phauri, Sirivhanusi naThimothi, ndinonyorera kuchiara chevaThesaronika chiri munaMwari Baba edu naMambo Jesu Kristu. \v 2 Nyasha ngadzigare
-nemwi nokunyarara zvinobva kunaMwari Baba edu naMambo Jesu Kristu.
+nemwi nokunyarara zvinobva kunaMwari Baba edu naMambo Jesu Kristu.
+=======
+\c 1 \v 1 Pauro muranda waMwari na timoti kusoto rotoreneka Kuna Mwari Baba wedu kuna Mambo Jesu Kristo. \v 2 Ngakuviye Nhasha norunyararo kuna Mambo Jesu kristo.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

01/03.txt

@@ -1 +1,5 @@
-\v 3 Tinofanira kubonga Mwari nguva dzeshe ndimwi, hama, kudai ngezvinosisira, ngokuti kugonda kwenyu kunokura kakuru, norudo rwenyu umwe kunoumweni runowanzwa. \v 4 Ndizvo isusu temene tinoganza ndimwi pakati pezviara zvaMwari ngendaa yokusengerera kwenyu nokugonda kwenyu mukutambudzika kweshe nomumadambudziko omunoshingirira. \v 5 Izvi zvinoonisa kururama kwekutonga kwaMwari, kuti muerengwe muri vanofanira umambo waMwari, uwo womunotambudzikirawo.
+<<<<<<< HEAD
+\v 3 Tinofanira kubonga Mwari nguva dzeshe ndimwi, hama, kudai ngezvinosisira, ngokuti kugonda kwenyu kunokura kakuru, norudo rwenyu umwe kunoumweni runowanzwa. \v 4 Ndizvo isusu temene tinoganza ndimwi pakati pezviara zvaMwari ngendaa yokusengerera kwenyu nokugonda kwenyu mukutambudzika kweshe nomumadambudziko omunoshingirira. \v 5 Izvi zvinoonisa kururama kwekutonga kwaMwari, kuti muerengwe muri vanofanira umambo waMwari, uwo womunotambudzikirawo.
+=======
+\v 3 Nguva yese ngatipire nhahsa kuna Mambo Jesu kuhama jedu, zvakanaka ngokuti gonda renhu rinokura kurudo renhu, \v 4 Kuti atizvikuji mussoto ngodava yorusengerero renhu nogonda, muvangirire kuteverewa kwenhu, \v 5 Ngokuti kutongua kwenhu kuvakarurama kuti muite vakarurama, kumambo wamwari,  ngokuti ndakatambujuavo.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

01/06.txt

@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 \v 6 Ngegwinyiso chiri chiro chakatendeka
 kunaMwari kuti aunzidzire kutambudzika kwavari vanomutambudza, \v 7 nokupa kudzorora
 kwomuri vanotambudzika pamwepo nesu, apo Mambo Jesu paanooneswa echibva mudenga
 pamwepo nengirosi dzake dzine simba, \v 8 mumurazvu womuriro unobaka, echiunzidzira kwavari vasikamuzii Mwari nokwavari
-vasikayaeyii vhangeri raMambo wedu Jesu.
+vasikayaeyii vhangeri raMambo wedu Jesu.
+=======
+\v 6 Ngokuti kakarurama kuripa kuvaia vanomushashira, \v 7 Kavaia vanoshsaisha munoebesuwa ndisu kana Mambo waviya kuvha kudenga nogirosi joSimba rake, \v 8 Nomulazvo omuriro veitamja vachikazvi Kristo, novachikatevereri vhangeri raMwari wedu.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

01/09.txt

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 \v 9 Avo vatambudzwa ngekuparadzwa kusikaperi,
 vanozopaurwa kubva kuhope yaMambo nokubva kuuthende wesimba rake, \v 10 apo paanouya
-kooirikidzwa ngevakacheneswa vake nokushamiswa pakati pavo veshe vanotenda, ngeiro zuva, ngokuti uchapupu wedu kwomuri wakatendwa.
+kooirikidzwa ngevakacheneswa vake nokushamiswa pakati pavo veshe vanotenda, ngeiro zuva, ngokuti uchapupu wedu kwomuri wakatendwa.
+=======
+\v 9 Vanokhawiswa no kutambujua ndhambo na Mwari nouthende noSimba rake; \v 10 Aviya kuti areremejuwe novatsene pazua ronaro zvinoshamisa kuva vese vanotenda (Nokuti chipupu chedhu kuna imwimwi zvakatendua).
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

01/11.txt

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 \v 11 Ngeiyi ndaa isusu tinomukumbirira nguva dzeshe, techikumbira kuti Mwari wedu amuite
 vanofanira mukudaidza kwake nokuzadza ngesimba rake rokudisisa kweshe kuita zvakanaka nemushando wekugonda, \v 12 kuti zita raMambo wedu Jesu riirikidzwe mwomuri, nemwi
-muirikidzwe mwaari, dai ngezvakaita nyasha dzaMwari wedu naMambo Jesu Kristu.
+muirikidzwe mwaari, dai ngezvakaita nyasha dzaMwari wedu naMambo Jesu Kristu.
+=======
+\v 11 Ngokudaro nguva yese tinoreremeja kwa Mwari nokudaijua kukuteverera Simba rake nokudainjua ngobasa rogonda noSimba. \v 12 Kuti zina raMambo Jesu Kristo wedu rikujue, Kuvha kunhasha jaMwari, noMambo Jesu Kristo.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/01.txt

@@ -1 +1,5 @@
-\c 2 \v 1 Hama, ngendaa yekuuya kwaMambo wedu Jesu Kristu nokuunganidzwa kwedu kwaari, \v 2 tinokumbira kuti musazokasira kuzunguniswa mumipinimidzo nokuti kushamiswa, kunyazwi ngomweya nokuti ngeizwi nokuti ngetsamba, yakadai ngeinobva kwetiri, yechiti zuva raMambo raguma.
+<<<<<<< HEAD
+\c 2 \v 1 Hama, ngendaa yekuuya kwaMambo wedu Jesu Kristu nokuunganidzwa kwedu kwaari, \v 2 tinokumbira kuti musazokasira kuzunguniswa mumipinimidzo nokuti kushamiswa, kunyazwi ngomweya nokuti ngeizwi nokuti ngetsamba, yakadai ngeinobva kwetiri, yechiti zuva raMambo raguma.
+=======
+\c 2 \v 1 Vakoma tinomungaja ngondava yo kuviya kwamabo Jesu Kristo pakubatana kwedu nayena. \v 2 Ngokuti amuzvizivi ngokukasika kuzua kwenhu mushaneseka mweya, wenhu ngondava yommazui akatawha kwatiri ngokuti mazuva aKristo aphedo.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/03.txt

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 \v 3 Musazochengedzerwa ngemunhu kunyazwi ngeiri njira; ngekuti zuva iro arizogumi kusati
 kwaapo kupauka kutanga, nemunhu wokushaisha asati aoniswa, Mwanakomana wekurashwa. \v 4 uwo unorwisa nokudzitunhumadza padera pazvo zveshe zvinozwi zvimwari nepadera
-pezvinodirwa, ndizvo unogara pachigaro chake mutemperi raMwari, echidziita Mwari.
+pezvinodirwa, ndizvo unogara pachigaro chake mutemperi raMwari, echidziita Mwari.
+=======
+\v 3 Apana anomujengeja ngokuti azovi zuva kuti zvikuvandhu nokururama kuvakarasika. \v 4 Vanomuka vedhanja Mwari ngokudaro vanozonamatwa vanozoga pateperi raMwari, vofanana naye.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/05.txt

@@ -1 +1,5 @@
-\v 5 Amuchakarakadzi here kuti apo ndichiriipo nemwi ndakamureketera izvi zviro? \v 6 Nazvino munozia icho chinomurambidza, kuti uwo aoniswe ngenguva yake yaguma. \v 7 Ngokuti chakafishika chisikazi kunaka choshanda; asi zvichaitika metsa uwo unorambidza zvino abviswa.
+<<<<<<< HEAD
+\v 5 Amuchakarakadzi here kuti apo ndichiriipo nemwi ndakamureketera izvi zviro? \v 6 Nazvino munozia icho chinomurambidza, kuti uwo aoniswe ngenguva yake yaguma. \v 7 Ngokuti chakafishika chisikazi kunaka choshanda; asi zvichaitika metsa uwo unorambidza zvino abviswa.
+=======
+\v 5 Amucherechezi kuti mainga nainini ndeimvhunja zvonazvo? \v 6 Wari mazviziva zvaitika kuti zviteketesue. \v 7 Ngokuti rutongo roda kuitika,  uya oda kuvhisua pakati.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/08.txt

@@ -1 +1,5 @@
-\v 8 Apo wakashata unozooneswa, uwo unozoparadzwa ndiMambo Jesu ngemweya womuromo wake, nekumuparadza ngokuoneka kwokuuya kwake. \v 9 Kuuya kwouwo usikazi kunaka kwakadai ngekushanda kwaSathani, unoshandisa simba reshe, zvioniso, mishamiso yemanyepo, \v 10 ngembeu yeshe yokuchengedzera kweshe kwokusikanaka kwavari vanorashika, ngokuti vanoramba kuda gwinyiso kuti vaponeswe.
+<<<<<<< HEAD
+\v 8 Apo wakashata unozooneswa, uwo unozoparadzwa ndiMambo Jesu ngemweya womuromo wake, nekumuparadza ngokuoneka kwokuuya kwake. \v 9 Kuuya kwouwo usikazi kunaka kwakadai ngekushanda kwaSathani, unoshandisa simba reshe, zvioniso, mishamiso yemanyepo, \v 10 ngembeu yeshe yokuchengedzera kweshe kwokusikanaka kwavari vanorashika, ngokuti vanoramba kuda gwinyiso kuti vaponeswe.
+=======
+\v 8 Ngokuti anozoshandisua uya anozoparajua ndmwari, \v 9 Ngophepo yomukanua make muviya kwake Satani anova nozvishamiso zvokunhepa, \v 10 Nokujengejab kwese ngokuti avana rudo rokadi kuti vaponese.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/11.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \v 11 Ngeiyi ndaa Mwari unovatumira simba guru rekuvapausa, kuti vatende manyepo, \v 12 kuti
-veshe vasikatendi gwinyiso, asi vechidakadzwa ngekusakatendeka vatongwe.
+veshe vasikatendi gwinyiso, asi vechidakadzwa ngekusakatendeka vatongwe.
+=======
+\v 11 Ngokudaro Mwari anozotuma bhasa rakashata kuvaia vanoda zvokunhepa. \v 12 Kuti vaende kugehena vashina zvokadi, asi vakazuwa tshumairo.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/13.txt

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 \v 13 Asi kunodikanwa kuti tibonge Mwari nguva dzeshe ngendaa yenyu, hama dzinodikanwa
 munaMambo, ngekuti Mwari wakaketera kuita muchero yekutanga yeruponeso kubudikidza
-ngokucheneswa kwoMweya nokubudikidza ngekutenda gwinyiso. \v 14 Ngekuti izvi ndizvo zvaakamudaidzira kubudikidza ngevhangeri redu, kuti muashire uthende waMambo wedu Jesu Kristu. \v 15 Ndizvo, hama, emai mwakagwinya, mubate mupango yemwakadzidziswa tisu, kunyazwi ngeizwi nokuti ngetsamba yedu.
+ngokucheneswa kwoMweya nokubudikidza ngekutenda gwinyiso. \v 14 Ngekuti izvi ndizvo zvaakamudaidzira kubudikidza ngevhangeri redu, kuti muashire uthende waMambo wedu Jesu Kristu. \v 15 Ndizvo, hama, emai mwakagwinya, mubate mupango yemwakadzidziswa tisu, kunyazwi ngeizwi nokuti ngetsamba yedu.
+=======
+\v 13 Asi nguva ese ngatipe nhasha jaMwari tivadikani vaVambo, Ngokuti Mwari wakasana kare pakuponesuwa pamwea; \v 14 Okadi nogonda, pamakadainjua pakati povhangeri redu, Mambo Jesu Kristo. \v 15 Ngokudaro, hama, ngarai, makaperera kuzvia zvamakajijisua kumazvi osamba yedu.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

02/16.txt

@@ -1 +1,5 @@
-\v 16 Zvino, ndizvo, Mambo wedu Jesu Kristu emene naMwari Baba edu, uwo wakatida nokubudikidza ngenyasha wakatipa kuembedzerwa kusikaperi negonda rakanaka, \v 17 ngaaembedzere mwoyo yenyu nekuigwinyisa kumushando yeshe nekumazwi eshe akanaka.
+<<<<<<< HEAD
+\v 16 Zvino, ndizvo, Mambo wedu Jesu Kristu emene naMwari Baba edu, uwo wakatida nokubudikidza ngenyasha wakatipa kuembedzerwa kusikaperi negonda rakanaka, \v 17 ngaaembedzere mwoyo yenyu nekuigwinyisa kumushando yeshe nekumazwi eshe akanaka.
+=======
+\v 16 Ivona, Mambo wedu Jesu Kristo, Wedu Mwari naBaba, wedu wakatinda panhasha otipa ruvetero rorunhararo; \v 17 Iyena ngaembesere moyo, jenhu nobasa .
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

03/01.txt

@@ -1 +1,5 @@
-\c 3 \v 1 Pakugumisira, hama, tikumbirirei kuti izwi raMambo rihambiskwe nokukudzwa, kudai ngezverinoita pakati penyu, \v 2 zve, kuti tinunurwe kubva kuvanhu vasikazi kunaka nevakashata, ngekuti andivopi veshe vanokugonda. \v 3 Asi Mambo unogondeka nekuti unozomugwinyisa nekumungwarira kune uwo wakashata.
+<<<<<<< HEAD
+\c 3 \v 1 Pakugumisira, hama, tikumbirirei kuti izwi raMambo rihambiskwe nokukudzwa, kudai ngezverinoita pakati penyu, \v 2 zve, kuti tinunurwe kubva kuvanhu vasikazi kunaka nevakashata, ngekuti andivopi veshe vanokugonda. \v 3 Asi Mambo unogondeka nekuti unozomugwinyisa nekumungwarira kune uwo wakashata.
+=======
+\c 3 \v 1 Kuzvizinji kozviro,vakoma tsumbiranhi kwatiri kuti mazvi  aMambo agare kwandiri, kuti Akujue, Kudai pakati penhu; \v 2 Kuti tisungunuke Kuvandhu vakashata,ngokuti gonda ariripi kuvandhu vese. \v 3 Asi wakarurama ndimambo,  kvauti vamuonerere nokushengeta kuvakashata
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

03/04.txt

@@ -1 +1,5 @@
-\v 4 Nesu tine gonda munaMambo ndimwi, kuti munoita munozoitazve zviro zvetinomupanga. \v 5 Mambo ngaatungamirire mwoyo yenyu kurudo rwaMwari nomukusengerera kwaKristu.
+<<<<<<< HEAD
+\v 4 Nesu tine gonda munaMambo ndimwi, kuti munoita munozoitazve zviro zvetinomupanga. \v 5 Mambo ngaatungamirire mwoyo yenyu kurudo rwaMwari nomukusengerera kwaKristu.
+=======
+\v 4 Tinotendera kuna Mambo kwamuri, kuti zvamukuita munoenderera mberi meshita izvo zvandinomutuma. \v 5 Kuti Mambo amutungamirire Moyo Jenhu Kuti muite Rudo Kuna Mwari no Rusengerero Kuna Kristo.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

03/06.txt

@@ -1 +1,5 @@
-\v 6 Nokuti hama, muzita raMambo wedu Jesu Kristu, kuti mupauke kubva kunehama yeshe inenungo, isikahambi kudai ngemipango yevakaashira kubva kwetiri. \v 7 Ngokuti imwimwi mwemene munozia njira yokutiedzerera ndiyo isusu; ngokuti atizi kuita nungo pakati penyu, \v 8 atizi kurha chingwa chomunhu nokuti ngouri tisikazi kuchitenga, asi takashanda techitambudzika usiku nemasikati kuti tisazoita mutwaro kunoumwe wenyu. \v 9 Haiwa ngokuti tainga tisina simba, asi kuti tidziite chionero kwomuri, kuti imwimwi mutedzerere.
+<<<<<<< HEAD
+\v 6 Nokuti hama, muzita raMambo wedu Jesu Kristu, kuti mupauke kubva kunehama yeshe inenungo, isikahambi kudai ngemipango yevakaashira kubva kwetiri. \v 7 Ngokuti imwimwi mwemene munozia njira yokutiedzerera ndiyo isusu; ngokuti atizi kuita nungo pakati penyu, \v 8 atizi kurha chingwa chomunhu nokuti ngouri tisikazi kuchitenga, asi takashanda techitambudzika usiku nemasikati kuti tisazoita mutwaro kunoumwe wenyu. \v 9 Haiwa ngokuti tainga tisina simba, asi kuti tidziite chionero kwomuri, kuti imwimwi mutedzerere.
+=======
+\v 6 Asi itusu tinomutuma, hama, noZina raMambo  Jesu Kristo, kuti mugare ndhambo kuno vano famba vashina kurongeka, kushiripi komulairo ya takahashira. \v 7 Ngokuti  imwimwi munozviziva kuti tevejera, ngokuti itusu atina kutama kurongueka kwamuri; \v 8 Ngokuti atizivi kuha mahara shingua, Asi ngobasa nokuremba takashanda no usiku no massikati, kuti tishanesua ngaumwe zvondhozvo, \v 9 Ngokuti itusu taifamba pamufananijo venhu, kuti timutevejere.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

03/10.txt

@@ -1 +1,5 @@
-\v 10 Petainga tichirinemwi takamupanga kuti: “Kudai aripo munhu usikadi kushanda, asazorha.” \v 11 Ngokuti tinozwa kuti vamweni vanoita nungo pakati penyu, vasikashandi, asi vanokangaidza vanhu. \v 12 Zvino avo vakadaro tinovapanga nokuvapota munaMambo Jesu Kristu kuti vashande  mushando yavo ngekunyarara, varhe chingwa chawo.
+<<<<<<< HEAD
+\v 10 Petainga tichirinemwi takamupanga kuti: “Kudai aripo munhu usikadi kushanda, asazorha.” \v 11 Ngokuti tinozwa kuti vamweni vanoita nungo pakati penyu, vasikashandi, asi vanokangaidza vanhu. \v 12 Zvino avo vakadaro tinovapanga nokuvapota munaMambo Jesu Kristu kuti vashande  mushando yavo ngekunyarara, varhe chingwa chawo.
+=======
+\v 10 Ngokuti patainga tesse taimuumiravo; ngokuti uwa Ashikadi kushanda, eshiphinginija Vamueni ashaha. \v 11 Ngokuti takazva kuti vamueni pakati penhu vaifamba vashina kurongeka, vashi kashandi, \v 12 Asi veshipinginija bassa rovamueni asi vakadaro tino vatxunguja kuna Mambo wedhu Jesu Kristo, kuti shandanhi mushikanesi vamueni muhe sadja renhu.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

03/13.txt

@@ -1 +1,5 @@
-\v 13 Hama, musaremba kuita zvakanaka. \v 14 Kudai aripo munhu usikazkwii izwi redu reiyi tsamba, muringisisei munhuwo, kutimmusazkwanana naye, kuti ena adaniskwe. \v 15 Musazomuerenga kuti igaa, asi mumupange kudai ngehama.
+<<<<<<< HEAD
+\v 13 Hama, musaremba kuita zvakanaka. \v 14 Kudai aripo munhu usikazkwii izwi redu reiyi tsamba, muringisisei munhuwo, kutimmusazkwanana naye, kuti ena adaniskwe. \v 15 Musazomuerenga kuti igaa, asi mumupange kudai ngehama.
+=======
+\v 13 Kwamuri vakoma, musharemba, kuita zvakanaka. \v 14 Asi kuno viya ashikazvi mazwi o tsamba iyi, eshi ngajua mushazobatana naye, kuti atweruke;  \v 15 Mushazomutaja seimuvengi, asi muitennhi arihamaenhu.
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

03/16.txt

@@ -1 +1,5 @@
-\v 16 Mambo wokunyarara  emene ngaamupe kunyarara nguva dzeshe nenjira dzeshe. Mambo ngaagare nemwi mweshe. \v 17 Inini Phauri ndanyora kutambisa uku ngenyara yangu yemene. Ichi chioniso chiri mutsamba yangu yeshe; ndiyo njira yendinonyora ndiyo. \v 18 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi mweshe.
+<<<<<<< HEAD
+\v 16 Mambo wokunyarara  emene ngaamupe kunyarara nguva dzeshe nenjira dzeshe. Mambo ngaagare nemwi mweshe. \v 17 Inini Phauri ndanyora kutambisa uku ngenyara yangu yemene. Ichi chioniso chiri mutsamba yangu yeshe; ndiyo njira yendinonyora ndiyo. \v 18 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi mweshe.
+=======
+\v 16 Asi muari horunhararo ngamupe runhararo. Mambo ngagare kwamuri mese. \v 17 Kutxungamija konhara jangu, pauro, kusaina kwangu phatsamba yangu yese, kudhai ndinotara. \v 18 Nhasha jamambo Jesu Kristo ngajigare kwamuri. Amen
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

front/title.txt

@@ -1 +1,5 @@
-Tsama yechipiri ya pauro kuva Tesalonis
+<<<<<<< HEAD
+Tsama yechipiri ya pauro kuva Tesalonis
+=======
+2 Vathesaronika
+>>>>>>> 2f45d2a99738efe9d6aa09e53bfd368a8d44f1ad

manifest.json

@@ -34,30 +34,12 @@
 	"parent_draft": {},
 	"translators": [
 		"Sama",
-		"Ndau - Mossurize"
+		"Ndau - Mossurize",
+		"Bernardo Masseruca Seze Munhai"
 	],
 	"finished_chunks": [
-		"front-title",
 		"01-title",
-		"01-01",
-		"01-03",
-		"01-06",
-		"01-09",
-		"01-11",
 		"02-title",
-		"02-01",
-		"02-03",
-		"02-05",
-		"02-08",
-		"02-11",
-		"02-13",
-		"02-16",
-		"03-title",
-		"03-01",
-		"03-04",
-		"03-06",
-		"03-10",
-		"03-13",
-		"03-16"
+		"03-title"
 	]
 }