From c99b39679a44819df9cad0f30a3202aa7db7b6e7 Mon Sep 17 00:00:00 2001 From: gibson Date: Tue, 16 Jul 2024 22:23:28 +1000 Subject: [PATCH] Tue Jul 16 2024 22:23:28 GMT+1000 (Papua New Guinea Time) --- 19/13.txt | 6 +----- 19/15.txt | 6 +----- 19/18.txt | 6 +----- 19/21.txt | 6 +----- 19/23.txt | 6 +----- 19/26.txt | 6 +----- 19/28.txt | 6 +----- 19/30.txt | 6 +----- 19/33.txt | 6 +----- 19/35.txt | 6 +----- 19/38.txt | 6 +----- manifest.json | 12 ++++++++++++ 12 files changed, 23 insertions(+), 55 deletions(-) diff --git a/19/13.txt b/19/13.txt index 58951120..64aef4cd 100644 --- a/19/13.txt +++ b/19/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Hinikia haba-heba bainti baiha bika bi batukara niha ora aiho bano bainti'i baira a'ini barake bariara. Bika Nora Ihura autureha kekau bareha ora aiho atitareka, bika tiha, "Bi Ihura autu'a Poluba tibaira, te kekauke niara turo ma baintira tutake tubitarate." \v 14 Bainti 7-nabu bi okarara minti bariaka, bika Juda iatapris bainti baaintiti, bira autu Skiva ra. -======= -\v 13 Hinikia haba-heba bainti baiha bika bi batukara niha ora aiho bano bainti'i baira a'ini barake baria. Bika Nora Ihura autureha kekau bareha ora aiho atitareka, bika tiha,''Bi Ihura autu'a poluba tibaira, te kakeue niara turo ma baintira tutake tubitarate.'' \v 14 Bainti 7-nabu bi okarara minti bariaka, bika Juda iatapris bainti baaintiti, bira autu Skiva ra. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 13 Hinikia haba-heba bainti baiha bika bi batukara niha ora aiho bano bainti'i baira a'ini barake bariara. Bika Nora Ihura autureha kekau bareha ora aiho atitareka, bika tiha, "Bi Ihura autu'a Poluba tibaira, te kekauke niara turo ma baintira tutake tubitarate." \v 14 Bainti 7-nabu bi okarara minti bariaka, bika Juda iatapris bainti baaintiti, bira autu Skiva ra. \ No newline at end of file diff --git a/19/15.txt b/19/15.txt index 586937b4..4c2c0cbd 100644 --- a/19/15.txt +++ b/19/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ora aiho bobano bika nai tiba nimiharo, "Te Ihura tabe, aii'a Polura bata tabauna be, nee taukae?" \v 16 Ora aiho bano korumpu rero haba-heba bainti ata, bika kekau bara muntubi kero, bika utaba'a raperi kero ora kabu bika arimanta, nora aiha birara bare bi nabura a'irake binuara. \v 17 Eka Juda batana bata Grik batana taukae Efesas ni bariaka bi ubara iri, bika bo'ake ete, aii'a bika Nora Ihura autu bara bini iara. -======= -\v 15 Ora aiho bobano bika nai tiba nimiharo, ''Te Ihura tabe, aii'a polura bata tabauna be, nee taukae?'' \v 16 ora aiho bano korumpu rero haba-haba bainti ata, bika kekau bara muntubi kero, bika utaba'a raperi kero ora kabu bika arimanta, nora aiha birara bare bi nabura a 'irake bonuara. \v 17 Eka Juda batana bata Grik batana taukae Efesas ni bariaka bi ubara iri,bika bo,ake ete, aii'a bika Nora Ihura autu bara bini iara. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 15 Ora aiho bobano bika nai tiba nimiharo, "Te Ihura tabe, aii'a Polura bata tabauna be, nee taukae?" \v 16 Ora aiho bano korumpu rero haba-heba bainti ata, bika kekau bara muntubi kero, bika utaba'a raperi kero ora kabu bika arimanta, nora aiha birara bare bi nabura a'irake binuara. \v 17 Eka Juda batana bata Grik batana taukae Efesas ni bariaka bi ubara iri, bika bo'ake ete, aii'a bika Nora Ihura autu bara bini iara. \ No newline at end of file diff --git a/19/18.txt b/19/18.txt index b1583254..0e21c8fe 100644 --- a/19/18.txt +++ b/19/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 Airu mara ura utua bainti ka ani nai kumi bata ora okara mintiara bata tiba o'ai iara. \v 19 Airu bainti haba-heba mintuaka nai buku bare biri eka bainti nahenti abu ata iha warakara. Bi bukura nora monu maki baireba 50 000 silva koins. \v 20 Mintibo Kotira uba bano nora kekau bata kero eka batana bira. -======= -\v 18 Airu mara ura utua bainti ka ani ani kumi bata ora okara mintiara bata tiba o'ai iara . \v 19 Airu bainti haba -haba mintuaka nai buku bare bira eka baintai nahenti abu ata ihia warakara. Bi bukuar noera monu maki baireba 50 000 silva koins. \v 20 Mintibo kotira uba bano nora kekau bata kero eka batana bira. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 18 Airu mara ura utua bainti ka ani nai kumi bata ora okara mintiara bata tiba o'ai iara. \v 19 Airu bainti haba-heba mintuaka nai buku bare biri eka bainti nahenti abu ata iha warakara. Bi bukura nora monu maki baireba 50 000 silva koins. \v 20 Mintibo Kotira uba bano nora kekau bata kero eka batana bira. \ No newline at end of file diff --git a/19/21.txt b/19/21.txt index eba86492..62112fcc 100644 --- a/19/21.txt +++ b/19/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Poluba nai kai'a Efesas ni tai'a kero, Kempuka Aiho Bainti kekau'a biba Masedonia biro Akaia biro Jerusalem ni bireba iri taira. Biba tiharo, "Jerusalem ni baima aii'a Rom ni bata ma buaina be. \v 22 Poluba tara kai'a bainti Timoti ka Erastus ka Masedonia nitita kero, bika hanta bira kai'a kaha ibariaka. Ibo nai Esia mini bo'a hanta bata baira. -======= -\v 21 Poluba nai kai'a Efesas ni tai'a kero Kempuka Aiho Baintu'a biba Masedonia biba biro Akaia biro Jerusalem ni bireba iri taira. Biba tiharo,''Jerusalem ni baima aii'a Rom ni bata ma buaina be. \v 22 Poluba tara Kai'a bainti Timoti ka Erastus ka Masedonia nitita kero, bika hanta bira kai'a kaha ibariaka. Ibo nai Esia minibo'a hanta bata baira. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 21 Poluba nai kai'a Efesas ni tai'a kero, Kempuka Aiho Bainti kekau'a biba Masedonia biro Akaia biro Jerusalem ni bireba iri taira. Biba tiharo, "Jerusalem ni baima aii'a Rom ni bata ma buaina be. \v 22 Poluba tara kai'a bainti Timoti ka Erastus ka Masedonia nitita kero, bika hanta bira kai'a kaha ibariaka. Ibo nai Esia mini bo'a hanta bata baira. \ No newline at end of file diff --git a/19/23.txt b/19/23.txt index 04059020..88899359 100644 --- a/19/23.txt +++ b/19/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Bira ahiro aniro bateta, kia bo mara'e o ina uba bata Efesas ira obariro Ihura abate bariara tintaira. \v 24 Bainti bo baira, bira autu Dimitris, biba silva nohairo una'ara kot Atemis ra piksa minti haro nora monu mintia ke haro bainti taukae bira batakeha una'ara kotira piksa mintiaka nimi baira. \v 25 Mintibo biba eka bainti taukae una'ara kotira mintia keha salim iaka ruba ira, bika tiba nimi haro, "Nee tabebe tenabu una'ara kotira piksa mintiha airu monu bare bauna be." -======= -\v 23 Bira ahiro aniro bateta, kia bo mara'e o ina uba bata Efesas ira obariro Ihura abate-bariara tintaira. \v 24 Bainti bo baira, bira autu Dimitris-ra biba silva nohairo una'arakot Atemis-ra piksa minti haronora monu mintiake haro bainti taukae bira batakeha una'ara kotira piksa mintiaka nimi baira. \v 25 Mintibo biba eka bainti taukae una'ara kotira mintia keha salim iaka ruba ira, bika tiba nimi haro, "Nee tabebe tenabu una'ara kotira piksa mintiha airu monu bare bauna be. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 23 Bira ahiro aniro bateta, kia bo mara'e o ina uba bata Efesas ira obariro Ihura abate bariara tintaira. \v 24 Bainti bo baira, bira autu Dimitris, biba silva nohairo una'ara kot Atemis ra piksa minti haro nora monu mintia ke haro bainti taukae bira batakeha una'ara kotira piksa mintiaka nimi baira. \v 25 Mintibo biba eka bainti taukae una'ara kotira mintia keha salim iaka ruba ira, bika tiba nimi haro, "Nee tabebe tenabu una'ara kotira piksa mintiha airu monu bare bauna be." \ No newline at end of file diff --git a/19/26.txt b/19/26.txt index eef91302..c9c79bdc 100644 --- a/19/26.txt +++ b/19/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Nee iri tabebe kia Efesas ni aii aube, eka Esia batana be bainti biba Poluba bainti nahenti bara arara tu'antara bo arana ma kaibo. Biba tiharo, kiama bo kotira baibo bainti kau'u ihai mintia tara. \v 27 Kia tenabu aii auma piksa mintia keha monu baraina kara be, mono nabu godmeri Atemis bira ihai bika bata uminarai ama biba. Be kotira autu eka bainti Esia batana mono ibariara, biba tubi ma buano be. -======= -\v 26 Nee iri tabebe kia Efesas ni aii aube, eka Esia batana bi bainti biba Poruba bainti nahenti bara arara tu'antara bo arana ma kaibo. Biba tiharo, kiama bo kotira baibo bainti kau'u ihai mintia tara. \v 27Kia tenabu aii auma piksa mintia keha monu baraina kara be, mono nabu godmeri Atemis bira ihai bika bata uminarai ama biba. Be kotira autu eka bainti Esia batana mono ibariara, biba tubima buano be. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 26 Nee iri tabebe kia Efesas ni aii aube, eka Esia batana be bainti biba Poluba bainti nahenti bara arara tu'antara bo arana ma kaibo. Biba tiharo, kiama bo kotira baibo bainti kau'u ihai mintia tara. \v 27 Kia tenabu aii auma piksa mintia keha monu baraina kara be, mono nabu godmeri Atemis bira ihai bika bata uminarai ama biba. Be kotira autu eka bainti Esia batana mono ibariara, biba tubi ma buano be. \ No newline at end of file diff --git a/19/28.txt b/19/28.txt index 7133d69c..6feb53c1 100644 --- a/19/28.txt +++ b/19/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Bika bi ubara iri, ooraha arara ite naberai tiha, "Efesas ni hainara Atemis ra bira nora be." \v 29 Eka bainti nahenti nora tauni irauka bira iri werai'i airu abu-ato bare kante bo nora nabu ruhara ira ori etara. Bika tara bainti Masedonia hai Polura batake aniaka wata bare, Gaius ka Aristakus ka. -======= -\v 28 Bika bi ubara iri, ooraha arara ite naberai tiha, "Efesas ni hainara Atemis ra bira nora be." \v 29 Eka bainti nahenti nora tauni irauka bira iri werai'i airu abu- ato bare kante bo nora nabu ruhara ira ori etara. Bika tara bainti Masedonia hai Porura batake aniaka wata bare, Gaius ka Aristakus ka. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 28 Bika bi ubara iri, ooraha arara ite naberai tiha, "Efesas ni hainara Atemis ra bira nora be." \v 29 Eka bainti nahenti nora tauni irauka bira iri werai'i airu abu-ato bare kante bo nora nabu ruhara ira ori etara. Bika tara bainti Masedonia hai Polura batake aniaka wata bare, Gaius ka Aristakus ka. \ No newline at end of file diff --git a/19/30.txt b/19/30.txt index 9462913e..fcab184f 100644 --- a/19/30.txt +++ b/19/30.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 30 Poluba bira ira airu bainti nahenti bariara abutana ori etareba, imanta disaipel bira raba abuke. \v 31 Imanta hinikia Esia provins kai'a bainti bika Polura ara'o kempuka uba barake tiha Polura ra kia ruha nabura ira ori etaire. \v 32 Bainti nahenti naberai bobano bo uba tibo bobano bo uba tiha, bika werai iha airu abu ota bareha, aii'a airu kia tabarai nanarae ruba uara ata bika bi. -======= -\v 30 Poruba bira ira airu bainti nahenti bariara abutana ori etareba, imanta disaipel bira raba abuke. \v 31 Imanta hinikia Esia provins kai'a bainti bika Porura ara'o kempuka uba barake tiha Porura ra kia ruha nabura ira ori etaire. \v 32 Bainti nahenti naberai bobano bo uba tiha, bika werai iha airu abu ato bareha, aii'a airu kia tabarai nanarae ruba uara ata bika bi. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 30 Poluba bira ira airu bainti nahenti bariara abutana ori etareba, imanta disaipel bira raba abuke. \v 31 Imanta hinikia Esia provins kai'a bainti bika Polura ara'o kempuka uba barake tiha Polura ra kia ruha nabura ira ori etaire. \v 32 Bainti nahenti naberai bobano bo uba tibo bobano bo uba tiha, bika werai iha airu abu ota bareha, aii'a airu kia tabarai nanarae ruba uara ata bika bi. \ No newline at end of file diff --git a/19/33.txt b/19/33.txt index 1c820bc1..505bc487 100644 --- a/19/33.txt +++ b/19/33.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 33 Hini kiaka Aleksendar tiba ami, bainti bira Juba batana abuni bate eka bainti ruba ira ata buaire ra. Mintibo Aleksendar ba nai kau'u bini batero bainti nahenti kanko kero tiba nimi reba bika Juda kia bo ora hika mintia bo. \v 34 Imanta, bika taba bo biba Juda batana bainti bano imanta, eka bainti nahenti kekau ke naberai tiha, "Atemis ra Efesas ni hainara bira nora be." Bika mintia ke naberai tara aua tiara. -======= -\v 33 Hini kiaka Aleksendar tiba ami, bainti bira Juda batana abuni bate eka bainti ruba ira ata buairera. Mintibo Aleksendar ba nai kau'u bini batero bainti nahenti kanko kero tiba nimireba bika Juda kia bo ora hika mintia bo. \v 34 Imanta, bika tababo biba Juda batana bainti bano imanta, eka bainti nahenti kekauke naberai tiha, "Atemis ra Efesas ni hainara bira nora be." Bika mintiake naberai tara aua tiara. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 33 Hini kiaka Aleksendar tiba ami, bainti bira Juba batana abuni bate eka bainti ruba ira ata buaire ra. Mintibo Aleksendar ba nai kau'u bini batero bainti nahenti kanko kero tiba nimi reba bika Juda kia bo ora hika mintia bo. \v 34 Imanta, bika taba bo biba Juda batana bainti bano imanta, eka bainti nahenti kekau ke naberai tiha, "Atemis ra Efesas ni hainara bira nora be." Bika mintia ke naberai tara aua tiara. \ No newline at end of file diff --git a/19/35.txt b/19/35.txt index 72545962..8a7f2dca 100644 --- a/19/35.txt +++ b/19/35.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 35 Bi tauni ra'ira kuskus bano naberai tia bainti nahenti ka raba-abu kero, bika tiba nimiro, nee Efesas bainti, eka bainti eka batanahi taba bo nee Efesas ma nahenti kotira Atemis ra mono nabu ra'iki tabo, ai'a taba bo una'ara kotira piksa narubai hairo a'u bira be. \v 36 Nee bihaikara taba tara, minti bo nee bohika ora hika kia totara bikai mintiate. \v 37 Bira nanarae bii baintika (Gaiyus ka Aristakus ka) nee bika hanta ko ata bitabare aniabo, bika kia tempolu ira muara bainti aube, ai'a bika kia tinabu nahenti kotira ra oora uba bata tiabo. -======= -\v 35 Bi tauni ra'ira kuskus bano naberai tia bainti nahenti ka raba-abu kero, bika tiba nimiro, nee Efesas bainti, eka bainti eka batanahi tababo nee Efesas ma nahenti kotira Atemis ra mono nabu ra'iki tabo, aii'a tababo una'ara kotira piksa narubai hairo a'u bira be. \v 36 Nee bihaikara taba tara, mintibo nee bohika ora hika kia totara bikai mintiate. \v 37 Bira nanarae, bii baintika (Gaiyus ka Aristakus ka) nee bika hanta ko ata bita bare aniabo, bika kia temporu ira muara bainti aube, aii'a bika kia tinabu nahenti kotira ra ora uba bata tiabo. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 35 Bi tauni ra'ira kuskus bano naberai tia bainti nahenti ka raba-abu kero, bika tiba nimiro, nee Efesas bainti, eka bainti eka batanahi taba bo nee Efesas ma nahenti kotira Atemis ra mono nabu ra'iki tabo, ai'a taba bo una'ara kotira piksa narubai hairo a'u bira be. \v 36 Nee bihaikara taba tara, minti bo nee bohika ora hika kia totara bikai mintiate. \v 37 Bira nanarae bii baintika (Gaiyus ka Aristakus ka) nee bika hanta ko ata bitabare aniabo, bika kia tempolu ira muara bainti aube, ai'a bika kia tinabu nahenti kotira ra oora uba bata tiabo. \ No newline at end of file diff --git a/19/38.txt b/19/38.txt index 39bc1a47..de13aa77 100644 --- a/19/38.txt +++ b/19/38.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 38 Mintibo Dimitris ra batake bainti una'ara kotira piksa mintiaka bainti bo iakai uba baibera, bira ko antua bibo ko iriaka bata bariabo, kaira bika nai bora ora hikara nai ko abu ata tiate. \v 39 Bira bohikara tireka ibera, bira nenta iata bainti oru tabe bika batake abu-abu iate. \v 40 U'ai ake turo tenabu bate haina ruba irara uba ma batauro bainti arara ite iabo bateta obarira, kia okara bata bai kebura ra kiama tenabu umina abu-abu ake bi keburara kamani ba irai'e tiaina be. \v 41 Biba tiba kero, bainti nahenti ruba uaka atite kaimanta, bika bi batukara ke buara. -======= -\v 38 Mintibo Dimitris ra batake bainti una'ara kotira piksa mintiaka bainti bo iakai uba baibera, bira ko antua bibo ko iriaka bata bariabo, kaira bika nai bora ora hikara nai ko abu ata tiate. \v 39 Bira bohikara tireka ibera, bira nenta iata bainti oru tabe bika batake abu-abu iate. \v 40 U'ai ake turo tenabu bate haina ruba irara ubama batauro bainti arara ite iabo bateta obarira, kia okara bata bai kebura ra kiama tenabu umina abu-abu ake bi keburara kamani ba irai'e tiaina be. ->>>>>>> f5223036edbf55b8a959b9d2190eef3d347b4eaa +\v 38 Mintibo Dimitris ra batake bainti una'ara kotira piksa mintiaka bainti bo iakai uba baibera, bira ko antua bibo ko iriaka bata bariabo, kaira bika nai bora ora hikara nai ko abu ata tiate. \v 39 Bira bohikara tireka ibera, bira nenta iata bainti oru tabe bika batake abu-abu iate. \v 40 U'ai ake turo tenabu bate haina ruba irara uba ma batauro bainti arara ite iabo bateta obarira, kia okara bata bai kebura ra kiama tenabu umina abu-abu ake bi keburara kamani ba irai'e tiaina be. \v 41 Biba tiba kero, bainti nahenti ruba uaka atite kaimanta, bika bi batukara ke buara. \ No newline at end of file diff --git a/manifest.json b/manifest.json index c6ac2b84..55421b6e 100644 --- a/manifest.json +++ b/manifest.json @@ -145,6 +145,18 @@ "19-03", "19-05", "19-08", + "19-11", + "19-13", + "19-15", + "19-18", + "19-21", + "19-23", + "19-26", + "19-28", + "19-30", + "19-33", + "19-35", + "19-38", "20-title", "20-01", "20-04",