From e81659184611ad3a43c76fb8d86b7b36fb6a3e51 Mon Sep 17 00:00:00 2001 From: Itai_Viegas Date: Mon, 15 Apr 2024 07:12:53 +0200 Subject: [PATCH] Mon Apr 15 2024 07:12:52 GMT+0200 (Central Africa Time) --- 04/16.txt | 3 +-- 05/01.txt | 6 +----- 05/04.txt | 6 +----- 05/08.txt | 6 +----- 05/12.txt | 8 +------- manifest.json | 7 ++++++- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/04/16.txt b/04/16.txt index 01f17c4..351b07b 100644 --- a/04/16.txt +++ b/04/16.txt @@ -1,2 +1 @@ -\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. \ No newline at end of file +\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. \ No newline at end of file diff --git a/05/01.txt b/05/01.txt index 2ee5e84..021928e 100644 --- a/05/01.txt +++ b/05/01.txt @@ -1,5 +1 @@ -<<<<<<< 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 +\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 \ No newline at end of file diff --git a/05/04.txt b/05/04.txt index 886f5c7..5fbde17 100644 --- a/05/04.txt +++ b/05/04.txt @@ -1,5 +1 @@ -<<<<<<< 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 +\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. \ No newline at end of file diff --git a/05/08.txt b/05/08.txt index 76ef55d..ee60d36 100644 --- a/05/08.txt +++ b/05/08.txt @@ -1,5 +1 @@ -<<<<<<< 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 +\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. \ No newline at end of file diff --git a/05/12.txt b/05/12.txt index e61f99a..da3e6e0 100644 --- a/05/12.txt +++ b/05/12.txt @@ -1,7 +1 @@ -<<<<<<< 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 +\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. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 4c56538..2c6d797 100644 --- a/manifest.json +++ b/manifest.json @@ -69,6 +69,11 @@ "04-07", "04-09", "04-13", - "05-title" + "04-16", + "05-title", + "05-01", + "05-04", + "05-08", + "05-12" ] } \ No newline at end of file