diff --git a/01/01.txt b/01/01.txt index ccfeaec..e799dee 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Isupano , Paulo, Sirivano na Timoti tinonemba tsamba ili kuna wanhu va guereja ya Dhedza bhabha na mambo wedhu Djesu Kristu lilipo ku Tesalonika litchilewa kuti: Ntsisi dza Dhedza na ufulu zvigale na imipa. -======= -\c 1 Kumonisana \v 1 Isupano , Paulo, Sirivano na Timoti tinonemba tsamba ili kuna wanhu va guereja ya Dhedza bhabha na mambo wedhu Djesu Kristu lilipo ku Tesalonika litchilewa kuti: Ntsisi dza Dhedza na ufulu zvigale na imipa. ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\c 1 \v 1 Isupano , Paulo, Sirivano na Timoti tinonemba tsamba ili kuna wanhu va guereja ya Dhedza bhabha na mambo wedhu Djesu Kristu lilipo ku Tesalonika litchilewa kuti: Ntsisi dza Dhedza na ufulu zvigale na imipa. \ No newline at end of file diff --git a/01/02.txt b/01/02.txt index afd0612..1c7c99a 100644 --- a/01/02.txt +++ b/01/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Tiintenda Dhedza ntsiku dzese na thangwe laimipa titchikukumbukiranyiwo pakunamata kwedhu. \v 3 Pakuti isupano timbokukumbukirai pamberi pa Dhedza bhabha wedhu, zvamunoita nakunbvana kwenyu na zvito zvenyu mukudhanana kwenyu, mutchisimbikira zvitchibvira mukunangatsira kuna mambo wedhu, Djesu Kristu. -======= -Kutenda kwa Paulo \v 2 Tiintenda Dhedza ntsiku dzese na thangwe laimipa titchikukumbukiranyiwo pakunamata kwedhu. \v 3 Pakuti isupano timbokukumbukirai pamberi pa Dhedza bhabha wedhu, zvamunoita nakunbvana kwenyu na zvito zvenyu mukudhanana kwenyu, mutchisimbikira zvitchibvira mukunangatsira kuna mambo wedhu, Djesu Kristu. ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\v 2 Tiintenda Dhedza ntsiku dzese na thangwe laimipa titchikukumbukiranyiwo pakunamata kwedhu. \v 3 Pakuti isupano timbokukumbukirai pamberi pa Dhedza bhabha wedhu, zvamunoita nakunbvana kwenyu na zvito zvenyu mukudhanana kwenyu, mutchisimbikira zvitchibvira mukunangatsira kuna mambo wedhu, Djesu Kristu. \ No newline at end of file diff --git a/02/01.txt b/02/01.txt index 80369ac..c7086c6 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 2 \v 1 Imi hama dzangu, mukukumbuka kuti kuuiya kwedhu kuna imipa kulibhe kugala kwakusaya hwenye. \v 2 Nadhenzipo zvatidhobhonera nakuitiriwa zvidhoipa pa Firipi, ninga zvamunziva , tidhosimbikira mu Dhedza wedhu, titchikuudzai fala latche pakati pakulambidziwa kukulu. -======= -\c 2 Paulo anovakumbutsa kuti adhobhata tini bhasa naiwo. \v 1 Imi hama dzangu, mukukumbuka kuti kuuiya kwedhu kuna imipa kulibhe kugala kwakusaya hwenye. \v 2 Nadhenzipo zvatidhobhonera nakuitiriwa zvidhoipa pa Firipi, ninga zvamunziva , tidhosimbikira mu Dhedza wedhu, titchikuudzai fala latche pakati pakulambidziwa kukulu. ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\c 2 \v 1 Imi hama dzangu, mukukumbuka kuti kuuiya kwedhu kuna imipa kulibhe kugala kwakusaya hwenye. \v 2 Nadhenzipo zvatidhobhonera nakuitiriwa zvidhoipa pa Firipi, ninga zvamunziva , tidhosimbikira mu Dhedza wedhu, titchikuudzai fala latche pakati pakulambidziwa kukulu. \ No newline at end of file diff --git a/02/17.txt b/02/17.txt index 13a3300..20f8d5b 100644 --- a/02/17.txt +++ b/02/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Hama dzangu zvatiguere kulefu na imipa pamuviri, pandzimu tilipaduze, saka tinodhitsitsa kukuwonai. \v 18 Pakudhitsa kwedhuku, Sathani adhotiviringuidza, napo kuti impano Paulo ndikhadhitsitsa kukuonai. \v 19 Tsono ntchinyi tchingandipfadze pamberi pa mambo wedhu Djesu Kristu pakuuya kwatche? \v 20 Thangwe lakuti imipa ndimi kusamwa nakupfala kwedhu. -======= -Paulo an`dha maningue kuwona vakuTesalonika \v 17 Hama dzangu zvatiguere kulefu na imipa pamuviri, pandzimu tilipaduze, saka tinodhitsitsa kukuwonai. \v 18 Pakudhitsa kwedhuku, Sathani adhotiviringuidza, napo kuti impano Paulo ndikhadhitsitsa kukuonai. \v 19 Tsono ntchinyi tchingandipfadze pamberi pa mambo wedhu Djesu Kristu pakuuya kwatche? \v 20 Thangwe lakuti imipa ndimi kusamwa nakupfala kwedhu. ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\v 17 Hama dzangu zvatiguere kulefu na imipa pamuviri, pandzimu tilipaduze, saka tinodhitsitsa kukuwonai. \v 18 Pakudhitsa kwedhuku, Sathani adhotiviringuidza, napo kuti impano Paulo ndikhadhitsitsa kukuonai. \v 19 Tsono ntchinyi tchingandipfadze pamberi pa mambo wedhu Djesu Kristu pakuuya kwatche? \v 20 Thangwe lakuti imipa ndimi kusamwa nakupfala kwedhu. \ No newline at end of file diff --git a/04/13.txt b/04/13.txt index 03988d5..7cb65fa 100644 --- a/04/13.txt +++ b/04/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Nadheripo hama dzangu nindha lini kuti muleke kuziva vanhu adhopfa kuti muleke kulira ninga anango alibhe tchathemba natcho. \v 14 Pamwe tin,daila kuti Djesu adhopfa atchimuka kamu, nadhenzo vale adhopfira muna Djesu, Dhedza andzouia pabhodzi naye. \v 15 Nakuti tinkuudzai na fala latche, kuti isupano tinamoyo, kuswika kuuiya kwatche, hatiyambire adhopfa -======= -Kumuka kwa vadhopfa na kuunza kwa Djesu. \v 13 Nadheripo hama dzangu nindha lini kuti muleke kuziva vanhu adhopfa kuti muleke kulira ninga anango alibhe tchathemba natcho. \v 14 Pamwe tin,daila kuti Djesu adhopfa atchimuka kamu, nadhenzo vale adhopfira muna Djesu, Dhedza andzouia pabhodzi naye. \v 15 Nakuti tinkuudzai na fala latche, kuti isupano tinamoyo, kuswika kuuiya kwatche, hatiyambire adhopfa ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\v 13 Nadheripo hama dzangu nindha lini kuti muleke kuziva vanhu adhopfa kuti muleke kulira ninga anango alibhe tchathemba natcho. \v 14 Pamwe tin,daila kuti Djesu adhopfa atchimuka kamu, nadhenzo vale adhopfira muna Djesu, Dhedza andzouia pabhodzi naye. \v 15 Nakuti tinkuudzai na fala latche, kuti isupano tinamoyo, kuswika kuuiya kwatche, hatiyambire adhopfa \ No newline at end of file diff --git a/05/01.txt b/05/01.txt index 4dbf59f..114cc73 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 5 \v 1 Hama dzangu pamwe zviri zvinhu zva ntsiku dzese hamudhikane kuti munemberewe tchinhu. \v 2 Zvamuziva kuti ntsiku ya mambo in`uiya mudzidzidzi. \v 3 Pakadzonzvika fala lomwe lindzoti ntendere nakudhimbikira, pakalepo kutchauya kupfudzika kundzimba ningati nkadzi ana mimba pakuzvala nadheripo palibhe andzopunhuka. -======= -\c 5 Galililai kuuiya kwa mambo \v 1 Hama dzangu pamwe zviri zvinhu zva ntsiku dzese hamudhikane kuti munemberewe tchinhu. \v 2 Zvamuziva kuti ntsiku ya mambo in`uiya mudzidzidzi. \v 3 Pakadzonzvika fala lomwe lindzoti ntendere nakudhimbikira, pakalepo kutchauya kupfudzika kundzimba ningati nkadzi ana mimba pakuzvala nadheripo palibhe andzopunhuka. ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\c 5 \v 1 Hama dzangu pamwe zviri zvinhu zva ntsiku dzese hamudhikane kuti munemberewe tchinhu. \v 2 Zvamuziva kuti ntsiku ya mambo in`uiya mudzidzidzi. \v 3 Pakadzonzvika fala lomwe lindzoti ntendere nakudhimbikira, pakalepo kutchauya kupfudzika kundzimba ningati nkadzi ana mimba pakuzvala nadheripo palibhe andzopunhuka. \ No newline at end of file diff --git a/05/12.txt b/05/12.txt index 311bb6c..b349cb3 100644 --- a/05/12.txt +++ b/05/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Tsono tiinkumbira kuna imipa hama dzangu kuti muvazive awo an`bhata bhasa pakati penyu, an`kumiririrai muna mambo, an`gala atchikuudzai. \v 13 Muvalemekedze mudhanane nawo thangwe la basa lawo galai nakupfala pakati penyu. \v 14 Tikukumbira tchaizvo kwa imipa hama dzangu, kuti muvaeruze asingatetekele mitemo, muvakhumise ananungo, muvabhatsire valibhe ntsimba, mugale na moyo watsisi na vese. -======= -kukumbutsana kwakupedzisira nakugonekana \v 12 Tsono tiinkumbira kuna imipa hama dzangu kuti muvazive awo an`bhata bhasa pakati penyu, an`kumiririrai muna mambo, an`gala atchikuudzai. \v 13 Muvalemekedze mudhanane nawo thangwe la basa lawo galai nakupfala pakati penyu. \v 14 Tikukumbira tchaizvo kwa imipa hama dzangu, kuti muvaeruze asingatetekele mitemo, muvakhumise ananungo, muvabhatsire valibhe ntsimba, mugale na moyo watsisi na vese. ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +\v 12 Tsono tiinkumbira kuna imipa hama dzangu kuti muvazive awo an`bhata bhasa pakati penyu, an`kumiririrai muna mambo, an`gala atchikuudzai. \v 13 Muvalemekedze mudhanane nawo thangwe la basa lawo galai nakupfala pakati penyu. \v 14 Tikukumbira tchaizvo kwa imipa hama dzangu, kuti muvaeruze asingatetekele mitemo, muvakhumise ananungo, muvabhatsire valibhe ntsimba, mugale na moyo watsisi na vese. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index acda46c..c6f1d1b 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Tsamba la Kuyamba la Paulo kuna Atesalonika -======= -TESALONIKA ->>>>>>> 459ddeab6ee353687674a4e9f4117b7a1b44020a +Tsamba la Kuyamba la Paulo kuna Atesalonika \ No newline at end of file diff --git a/manifest.json b/manifest.json index 7da20b3..cfe96ac 100644 --- a/manifest.json +++ b/manifest.json @@ -40,17 +40,22 @@ "safuli pedro madjonguisse" ], "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", @@ -62,10 +67,13 @@ "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",