diff --git a/20/05.txt b/20/05.txt index 2f03f05..55c7749 100644 --- a/20/05.txt +++ b/20/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Tjorukwao ye waire mangara moiri oitjamurongo na imwe nu tjorukwao oiri oitjamuvyu, atjiti tji ngetjo. \v 6 Tjorukwao moiri oitjamurongo naimwe ye waya na kavaza varwe ava kurama uriri. Ye watja kuwo, 'ongwaike, mbu mwakurama eyuva arihe nahi?' \v 7 ''wo vatja kuye,''minoo kutja kapena omundu ngu metu yazema.' ''Ye atja kuwo,' ene noho twendee kotjana tjomindjembere.' -======= -\v 5 Tjorukwao ye waire mangara moiri oitjahamboumwe nu tjorukwao oiri oitjamuvyu,a tjiti tjingetjo. \v 6 Tjorukwao moiri oitjamurongo naimue ye waya na kavaza varwe avakurama uriri. Ye watja kuwo,ongwaike,mbumwakurama eyuva arihe nahi. ''Wo vatja kuye,Minoo kutja kapana omundu ngumetuyazema''. \v 7 Ye atja kuwo;ene noho twende kotjana tjomandjembere. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 5 Tjorukwao ye waire mangara moiri oitjahamboumwe nu tjorukwao oiri oitjamuvyu,a tjiti tjingetjo. \v 6 Tjorukwao moiri oitjamurongo naimue ye waya na kavaza varwe avakurama uriri. Ye watja kuwo,ongwaike,mbumwakurama eyuva arihe nahi. ''Wo vatja kuye,Minoo kutja kapana omundu ngumetuyazema''. \v 7 Ye atja kuwo;ene noho twende kotjana tjomandjembere. \ No newline at end of file diff --git a/20/08.txt b/20/08.txt index 45e7687..34941b8 100644 --- a/20/08.txt +++ b/20/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Nu ongurova tji yeya, omuni wotjana tjomindjembere wa tja komunane we,' isana ovaungure nu uvesute ondjambi yawo, uutire pomusenina tee ukayandere pomutenga.' \v 9 ''Nu ovaungure tjiva mba yazememwe poiri oitjamurongo na imwe veya, auhe wawo wamuna Edenarius. \v 10 Nu ovaungure imbi ovatenga tji veya, vanangarasi mave munu ovingi komeho, nu auhe wa muna Edenarius rimwe uriri. -======= -\v 8 Nu ongurova tjiweya, omuini wotjana tjomandjembere watja komunane we, isana ovaungure nu uvesute ondjiwo yawo,uutire pomusenina tee ukandere pomutenga' \v 9 Nu ovaungure tjiva mbaya zemenwe po iri oitjamurongo naimwe veya,auhe wawo wamuna Denarius. \v 10 Nu ovaungure imba ovatenga tjiveya,vanangarasi mave munu ovingi komeho,Denaries rimue uriri. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 8 Nu ongurova tjiweya, omuini wotjana tjomandjembere watja komunane we, isana ovaungure nu uvesute ondjiwo yawo,uutire pomusenina tee ukandere pomutenga' \v 9 Nu ovaungure tjiva mbaya zemenwe po iri oitjamurongo naimwe veya,auhe wawo wamuna Denarius. \v 10 Nu ovaungure imba ovatenga tjiveya,vanangarasi mave munu ovingi komeho,Denaries rimue uriri. \ No newline at end of file diff --git a/20/11.txt b/20/11.txt index 4781982..70eafc4 100644 --- a/20/11.txt +++ b/20/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Nu wo tjiva muna ondjambi yawo, wo vaunaunina omuni wotjana. \v 12 Wo vatja,' ovaungure mba mbeya orusenina vaungura uriri oiri imwe, nu we ve sutu tjimwe naete, mbutwa ungura oure weyuva arihe momutenja mbwa ruvaere. -======= -\v 11 Nuwo tjivamuna ondjambi yowo, wo vaunaunaunine omunu watjana. \v 12 Wo vatja, ovaungure mna mbeya rusenina vaungura uriri oiri imwe, nu we ve sutu tjimwe naete,mbu twa ungura oure weyuva arihe mo mutenya mbwaruvaere; ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 11 Nuwo tjivamuna ondjambi yowo, wo vaunaunaunine omunu watjana. \v 12 Wo vatja, ovaungure mna mbeya rusenina vaungura uriri oiri imwe, nu we ve sutu tjimwe naete,mbu twa ungura oure weyuva arihe mo mutenya mbwaruvaere; \ No newline at end of file diff --git a/20/13.txt b/20/13.txt index b22682a..d22e38a 100644 --- a/20/13.txt +++ b/20/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 ''Posiya omuni wa zirire atja kuumwe wawo, 'epanga, himu tji tire navi. Katuzuvasanene kotji Denarius tjimwe kware? \v 14 kambura ihi tji tjiri otjoye nu uyende nondjira yoye. Ami mba toorora okuyandja imbi mbita pamwe novaungure imba ovasenina. -======= -\v 13 Posiya, omuini wazirire atja kuumwe wawo,Epanga,himu tjitire navi. katuzuvasanene kotji Denaries tjimwe kwarwe? Kmbura ihi tjitjiri otjoye nu uyende nondjira yoye. \v 14 Ami mbatoorora oukuyandja imbi mbita pamue no vaungure imba ovasenina. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 13 Posiya, omuini wazirire atja kuumwe wawo,Epanga,himu tjitire navi. katuzuvasanene kotji Denaries tjimwe kwarwe? Kmbura ihi tjitjiri otjoye nu uyende nondjira yoye. \v 14 Ami mbatoorora oukuyandja imbi mbita pamue no vaungure imba ovasenina. \ No newline at end of file diff --git a/20/15.txt b/20/15.txt index c496c54..91b628b 100644 --- a/20/15.txt +++ b/20/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Nu hapo hina ousemba okuungura na imbi mbiri ovyandje re? poo moteruru tjinga ambiri omuharupu? \v 16 nu ovasenina mave rire ovatenga, nu ovatenga mave rire ovasenina.'' -======= -\v 15 Nu hapo hi na ousemba okuungura imbi mbiri ovyandje re? poo moteruru tjinga ambari omaharupu? \v 16 Nu ovasenina mave rire ovatenga nu ovatenga mave rire ovasenina''. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 15 Nu hapo hi na ousemba okuungura imbi mbiri ovyandje re? poo moteruru tjinga ambari omaharupu? \v 16 Nu ovasenina mave rire ovatenga nu ovatenga mave rire ovasenina''. \ No newline at end of file diff --git a/20/17.txt b/20/17.txt index 5301913..85d3e95 100644 --- a/20/17.txt +++ b/20/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Nu Jesus waa ko Jerusalem, pu novahongewa ve omurongo na vevari,nu mondjira okuyenda ye atja kuwo, '' \v 18 tara, ete matu i ku Jerusalem, nu omuatje womundu ma kaandjwa kovaPristeli oviuru nozonongo zomambo. Wo mave kemupangura kokuta. \v 19 Wo mave muyandja kovandu mbe hei Ndjambi kutja wo ve mu njekerere, ave mutono, nave mu papere kotjikoroise. Nu meyuva oritjatatu mapendurwa.'' -======= -\v 17 Nu Jesus waa ko Jerusalem,nu mondjira okuyenda ye atja kuwo; \v 18 Tara,ete matu i ku Jerusalem, nu omwatje womundu makaandjwa ko vapristeri oviuru nozonongo zomatwako. \v 19 Wo mave ke mupangura kokuta. wo mave muyandja kovandu mbe hei Ndjambi kutja wo ve munyekerere,ave mutono,nave mupapere kotjikoroise. Nu meyuva oritjatatu mapenduke''. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 17 Nu Jesus waa ko Jerusalem,nu mondjira okuyenda ye atja kuwo; \v 18 Tara,ete matu i ku Jerusalem, nu omwatje womundu makaandjwa ko vapristeri oviuru nozonongo zomatwako. \v 19 Wo mave ke mupangura kokuta. wo mave muyandja kovandu mbe hei Ndjambi kutja wo ve munyekerere,ave mutono,nave mupapere kotjikoroise. Nu meyuva oritjatatu mapenduke''. \ No newline at end of file diff --git a/20/20.txt b/20/20.txt index fed7410..c2e30a3 100644 --- a/20/20.txt +++ b/20/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Nu ina yovazandu va Zebedeus weya ku Jesus novazandu ve. Ye weripeta komurungu we ne muningire otjina. \v 21 Jesus atja kuye,'' wa vanga ike? omukazendu atja kuye,'' rakiza ovazandona vandje vevari mba kutja ve haame, umwe kokuwoko koye okunene na umwe kokuwoko koye okumuho, mouhona woye.'' -======= -\v 20 \v 21 Nu ina yovazandu va Zebedeus weya ku Jesus novazandu ve. ye weripeta komurungu we ne muningire otjina. Jesus atja kuye wavanga ike? omukazendu atja kuye''Rakiza ovazandona vandje vevari mba kutja ve haame,umwe kokuwoko koye okunene na umwe ko kuwoko koye okumuho mouhona woye. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 20 \v 21 Nu ina yovazandu va Zebedeus weya ku Jesus novazandu ve. ye weripeta komurungu we ne muningire otjina. Jesus atja kuye wavanga ike? omukazendu atja kuye''Rakiza ovazandona vandje vevari mba kutja ve haame,umwe kokuwoko koye okunene na umwe ko kuwoko koye okumuho mouhona woye. \ No newline at end of file diff --git a/20/22.txt b/20/22.txt index 1eb77fb..f655ec3 100644 --- a/20/22.txt +++ b/20/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Posiya Jesus wa zira atja,'' ove kona kutjiwa mbi muningire. Mu yenene okunwa ke kopi ami ku mii kanwa?'' wo vatja kuye , matuyenene. \v 23 Ye atja kuwo,'' muyenene okunwa ke kopi ami ku mikanwa. Nu ingwi okuhaama kokuwoko kwandje okunene na kokuwoko kwandje okumuho ka pandje okupe yandja nu okwa imba mba tuninwa i Tate.'' \v 24 Nu ovahongewa varwe omurongo tji vazuva mbi, wo va pindikira ovangu vawo vevari. -======= -\v 22 Posiya Jesus wazira atja ''ove kono okutjiwa mbimuningire. Muyenene okunwa kokopi ami kumikanwa?'' Wo vatja kuye,matwenene. \v 23 Eye atja kuwo,''muyenene okunwa kekepi ami kumikanwa. Nu ingwi okuhaama kokuwoko kwandje okunene na kokuwoko kwandje okumuho kwapandje okupeyandja nu okwaimba mbatuninwa i Tate. \v 24 Nu ovahongewa varwe omurongo tjivazuva mbi, wo vapindikira ovangu vao vevari. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 22 Posiya Jesus wazira atja ''ove kono okutjiwa mbimuningire. Muyenene okunwa kokopi ami kumikanwa?'' Wo vatja kuye,matwenene. \v 23 Eye atja kuwo,''muyenene okunwa kekepi ami kumikanwa. Nu ingwi okuhaama kokuwoko kwandje okunene na kokuwoko kwandje okumuho kwapandje okupeyandja nu okwaimba mbatuninwa i Tate. \v 24 Nu ovahongewa varwe omurongo tjivazuva mbi, wo vapindikira ovangu vao vevari. \ No newline at end of file diff --git a/20/25.txt b/20/25.txt index d675e92..72a85a0 100644 --- a/20/25.txt +++ b/20/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Posiya Jesus we veisanena kuye omuni atja,'' mamu tjiwa kutja ovahonapare woviwana vevihonaparera noninikizire, nu ovarumendu vawo ovanandengu ve kara nouvara kombanda yawo. \v 26 Nu kape sokukara nao mokati kenu, \v 27 nu ingwi ngu mavanga okurira omunene mokati kenu nga rire omukarere, nu auhe ngu mavanga okurira omutenga mokati kenu nga rire omukarere wenu, \v 28 punao omwatje womundu keere okukarerwa, nungwari okukarera, nokuyandja omuinjo we urire onguturiro yovengi. -======= -\v 25 Posia Jesus weveisanena puye omuini atja ,''Mamutjiwa kutja ovahonapare woviwana ve vihonaparera no ninikizire,nu ovarumendu vawo ovanandengu vekara nouvara kombanda yawo. \v 26 Nu kapeso okukara nao mokati kenu,ingwi ngumavanga okurira omunene mokati kenu ngarire omukarere. \v 27 Nu auhe ngumavanga ookurira omutenga mokati kenu ngarirre omukarere wenu, \v 28 Punao omuna womundu keere okukarerwa nungwari okukarera,no kuyandja omuindjo wee urire onguturiro yovengi. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 25 Posiya Jesus we veisanena kuye omuni atja,'' mamu tjiwa kutja ovahonapare woviwana vevihonaparera noninikizire, nu ovarumendu vawo ovanandengu ve kara nouvara kombanda yawo. \v 26 Nu kape sokukara nao mokati kenu, \v 27 nu ingwi ngu mavanga okurira omunene mokati kenu nga rire omukarere, nu auhe ngu mavanga okurira omutenga mokati kenu nga rire omukarere wenu, \v 28 punao omwatje womundu keere okukarerwa, nungwari okukarera, nokuyandja omuinjo we urire onguturiro yovengi. \ No newline at end of file diff --git a/20/29.txt b/20/29.txt index 5bf0c37..93f7b12 100644 --- a/20/29.txt +++ b/20/29.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 29 Nu wo tjivaza mu Jeriko, otjimbumba otjinene tjemu kongorera. \v 30 Pari ovarumendu ovapotu vevari mbahaamene mene yondjira. Tji vazuva kutja Jesus makapita mbo, va ravaera tjinene, '' muhona, muzandu waDavid, tu tira ondjenda.'' \v 31 Nu otjimbumba tjeve kandaiza, aveve raere kutja ngave muine, nu wo varavaererako tjinene, '' muhona, muzandu wa David tu tira ondjenda.'' -======= -\v 29 Nu wu tjivaza mu Jeriko,otjimbumba otjinene tjemukongorera. \v 30 Pari ovarumendu ovapotu ve vari mbahaamene mene yo ndjira tjivazuva kutja Jesus makapita mbo, varavaera tjinene,'' Muhona,muzandu wa David, turira ondjenda.'' \v 31 Nu otjimbumba tje ve kandaiza, aveveraere kutja ngavemwine, nu wo varavaererako tjinene''Muhona,Muzandu wa David tu tira ondjenda. ->>>>>>> 8c7dd1a40a82d51e33d6f4f81aeccffb314804c5 +\v 29 Nu wu tjivaza mu Jeriko,otjimbumba otjinene tjemukongorera. \v 30 Pari ovarumendu ovapotu ve vari mbahaamene mene yo ndjira tjivazuva kutja Jesus makapita mbo, varavaera tjinene,'' Muhona,muzandu wa David, turira ondjenda.'' \v 31 Nu otjimbumba tje ve kandaiza, aveveraere kutja ngavemwine, nu wo varavaererako tjinene''Muhona,Muzandu wa David tu tira ondjenda. \ No newline at end of file