diff --git a/14/21.txt b/14/21.txt index f2c286f..54c2671 100644 --- a/14/21.txt +++ b/14/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Meim pem om yape omteki rohk om.Rohk mounip om pem yirahpsepe omre Ar Ahro om. Pem dan emseki harpe Yeisi amseki rohk fare fohmum onarohk om tom nim. \v 22 Yudas om ine iskaraiot rohk fohmum tom nim om Ai Tuhan tamtekim ah emseki rohk fen onorohk. Om tomnim om dep pem ine tom nim dep. -======= -\v 21 Meim pem om yape omteki rohk om.Rohk mounip om pem yirahpsepe omre Ar Ahro om.Pem dan emseki harpe Yeisi amseki rohk fare fohmum onarohk om tom nim. \v 22 Yudas om ine iskaraiot rohk fohmum tom nim om Ai Tuhan tamtekim ah emseki rohk fen onorohk.Om tomnim om dep pem ine tom nim dep. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 21 Meim pem om yape omteki rohk om.Rohk mounip om pem yirahpsepe omre Ar Ahro om. Pem dan emseki harpe Yeisi amseki rohk fare fohmum onarohk om tom nim. \v 22 Yudas om ine iskaraiot rohk fohmum tom nim om Ai Tuhan tamtekim ah emseki rohk fen onorohk. Om tomnim om dep pem ine tom nim dep. \ No newline at end of file diff --git a/14/23.txt b/14/23.txt index 8cc7b73..3295924 100644 --- a/14/23.txt +++ b/14/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Yeisi rohk fare fohmum tom nim enteki yanap pamok harpe dahro Yeisi enteki indeki rahan firman om pem firman enseki an yirari om ine onarohk om warki Ai are emseki tuhan Ar Ahro konom katne Yeisi. \v 24 Om fakir, yahnap mein dahro epeakham maam eine eipopki raan omro firman akhan yirari om dahre om omor Ai ahre fohmum mounip dahro. -======= -\v 23 Yeisi rohk fare fohmum tom nim enteki yanap pamok harpe dahro Yeisi enteki indeki rahan firman om pem firman enseki an yirari om ine onarohk om warki Ai are emseki tuhan Ar Ahro konom katne Yeisi. \v 24 ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 23 Yeisi rohk fare fohmum tom nim enteki yanap pamok harpe dahro Yeisi enteki indeki rahan firman om pem firman enseki an yirari om ine onarohk om warki Ai are emseki tuhan Ar Ahro konom katne Yeisi. \v 24 Om fakir, yahnap mein dahro epeakham maam eine eipopki raan omro firman akhan yirari om dahre om omor Ai ahre fohmum mounip dahro. \ No newline at end of file diff --git a/15/10.txt b/15/10.txt index bc68a20..ba5491b 100644 --- a/15/10.txt +++ b/15/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Enseki an yirahpsepe rokh nem om an omor mim emseki harpe waspahgi. Ai na rokh harpe om eper. \v 11 Rokh-rokh am dah rokh fare tom nim omro om sek ene ou amro depro om onaki harpe om biap. -======= -\v 10 Enseki an yirahpsepe rokh nem om an omor mim emseki harpe waspahgi.Ai na rokh harpe om eper. \v 11 Rokh-rokh am dah rokh fare tom nim omro om sek ene ou amro depro om onaki harpe om biap. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 10 Enseki an yirahpsepe rokh nem om an omor mim emseki harpe waspahgi. Ai na rokh harpe om eper. \v 11 Rokh-rokh am dah rokh fare tom nim omro om sek ene ou amro depro om onaki harpe om biap. \ No newline at end of file diff --git a/15/26.txt b/15/26.txt index a25bf47..b09a5f1 100644 --- a/15/26.txt +++ b/15/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Omki yirahpsepe nim houm,dak kaumiripop ekam Ai ahro, omor rokh yeram yaap Ai ahriki sepe yap,ekam feifein dak fakir. \v 27 Omki, akhan frufur omor akhan sahpe waspahki weimeki yap." -======= -\v 27 \v 26 Ene rokh yirahpsepe om semar omki emseki dah kakoteme tom nim om harpe Ai Ahre omor rokh yapu temimi om warki Ai ahro omki omor saksi rokh Yeisi. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 26 Omki yirahpsepe nim houm,dak kaumiripop ekam Ai ahro, omor rokh yeram yaap Ai ahriki sepe yap,ekam feifein dak fakir. \v 27 Omki, akhan frufur omor akhan sahpe waspahki weimeki yap." \ No newline at end of file diff --git a/16/05.txt b/16/05.txt index adad547..a4e3d17 100644 --- a/16/05.txt +++ b/16/05.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 5 Emseki pem wam dah amseki dah amsepe tom Yeisi omre kaumari dah pem ine pamok yap yanap om omki naimap dah tamro an omkisepe? \v 6 Omki enek dah enseki roh fare waspahgi om tom om natiyepe yirtimeki nimme epeahm om. \v 7 Emseki pem pem dah rok fare forpe yeram tom om emseki naimap inek om omki dah, sepe entegi dah inek sepe dah amseki konom kakeme om tom nim. -======= -\v 5 Emseki pem wam dah amseki dah amsepe tom Yeisi omre kaumari dah pem ine pamok yap yanap om omki naimap dah tamro an omkisepe? \v 6 Omki enek dah enseki roh fare waspahgi om tom om natiyepe yirtimeki nimme epeahm om. \v 7 Emseki pem pem dah rok fare forpe yeram tom om emseki naimap inek om omki dah,sepe entegi dah inek sepe dah amseki konom kakeme om tom nim. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 5 Emseki pem wam dah amseki dah amsepe tom Yeisi omre kaumari dah pem ine pamok yap yanap om omki naimap dah tamro an omkisepe? \v 6 Omki enek dah enseki roh fare waspahgi om tom om natiyepe yirtimeki nimme epeahm om. \v 7 Emseki pem pem dah rok fare forpe yeram tom om emseki naimap inek om omki dah, sepe entegi dah inek sepe dah amseki konom kakeme om tom nim. \ No newline at end of file diff --git a/16/12.txt b/16/12.txt index ee5ec87..38e3363 100644 --- a/16/12.txt +++ b/16/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Tamin biap rok om yirahpsepe dah farupop tom om emseki an ineh hepe yirahpsepe om amteki. \v 13 Omki emseki Yeisi roh yeraraam om semar Yeisi omseki baitotpe om bopopro waspahgi yeram omseki Yeisi ine rok farupur omseki yirap semaim omro onah yanap pem emseki waspahgi rok om Yeisi yirari omor pem emseki Yeisi rok fare omi Yeisi omki rok hamsemar rok-rok om emseki firkum. \v 14 Yeisi omki rok fomum Yeisi ensegi ensegi harpe dah hepe pem anteki rok fare tom nim ro. -======= -\v 12 tamin biap rok om yirahpsepe dah farupop tom om emseki an ineh hepe yirahpsepe om amteki. \v 13 Omki emseki Yeisi roh yeraraam om semar Yeisi omseki baitotpe om bopopro waspahgi yeram omseki Yeisi ine rok farupur omseki yirap semaim omro onah yanap pem emseki waspahgi rok om Yeisi yirari omor pem emseki Yeisi rok fare omi Yeisi omki rok hamsemar rok-rok om emseki firkum. \v 14 Yeisi omki rok fomum Yeisi ensegi ensegi harpe dah hepe pem anteki rok fare tom nim ro. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 12 Tamin biap rok om yirahpsepe dah farupop tom om emseki an ineh hepe yirahpsepe om amteki. \v 13 Omki emseki Yeisi roh yeraraam om semar Yeisi omseki baitotpe om bopopro waspahgi yeram omseki Yeisi ine rok farupur omseki yirap semaim omro onah yanap pem emseki waspahgi rok om Yeisi yirari omor pem emseki Yeisi rok fare omi Yeisi omki rok hamsemar rok-rok om emseki firkum. \v 14 Yeisi omki rok fomum Yeisi ensegi ensegi harpe dah hepe pem anteki rok fare tom nim ro. \ No newline at end of file diff --git a/17/01.txt b/17/01.txt index 3df7e57..8fa46cd 100644 --- a/17/01.txt +++ b/17/01.txt @@ -1,7 +1,3 @@ -<<<<<<< HEAD \c 17 \s Yeisi Hapyape Yoyim Enam Fakir Fomum -\p \v 1 Yesus omre fomum, omki oura fomum: "Ai amseki taam enem waspaki semar; axitom yasap anam dayroheim omki axro eper yare fakir axro. \v 2 Axre weimeki farkim otoxm yasap harpakim enaro, omkipem yapu temimi yap.Yanap waspaki harpakim enako axre. -======= -\c 17 (Yesus Hapyape Yoyim Enam Fakir Fomum) \v 1 Yesus omre fomum,omki oura fomum: "Ai amseki taam enem waspaki semar; axitom yasap anam dayroheim omki axro eper yare fakir axro. \v 2 Axre weimeki farkim otoxm yasap harpakim enaro,omkipem yapu temimi yap.yanap waspaki harpakim enako axre. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\p \v 1 Yesus omre fomum, omki oura fomum: "Ai amseki taam enem waspaki semar; axitom yasap anam dayroheim omki axro eper yare fakir axro. \v 2 Axre weimeki farkim otoxm yasap harpakim enaro, omkipem yapu temimi yap.Yanap waspaki harpakim enako axre. \ No newline at end of file diff --git a/17/06.txt b/17/06.txt index 2e96c63..9e8a350 100644 --- a/17/06.txt +++ b/17/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Ai na anam waspak farpurfep yonop waski,okamare harapakin daxro-omki en wospaki ran onam waspaki yirairan. \v 7 Amseki en waspaki yiram,yonop waspaki daxro harpakim,om konom enem axro weina aping. \v 8 Pree ran anam waspaki daxro fomim om, wospaki enoro forpap,omki waspaki yirairan, omki en yeram-yeram yasap,Yesus om wapkienaro srumum, en waspaki yirapsemhonukum. Omki dax ekamare kaxumirimim. -======= -\v 6 Ai na anam waspak farpurfep yonop waski,okamare harapakin daxro-omki en wospaki ran onam waspaki yirairan. \v 7 Amseki en waspaki yiram,yonop waspaki daxro harpakim,om konom enem axro weina aping. \v 8 Pree ran anam waspaki daxro fomim om,wospaki enoro forpap,omki waspaki yirairan,omki en yeram-yeram yasap,Yesus om wapkienaro srumum,en waspaki yirapsemhonukum. omki dax ekamare kaxumirimim. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 6 Ai na anam waspak farpurfep yonop waski,okamare harapakin daxro-omki en wospaki ran onam waspaki yirairan. \v 7 Amseki en waspaki yiram,yonop waspaki daxro harpakim,om konom enem axro weina aping. \v 8 Pree ran anam waspaki daxro fomim om, wospaki enoro forpap,omki waspaki yirairan, omki en yeram-yeram yasap,Yesus om wapkienaro srumum, en waspaki yirapsemhonukum. Omki dax ekamare kaxumirimim. \ No newline at end of file diff --git a/17/09.txt b/17/09.txt index e398468..8487790 100644 --- a/17/09.txt +++ b/17/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Dax hapyape enfakir dunia yanap fakir eine, yanap endaro harfakim, daro en omki waspaki yanap om axro waspaki harpe waspaki anam. \v 10 Omki yasap naxnem waspaki om yasap anam, omki yasap anam om yasap nem,omki dax enoro waspaki oitom enorohiras. \v 11 Omki dax ura dunia amro mimi ene,prer in amseki minipin dunia amro,Ai dax axro houpap, pamipmam,en omki yosiaro kakar naimap, na naxnemki omki na pem anamki naa anam akamare daxrohinim. omki en roh pamox, axpis daxpispaski tepefakir. -======= -\v 9 Dax hapyape enfakir dunia yanap fakir eine,yanap endaro harfakim,daro en omki waspaki yanap om axro waspaki harpe waspaki anam. \v 10 Omki yasap naxnem waspaki om yasap anam,omki yasap anam om yasap nem,omki dax enoro waspaki oitom enorohiras. \v 11 Omki dax ura dunia amro mimi ene,prer in amseki minipin dunia amro,Ai dax axro houpap,pamipmam,en omki yosiaro kakar naimap,na naxnemki omki na pem anamki naa anam akamare daxrohinim. omki en roh pamox,axpis daxpispaski tepefakir. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 9 Dax hapyape enfakir dunia yanap fakir eine, yanap endaro harfakim, daro en omki waspaki yanap om axro waspaki harpe waspaki anam. \v 10 Omki yasap naxnem waspaki om yasap anam, omki yasap anam om yasap nem,omki dax enoro waspaki oitom enorohiras. \v 11 Omki dax ura dunia amro mimi ene,prer in amseki minipin dunia amro,Ai dax axro houpap, pamipmam,en omki yosiaro kakar naimap, na naxnemki omki na pem anamki naa anam akamare daxrohinim. omki en roh pamox, axpis daxpispaski tepefakir. \ No newline at end of file diff --git a/17/12.txt b/17/12.txt index 69ff2a0..08bacc2 100644 --- a/17/12.txt +++ b/17/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Dax omki enpis, dax en kakar en nah anamki, nah anam dax ro heimim, dax waspaki kakarfromorap. Omki yanap pamakin sarar ine, omki akamare fonim nim pamox omex hadnupein, omki buku pamip mamro teremakim. \v 13 Pree omsekim dax oxrobeir. Dax axrofep waspaki dax waam dunia, omki roh naimap yasap,dax omki warom enkemro wani biip. \v 14 Dax ran anam waspaki xharpap enero waspaki, omki dunia henma fenmin, reem dnia yasap ine, dax pamseki dunia yasep ine. -======= -\v 12 Dax omki enpis,dax en kakar en nah anamki,nah anam dax ro heimim,dax waspaki kakarfromorap. omki yanap pamakin sarar ine,omki akamare fonim nim pamox omex hadnupein,omki buku pamip mamro teremakim. \v 13 Pree omsekim dax oxrobeir. Dax axrofep waspaki dax waam dunia,omki roh naimap yasap,dax omki warom enkemro wani biip. \v 14 Dax ran anam waspaki xharpap enero waspaki,omki dunia henma fenmin,reem dnia yasap ine,dax pamseki dunia yasep ine. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 12 Dax omki enpis, dax en kakar en nah anamki, nah anam dax ro heimim, dax waspaki kakarfromorap. Omki yanap pamakin sarar ine, omki akamare fonim nim pamox omex hadnupein, omki buku pamip mamro teremakim. \v 13 Pree omsekim dax oxrobeir. Dax axrofep waspaki dax waam dunia, omki roh naimap yasap,dax omki warom enkemro wani biip. \v 14 Dax ran anam waspaki xharpap enero waspaki, omki dunia henma fenmin, reem dnia yasap ine, dax pamseki dunia yasep ine. \ No newline at end of file diff --git a/17/20.txt b/17/20.txt index 06e7397..63097d1 100644 --- a/17/20.txt +++ b/17/20.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 20 Ai, daxk hap yape enox pamok ine, yonop doxm ran anam farpur yonop dunia omfakir. \v 21 En omki pamox rape fakir, ya Aii,dax axro wahni omki axx daxro ahni, omki famseki epeatmkap doux mimifaki, omki dunia saxm omki parare yeram nim am Ai axre kau mirmum arefakir. -======= -\v 20 Ai,daxk hap yape enox pamok ine,yonop doxm ran anam farpur yonop dunia omfakir. \v 21 En omki pamox rape fakir,ya Aii,dax axro wahni omki axx daxro ahni,omki famseki epeatmkap doux mimifaki,omki dunia saxm omki parare yeram nim am Ai axre kau mirmum arefakir. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 20 Ai, daxk hap yape enox pamok ine, yonop doxm ran anam farpur yonop dunia omfakir. \v 21 En omki pamox rape fakir, ya Aii,dax axro wahni omki axx daxro ahni, omki famseki epeatmkap doux mimifaki, omki dunia saxm omki parare yeram nim am Ai axre kau mirmum arefakir. \ No newline at end of file diff --git a/17/22.txt b/17/22.txt index 29a3f15..e30a868 100644 --- a/17/22.txt +++ b/17/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 Omki en waspaki oitom yasep harpap, pre axre paxro harpakim omom, omki en pamo rape fakir, deper paski tepe fakir pamox. \v 23 Dax kaap enkemro wani, omki ax daxro nahni, omki en naimapai rare fakir, omki pamox rare waspaki ax enoro epeaxm forare, omki dax epeaxam enoro ferare fakir. -======= -\v 22 Omki en waspaki oitom yasep harpap,pre axre paxro harpakim omom,omki en pamo rape fakir,deper paski tepe fakir pamox. \v 23 Dax kaap enkemro wani,omki ax daxro nahni,omki en naimapai rare fakir,omki pamox rare waspaki ax enoro epeaxm forare,omki dax epeaxam enoro ferare fakir. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 22 Omki en waspaki oitom yasep harpap, pre axre paxro harpakim omom, omki en pamo rape fakir, deper paski tepe fakir pamox. \v 23 Dax kaap enkemro wani, omki ax daxro nahni, omki en naimapai rare fakir, omki pamox rare waspaki ax enoro epeaxm forare, omki dax epeaxam enoro ferare fakir. \ No newline at end of file diff --git a/17/24.txt b/17/24.txt index 583daa2..162f8af 100644 --- a/17/24.txt +++ b/17/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Ya Ai, Dax hapyose nem, Dax tamroyn mimi yasep en pamox omro waspaki mimi fakir. exkamar en daxro neimim. En omkifrarenem omki saxpe fakir. Ai wimeki epeam tanam daxro anam dunia am Baitx mamki omor epeamanam. -======= -\v 24 Ya Ai,Dax hapyose nem,Dax tamroyn mimi yasep en pamox omro waspaki mimi fakir. exkamar en daxro neimim. En omkifrarenem omki saxpe fakir. Ai wimeki epeam tanam daxro anam dunia am Baitx mamki omor epeamanam. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 24 Ya Ai, Dax hapyose nem, Dax tamroyn mimi yasep en pamox omro waspaki mimi fakir. exkamar en daxro neimim. En omkifrarenem omki saxpe fakir. Ai wimeki epeam tanam daxro anam dunia am Baitx mamki omor epeamanam. \ No newline at end of file diff --git a/17/25.txt b/17/25.txt index 6b67936..a88a1e1 100644 --- a/17/25.txt +++ b/17/25.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 25 Ya, Ai naimap yeram dunia axk yirari eineram predax sarap fakir, omki en saraman dax akamare kaxumirmim. \v 26 Omki Dax naa anam, enaro waspaskiforpakuni enoro, harpe yuru axre forpakim om enoro waheran, omki dax emro wah mimi fakir. -======= -\v 25 Ya,Ai naimap yeram dunia axk yirari eineram predax sarap fakir,omki en saraman dax akamare kaxumirmim. \v 26 Omki Dax naa anam,enaro waspaskiforpakuni enoro,harpe yuru axre forpakim om enoro waheran,omki dax emro wah mimi fakir. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 25 Ya, Ai naimap yeram dunia axk yirari eineram predax sarap fakir, omki en saraman dax akamare kaxumirmim. \v 26 Omki Dax naa anam, enaro waspaskiforpakuni enoro, harpe yuru axre forpakim om enoro waheran, omki dax emro wah mimi fakir. \ No newline at end of file diff --git a/18/01.txt b/18/01.txt index 1055b66..011aa98 100644 --- a/18/01.txt +++ b/18/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 18 \v 1 Yeisi roh fomum bekem bekem Am omki semamu joim joim enem jopape re were bapan rooh kidrom mimiam kekape wimegiomki Yeisi yemamu wainaroh joim-joim enem yapape roh fomum. \v 2 Yudas nimpamu damorom joim henma nim Yeisi aro omki haasarum oro wousem om yeisi ona ram biokum waspaki om kifo yapekum yoim-yoim enem yapap honikum Yudas, omki hapum rooh yoim-yoim enem yapienem omki kamam somom. \v 3 Bup ram Ibrani omki tom yo-tomyo imam imam yam yohono tomyo yonop yonop Farisi omki honkum bep om sape Truaru hepegiomki perhepegi omki horikum. -======= -\c 18 \v 1 Yeisi roh fomum bekem bekem Am omki semamu joim joim enem jopape re were bapan rooh kidrom mimiam kekape wimegiomki Yeisi yemamu wainaroh joim-joim enem yapape roh fomum. \v 2 Yudas nimpamu damorom joim henma nim Yeisi aro omki haasarum oro wousem om yeisi ona ram biokum waspaki om kifo yapekum yoim-yoim enem yapap honikum Yudas,omki hapum rooh yoim-yoim enem yapienem omki kamam somom. \v 3 Bup ram Ibrani omki tom yo-tomyo imam imam yam yohono tomyo yonop yonop Farisi omki honkum bep om sape Truaru hepegiomki perhepegi omki horikum. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\c 18 \v 1 Yeisi roh fomum bekem bekem Am omki semamu joim joim enem jopape re were bapan rooh kidrom mimiam kekape wimegiomki Yeisi yemamu wainaroh joim-joim enem yapape roh fomum. \v 2 Yudas nimpamu damorom joim henma nim Yeisi aro omki haasarum oro wousem om yeisi ona ram biokum waspaki om kifo yapekum yoim-yoim enem yapap honikum Yudas, omki hapum rooh yoim-yoim enem yapienem omki kamam somom. \v 3 Bup ram Ibrani omki tom yo-tomyo imam imam yam yohono tomyo yonop yonop Farisi omki honkum bep om sape Truaru hepegiomki perhepegi omki horikum. \ No newline at end of file diff --git a/18/06.txt b/18/06.txt index 708a10c..7db7c92 100644 --- a/18/06.txt +++ b/18/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Omki Yeisi roohomki dak roh Yeisi, omki janap waspaki semsamum waspaki depenum Bape roh. \v 7 Omki Yeisi urah roh forum enek roh An beke farukum farnaperem? En omki fenukum" Yeisi Nazaret yap hak." -======= -\v 6 Omki Yeisi roohomki dak roh Yeisi,omki janap waspaki semsamum waspaki depenum Bape roh. \v 7 Omki Yeisi urah roh forum enek roh An beke farukum farnaperem? En omki fenukum" Yeisi Nazaret yap hak." ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 6 Omki Yeisi roohomki dak roh Yeisi, omki janap waspaki semsamum waspaki depenum Bape roh. \v 7 Omki Yeisi urah roh forum enek roh An beke farukum farnaperem? En omki fenukum" Yeisi Nazaret yap hak." \ No newline at end of file diff --git a/18/08.txt b/18/08.txt index 69f8d5b..abbec94 100644 --- a/18/08.txt +++ b/18/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Yeisi rokh fomi wimegi ro fumnia anokro dara. Jeisi min pem An dak ha farapere omseki joim-joim donem semnuer ro amseikipur supen omki inegi arupenm roh oki fomum Jeisi waspagi roh har tomen dak ine waspagi memairare. \v 9 rokh anam fupsemaim omki eineki ferasepe fakir Yeisi ahre fohmum om,paskim momai rare eine." -======= -\v 9 \v 8 Jeisi roh fomi wimegi ro fumnia anokro dara. Jeisi min pem An dak ha farapere omseki joim-joim donem semnuer ro amseikipur supen omki inegi arupenm roh oki fomum Jeisi waspagi roh har tomen dak ine waspagi memairare. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 8 Yeisi rokh fomi wimegi ro fumnia anokro dara. Jeisi min pem An dak ha farapere omseki joim-joim donem semnuer ro amseikipur supen omki inegi arupenm roh oki fomum Jeisi waspagi roh har tomen dak ine waspagi memairare. \v 9 rokh anam fupsemaim omki eineki ferasepe fakir Yeisi ahre fohmum om,paskim momai rare eine." \ No newline at end of file diff --git a/18/10.txt b/18/10.txt index a9a2e0e..5570d14 100644 --- a/18/10.txt +++ b/18/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Simon Petrus rooh fomum bakip sinepen bakip ar. Harpe jeiru nim tapur omki kapum om rikap kapum Jeteram om segi farkum harpenim om Imam tapur Malkhus. \v 11 Om, Yeisi roohfomum Petrus johom homarikim bakim om ruruh wahi supoh rroh wimeigi Aiare himum wam harpe ine daro daki jori? Yeisi om yampesaim saimpam hanas enem rooh. -======= -\v 10 Simon Petrus rooh fomum bakip sinepen bakip ar. harpe jeiru nim tapur omki kapum om rikap kapum Jeteram om segi farkum harpenim om Imam tapur Malkhus. \v 11 Om,Yeisi roohfomum Petrus johom homarikim bakim om ruruh wahi supoh rroh wimeigi Aiare himum wam harpe ine daro daki jori? Yeisi om yampesaim saimpam hanas enem rooh. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 10 Simon Petrus rooh fomum bakip sinepen bakip ar. Harpe jeiru nim tapur omki kapum om rikap kapum Jeteram om segi farkum harpenim om Imam tapur Malkhus. \v 11 Om, Yeisi roohfomum Petrus johom homarikim bakim om ruruh wahi supoh rroh wimeigi Aiare himum wam harpe ine daro daki jori? Yeisi om yampesaim saimpam hanas enem rooh. \ No newline at end of file diff --git a/18/12.txt b/18/12.txt index 185ce0e..5629637 100644 --- a/18/12.txt +++ b/18/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Omki para prajurit Romawi pemperwira-perwiranya waspagi ipopi pesaim yanap Yahudi omki yaiyaiam Yeisi omki kemenukum, \v 13 Om wei meki yampesaim Yeisi hanas mertu om roo nim nah kaifas, om ree nim tapur tahun. \v 14 Om, Kayafas omree romunarpe yanap-yanap Yahudi omki hamsesaim rooh hamsesaim rooh hamsesaim naimap mein pamok yanap hanoupen amor kateam. -======= -\v 12 Omki para prajurit Romawi pemperwira-perwiranya waspagi ipopi pesaim yanap Yahudi omki yaiyaiam Yeisi omki kemenukum, \v 13 Om wei meki yampesaim Yeisi hanas mertu om roo nim nah kaifas,om ree nim tapur tahun. \v 14 Om,Kayafas omree romunarpe yanap-yanap Yahudi omki hamsesaim rooh hamsesaim rooh hamsesaim naimap mein pamok yanap hanoupen amor kateam. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 12 Omki para prajurit Romawi pemperwira-perwiranya waspagi ipopi pesaim yanap Yahudi omki yaiyaiam Yeisi omki kemenukum, \v 13 Om wei meki yampesaim Yeisi hanas mertu om roo nim nah kaifas,om ree nim tapur tahun. \v 14 Om,Kayafas omree romunarpe yanap-yanap Yahudi omki hamsesaim rooh hamsesaim rooh hamsesaim naimap mein pamok yanap hanoupen amor kateam. \ No newline at end of file diff --git a/18/28.txt b/18/28.txt index 2d72bcd..b4b5978 100644 --- a/18/28.txt +++ b/18/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Tam en jam pesai Yeisi yam mimiam kayafas woina woutapur buke wouh yamamu wou \v 29 Urah Petrus topae fomum kekorpe ayam boup fomum Yeisi yam pesai nim nah Pilatus en yampesaim Yeisi omki mimiam kayafas wou tapur buke wou roh yeram yapu (tapur pe yoh) mimia mimiyap nimtapur tam wam amm en onah jepe ine jaepe wou tapur jemamu omki en ineh pamip japtepari toh rohb amki ineh omki teremenum proetorium japu tapur (pe saku joh) mimiam mimi jap tom am. \v 30 En rooh fare fakir rooh fare an yanpe tepae ine yanap yapsane yanap. -======= -\v 28 Tam en jam pesai Yeisi yam mimiam kayafas woina woutapur buke wouh yamamu wou \v 29 Urah Petrus topae fomum/kekorpe ayam boup fomum Yeisi yam pesai nim nah Pilatus en yampesaim Yeisi omki mimiam kayafas wou tapur buke wou roh yeram yapu (tapur pe yoh) mimia mimiyap nimtapur tam wam amm en onah jepe ine jaepe wou tapur jemamu omki en ineh pamip japtepari toh rohb amki ineh omki teremenum proetorium japu tapur (pe saku joh) mimiam mimi jap tom am. \v 30 En rooh fare fakir rooh fare an yanpe tepae ine yanap yapsane yanap. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 28 Tam en jam pesai Yeisi yam mimiam kayafas woina woutapur buke wouh yamamu wou \v 29 Urah Petrus topae fomum kekorpe ayam boup fomum Yeisi yam pesai nim nah Pilatus en yampesaim Yeisi omki mimiam kayafas wou tapur buke wou roh yeram yapu (tapur pe yoh) mimia mimiyap nimtapur tam wam amm en onah jepe ine jaepe wou tapur jemamu omki en ineh pamip japtepari toh rohb amki ineh omki teremenum proetorium japu tapur (pe saku joh) mimiam mimi jap tom am. \v 30 En rooh fare fakir rooh fare an yanpe tepae ine yanap yapsane yanap. \ No newline at end of file diff --git a/18/33.txt b/18/33.txt index 02cf997..a67829a 100644 --- a/18/33.txt +++ b/18/33.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 33 Omki, Pilatus yemamu urah wainaro yemamu roo wou buke kaprod urah foiayayaim Yeisi urah fenukum rooh ak bekem tomnim Yahudi? \v 34 Yeisi Rooh fumum ak bekem rooh fomanum hapeosa kap enemgi farukum yanap pem rooh farupat mei oki dar omu? \v 35 Pilatus rooh fomum nim ak dak pamo ram Yahudi nim, yapu amu yoim yamomutomyo tomyo ohnaro heiyaim energe bekem en furkum. -======= -\v 33 Omki,Pilatus yemamu urah wainaro yemamu roo wou buke kaprod urah foiayayaim Yeisi urah fenukum rooh ak bekem tomnim Yahudi? \v 34 Yeisi Rooh fumum ak bekem rooh fomanum hapeosa kap enemgi farukum yanap pem rooh farupat mei oki dar omu? \v 35 Pilatus rooh fomum nim ak dak pamo ram Yahudi nim,yapu amu yoim yamomutomyo tomyo ohnaro heiyaim energe bekem en furkum. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 33 Omki, Pilatus yemamu urah wainaro yemamu roo wou buke kaprod urah foiayayaim Yeisi urah fenukum rooh ak bekem tomnim Yahudi? \v 34 Yeisi Rooh fumum ak bekem rooh fomanum hapeosa kap enemgi farukum yanap pem rooh farupat mei oki dar omu? \v 35 Pilatus rooh fomum nim ak dak pamo ram Yahudi nim, yapu amu yoim yamomutomyo tomyo ohnaro heiyaim energe bekem en furkum. \ No newline at end of file diff --git a/19/12.txt b/19/12.txt index 04151b4..a5885f6 100644 --- a/19/12.txt +++ b/19/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 Pre oumigi oum jirari pouk boup asip oum "Pilatus ahin oumigi fargum jeip buke keimenugum geisi ahin feipih hapnagum; pro oumigi oum yanap Yahudi yanap oum ahoor fare "Pre amtegi buke nim am roum fimfanoum" ak eine ar yanap jojim doum eine ar yanap waspagi fare waniekap oum doak toum nim ar pasgim pre oumgi oum keimam yanap jojim rouk." \v 13 Pilatus ahim jirari rouk boup asip oum,oumiig oum Yeisi ashim yaap sepe wani gina buke wohugi oumigi mimi am oum na enem hua kakup na pein omn brata-nanenam oum houakakup. -======= -\v 12 Pre oumigi oum jirari pouk boup asip oum "Pilatus ahin oumigi fargum jeip buke keimenugum geisi ahin feipih hapnagum; pro oumigi oum yanap Yahudi yanap oum ahoor fare "Pre amtegi buke nim am roum fimfanoum" ak eine ar yanap jojim doum eine ar yanap waspagi fare waniekap oum doak toum nim ar pasgim pre oumgi oum keimam yanap jojim rouk." \v 13 Pilatus ahim jirari rouk boup asip oum,oumiig oum Yeisi ashim yaap sepe wani gina buke wohugi oumigi mimi am oum na enem hua kakup na pein omn brata/nanenam oum houakakup. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 12 Pre oumigi oum jirari pouk boup asip oum "Pilatus ahin oumigi fargum jeip buke keimenugum geisi ahin feipih hapnagum; pro oumigi oum yanap Yahudi yanap oum ahoor fare "Pre amtegi buke nim am roum fimfanoum" ak eine ar yanap jojim doum eine ar yanap waspagi fare waniekap oum doak toum nim ar pasgim pre oumgi oum keimam yanap jojim rouk." \v 13 Pilatus ahim jirari rouk boup asip oum,oumiig oum Yeisi ashim yaap sepe wani gina buke wohugi oumigi mimi am oum na enem hua kakup na pein omn brata-nanenam oum houakakup. \ No newline at end of file diff --git a/19/14.txt b/19/14.txt index d002882..2a8894c 100644 --- a/19/14.txt +++ b/19/14.txt @@ -1,6 +1,3 @@ \v 14 Taam oum taam haap te sapaeh fagiyame yasep pre oumigi oum douh saam enem jeip kapir jeip pre darem pamouk Pilatus ahin rouk boup asip fipos harpo yanap Yahudi yanap enrouk, "amar ar toum nim an gim. \v 15 Oumigi oum enrough boup asip tapur fare oumur ar pre woumrouk toum tai to aip ar woum roule toum taite aip ar! Pilatus roule boup asip fare enrouk" Woum rouk taite aip tein? toum jo toum jo oumrouk waspagi rouk hamtair aim,deip amrouk waspagi toum yanap epampouk ak gi waapgi. \v 16 Amar ar rouk boup asip fare Pilatus diak amar ar Yeisi ahni anrouk harpe woumrouk taiteyam. -<<<<<<< HEAD \p -======= ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 Yeisi Ahin Woum Rouk Taiteaim \ No newline at end of file diff --git a/19/19.txt b/19/19.txt index bd7878e..d1ef3fb 100644 --- a/19/19.txt +++ b/19/19.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 19 Pilatus ahare ter emagum wagina tremtaitemoum waum rouk taiteaim. Tere yaap oum boup asip enem oum jirari. "YEISI YANAP NAZARET YAAP,TOUM YANAP YAHUDI OUM." \v 20 Yanap biap Yahudi yanap boup asip jirari pre oumigi oum uimiam Yeisi ahim woum rouk toum tai teaim jirap yapu kapgi, pahas tre re yaap oum boup Ibrani,ouhjo pem boup Yunani. -======= -\v 19 Pilatus ahare ter emagum wagina tremtaitemoum waum rouk taiteaim. Tere yaap oum boup asip enem oum jirari. "YEISI YANAP NAZARET YAAP,TOUM YANAP YAHUDI OUM." \v 20 Yanap biap Yahudi yanap boup asip jirari pre oumigi oum uimiam Yeisi ahim woum rouk toum tai teaim jirap yapu kapgi,pahas tre re yaap oum boup Ibrani,ouhjo pem boup Yunani. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 19 Pilatus ahare ter emagum wagina tremtaitemoum waum rouk taiteaim. Tere yaap oum boup asip enem oum jirari. "YEISI YANAP NAZARET YAAP,TOUM YANAP YAHUDI OUM." \v 20 Yanap biap Yahudi yanap boup asip jirari pre oumigi oum uimiam Yeisi ahim woum rouk toum tai teaim jirap yapu kapgi, pahas tre re yaap oum boup Ibrani,ouhjo pem boup Yunani. \ No newline at end of file diff --git a/19/23.txt b/19/23.txt index 91d3e27..bc2988e 100644 --- a/19/23.txt +++ b/19/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Kne pe kripe jo toumjo enre waspagi jeisi,ahim woumrouk toum taite aim hour piip oum aitoure baapmetei airikum, pamu am kriepe kripe jo oum peip pem sam sapae tiep eineram hais teramasin wagina jeina seyape maam pasgi. \v 24 Kripe kreipjo enre rouk boup asip yaaf fare pemrouk,"Taruru teak ar,pre aumigi deip ukip heteipe fir kirauh oumigi oum deip roule heipe mane heepeh akgar." Rouk am yeram rare fagir. pahas treim makum naina rouk boup asip kaap rouk. "enre waspagi,aitouhru haaprare hour pip danemoum enre waspagi pre pem hour pilp tapur danemuom enerre ougip hetelpih trare. pre rumigi oum kreipe jo enre waspagi ruok boup asip rouk jirai teimamegi fiogum. -======= -\v 23 Kne pe kripe jo toumjo enre waspagi jeisi,ahim woumrouk toum taite aim hour piip oum aitoure baapmetei airikum,pamu am kriepe kripe jo oum peip pem sam sapae tiep eineram hais teramasin wagina jeina seyape maam pasgi. \v 24 Kripe kreipjo enre rouk boup asip yaaf fare pemrouk,"Taruru teak ar,pre aumigi deip ukip heteipe fir kirauh oumigi oum deip roule heipe mane heepeh akgar." Rouk am yeram rare fagir. pahas treim makum naina rouk boup asip kaap rouk. "enre waspagi,aitouhru haaprare hour pip danemoum enre waspagi pre pem hour pilp tapur danemuom enerre ougip hetelpih trare. pre rumigi oum kreipe jo enre waspagi ruok boup asip rouk jirai teimamegi fiogum. ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 +\v 23 Kne pe kripe jo toumjo enre waspagi jeisi,ahim woumrouk toum taite aim hour piip oum aitoure baapmetei airikum, pamu am kriepe kripe jo oum peip pem sam sapae tiep eineram hais teramasin wagina jeina seyape maam pasgi. \v 24 Kripe kreipjo enre rouk boup asip yaaf fare pemrouk,"Taruru teak ar,pre aumigi deip ukip heteipe fir kirauh oumigi oum deip roule heipe mane heepeh akgar." Rouk am yeram rare fagir. pahas treim makum naina rouk boup asip kaap rouk. "enre waspagi,aitouhru haaprare hour pip danemoum enre waspagi pre pem hour pilp tapur danemuom enerre ougip hetelpih trare. pre rumigi oum kreipe jo enre waspagi ruok boup asip rouk jirai teimamegi fiogum. \ No newline at end of file diff --git a/21/19.txt b/21/19.txt index db170a8..0be9ab0 100644 --- a/21/19.txt +++ b/21/19.txt @@ -1,8 +1,3 @@ -<<<<<<< HEAD \v 19 Yeisi fohmum yasap am amar fohrpe hatnepy tamseki paskin,Petrus om ohou ene Ar ahro.Pem omki om fotem hameki om fohmum Petrus ahro, yirahpsepy dahro." \p - Bekeme Om Farufeitn Om Murid Om Epeyahm Yap Yeisi Ahre -======= -\v 19 Yeisi fohmum yasap am amar fohrpe hatnepy tamseki paskin,Petrus om ohou ene Ar ahro.Pem omki om fotem hameki om fohmum Petrus ahro,yirahpsepy dahro." -(Bekeme Om Farufeitn Om Murid Om Epeyahm Yap Yeisi Ahre) ->>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2 + Bekeme Om Farufeitn Om Murid Om Epeyahm Yap Yeisi Ahre \ No newline at end of file diff --git a/manifest.json b/manifest.json index 966baaa..f025aa3 100644 --- a/manifest.json +++ b/manifest.json @@ -179,8 +179,13 @@ "12-41", "12-48", "13-title", + "13-31", + "13-34", + "13-36", "14-title", + "14-01", "14-04", + "14-08", "14-10", "14-12", "14-15",