diff --git a/02/25.txt b/02/25.txt index 771dec5f..a4fdb306 100644 --- a/02/25.txt +++ b/02/25.txt @@ -1,8 +1 @@ -<<<<<<< HEAD -\v 25Oronage,Daud kali linage tutui Yesus,'Nauwag etayi Mori ba da' hanagatani ta arogu,oro Nyi ba dani ta bara lima kawanagu dajalage nauwa walegu engakmana gedo.\v 26Oro batauda dage,ategu na lagaharawe,mono lammagu na lageborawe.Tau dumogu engage ba tatilu mamannewe, -======= -\v 25Oro,Daud kali linage tuutui Yesus, - -'Nauwa etayi Mori ba'da hangatani ta arogu, - oro Nyi ba da'ni ta limma kawanagu dajalge nauwa wallegu engamana gedo.\v 26Oro batauda dage'ge,ategu nalagaharawe,mono lammagu nalageborawe.tauda dumoge engage ba'tatillu ma'mannewe. ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 25 Oronage,Daud kali linage tutui Yesus,'Nauwag etayi Mori ba da' hanagatani ta arogu,oro Nyi ba dani ta bara lima kawanagu dajalage nauwa walegu engakmana gedo. \v 26 Oro batauda dage,ategu na lagaharawe,mono lammagu na lageborawe.Tau dumogu engage ba tatilu mamannewe, \ No newline at end of file diff --git a/02/27.txt b/02/27.txt index e79e8581..14babd2d 100644 --- a/02/27.txt +++ b/02/27.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 27oroge yauwu aimu tanyragani uragu badami tapanu tana ata mate,waleka aimu pahaimodi tauda ata katenguna etawe ka liloko.\v 28Yau um takbegage tabaragu lara morha.yau engage bamu pahadawa ka bannuna ege ate waige mata-Mu.' -======= -\v 27 orom yauwu aimu tanna gage urra dewagu ta jonga dalara ata kamate,waleka aimu pahi modi tau'da ata katengumu etawse kaliloko.\v 28yauwu im takigage tabaragu lara morha yauwu engage bamu pahadawa kabanuna ege ate waige mata-Mu.' ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 27 oroge yauwu aimu tanyragani uragu badami tapanu tana ata mate,waleka aimu pahaimodi tauda ata katenguna etawe ka liloko. \v 28 Yau um takbegage tabaragu lara morha.yau engage bamu pahadawa ka bannuna ege ate waige mata-Mu.' \ No newline at end of file diff --git a/02/29.txt b/02/29.txt index d1f6d4b7..c0a25a16 100644 --- a/02/29.txt +++ b/02/29.txt @@ -1,8 +1 @@ -<<<<<<< HEAD -\v 29 Bagu ole baigimi,nauwa dadiwe bagu hanewe tabarami waige kadibaha tutu weda waikada yita,Daud,oro nyi bana mate be' mono tanini,mono ratena dahoni hamera waida yita kahha lado nehe.\v 30Nyidawe,oro nyi ba wuyi Nabi mono katadawe nai Allah bana jaji bewe waige haurana tabarama tutu ba hangodoyi wuyo wali ta ana suhui Daud tahadauwu ngodona.\v 31Oroge inna,Daud na etawe hada inna ullugenNyiyo nahanewe tutu kaddei Kristus Nyi:'Nyi wale hamadhtakmayi ta panu tana ata mate,mono tau-Na wale matekmawe liloko.' -======= -\v 29 Bagu ole baigimi,nauwa dadiwe bagu hanewe tabarami waige kamamanne tutu'da weda waikada yitta,Daud,oro nyi bana mate'be mono tanini,mono ratena dahoni hamera waida yitta kahha la'do neha.Nyidawe,oro nyiyo ba wuyi\v 30 nabi mono katadawe nai Allah bana jaji bewe waige haurana tabarana tutu ba'hangodoyi wu wali ta ana suhu nai Daud ta hadawu ngodona.\v 31 Oroge inna,Daud na etawe ha'da inna uluge,nyiyo na'hanewe tutu kaddei Kristus Nyi: - -'Nyi walle na bijaka gimi ta jonga dalara at a kamate, - monno tauwunaa-Nyi walle etamawe ha jala dangnga.' ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 29 Bagu ole baigimi,nauwa dadiwe bagu hanewe tabarami waige kadibaha tutu weda waikada yita,Daud,oro nyi bana mate be' mono tanini,mono ratena dahoni hamera waida yita kahha lado nehe. \v 30 Nyidawe,oro nyi ba wuyi Nabi mono katadawe nai Allah bana jaji bewe waige haurana tabarama tutu ba hangodoyi wuyo wali ta ana suhui Daud tahadauwu ngodona. \v 31 Oroge inna,Daud na etawe hada inna ullugenNyiyo nahanewe tutu kaddei Kristus Nyi:'Nyi wale hamadhtakmayi ta panu tana ata mate,mono tau-Na wale matekmawe liloko.' \ No newline at end of file diff --git a/02/32.txt b/02/32.txt index e14d4c3e..16e53f63 100644 --- a/02/32.txt +++ b/02/32.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 32Yesus nadelage Nyi hahadenai Allah mono nami tangngama kaetawe tutu hada inna.\v 33Oro bataudagege,ba hamadehta beyi ge wainin limanai Allah mono hibbawe jaji inna wali tai Ama tutu waddi Katenguna,Nyi na bibeyi ,ba agawe inna harangemu loho dumo haetamu. -======= -\v 32Yesus naddege Nyi hakaddenai Allah mono waini tangama kaetawe tutu hada inna.\v 33Oro ba taudadagege,ba hamadehita beyi ge waini limma kawananaI Allah mono hibbabewe,jaji inna wali ta'i Ama tuttu waddi katengna Nyi na bebeyi,ba agawe inna harangemu lohho dumo haetamu. ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 32 Yesus nadelage Nyi hahadenai Allah mono nami tangngama kaetawe tutu hada inna. \v 33 Oro bataudagege,ba hamadehta beyi ge wainin limanai Allah mono hibbawe jaji inna wali tai Ama tutu waddi Katenguna,Nyi na bibeyi ,ba agawe inna harangemu loho dumo haetamu. \ No newline at end of file diff --git a/02/34.txt b/02/34.txt index eae6a7c4..756b6eca 100644 --- a/02/34.txt +++ b/02/34.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 34Oronage,Daud wale panekma ta Surga,tabolo nyi dauwu kahanewe,"Mori nahanewe tabara morigu,'ngodowu tabara limma kawana-Gu,\v 35kahha nauwa bagu rayidi muhhumu dadi dau ijalagudi ledugu.\v 36Oro batauda dage,nyammadi tangadi umma Israel tadwe waige kalijaka nadai Allah bebe bana hada-Ni Mori mono Kristus,nyiknai Yesus pakadailo bemi." -======= -\v 34Oronage,Daud wallena pannekma ta Surga,tabollo nyidawu kahanewe - "Mori nia hanewe tabara Morigu, - 'Ngodowu tabara limma kawna-Gu, -\v 35Kahha nauwa bagu rayidi muhh-muhhu-Mu 'daddi hadawu marahkadi ledu-Mu.'" -\v 36"Oro batauda dage,nyamma kadi tangadi umma Israel tadawe waige kalijjaka nadai Allah bewe bana hadadini Mori mono Kristus,nyidunai Yesus ha kadailo bemi." ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 34 Oronage,Daud wale panekma ta Surga,tabolo nyi dauwu kahanewe,"Mori nahanewe tabara morigu,'ngodowu tabara limma kawana-Gu, \v 35 kahha nauwa bagu rayidi muhhumu dadi dau ijalagudi ledugu. \v 36 Oro batauda dage,nyammadi tangadi umma Israel tadwe waige kalijaka nadai Allah bebe bana hada-Ni Mori mono Kristus,nyiknai Yesus pakadailo bemi." \ No newline at end of file diff --git a/02/37.txt b/02/37.txt index f85ae77e..1752e9aa 100644 --- a/02/37.txt +++ b/02/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37KOle yidda bada rangewe hada inna,nama duhkayi ateda yida,loho liddage tabarai Petrus mono lede lina wadeka,"Ole baiyigu,aga dahowe nami harayima?"\v 38Loho Petrus linnage tabarada yidda,"Jarrami mono harihawe taumu dihha-dihha lar tangaranai Kristus Yesus tutu hawalidi jalami,mono miyo enga hibbami kanyuru Waddi Katenguna.\v 39Oro jaji inna nyikwe tutumi,mono anami,mono tutu tasngada ata kamarauho,katauna butana Mori Allahda yita ha kamaikana." -======= -\v 37 Kole yidda bada rangewe hada inne,na maduhkawe ate'da yidda,lohho lid'dage tabaranai Petrus mono lede li'na wadeka "ole baiyigu,aga dahowe nami harayima?"\v 38Begge,Petrus na Hanewe tabarada yid'da,"Jarrami mono hariha we tauwumu dihha-dihha larr tangaranai Kristus Yesus tuttu hawalidi jalami,mono miyo engam hibbami kanyurru Waddi Katengna.\v 39Oro jaji inne nyidawe tuttumi,mono anami,mono tuttu tangada ata kamarauho,katauna butana Mori Allah yitta engada kamaikani." ->>>>>>> 3ab6d8bd21d8897b62f0d27a3ae6df7622baabb4 +\v 37 KOle yidda bada rangewe hada inna,nama duhkayi ateda yida,loho liddage tabarai Petrus mono lede lina wadeka,"Ole baiyigu,aga dahowe nami harayima?" \v 38 Loho Petrus linnage tabarada yidda,"Jarrami mono harihawe taumu dihha-dihha lar tangaranai Kristus Yesus tutu hawalidi jalami,mono miyo enga hibbami kanyuru Waddi Katenguna. \v 39 Oro jaji inna nyikwe tutumi,mono anami,mono tutu tasngada ata kamarauho,katauna butana Mori Allahda yita ha kamaikana." \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1038dbd3..8e2e6dad 100644 --- a/manifest.json +++ b/manifest.json @@ -69,6 +69,12 @@ "02-18", "02-20", "02-22", + "02-25", + "02-27", + "02-29", + "02-32", + "02-34", + "02-37", "03-title", "04-title", "05-title",