diff --git a/23/01.txt b/23/01.txt index 317529f..bbbb99b 100644 --- a/23/01.txt +++ b/23/01.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\c 23 \v 1 Oto ilulung fad ko wojuno ko kiyaruno Yesu diho Pilato. \v 2 Manyu iciak icieng fad kidoro inyi ojo, “kirumu ohoi ene tungani itirijoro kof niyang. Itiho sofo lo mocoro diho Cesar manyu ilolongoro ake ake ojo inyi kristo kabu”. -======= -\c 23 \v 1 Oto ilulung fad ko wojuno ko kiyaruno Yesu diho Pilato. \v 2 Manyu iciak icieng fad kidoro inyi ojo, -“kirumu ohoi ene tungani itirijoro kof niyang. Itiho sofo lo mocoro diho Cesar manyu ilolongoro -ake ake ojo inyi kristo kabu”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 23 \v 1 Oto ilulung fad ko wojuno ko kiyaruno Yesu diho Pilato. \v 2 Manyu iciak icieng fad kidoro inyi ojo, “kirumu ohoi ene tungani itirijoro kof niyang. Itiho sofo lo mocoro diho Cesar manyu ilolongoro ake ake ojo inyi kristo kabu”. \ No newline at end of file diff --git a/23/03.txt b/23/03.txt index 9cac189..038a99c 100644 --- a/23/03.txt +++ b/23/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Itifi Pilato inyi ojo “ira isi kabu lo cio kulo Judea?” Inyiahahi inyi ojo, “Ibo, ori iya na liteny isi”. \v 4 Oto Pilato ko rihohino kadwarak kuna hitoha ko ilulung ojo, “ida nan aumu lobo kipal na ngotum ifadarorihin ene tungani”. \v 5 Ati ifud icieng ojo, “Isusua lerok cio ene Judea fad to kitiyena nenge. Iciak many to Galilea olotunore many ene”. -======= -\v 3 Itifi Pilato inyi ojo “ira isi kabu lo cio kulo Judea?” Inyiahahi inyi ojo, “Ibo, ori iya na liteny isi”. \v 4 Oto Pilato ko rihohino kadwarak kuna hitoha ko ilulung ojo, “ida nan aumu lobo kipal na ngotum ifadarorihin ene tungani”. \v 5 Ati ifud icieng ojo, “Isusua lerok cio ene Judea fad to kitiyena nenge. Iciak many to Galilea olotunore many ene”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 3 Itifi Pilato inyi ojo “ira isi kabu lo cio kulo Judea?” Inyiahahi inyi ojo, “Ibo, ori iya na liteny isi”. \v 4 Oto Pilato ko rihohino kadwarak kuna hitoha ko ilulung ojo, “ida nan aumu lobo kipal na ngotum ifadarorihin ene tungani”. \v 5 Ati ifud icieng ojo, “Isusua lerok cio ene Judea fad to kitiyena nenge. Iciak many to Galilea olotunore many ene”. \ No newline at end of file diff --git a/23/15.txt b/23/15.txt index a88b464..0f11892 100644 --- a/23/15.txt +++ b/23/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Ida kileng Erod orumu tonyio inyahu manyu inyi diho ohoi, iya na lideyare ite ida inyi itii lobotohi na ngotum kifadarore inyi \v 16 tona atilum ca nan inyi alahahi olo. \v 17 to faritin kulo karama ongonita afa ojo ojir olahahi tungani mabus lobito to icieng''. -======= -\v 15 Ida kileng Erod orumu tonyio inyahu manyu inyi diho ohoi, iya na lideyare ite ida inyi itii lobotohi na ngotum kifadarore inyi \v 16 tona atilum ca nan inyi alahahi olo. \v 17 [to faritin kulo karama ongonita afa ojo ojir olahahi tungani mabus lobito to icieng]. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 15 Ida kileng Erod orumu tonyio inyahu manyu inyi diho ohoi, iya na lideyare ite ida inyi itii lobotohi na ngotum kifadarore inyi \v 16 tona atilum ca nan inyi alahahi olo. \v 17 to faritin kulo karama ongonita afa ojo ojir olahahi tungani mabus lobito to icieng''. \ No newline at end of file diff --git a/23/18.txt b/23/18.txt index 732e9cd..9be04a2 100644 --- a/23/18.txt +++ b/23/18.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 18 To ogoro lobito igori, “todume ene tungani tolahahi Barabas diho ohoi!” \v 19 orumu Barabas otori to kisusua ko kifada lo tungani. -======= -\v 18 To ogoro lobito igori, “todume ene tungani tolahahi Barabas diho ohoi!” \v 19 (orumu Barabas otori to kisusua ko kifada lo tungani). ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 18 To ogoro lobito igori, “todume ene tungani tolahahi Barabas diho ohoi!” \v 19 orumu Barabas otori to kisusua ko kifada lo tungani. \ No newline at end of file diff --git a/23/20.txt b/23/20.txt index 0f0d0a3..cfebe6e 100644 --- a/23/20.txt +++ b/23/20.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 20 Iya na lowahare Pilato lahahino Yesu, otan inyi icieng ari. \v 21 Ati itiring icieng kigorita, “togurohi iyo kuruce! Togurohi iyo kuruce!” \v 22 Lo kakeny uni oteny inyi diho icieng, “tonyio kipal nyio itii ene tungani? Ida nan arumu ken nenge lobo kipal ngocamare nan kifadaru inyi, tona, atilum nan inyi alahahi olo”. -======= -\v 20 Iya na lowahare Pilato lahahino Yesu, otan inyi icieng ari. \v 21 Ati itiring icieng kigorita, “togurohi iyo kuruce! Togurohi iyo kuruce!” \v 22 Lo kakeny uni oteny inyi diho icieng, “tonyio kipal nyio itii ene tungani? Ida nan arumu ken nenge lobo kipal ngocamare nan kifadaru inyi, tona, atilum nan inyi -alahahi olo”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 20 Iya na lowahare Pilato lahahino Yesu, otan inyi icieng ari. \v 21 Ati itiring icieng kigorita, “togurohi iyo kuruce! Togurohi iyo kuruce!” \v 22 Lo kakeny uni oteny inyi diho icieng, “tonyio kipal nyio itii ene tungani? Ida nan arumu ken nenge lobo kipal ngocamare nan kifadaru inyi, tona, atilum nan inyi alahahi olo”. \ No newline at end of file diff --git a/23/23.txt b/23/23.txt index b084759..20f6e15 100644 --- a/23/23.txt +++ b/23/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Ati to ogorohin kuna ikwati itiring kigorita ojo ojir inyi ogurohini iyo kuruce, olanyu dong icieng tona kigorita neicieng. \v 24 Tona pilato ko kiruk kicwara icieng wahun neicieng. \v 25 Olahahi inyi na tungani lotori to kisusua ko kifada lo tungani, iya na lilifare icieng ko lahahino Yesu iyo wahun neicieng. -======= -\v 23 Ati to ogorohin kuna ikwati itiring kigorita ojo ojir inyi ogurohini iyo kuruce, olanyu dong icieng tona kigorita neicieng. \v 24 Tona pilato ko kiruk kicwara icieng wahun neicieng. \v 25 Olahahi inyi na tungani lotori to kisusua ko kifada lo tungani, iya na lilifare icieng ko lahahino Yesu iyo wahun neicieng ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 23 Ati to ogorohin kuna ikwati itiring kigorita ojo ojir inyi ogurohini iyo kuruce, olanyu dong icieng tona kigorita neicieng. \v 24 Tona pilato ko kiruk kicwara icieng wahun neicieng. \v 25 Olahahi inyi na tungani lotori to kisusua ko kifada lo tungani, iya na lilifare icieng ko lahahino Yesu iyo wahun neicieng. \ No newline at end of file diff --git a/23/26.txt b/23/26.txt index 1137c46..d68fbb0 100644 --- a/23/26.txt +++ b/23/26.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 26 Kolorihoroti inyi, ko kiniefunoti Saimon lo Ciren na lolotu to kangite oloro katwa lo Jerusalem ko kifudahinoti inyi tingo kuruce to omot lo Yesu. -======= -\v 26 Kolorihoroti inyi, ko kiniefunoti Saimon lo Ciren na lolotu to kangite oloro katwa lo Jerusalem ko -kifudahinoti inyi tingo kuruce to omot lo Yesu. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 26 Kolorihoroti inyi, ko kiniefunoti Saimon lo Ciren na lolotu to kangite oloro katwa lo Jerusalem ko kifudahinoti inyi tingo kuruce to omot lo Yesu. \ No newline at end of file diff --git a/23/29.txt b/23/29.txt index 6b65c95..9ec5bfa 100644 --- a/23/29.txt +++ b/23/29.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD -\v 29 Tonyio olotuno far na lijimitare ite, ‘ongon ko gum ngorwo kakorifok, koceheri kuna lida ifongu ko iki kuna lida itinak. \v 30 Oto ojimi diho dongeco, kiurohinoohoi manyu diho locolongi kimuk ohoi!’ \v 31 Tonyio, kalitiyo cio kuno sangite kolocef ciani, oto ca itii aja kalotou?” -======= \v 29 Tonyio olotuno far na lijimitare ite, ‘ongon ko gum ngorwo kakorifok, koceheri kuna lida ifongu -ko iki kuna lida itinak. \v 30 Oto ojimi diho dongeco, kiurohinoohoi manyu diho locolongi kimuk ohoi!’ - \v 31 Tonyio, kalitiyo cio kuno sangite kolocef ciani, oto ca itii aja kalotou?” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +ko iki kuna lida itinak. \v 30 Oto ojimi diho dongeco, kiurohinoohoi manyu diho locolongi kimuk ohoi!’ \v 31 Tonyio, kalitiyo cio kuno sangite kolocef ciani, oto ca itii aja kalotou?” \ No newline at end of file diff --git a/23/33.txt b/23/33.txt index 981205a..eca05c8 100644 --- a/23/33.txt +++ b/23/33.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 33 Kolofwonuni lobo faji lobara “koite lo kwe”, kogurohinoti inyi ijia ko kuna kabelak ara lobito- lobito ngati lo iteten ko lobito ngati lo ikajong nenge. \v 34 Ojo Yesu, “Apa tolau icieng tonyio ida oyeniti tohi na litiyo icieng”. Manyu ikokor icieng kyelani kunenge to kibiro lo gumar. -======= -\v 33 Kolofwonuni lobo faji lobara “koite lo kwe”, -kogurohinoti inyi ijia ko kuna kabelak ara lobito- lobito ngati lo iteten ko lobito ngati lo ikajong nenge. \v 34 Ojo Yesu, “Apa tolau icieng tonyio ida oyeniti tohi na litiyo icieng”. Manyu ikokor icieng kyelani kunenge to kibiro lo gumar. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 33 Kolofwonuni lobo faji lobara “koite lo kwe”, kogurohinoti inyi ijia ko kuna kabelak ara lobito- lobito ngati lo iteten ko lobito ngati lo ikajong nenge. \v 34 Ojo Yesu, “Apa tolau icieng tonyio ida oyeniti tohi na litiyo icieng”. Manyu ikokor icieng kyelani kunenge to kibiro lo gumar. \ No newline at end of file diff --git a/23/35.txt b/23/35.txt index 51c33ac..c3d4ea7 100644 --- a/23/35.txt +++ b/23/35.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 35 Owoita cio odeya ko kalanyunok isiriati inyi ojimi, “Olwahu inyi kuna kude, ingohi to lwak ken nenge kalara inyi kristo lo Lobanga na lonyumuni.'' -======= -\v 35 Owoita cio odeya ko kalanyunok isiriati inyi ojimi, “Olwahu inyi kuna kude, ingohi to lwak ken nenge kalara inyi kristo lo Lobanga na lonyumuni ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 35 Owoita cio odeya ko kalanyunok isiriati inyi ojimi, “Olwahu inyi kuna kude, ingohi to lwak ken nenge kalara inyi kristo lo Lobanga na lonyumuni.'' \ No newline at end of file diff --git a/manifest.json b/manifest.json index cabcc2e..90a35ba 100644 --- a/manifest.json +++ b/manifest.json @@ -503,13 +503,23 @@ "22-61", "22-63", "22-66", + "22-69", "23-title", + "23-01", + "23-03", "23-06", "23-08", "23-11", "23-13", + "23-15", + "23-18", + "23-20", + "23-23", + "23-26", "23-27", + "23-29", "23-32", + "23-33", "23-44", "23-46", "23-48",