Sun Apr 14 2024 20:30:35 GMT+0200 (Central Africa Time)

01/01.txt

@@ -1 +1,6 @@
-\c 1 \v 1 Phaulo, Silvano naTimotio, ngonguereke ya thesalonika, munaMwari Baba, no Mambo Jesu Kristo; Nyasha noUnyararo kwamuri.
+<<<<<<< HEAD
+\c 1 \v 1 Phauri, Sirivhanusi naThimothi, ndinonyorera kuchiara chevaThesaronika chiri munaMwari Baba nomunaMambo Jesu Kristu. Nyasha nokunyarara 
+ngazvigare nemwi.
+=======
+\c 1 \v 1 Phaulo, Silvano naTimotio, ngonguereke ya thesalonika, munaMwari Baba, no Mambo Jesu Kristo; Nyasha noUnyararo kwamuri.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

01/02.txt

@@ -1 +1,5 @@
-\v 2 Itusu tinotenda Mwari kuna imwimwi mwese, kumuchowedjera munamato vedu. \v 3 Nokurangarira kwedu, pamberi paMwari Bhaba, noBasa nokugonda kwenyu, no mabasa no kudha kwenyu nochigarano no kushinga kwenyu muna Jesu Kristo.
+<<<<<<< HEAD
+\v 2 Tinobonga Mwari nguva dzeshe ndimwi mweshe, techimukarakadza mumukumbiro yedu. \v 3 Tinogara techimukarakadza pamberi paMwari naBaba edu ngemushando wenyu wokugonda nokushandira kwenyu murudo nokusengerera kwokugonda munaMambo wedu Jesu Kristu.
+=======
+\v 2 Itusu tinotenda Mwari kuna imwimwi mwese, kumuchowedjera munamato vedu. \v 3 Nokurangarira kwedu, pamberi paMwari Bhaba, noBasa nokugonda kwenyu, no mabasa no kudha kwenyu nochigarano no kushinga kwenyu muna Jesu Kristo.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

01/04.txt

@@ -1 +1,5 @@
-\v 4 Tinoziva, hama djinodika naMwari, itusu tinozwidziva kuti iena vakamusana, \v 5 Ngokuti vangueri redu ariziwi kuguma kuna imwimwi no mazwi, no simba remweia mutwene ngokuti rese rokuti mazwi vaya ngookadi, munodziwa vanarume vanga pakati patiri, vai ita noudakari vedu vakadhakadja.
+<<<<<<< HEAD
+\v 4 Ngekuti tinozia, hama munodiwa ndiMwari, kuti wakamusarudza, \v 5 ngekuti vhangeri redu arizi kuuya kwomuri ngeizwi rega, asi ngesimbawo nomuMweya Wakachena nokugwinyiswa kukuru. kudai ngezvomunozia kuti tainga tiri vanhu vakadini pakati penyu ngendaa yenyu.
+=======
+\v 4 Tinoziva, hama djinodika naMwari, itusu tinozwidziva kuti iena vakamusana, \v 5 Ngokuti vangueri redu ariziwi kuguma kuna imwimwi no mazwi, no simba remweia mutwene ngokuti rese rokuti mazwi vaya ngookadi, munodziwa vanarume vanga pakati patiri, vai ita noudakari vedu vakadhakadja.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

01/06.txt

@@ -1 +1,5 @@
-\v 6 Imwimwi kuti muite vatewedjeri wo Mambo, kuashira mazwi nokudhakara kwa Mweia Mutsene, ngokuti zwichaishe zwakavanda. \v 7 Nadzonadzo mwakapanguidja kuna vese vatendi va Masedhonia noAkaia.
+<<<<<<< HEAD
+\v 6 Nemwi mwakaita vaedzereri vedu nevaMambozve, mwechiashira izwi mukutambudzika kukuru, ngekudakara kwoMweya Wakachena. \v 7 Ngekudaro mwakaita chionero kwavari veshe vanotenda muMasedhonia nomuAkhaiya.
+=======
+\v 6 Imwimwi kuti muite vatewedjeri wo Mambo, kuashira mazwi nokudhakara kwa Mweia Mutsene, ngokuti zwichaishe zwakavanda. \v 7 Nadzonadzo mwakapanguidja kuna vese vatendi va Masedhonia noAkaia.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

01/08.txt

@@ -1 +1,5 @@
-\v 8 Nopakati pamuri, mazwi aMambo vanochiparadjana, ngoMasedhoniya noAkaia, nondawa ymwe, kugonda kwenyu naMwari vanotchiita. Naedzonazwo atidhi kuwerekweta chiro. \v 9 Ivona kamare warikuwerekweta tinga ita kungana itusu na imwimwi mwakadhawira Mwari weuphenyu vakanaka, \v 10 Mwechigarira Mwana wakwe, etchiva kudhenga, wakamuka pakufa: Ndiena Jesu, anotihonera
+<<<<<<< HEAD
+\v 8 Ngokuti kubvira kwomuri izwi raMambo rakazwika haiwa muMasedhonia nomuAkhaiya mwega, asi kundau dzeshe kugonda kwenyu munaMwari kwakaziikanwa, akuchasisiri kuti isusu tirekete chiro. \v 9 Ngekuti avo vemene vanoshuma tisu ngenjira yemwakatiashira ndiyo pakati penyu, nenjira yemwakatendeuka ndiyo kuna Mwari kubva kumuedzaniso yekudira, kuti mushandire Mwari unopona wegwinyiso, \v 10 nokugarira Mukororo wake unobva mudenga, waakamusa kubva kwavakafa, ndiJesu uwo unotinunura kubva muushungu unouya.
+=======
+\v 8 Nopakati pamuri, mazwi aMambo vanochiparadjana, ngoMasedhoniya noAkaia, nondawa ymwe, kugonda kwenyu naMwari vanotchiita. Naedzonazwo atidhi kuwerekweta chiro. \v 9 Ivona kamare warikuwerekweta tinga ita kungana itusu na imwimwi mwakadhawira Mwari weuphenyu vakanaka, \v 10 Mwechigarira Mwana wakwe, etchiva kudhenga, wakamuka pakufa: Ndiena Jesu, anotihonera
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/01.txt

@@ -1 +1,5 @@
-\c 2 \v 1 Imwimwi munozviziva, hama, noKuonana kwedu naimwimwi akuzvivi kwamahala. \v 2 Munoziva kuti takatambijika nyajiwa ngozvonyova muFhilipo. Nokudaro takabatana muna Mwari wedu tidjidjisane noVangeri rake kuna itusu, noPakati noPakakura.
+<<<<<<< HEAD
+\c 2 \v 1 Ngokuti imwimwi mwemene munozia, hama, kuti kuuya kwedu kwomuri akuzi kuita kusina shkwiro. \v 2 Asi kunyazwi takatambudzika pakutanga nokuitirwa zvinotsverudza muFiripi, kudai ngezvomunozia, takatsunga munaMwari wedu kureketa kwomuri vhangeri raMwari ngokutambudzika kukuru.
+=======
+\c 2 \v 1 Imwimwi munozviziva, hama, noKuonana kwedu naimwimwi akuzvivi kwamahala. \v 2 Munoziva kuti takatambijika nyajiwa ngozvonyova muFhilipo. Nokudaro takabatana muna Mwari wedu tidjidjisane noVangeri rake kuna itusu, noPakati noPakakura.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/03.txt

@@ -1 +1,5 @@
-\v 3 Ngokuti ngozviro zvedu azvisi zviro zvokuchata, nezvokuchegejia, neZvokunhepa. \v 4 Asi, takatendewa, ndiMwari nokuti vangeri ridikwe, dari tirikuwereketa, azviviri kudhakajisa kuna varume, asi kuna Mwari. Iena anovona moyo jedu.
+<<<<<<< HEAD
+\v 3 Ngekuti kupota kwedu akuzi kubva mukupauka akadi nokuti mukusikasukika nokuti mukuchengedzera. \v 4 Asi kudai ngezvetakatendwa ndiMwari kuti tigondwe ngevhangeri, ndizvo tinoreketa, haiwa kudakadza vanhu, asi Mwari uwo unoedza mwoyo yedu.
+=======
+\v 3 Ngokuti ngozviro zvedu azvisi zviro zvokuchata, nezvokuchegejia, neZvokunhepa. \v 4 Asi, takatendewa, ndiMwari nokuti vangeri ridikwe, dari tirikuwereketa, azviviri kudhakajisa kuna varume, asi kuna Mwari. Iena anovona moyo jedu.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/05.txt

@@ -1 +1,5 @@
-\v 5 Ngokudaro atizivi kumbodira mazvi akanaka okumuchengwedja imwimwi. \v 6 Atizivi kutsawanga imwimwi kana muvane mare. Mwari ichapupu zvondozvo. Atitsaki tchigare choVarume, neKuna imwimwi.
+<<<<<<< HEAD
+\v 5 Ngekuti munonasa kuzia, naMwari ndiye chapupu chedu, atizi kuoneka kunyazwi ngouri mukuwo techironza mazwi ourimbwi, kudai ngezvomunozia, nokuti zano rokuemura pfuma. \v 6 Tisikatswaki kuirikidzwa ngevanhu, nokuti kunobva kwomuri nokuti kunobva kunevamweni.
+=======
+\v 5 Ngokudaro atizivi kumbodira mazvi akanaka okumuchengwedja imwimwi. \v 6 Atizivi kutsawanga imwimwi kana muvane mare. Mwari ichapupu zvondozvo. Atitsaki tchigare choVarume, neKuna imwimwi.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/07.txt

@@ -1 +1,6 @@
-\v 7 Zwichiadaropi, takari tiri vandhu kuana imwimwi, no djimai rimwe veitambuja vana vake. \v 8 Ngazwimwezwo, ngondava yo zwiitiso kwamuri, tainga takagarisika patakazwa naimwimwi  richikaripi vanger raMwari basi, no undhu  wedhu. nazwo mwaita vokudika kuna ituso. \v 9 Hamadiwa, pachina kuthimwathimwa rangarirai basa redu naizwo tinobata usiku nomasikati kutgi tichaita nenga vaiya vakachatihwa kwamuri. Panguva iya, taimuparijira vangeri ra Mwari.
+<<<<<<< HEAD
+\v 7 kunyazwi taikona kuita mutwaro kwomuri, kudai ngevapostori vaKristu. Asi taiya takapfaa
+pakati penyu, kudai ngezvaanoita mureri apo echirera vana vake. \v 8 Ndizvo techimudisisa taida kukoverana nemwi haiwa vhangeri raMwari rega, asi nokupona kwedu kwemene, ngokuti imwimwi mwakaita vanopinda kudikanwa kakuru kwetiri. \v 9 Ngokuti munokarakadza kushanda kwedu nokurwadziwa hama. Takashanda usiku nemasikati, kuti tisazoita mutwaro kunoumwe wenyu, apo petakachumaira kwomuri vhangeri raMwari
+=======
+\v 7 Zwichiadaropi, takari tiri vandhu kuana imwimwi, no djimai rimwe veitambuja vana vake. \v 8 Ngazwimwezwo, ngondava yo zwiitiso kwamuri, tainga takagarisika patakazwa naimwimwi  richikaripi vanger raMwari basi, no undhu  wedhu. nazwo mwaita vokudika kuna ituso. \v 9 Hamadiwa, pachina kuthimwathimwa rangarirai basa redu naizwo tinobata usiku nomasikati kutgi tichaita nenga vaiya vakachatihwa kwamuri. Panguva iya, taimuparijira vangeri ra Mwari.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/10.txt

@@ -1 +1,7 @@
-\v 10 Imwimwi munopupura kudai Mwari, ngokudaro patinogarisika pazwiya zwakachena nozwakanaka ndizwona zwakaanaka kuna imwimwi, kuti tendai. \v 11 Zwakadaro, zivai kuti tinowona umwe na umwe kuna imwimwi nenga baba nadjirira mwana wake, \v 12 Dhakaranhi, mudjichikirire nokudjivangirira kuti urarame  zwakanaka kuna Mwari, anomudainja  kuUmamabo wake wou thende.
+<<<<<<< HEAD
+\v 10 Imwimwi muri zvapupu, naMwariwo, ngokucheneswa nokurungama nokusakaitirwa ndaa kwakaitawani kwetakaita kwomuri imwimwi vatendi. \v 11 Kudai ngezvomunozia njira yetakaita
+kunoumwe ngaumwe wenyu, kudai ndibaba vanoitira kunevana vavo, \v 12 techimupanga
+nokumugwinyisa nokupupura, kuti muhambe kudai ngezvinosisira kuna Mwari, uwo unomudaidza kuumambo wake wemene nouthende.
+=======
+\v 10 Imwimwi munopupura kudai Mwari, ngokudaro patinogarisika pazwiya zwakachena nozwakanaka ndizwona zwakaanaka kuna imwimwi, kuti tendai. \v 11 Zwakadaro, zivai kuti tinowona umwe na umwe kuna imwimwi nenga baba nadjirira mwana wake, \v 12 Dhakaranhi, mudjichikirire nokudjivangirira kuti urarame  zwakanaka kuna Mwari, anomudainja  kuUmamabo wake wou thende.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/13.txt

@@ -1 +1,5 @@
-\v 13 Ngokuda itusu tinotenda Mwari paiya, panoachira itusu mazwi awazwa, uchaatenda nenga mazwi omundhu , ngondava yokuti iona, mazwi a Mwari. aya ndiona mazwi anoitisa kuti utende.
+<<<<<<< HEAD
+\v 13 Isusuwo tinoangira kubonga Mwari ngeizvi, kuti apo pemwakaashira izwi raMwari iro remwakazwa kubva kwetiri, mwakariashira haiwa kudai ngeizwi revanhu, asi kudai ngezveriri gwinyiso, izwi raMwari, iro rinoshandawo mukati mwenyu imwimwi vatendi.
+=======
+\v 13 Ngokuda itusu tinotenda Mwari paiya, panoachira itusu mazwi awazwa, uchaatenda nenga mazwi omundhu , ngondava yokuti iona, mazwi a Mwari. aya ndiona mazwi anoitisa kuti utende.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/14.txt

@@ -1 +1,8 @@
-\v 14 Nokuti imwimwi, hama, mwakaita vatevereri vemuchiara raMwari Kristu Jesu; zviri muJudheya, nokuti mwakatambudjwua nozviro zvakatodjana ngevanhu venyika yenyu kudai ngezvevakatambudjwa avo ngevajudhea. \v 15 Avo vakaenda vaJudeu vakamuraya veshe Manbo Jesu nevaProfeti. Vakati gogomera, vachingadakadzirMwari, vanorwisana noveshe vanarume; \v 16 Vechitiranbisa kuvereketa kunavemadjindza kuti vaponeswe, ndizvo vechizadzisa chipimo chochishaishi kwavo ngenguva weshe asi ushungu hwaMwari hwakauya panber pavo pakupedjesera.
+<<<<<<< HEAD
+\v 14 Ngokuti imwimwi, hama, mwakaita vatedzereri vezviara zvaMwari munaKristu Jesu izvo zviri muJudhiya, ngokuti mwakatambudzwawo ngezviro zvakatodzana ngevanhu venyika yenyu
+kudai ngezvevakatambudzwa avo ngevaJudha. 15 \v 15 avo vaJudha vakauraya veshe. Mambo Jesu nevaprofeti, vakatidzinga, vasikadakadzi Mwari, vari vanorwisana nevanhu veshe, \v 16 vechitirambidza
+kureketa kunevemadzinza kuti vaponeswe. Ndizvo vakaangira vechizadzisa chipimo chekushaisha kwavo ngenguva dzeshe. Asi ushungu waMwari wakauya padera pavo.
+pakupedzisira.
+=======
+\v 14 Nokuti imwimwi, hama, mwakaita vatevereri vemuchiara raMwari Kristu Jesu; zviri muJudheya, nokuti mwakatambudjwua nozviro zvakatodjana ngevanhu venyika yenyu kudai ngezvevakatambudjwa avo ngevajudhea. \v 15 Avo vakaenda vaJudeu vakamuraya veshe Manbo Jesu nevaProfeti. Vakati gogomera, vachingadakadzirMwari, vanorwisana noveshe vanarume; \v 16 Vechitiranbisa kuvereketa kunavemadjindza kuti vaponeswe, ndizvo vechizadzisa chipimo chochishaishi kwavo ngenguva weshe asi ushungu hwaMwari hwakauya panber pavo pakupedjesera.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

02/17.txt

@@ -1 +1,5 @@
-\v 19 \v 17 Asi itisu hama, petakaparadzwa nemwi ngeguva choma, mokuonana kwomuiri , asi kwemoyo , takagaririra kuona hope yenyu ngokumushingirira kwakakura. \v 18 Nokuti taida kuviya kwomuri, inini, Phauro, kamwe nekwechipiri, nasathani wakatipinga.  \v Nokuti  Manbo Jesu angazo wirira ngerapi gondisho redu kana kudakara kwedu nokuti dzungudza retinogadjwa ndiro?  pamberi paMambo wedu Jesu pkuuya kwake andimwipi here. \v 20 Ngokuti imwimwi muno kuganha hwedu nokudara kwedu
+<<<<<<< HEAD
+\v 17 Asi kudai tisu, hama, petakaparadzaniswa nemwi kwenguva doko, mukuonana kwemuiri, haiwa kwomwoyo, takatsamwirira kuona hope yenyu ngokumushuwira kakurutu. \v 18 Ngokuti tinoda kuuya kwomuri. Inini, Phauri, kamwe nokwechipiri, naSathani wakatipinga. \v 19 Ngokuti chiinyi gonda redu nokuti kudakara kwedu nokuti dzungudza retinoganza ndiro pamberi paMambo wedu Jesu pakuuya kwake? Andimwipi here? \v 20 Ngekuti imwimwi muri uthende wedu nekudakara kwedu.
+=======
+\v 19 \v 17 Asi itisu hama, petakaparadzwa nemwi ngeguva choma, mokuonana kwomuiri , asi kwemoyo , takagaririra kuona hope yenyu ngokumushingirira kwakakura. \v 18 Nokuti taida kuviya kwomuri, inini, Phauro, kamwe nekwechipiri, nasathani wakatipinga.  \v Nokuti  Manbo Jesu angazo wirira ngerapi gondisho redu kana kudakara kwedu nokuti dzungudza retinogadjwa ndiro?  pamberi paMambo wedu Jesu pkuuya kwake andimwipi here. \v 20 Ngokuti imwimwi muno kuganha hwedu nokudara kwedu
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

03/01.txt

@@ -1 +1,5 @@
-\c 3 \v 1 Ngokudaro,atishaidepi kukwanisazve, takazogara tega kuhAtena. \v 2 Takazotuma hama yedu Timoti hama yedu arimushandi wakristo muvhangeri raKristo kuti amuguinhise nokuvanguisa muvhangeri raKristo pagonda renhu. \v 3 Pakuti apana anowaniwa ngommatambujiko ondhoo.  Ngokuti tahemesewa zvondhozho.
+<<<<<<< HEAD
+\c 3 \v 1 Ndizvo apo takakorera kushingirira, takapinimidza kuti kwakanaka kuti tisiiwe sure tega muAtenesi. \v 2 Nesu takatuma Thimothi, hama yedu nomushandi waMwari muvhangeri raKristu, kuti amugwinyise nokumuembedzera mukutenda kwenyu. \v 3 Kuti asazoapo munhu unokutukuswa ngemadambudziko aya. Ngegwinyiso imwimwi mwemene munozia kuti izvi ndizvo zvetakaemeserwa.
+=======
+\c 3 \v 1 Ngokudaro,atishaidepi kukwanisazve, takazogara tega kuhAtena. \v 2 Takazotuma hama yedu Timoti hama yedu arimushandi wakristo muvhangeri raKristo kuti amuguinhise nokuvanguisa muvhangeri raKristo pagonda renhu. \v 3 Pakuti apana anowaniwa ngommatambujiko ondhoo.  Ngokuti tahemesewa zvondhozho.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

03/04.txt

@@ -1 +1,8 @@
-\v 4 Ngomuchokwadi, Patainga Naimwimwi maitivhunja kuti tishito kuti tinozotanbudjika  kutamujua zvakamboitikayazve,noku ti munozviziva. \v 5 Ngokwazvo, pandajayida kukwanisha, Inini  ndakamutuma kuti ndione gonda renhu inini ndaityia kuti mueji amueje, kuti basa redu rishande.
+<<<<<<< HEAD
+\v 4 Ngegwinyiso, apo petaInga nemwi, takambomuronzera kuti tinozorwadziwa
+ngokutambudzwa, kudai ngezvakaitika, kudai ngezvomunozia. \v 5 Ngeiyi ndaa ininiwo apo
+ndakakorera kushingirira, ndakatumira kuti ndizie ngendaa yokutenda kwenyu, ndechitya kuti
+pamweni muedzi waiya amuedza nomushando wedu waizoita usina shkwiro.
+=======
+\v 4 Ngomuchokwadi, Patainga Naimwimwi maitivhunja kuti tishito kuti tinozotanbudjika  kutamujua zvakamboitikayazve,noku ti munozviziva. \v 5 Ngokwazvo, pandajayida kukwanisha, Inini  ndakamutuma kuti ndione gonda renhu inini ndaityia kuti mueji amueje, kuti basa redu rishande.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

03/06.txt

@@ -1 +1,7 @@
-\v 6 Asi wari,Timopti wawhirira kwatiri pamberi penhu, wakativisira masoko akanaka, ogonda renhu norudo, kuti nguva jese mutirangarirevo, tinoda kumuona kakurutu. \v 7 Asi itsusu kwamuri. Ngokudaro hama tihembesenhi ngondava yo zvido zvedu nokutambujika kwedu ngogonda renhu.
+<<<<<<< HEAD
+\v 6 Asi  Thimothi apetuka kwetiri kubva kwomuri, wakatiunzira mashoko anodakadza okutenda kwenyu nerudo rwenyu. Wakatironzerawo kuti munonasa kupinimidza tisu ngenguva dzeshe,
+mwechishuwira kutiona, kudai tisuwo tinoshuwira kumuona. \v 7 Ngendaa yeizvi, hama, takagwinyiswa ndimwi mukutama kwedu kweshe nokutambudzika
+kubudikidza ngokugonda kwenyu.
+=======
+\v 6 Asi wari,Timopti wawhirira kwatiri pamberi penhu, wakativisira masoko akanaka, ogonda renhu norudo, kuti nguva jese mutirangarirevo, tinoda kumuona kakurutu. \v 7 Asi itsusu kwamuri. Ngokudaro hama tihembesenhi ngondava yo zvido zvedu nokutambujika kwedu ngogonda renhu.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

03/08.txt

@@ -1 +1,5 @@
-\v 8 Asi wari tinopona,kudai imwimwi makaperera paMambo. \v 9 Asi tinobongesa kudinini Mwari kwamuri ngokudakara kwese ngokuti itusu tinodakara ngondava yenhu, pakati paMwari? \v 10 Nousiku nomasikati nosimba tinonamata kuti tikwanise kuona mumeso menhu, tinoohona kukaraira kwenhu kogonda.
+<<<<<<< HEAD
+\v 8 Ngokuti zvino tinopona, kudai imwimwi mwechiangira kuema mwakagwinya munaMambo. \v 9 Ngekuti tingaita mabongereyi kuna Mwari ndimwi, ngendaa yekudakara kweshe kwetinodakara ndikwo ngendaa yenyu pamberi paMwari wedu? \v 10 Tinokumbira kakuru usiku nemasikati kuti tione hope dzenyu nokuzadzisa kunyazkwi  chiri chinotamika mukugonda kwenyu.
+=======
+\v 8 Asi wari tinopona,kudai imwimwi makaperera paMambo. \v 9 Asi tinobongesa kudinini Mwari kwamuri ngokudakara kwese ngokuti itusu tinodakara ngondava yenhu, pakati paMwari? \v 10 Nousiku nomasikati nosimba tinonamata kuti tikwanise kuona mumeso menhu, tinoohona kukaraira kwenhu kogonda.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

03/11.txt

@@ -1 +1,6 @@
-\v 11 Asi Mwari, Baba wedu, Mambo wedu Jesu, nasiriranhi guanja redu mbesa renhu. \v 12 Kuti Mambo ngamukuje meipidirija rudo umwe kunoumweni, kwamuri mwese, kutojana kwedu naimwimwi; pakati pokuvanguisa moyo yenhu. \v 13 Kuti mushapumbwa pautsene pakati pamwari wenhu Baba,pakuviya Mambo Jesu nohutsene wese.
+<<<<<<< HEAD
+\v 11 Zvino Mwari wedu naBaba emene naMambo
+wedu Jesu ngaatungamirire njira yedu kwomuri. \v 12 NaMambo ngaaite kuti muwande nokuwanza rudo pakati penyu umwe kune umweni nokunevanhu veshe, kudai ngezvetinoitawo isusu kwomuri. \v 13 kuti ena agwinyise mwoyo yenyu mukucheneswa kuti muite vasina ndaa pamberi paMwari wedu naBaba, pakuuya kwaMambo wedu Jesu pamwepo nevatswene vake veshe.
+=======
+\v 11 Asi Mwari, Baba wedu, Mambo wedu Jesu, nasiriranhi guanja redu mbesa renhu. \v 12 Kuti Mambo ngamukuje meipidirija rudo umwe kunoumweni, kwamuri mwese, kutojana kwedu naimwimwi; pakati pokuvanguisa moyo yenhu. \v 13 Kuti mushapumbwa pautsene pakati pamwari wenhu Baba,pakuviya Mambo Jesu nohutsene wese.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

04/01.txt

@@ -1 +1,5 @@
-\c 4 \v 1 Ngokudaro,hama,ngozvasara kumushonipa nokumukuja paMambo Jesu, ngokuti takaashira Kwamuri kuti tifambe mukudakajisa Mwari ngokuti tirikufamba, ngatidaro nguva jese. \v 2 Asi Munoziva mupango jamakapuwa na Mambo Jesu.
+<<<<<<< HEAD
+\c 4 \v 1 Ndizvo pakupedzisira, hama, tinomukumbira nokukumbira munaMambo Jesu kuti, kudai ngezvemwakaashira kwetiri njira inofanera yekuhamba ndiyo nekumudakadza Mwari, kudai ngezvomunohamba, kuti muwanze kudaro. \v 2 Ngokuti munozia kupanga kwetakamupanga kubudikidza ndiMambo Jesu.
+=======
+\c 4 \v 1 Ngokudaro,hama,ngozvasara kumushonipa nokumukuja paMambo Jesu, ngokuti takaashira Kwamuri kuti tifambe mukudakajisa Mwari ngokuti tirikufamba, ngatidaro nguva jese. \v 2 Asi Munoziva mupango jamakapuwa na Mambo Jesu.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

04/03.txt

@@ -1 +1,6 @@
-\v 3 Asi uku kuda kwamwari; utsene wenhu, kuti mushaite shitema choumaponde, kuti \v 4 Umwe naumwe azive kugara no mujiyo wake oustzene nokureremeja. \v 5 kushiripi ngokuda kakashata, tenga vahedeni vashikazivi Mwari. \v 6 Ngokudaro Apana anoctjengeja nokuzvinhirira hama yako, ngokuti  Mambo indiena anotambuja. pazvese ngokuti tichito takananga topekeja chapupu.
+<<<<<<< HEAD
+\v 3 Ngokuti uku ndikwo kuda kwaMwari, kucheneswa kwenyu; kuti murekere kupomba, \v 4 kuti umwe ngaumwe wenyu azie njira yokudzitorera mukadzi pachake  mukucheneswa
+nemukureremedza, \v 5 haiwa ngokuemura kwakashata, kudai ngevemadzinza vasikamuzii Mwari. \v 6 kuti kusaapo naumwe unopauka nokushaishira hama yake ngeiyi ndaa, ngokuti Mambo ndiye muunzidziri weizvi zveshe, kudai ngezvetakambomuronzera nokupupura kudaro.
+=======
+\v 3 Asi uku kuda kwamwari; utsene wenhu, kuti mushaite shitema choumaponde, kuti \v 4 Umwe naumwe azive kugara no mujiyo wake oustzene nokureremeja. \v 5 kushiripi ngokuda kakashata, tenga vahedeni vashikazivi Mwari. \v 6 Ngokudaro Apana anoctjengeja nokuzvinhirira hama yako, ngokuti  Mambo indiena anotambuja. pazvese ngokuti tichito takananga topekeja chapupu.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

04/07.txt

@@ -1 +1,7 @@
-\v 7 Asi Mwari azivi kutidanja kukushata, Asi wakatidainja kuhuzvene. \v 8 Ngokudaro anoramba achiripi mundhu, Asi kwaMwari, ngokuti wakamupavo Mweya mutsene.
+<<<<<<< HEAD
+\v 7 Ngokuti Mwari aazi kutidaidzira kunezvisikazi kusukika, asi mune zvakacheneswa. \v 8 Ndizvo
+kunyazwi ndiani unoramba izvi, aarambi munhu akadi, asi unoramba Mwari, uwo unopa
+kwomuri Mweya wake Wakachena.
+=======
+\v 7 Asi Mwari azivi kutidanja kukushata, Asi wakatidainja kuhuzvene. \v 8 Ngokudaro anoramba achiripi mundhu, Asi kwaMwari, ngokuti wakamupavo Mweya mutsene.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

04/09.txt

@@ -1 +1,6 @@
-\v 9 Asi kurudo wamwari, azvidiki kuti nditare, Asi imwimwi jijiswanhi ndi mwari disananhi umwe kunoumweni. \v 10 Ngokudaro, maita kudaro kuha jese jo masidona. \v 11 Asi, tinomunguaja kuti muite zvondhozvo. \v 12 Zvanganhi kupona zvakanaka, mechita zvamunoda, mechishanda ngonhara jenhu, ngokuti takamuvhunja kare, kuti fambanhi mukushonipa novokunja, mushikadi tsiro.
+<<<<<<< HEAD
+\v 9 Asi ngendaa yerudo pakati pehama amutami kuti munhu amunyorere, ngokuti imwimwi mwemene mwakadzidziswa ndiMwari kuti mudane umwe kuneumweni. \v 10 Ngegwinyiso munodzida hama dzeshe dziri muMasedonia mweshe. Asi tinomupanga, hama, kuti muwanze nokuwanzisisa. \v 11 Kuti muedze kugara ngokunyarara nokubatika ngemushando yenyu yega nekushanda ngenyara dzenyu, kudai ngezvetakamupanga, \v 12 kuti muhambe ngenjira inosisira pamberi pevari
+kubanze, musina chemunotama.
+=======
+\v 9 Asi kurudo wamwari, azvidiki kuti nditare, Asi imwimwi jijiswanhi ndi mwari disananhi umwe kunoumweni. \v 10 Ngokudaro, maita kudaro kuha jese jo masidona. \v 11 Asi, tinomunguaja kuti muite zvondhozvo. \v 12 Zvanganhi kupona zvakanaka, mechita zvamunoda, mechishanda ngonhara jenhu, ngokuti takamuvhunja kare, kuti fambanhi mukushonipa novokunja, mushikadi tsiro.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

04/13.txt

@@ -1 +1,6 @@
-\v 13 Asi hama, atidi kuti mushaziva ngodava yovakafa, kuti mushazonhangajua tenga vamweni vashina ruvetero. \v 14 Asi tatenda kuti jesu wakafa omuka, asi vakafa kuna Jesu, kwamwari vanozoviya naye ngopatsa. \v 15 Asi tinonanga izvi ngomazvi ya Mambo Jesu, itusu tinosara tiripenhe mbpesa mukuviya kwake Mambo, atiendi tishito tafa.
+<<<<<<< HEAD
+\v 13 Hama, atidi kuti muite vasikazii, ngendaa yaavo vakaata, kuti musazotambudzika kudai ngavamweni vasina gonda. \v 14 Ngokuti kudai techitenda kuti Jesu wakafa nokumukazve, zvakanyadaro kubudikidza ndiJesu, Mwari unozovaunza pamwepo naye avo vakaata. \v 15 Ngokuti tinoronza izvi kwomuri ngeizwi raMambo, kuti isusu tichapona, tasara metsa kuuya
+kwaMambo, atitongozotangiri avo vakaata.
+=======
+\v 13 Asi hama, atidi kuti mushaziva ngodava yovakafa, kuti mushazonhangajua tenga vamweni vashina ruvetero. \v 14 Asi tatenda kuti jesu wakafa omuka, asi vakafa kuna Jesu, kwamwari vanozoviya naye ngopatsa. \v 15 Asi tinonanga izvi ngomazvi ya Mambo Jesu, itusu tinosara tiripenhe mbpesa mukuviya kwake Mambo, atiendi tishito tafa.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

04/16.txt

@@ -1 +1,8 @@
-\v 16 Asi Mambo anozozaka mudenga edanjira noizvi guru Arikanjo Miguel no hwamanda wamwari, vakafa kuna Kristo vanomuka pakutanga. \v 17 Goshikapiri itusu tiripenhe, tinozotohwa pamwepo naivona mumakore, kuti tionane na Mambo mumphepo, Ngokudaro tinozogara na Mambo kuenda nokuenda. \v 18 Ngokudaro embeserananhi umwe kunoumweni ngomazvi
+<<<<<<< HEAD
+\v 16 Ngekuti Mambo pachake unozodzaka kubva
+kudenga ngekudaidzira ngeizwi rengirosi huru nekuridzwa kwegwama raMwari, nevakafa vari
+munaKristu vanozotanga kumuka. \v 17 Zvino isusu tichapona tasara, tinozotorwa pamwepo navo
+mumakore kooshongana naMambo mudenga. Ngokudaro tinozogara naMambo mhera nariini. \v 18 Ndizvo embedzeranai ngemazwi aya.
+=======
+\v 16 Asi Mambo anozozaka mudenga edanjira noizvi guru Arikanjo Miguel no hwamanda wamwari, vakafa kuna Kristo vanomuka pakutanga. \v 17 Goshikapiri itusu tiripenhe, tinozotohwa pamwepo naivona mumakore, kuti tionane na Mambo mumphepo, Ngokudaro tinozogara na Mambo kuenda nokuenda. \v 18 Ngokudaro embeserananhi umwe kunoumweni ngomazvi
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/01.txt

@@ -1 +1,5 @@
-\c 5 \v 1 Ngokudaro hama, ngokuti nomazuva vano azvidikani kuti itusu titarive. \v 2 Apo imwimwi kamare munoziva kuti Mambo anodzoviya ninga mbava yousiku. \v 3 Munga famba munoti:" Pano mutendere nokugadjana", apo, ngokuti, zwinomuwirira ngokuphatura, kudaro ninga kuwadja pokubhara ninga vuyana vano bhara. I pana umwe atchakwicha.
+<<<<<<< HEAD
+\c 5 \v 1 Asi ngendaa yenguva nemikuwo, hama, amutami kunyorerwa ndizvo. \v 2 Munonasa kuzia kuti zuva raMambo rinoguma kudai ngembavha inoguma usiku. \v 3 Apo vanozoti: “Kuripo kunyarara nokungwaririka,” zvino ngekukasira kuparadzwa kuchauya padera pavo, kudai ngokurwadziwa kunouya padera pemudzimai wosununguka, apana unozotiza
+=======
+\c 5 \v 1 Ngokudaro hama, ngokuti nomazuva vano azvidikani kuti itusu titarive. \v 2 Apo imwimwi kamare munoziva kuti Mambo anodzoviya ninga mbava yousiku. \v 3 Munga famba munoti:" Pano mutendere nokugadjana", apo, ngokuti, zwinomuwirira ngokuphatura, kudaro ninga kuwadja pokubhara ninga vuyana vano bhara. I pana umwe atchakwicha.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/04.txt

@@ -1 +1,5 @@
-\v 4 Nokuti imwimwi, hama, amuripi pachidima nokuti zuva rimugumire kudai ngenbavha \v 5 Nokuti imwimwi mweshe muri vana vokujeka nomasikati , asi nousiku nokuti pashidima. \v 6 Naapo wari tisaatia kudai ngevzevanoita, vamweni  asi ngatiranbe techirinda, tingware. \v 7 Nokuti anovata, anovata noushiku, vanodakwua, vadakwua nousiku.
+<<<<<<< HEAD
+\v 4 Asi imwimwi, hama, amuri muchidimapi, kuti iro zuva rimugumire kudai ngembavha. \v 5 Ngokuti imwimwi mweshe muri vana vokujeka nevemasikati; atisiri vousiku akadi nokuti vechidima. \v 6 Ndizvo zvino tisaata, kudai ngezvevanoita vamweni, asi ngatirambe techirinda, tingware. \v 7 Ngokuti avo vanoata, vanoata usiku, naavo vanodakwa, vanodakwa usiku.
+=======
+\v 4 Nokuti imwimwi, hama, amuripi pachidima nokuti zuva rimugumire kudai ngenbavha \v 5 Nokuti imwimwi mweshe muri vana vokujeka nomasikati , asi nousiku nokuti pashidima. \v 6 Naapo wari tisaatia kudai ngevzevanoita, vamweni  asi ngatiranbe techirinda, tingware. \v 7 Nokuti anovata, anovata noushiku, vanodakwua, vadakwua nousiku.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/08.txt

@@ -1 +1,5 @@
-\v 8 Ngokudaro itussu tirivana vomasikati, ngatigare takangurira, ngatisimire shigoko shorudo no gonda, nokuvetera kokuponesuwa kamanguna kudai koshigoko chedu, \v 9 Ngokudaro asivi kutiemesera pashike, Asi kuti tiwane kuponesuwa pakati pa Mambo Jesu Kristo, \v 10 Iena wakatifira, kuti, kurikwese takavata kana kumuka, kuti tipone pamwepo naeena. \v 11 Ngokudaro tinovangisana techivakana umwe kunoumweni izvo zvamakaita.
+<<<<<<< HEAD
+\v 8 Asi isusu tiri vemasikati ngatingware, takapfeka chihlangu chepaditi chokugonda norudo, nechiqoko kuita gonda reruponeso. \v 9 Ngokuti Mwari aazi kutiemesera ushungu, asi kuti tione kuponeswa kubudikidza ndiye Mambo  wedu Jesu Kristu. \v 10 Uwo wakatifira kuti kunyazwi tichazwa nokuti taata, tipone pamwepo naye. \v 11 Ndizvo embedzeranai umwe kuneumweni, muakane umwe kuneumweni, kudai ngezvamunoita.
+=======
+\v 8 Ngokudaro itussu tirivana vomasikati, ngatigare takangurira, ngatisimire shigoko shorudo no gonda, nokuvetera kokuponesuwa kamanguna kudai koshigoko chedu, \v 9 Ngokudaro asivi kutiemesera pashike, Asi kuti tiwane kuponesuwa pakati pa Mambo Jesu Kristo, \v 10 Iena wakatifira, kuti, kurikwese takavata kana kumuka, kuti tipone pamwepo naeena. \v 11 Ngokudaro tinovangisana techivakana umwe kunoumweni izvo zvamakaita.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/12.txt

@@ -1 +1,7 @@
-\v 12 Hama, itusu takamukumbira, hama, kuti muzive anoshanda pakati penhu, kuti Amutaje nokumukhombija. \v 13 Asi tikumbira kuti vamutaje ngokudakara, murudo ngodava yobasa ravo. Rabai noUnyarararo. \v 14 Hama, itusu takamutcheudja, kuwagwisa wayana atchizivi kuwanga, kupanguira vakaremba wanasi kugara neVamweni.
+<<<<<<< HEAD
+\v 12 Asi tinomukumbira, hama, kuti mureremedze avo vanoshanda pakati penyu, vanomutungamirira
+munaMambo, vanomupanga. \v 13 Muvareremedze kakuru murudo ngendaa yemushando wavo.
+Iwai vanekunyarara pakati penyu. \v 14 Tinomukumbirawo, hama, pangai avo vane nungo, gwinyisai avo vane mwoyo inodemera, detserai avo vakarembedzeka, sengererai kwavari veshe.
+=======
+\v 12 Hama, itusu takamukumbira, hama, kuti muzive anoshanda pakati penhu, kuti Amutaje nokumukhombija. \v 13 Asi tikumbira kuti vamutaje ngokudakara, murudo ngodava yobasa ravo. Rabai noUnyarararo. \v 14 Hama, itusu takamutcheudja, kuwagwisa wayana atchizivi kuwanga, kupanguira vakaremba wanasi kugara neVamweni.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/15.txt

@@ -1 +1,5 @@
-\v 15 Basopa kuti pachatika kushita ngokushaata, ngokuti ndakatevera kunaka, novamweni navese. \v 16 Dakaranhi nguva yese. \v 17 Kumbiranhi mushikarembi. \v 18 Meshibonga ngozvese. Ngokuti kuda kwaMwari kwa Jesu Kristo kwamuri.
+<<<<<<< HEAD
+\v 15 Ngwarai kuti pasazoapo naumwe unounzidzira zvakashata kumunhu ngendaa yezvakashata, asi ngenguva dzeshe tsvakai kuita zvakanaka, umwe kwoumweni nokwavari veshe. \v 16 Dakarai nguva dzeshe. \v 17 Kumbirai ngokusikareki. \v 18 Bongai pazviro zveshe; ngokuti ichi chiri kuda kwaMwari muna Kristu Jesu ndimwi.
+=======
+\v 15 Basopa kuti pachatika kushita ngokushaata, ngokuti ndakatevera kunaka, novamweni navese. \v 16 Dakaranhi nguva yese. \v 17 Kumbiranhi mushikarembi. \v 18 Meshibonga ngozvese. Ngokuti kuda kwaMwari kwa Jesu Kristo kwamuri.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/19.txt

@@ -1 +1,5 @@
-\v 19 Musharipa kushata ngomweya. \v 20 mushaherusa shiprofeti. \v 21 Tesitanhi zvese, meshita zvakanaka. \v 22 Zvishaitika kuwamuri zvakashata.
+<<<<<<< HEAD
+\v 19 9 Musadzima Mweya. \v 20 Musashoora mazwi akaprofetwa. \v 21 Asi edzai zviro zveshe; batisisai izvo zvakanaka. \v 22 Swederai miemo yezveshe zvakashata.
+=======
+\v 19 Musharipa kushata ngomweya. \v 20 mushaherusa shiprofeti. \v 21 Tesitanhi zvese, meshita zvakanaka. \v 22 Zvishaitika kuwamuri zvakashata.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/23.txt

@@ -1 +1,5 @@
-\v 23 Mwari endhoo orunhararo ngamushenese kuzvese. Asi mweya wenyu mwese, kutu mweya nomuviri ushengeteke nokutama kukhomju mukuvia kwaJesu Kristo. \v 24 Wakarurama ngawiya wakamudainja, iyenavo anozoitavo.
+<<<<<<< HEAD
+\v 23 Mwari wekunyarara emene ngaamuchenese kakuru; mweya wenyu nemwoyo nemuiri ngazvingwarirwe kukuru, zvisina ndaa pakuuya kwaMambo wedu Jesu Kristu. \v 24 Uwo wakamudaidza unogondeka, naye unozozviita.
+=======
+\v 23 Mwari endhoo orunhararo ngamushenese kuzvese. Asi mweya wenyu mwese, kutu mweya nomuviri ushengeteke nokutama kukhomju mukuvia kwaJesu Kristo. \v 24 Wakarurama ngawiya wakamudainja, iyenavo anozoitavo.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

05/25.txt

@@ -1 +1,7 @@
-\v 25 Hama, namatanhi kwatiri. \v 26 Ctungamijananhi hama jese  ngomuromo rakasheneswa. \v 27 ndonomutuma kunaMambo kuti tsamba iyi iverengwe no hama jese. \v 28 Nhasha jaMambo wedu Jesu Kristo ngajigare kwamuri.
+<<<<<<< HEAD
+\v 25 Hama, tikumbirirei. \v 26 Chingamidzai
+veshe vatendi ngemuromo ngokucheneswa. \v 27 Ndinomupanga kukuru ndiMambo kuti iyi
+tsamba idzidzwe kuhama dzeshe. \v 28 Nyasha dzaMambo wedu Jesu Kristu ngadzigare nemwi.
+=======
+\v 25 Hama, namatanhi kwatiri. \v 26 Ctungamijananhi hama jese  ngomuromo rakasheneswa. \v 27 ndonomutuma kunaMambo kuti tsamba iyi iverengwe no hama jese. \v 28 Nhasha jaMambo wedu Jesu Kristo ngajigare kwamuri.
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

front/title.txt

@@ -1 +1,5 @@
-1 vathesaronika
+<<<<<<< HEAD
+Tsamba yekutanga kuva Tasolonis
+=======
+1 vathesaronika
+>>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a

manifest.json

@@ -29,59 +29,21 @@
 			"checking_level": "3",
 			"date_modified": "2023-05-11T15:58:09.5433175+00:00",
 			"version": "6.10"
-		},
-		{
-			"language_id": "pt-br",
-			"resource_id": "blv",
-			"checking_level": "3",
-			"date_modified": "2023-05-11T16:03:14.0531649+00:00",
-			"version": "2"
 		}
 	],
 	"parent_draft": {},
 	"translators": [
+		"sama",
+		"Sama",
 		"Bernardo Masseruca Seze Munhai",
 		"Bernardo Masseruca Sezi Munhai",
 		"Bernardo Masseruca Masseruca Seze Munhai"
 	],
 	"finished_chunks": [
-		"front-title",
 		"01-title",
-		"01-01",
-		"01-02",
-		"01-04",
-		"01-06",
-		"01-08",
 		"02-title",
-		"02-01",
-		"02-03",
-		"02-05",
-		"02-07",
-		"02-10",
-		"02-13",
-		"02-14",
-		"02-17",
 		"03-title",
-		"03-01",
-		"03-04",
-		"03-06",
-		"03-08",
-		"03-11",
 		"04-title",
-		"04-01",
-		"04-03",
-		"04-07",
-		"04-09",
-		"04-13",
-		"04-16",
-		"05-title",
-		"05-01",
-		"05-04",
-		"05-08",
-		"05-12",
-		"05-15",
-		"05-19",
-		"05-23",
-		"05-25"
+		"05-title"
 	]
 }