diff --git a/13/20.txt b/13/20.txt index c40ce36..5560161 100644 --- a/13/20.txt +++ b/13/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Kanki akahanya, "Niwiikhoye na ntuni utremi wa Mungu? \v 21 Ni ginya usasu ni mukhema akahoa watrendea ugu utru unoo waumuka." -======= -\v 20 Kanki akahanya, "Niwiikhoye na ntuni utremi wa Mungu? \v 21 Ni ginya usasu ni mukhema akahoa watrendea ugu utru unoo waumuka". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 20 Kanki akahanya, "Niwiikhoye na ntuni utremi wa Mungu? \v 21 Ni ginya usasu ni mukhema akahoa watrendea ugu utru unoo waumuka." \ No newline at end of file diff --git a/13/28.txt b/13/28.txt index d6bc1a9..6ecf20a 100644 --- a/13/28.txt +++ b/13/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Gujotrendeka gwina girio gikuu nimwajovaona Abrahamu, Isaka, Yakobo na manabii vong'e ugu utremi wa Mungu, nyeso nyenye mwajughutrwaa unji. \v 29 Vijoghea ufuma ukiya, umwei ukuma na utraghama, na utuya u meza a maliwa ugu utremi wa Mungu. \v 30 Na manya irii, wa nyuma ugutrendeka wa mwandio na wa mwandio ujotrendeka wa nyuma." -======= -\v 28 Gujotrendeka gwina girio gikuu nimwajovaona Abrahamu, Isaka, Yakobo na manabii vong'e ugu utremi wa Mungu, nyeso nyenye mwajughutrwaa unji. \v 29 Vijoghea ufuma ukiya, umwei ukuma na utraghama, na utuya u meza a maliwa ugu utremi wa Mungu. \v 30 Na manya irii, wa nyuma ugutrendeka wa mwandio na wa mwandio ujotrendeka wa nyuma". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 28 Gujotrendeka gwina girio gikuu nimwajovaona Abrahamu, Isaka, Yakobo na manabii vong'e ugu utremi wa Mungu, nyeso nyenye mwajughutrwaa unji. \v 29 Vijoghea ufuma ukiya, umwei ukuma na utraghama, na utuya u meza a maliwa ugu utremi wa Mungu. \v 30 Na manya irii, wa nyuma ugutrendeka wa mwandio na wa mwandio ujotrendeka wa nyuma." \ No newline at end of file diff --git a/13/34.txt b/13/34.txt index fd8e36d..ab6fff2 100644 --- a/13/34.txt +++ b/13/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Yerusalemu, Yerusalemu, anyu niuguvauragha manabii na uvakhua na magwe avoo nivatrumiwe guni nyenye. Mara ngapi nusighaa uvarundaana vanyu ginya nkuku niurundaa anankuku vakwe u mbaya yakwe, unoo mutrinasighaa. \v 35 Rava, nyumba ako arekwaa. Nanee nuvakhania, mutrudaha unyona hata mujohanya, 'Ubarikiwe usuu niujie gwa rina rama Bwana."' -======= -\v 34 Yerusalemu, Yerusalemu, anyu niuguvauragha manabii na uvakhua na magwe avoo nivatrumiwe guni nyenye. Mara ngapi nusighaa uvarundaana vanyu ginya nkuku niurundaa anankuku vakwe u mbaya yakwe, unoo mutrinasighaa. \v 35 Rava, nyumba ako arekwaa. Nanee nuvakhania, mutrudaha unyona hata mujohanya, 'Ubarikiwe usuu niujie gwa rina rama Bwana". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 34 Yerusalemu, Yerusalemu, anyu niuguvauragha manabii na uvakhua na magwe avoo nivatrumiwe guni nyenye. Mara ngapi nusighaa uvarundaana vanyu ginya nkuku niurundaa anankuku vakwe u mbaya yakwe, unoo mutrinasighaa. \v 35 Rava, nyumba ako arekwaa. Nanee nuvakhania, mutrudaha unyona hata mujohanya, 'Ubarikiwe usuu niujie gwa rina rama Bwana."' \ No newline at end of file diff --git a/14/07.txt b/14/07.txt index df2926b..079d454 100644 --- a/14/07.txt +++ b/14/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Yesu newamanya avoo neviraikiwe vahwaniaa matrumbi a hesima, akavakhania ndolio wahanya, \v 8 "ikhondo nemuraikiwee na muntu u harusi, utragikhae sehemu ya hesima, fangi uraikiwe muntu wohesimiwa ino hiya navee. \v 9 Uu muntu niuvaraikiee nyenye niwaghea, ujogukhania veve, "mufe muntu uyui nafasi ako," unoo gwa minyaa ujohoa nafasi a mwisio. -======= -\v 7 Yesu newamanya avoo neviraikiwe vahwaniaa matrumbi a hesima, akavakhania ndolio wahanya, \v 8 "ikhondo nemuraikiwee na muntu u harusi, utragikhae sehemu ya hesima, fangi uraikiwe muntu wohesimiwa ino hiya navee. \v 9 Uu muntu niuvaraikiee nyenye niwaghea, ujogukhania veve, "mufe muntu uyui nafasi ako", unoo gwa minyaa ujohoa nafasi a mwisio. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 7 Yesu newamanya avoo neviraikiwe vahwaniaa matrumbi a hesima, akavakhania ndolio wahanya, \v 8 "ikhondo nemuraikiwee na muntu u harusi, utragikhae sehemu ya hesima, fangi uraikiwe muntu wohesimiwa ino hiya navee. \v 9 Uu muntu niuvaraikiee nyenye niwaghea, ujogukhania veve, "mufe muntu uyui nafasi ako," unoo gwa minyaa ujohoa nafasi a mwisio. \ No newline at end of file diff --git a/14/10.txt b/14/10.txt index 27cecde..a2625e7 100644 --- a/14/10.txt +++ b/14/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Nyeso veve niwaraikwa enda wendogikhaa u mwisio, unoo uyoo niuguraikie niwaja, adahe ugukhania veve, 'Rafiki enda usonge', ujotrendeka wahesimikaa usonge a vong'e nivigikhee navee. \v 11 Gwasoko uyoo niugugihumbua ujosimywa, na uyoo niugugisimywaa ujohumbuwa. ' -======= -\v 10 Nyeso veve niwaraikwa enda wendogikhaa u mwisio, unoo uyoo niuguraikie niwaja, adahe ugukhania veve, 'Rafiki enda usonge', ujotrendeka wahesimikaa usonge a vong'e nivigikhee navee. \v 11 Gwasoko uyoo niugugihumbua ujosimywa, na uyoo niugugisimywaa ujohumbuwa. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 10 Nyeso veve niwaraikwa enda wendogikhaa u mwisio, unoo uyoo niuguraikie niwaja, adahe ugukhania veve, 'Rafiki enda usonge', ujotrendeka wahesimikaa usonge a vong'e nivigikhee navee. \v 11 Gwasoko uyoo niugugihumbua ujosimywa, na uyoo niugugisimywaa ujohumbuwa. ' \ No newline at end of file diff --git a/14/13.txt b/14/13.txt index a88415a..1a3b9c2 100644 --- a/14/13.txt +++ b/14/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Hiya ayo, niugutrenda sherehe, raika atruki, vilema na afoku, \v 14 navee ujobarikiwa gwasoko vitrudaha ugurifa. Gwasoko ujorifwa gwa ufityo wa. nivina haki". -======= -\v 13 Hiya ayo, niugutrenda sherehe, raika atruki, vilema na afoku, \v 14 navee ujobarikiwa gwasoko vitrudaha ugurifa. Gwasoko ujorifwa gwa ufityo wa nivina haki". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 13 Hiya ayo, niugutrenda sherehe, raika atruki, vilema na afoku, \v 14 navee ujobarikiwa gwasoko vitrudaha ugurifa. Gwasoko ujorifwa gwa ufityo wa. nivina haki". \ No newline at end of file diff --git a/14/28.txt b/14/28.txt index 30f38e6..d3ed1f2 100644 --- a/14/28.txt +++ b/14/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Gwasoko ni anyu ukhatri anyu niusighitre ujenga munara atrijogikhaa agheme mahesabu mwese ukwetre iroo niusighitre adahe ukhondeya risii? \v 29 Hiya ayo niwaika musingi na waremwa ukhondeya, vong'e nivaoniee vijoandia umuzihaki, \v 30 vijohanya, 'Muntu uyui akaandia ujenga, wauriaa nguu yokhondeya.' -======= -\v 28 Gwasoko ni anyu ukhatri anyu niusighitre ujenga munara atrijogikhaa agheme mahesabu mwese ukwetre iroo niusighitre adahe ukhondeya risii? \v 29 Hiya ayo niwaika musingi na waremwa ukhondeya, vong'e nivaoniee vijoandia umuzihaki, \v 30 vijohanya, 'Muntu uyui akaandia ujenga, wauriaa nguu yokhondeya'. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 28 Gwasoko ni anyu ukhatri anyu niusighitre ujenga munara atrijogikhaa agheme mahesabu mwese ukwetre iroo niusighitre adahe ukhondeya risii? \v 29 Hiya ayo niwaika musingi na waremwa ukhondeya, vong'e nivaoniee vijoandia umuzihaki, \v 30 vijohanya, 'Muntu uyui akaandia ujenga, wauriaa nguu yokhondeya.' \ No newline at end of file diff --git a/14/34.txt b/14/34.txt index 883efb5..49bc35c 100644 --- a/14/34.txt +++ b/14/34.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 34 Munyu ni uja, nyeso munyu niwaurya lombe ayo ugudaha utrendeka uri kanki munyu? \v 35 Itrina matumizi kanki ugu udongo au gwa mbolea. Ugujughutrwa kwengi. Usuu niwina matrwi otregheya atregheye." -======= -\v 34 Munyu ni uja, nyeso munyu niwaurya lombe ayo ugudaha utrendeka uri kanki munyu? \v 35 Itrina matumizi kanki ugu udongo au gwa mbolea. Ugujughutrwa kwengi. Usuu niwina matrwi otregheya atregheye". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 34 Munyu ni uja, nyeso munyu niwaurya lombe ayo ugudaha utrendeka uri kanki munyu? \v 35 Itrina matumizi kanki ugu udongo au gwa mbolea. Ugujughutrwa kwengi. Usuu niwina matrwi otregheya atregheye." \ No newline at end of file diff --git a/15/01.txt b/15/01.txt index 5d36b9c..15ce121 100644 --- a/15/01.txt +++ b/15/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 15 \v 1 uu atoza usuru vong'e na avoo nivina mahutye vikaja umughimba Yesu. \v 2 Mafarisayo vong'e na anyohadia vikahanya, "muntu uyui uguvakaribisya anya mahutye na uulia nayo." -======= -\v 1 uu atoza usuru vong'e na avoo nivina mahutye vikaja umughimba Yesu. \v 2 Mafarisayo vong'e na anyohadia vikahanya, "muntu uyui uguvakaribisya anya mahutye na uulia nayo". ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\c 15 \v 1 uu atoza usuru vong'e na avoo nivina mahutye vikaja umughimba Yesu. \v 2 Mafarisayo vong'e na anyohadia vikahanya, "muntu uyui uguvakaribisya anya mahutye na uulia nayo." \ No newline at end of file diff --git a/15/06.txt b/15/06.txt index a8cf42f..1ab4b00 100644 --- a/15/06.txt +++ b/15/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Ni waghea unyumba, uguvaitrana marafiki vakwe na jirani vakwe wavakhania yanji nanee, gwasoko nahangaa nkhoo ane neayaghaa, \v 7 nuvakhania uyi gujotrendeka gwina uyanjo girunde gwasoko a munya mahutye umwedu niwatubu, ino a anya haki tisini nivirtina nkumbu otubu -======= -\v 6 Ni waghea unyumba, uguvaitrana marafiki vakwe na jirani vakwe wavakhania yanji nanee, gwasoko nahangaa nkhoo ane neayaghaa, \v 7 nuvakhania uyi gujotrendeka gwina uyanjo girunde gwasoko a munya mahutye umwedu niwatubu, ino a anya haki tisini nivirtina nkumbu otubu. ->>>>>>> af4139759824b16e8a1af688121d7cdad780c5f8 +\v 6 Ni waghea unyumba, uguvaitrana marafiki vakwe na jirani vakwe wavakhania yanji nanee, gwasoko nahangaa nkhoo ane neayaghaa, \v 7 nuvakhania uyi gujotrendeka gwina uyanjo girunde gwasoko a munya mahutye umwedu niwatubu, ino a anya haki tisini nivirtina nkumbu otubu \ No newline at end of file diff --git a/manifest.json b/manifest.json index dc96397..a51e1d6 100644 --- a/manifest.json +++ b/manifest.json @@ -319,21 +319,31 @@ "13-15", "13-17", "13-18", + "13-20", "13-22", "13-25", + "13-28", "13-31", + "13-34", "14-title", "14-01", "14-04", + "14-07", + "14-10", "14-12", + "14-13", "14-15", "14-18", "14-21", "14-23", "14-25", + "14-28", "14-31", + "14-34", "15-title", + "15-01", "15-03", + "15-06", "15-11", "15-13", "15-15",