From 350b5c99bce226314a4ff6561ad2df70c533346f Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 14:46:25 +0200 Subject: [PATCH] Wed Nov 02 2022 14:46:25 GMT+0200 (Central Africa Time) --- 22/24.txt | 8 +------- 22/26.txt | 6 +----- 22/28.txt | 6 +----- 22/35.txt | 8 +------- 22/37.txt | 6 +----- 22/39.txt | 6 +----- 22/41.txt | 6 +----- 22/43.txt | 7 +------ 22/54.txt | 7 +------ 22/63.txt | 7 +------ 22/66.txt | 6 +----- 22/69.txt | 8 +------- manifest.json | 11 +++++++++++ 13 files changed, 23 insertions(+), 69 deletions(-) diff --git a/22/24.txt b/22/24.txt index b0d8a92..2fa855d 100644 --- a/22/24.txt +++ b/22/24.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 24 Olotu rija ongon kiji neicieng lo jimitan ani to kiji neicieng lobolo ilany fad. \v 25 Ojo Yesu diho icieng, “Kabolorok kulo misiok, olanyu icieng cio to golun manyu kuna longon ko obolore to kiji neicieng ilolongoroti ojo katiyok kuna ijiri to cio. -======= -\v 24 Olotu rija ongon kiji neicieng lo jimitan ani to kiji neicieng lobolo ilany fad. \v 25 Ojo Yesu diho icieng, -“Kabolorok kulo misiok, olanyu icieng cio to golun manyu kuna longon ko obolore to kiji neicieng -ilolongoroti ojo katiyok kuna ijiri to cio. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 24 Olotu rija ongon kiji neicieng lo jimitan ani to kiji neicieng lobolo ilany fad. \v 25 Ojo Yesu diho icieng, “Kabolorok kulo misiok, olanyu icieng cio to golun manyu kuna longon ko obolore to kiji neicieng ilolongoroti ojo katiyok kuna ijiri to cio. \ No newline at end of file diff --git a/22/26.txt b/22/26.txt index acf8097..2f9e7ab 100644 --- a/22/26.txt +++ b/22/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Ati ida ite itum iri ji. Ati nahitok ilany to kiji ningi owak ara nasidi tur, manyu na lolanyu iya karwaani \v 27 kode ani lobolo na litongo meja kode na lirwaa? Ida na longon iyo meja? Ati angon nan kiji ningi iya karwaani. -======= -\v 26 Ati ida ite itum iri ji. Ati nahitok ilany to kiji ningi owak ara nasidi tur, manyu na lolanyu iya karwaani \v 27 kode ani lobolo na litongo meja kode na lirwaa? Ida na longon iyo meja? Ati angon nan kiji ningi iya karwaani. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 26 Ati ida ite itum iri ji. Ati nahitok ilany to kiji ningi owak ara nasidi tur, manyu na lolanyu iya karwaani \v 27 kode ani lobolo na litongo meja kode na lirwaa? Ida na longon iyo meja? Ati angon nan kiji ningi iya karwaani. \ No newline at end of file diff --git a/22/28.txt b/22/28.txt index cb5dfe5..1c5adea 100644 --- a/22/28.txt +++ b/22/28.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 28 Ite kuna lohiwoita ko nan diho kidak nei. \v 29 Manyu ahicio nan ite okabwe iya na lohicwarare Apa nan \v 30 ojit mute idaha ko mata ko nan iyo okabwe nei manyu itongo to segeri kulo obolore ingoto tenya diho imaniti tomon ko are kulo Isirael”. -======= -\v 28 Ite kuna lohiwoita ko nan diho kidak nei. \v 29 Manyu ahicio nan ite okabwe iya na lohicwarare Apa nan \v 30 ojit mute idaha ko mata ko nan iyo okabwe nei manyu itongo to segeri kulo obolore ingoto tenya diho imaniti tomon ko are kulo Isirael”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 28 Ite kuna lohiwoita ko nan diho kidak nei. \v 29 Manyu ahicio nan ite okabwe iya na lohicwarare Apa nan \v 30 ojit mute idaha ko mata ko nan iyo okabwe nei manyu itongo to segeri kulo obolore ingoto tenya diho imaniti tomon ko are kulo Isirael. \ No newline at end of file diff --git a/22/35.txt b/22/35.txt index 4f7bb76..8d239ec 100644 --- a/22/35.txt +++ b/22/35.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 35 Oto Yesu itifi icieng ojo, “Lafar kalahicule nan ite oru ko ogogori, robia kode kamuha ongon afa lobo tohi longoromahino diho ite?” Inyiahahi icieng ojo “oru”. \v 36 Ojo diho icieng, “Ati jija, na longon ogogor ingohi totek manyu koloru latubot nino lo lobo, itilote kiela inyangu. -======= -\v 35 Oto Yesu itifi icieng ojo, “Lafar kalahicule nan ite oru ko ogogori, robia kode kamuha ongon afa lobo -tohi longoromahino diho ite?” Inyiahahi icieng ojo “oru”. \v 36 Ojo diho icieng, “Ati jija, na longon ogogor -ingohi totek manyu koloru latubot nino lo lobo, itilote kiela inyangu. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 35 Oto Yesu itifi icieng ojo, “Lafar kalahicule nan ite oru ko ogogori, robia kode kamuha ongon afa lobo tohi longoromahino diho ite?” Inyiahahi icieng ojo “oru”. \v 36 Ojo diho icieng, “Ati jija, na longon ogogor ingohi totek manyu koloru latubot nino lo lobo, itilote kiela inyangu. \ No newline at end of file diff --git a/22/37.txt b/22/37.txt index c543d7d..078ed06 100644 --- a/22/37.txt +++ b/22/37.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 37 Igero ojo ‘ikenahini inyi ko kapalak’ manyu ahirihohi ite ojo itiihino ca ene diho nan. Ibo sangite fad kuna ligero to nan ogoruno kitifuta”. \v 38 Ojo jayona, “Tode Lahitok latuboti are kuno”. Ifotu inyi ojo, “otum kuna.” -======= -\v 37 Igero ojo ‘ikenahini inyi ko kapalak’ manyu ahirihohi ite ojo itiihino ca ene diho nan. Ibo sangite fad kuna ligero to nan ogoruno kitifuta”. \v 38 Ojo jayona, “Tode Lahitok latuboti are kuno”. Ifotu inyi ojo, “otum kuna” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 37 Igero ojo ‘ikenahini inyi ko kapalak’ manyu ahirihohi ite ojo itiihino ca ene diho nan. Ibo sangite fad kuna ligero to nan ogoruno kitifuta”. \v 38 Ojo jayona, “Tode Lahitok latuboti are kuno”. Ifotu inyi ojo, “otum kuna.” \ No newline at end of file diff --git a/22/39.txt b/22/39.txt index ad8d347..11a2ac5 100644 --- a/22/39.txt +++ b/22/39.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 39 Olo Yesu iya langun; donge lo Oliv ko jayona kunenge ijifita inyi \v 40 kalogoruni nu faji, ojo diho icieng, “Ilifati ojir ida iurohino iyo laba”. -======= -\v 39 Olo Yesu iya langun; donge lo Oliv ko jayona kunenge ijifita inyi \v 40 kalogoruni nu faji, ojo diho icieng, “Ilifati ojir ida iurohino iyo laba”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 39 Olo Yesu iya langun; donge lo Oliv ko jayona kunenge ijifita inyi \v 40 kalogoruni nu faji, ojo diho icieng, “Ilifati ojir ida iurohino iyo laba”. \ No newline at end of file diff --git a/22/41.txt b/22/41.txt index 0972c7b..3b9efcc 100644 --- a/22/41.txt +++ b/22/41.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 41 Isol tinya diho icieng many fajii na ngotum moru dohino kalibirori, ogung kof ilifa ojo, \v 42 “Apa kaliwak isi, todume ene kubaya diho nan, ati ida ara wahun nei, ati nino itiihino”. -======= -\v 41 Isol tinya diho icieng many fajii na ngotum moru dohino kalibirori, ogung kof ilifa ojo, \v 42 “Apa kaliwak isi, todume ene kubaya diho nan, ati ida ara wahun nei, ati nino itiihino”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 41 Isol tinya diho icieng many fajii na ngotum moru dohino kalibirori, ogung kof ilifa ojo, \v 42 “Apa kaliwak isi, todume ene kubaya diho nan, ati ida ara wahun nei, ati nino itiihino”. \ No newline at end of file diff --git a/22/43.txt b/22/43.txt index b4513ce..d10e4de 100644 --- a/22/43.txt +++ b/22/43.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 43 Oboto malaika to kai diho inyi itigol inyi. \v 44 Tona longonore inyi iyo kidak noo ilifa to tau fad oto cora nenge ododo kof ara okoto. -======= -\v 43 Oboto malaika to kai diho inyi itigol inyi. \v 44 Tona longonore inyi iyo kidak noo ilifa to tau fad -oto cora nenge ododo kof ara okoto. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 43 Oboto malaika to kai diho inyi itigol inyi. \v 44 Tona longonore inyi iyo kidak noo ilifa to tau fad oto cora nenge ododo kof ara okoto. \ No newline at end of file diff --git a/22/54.txt b/22/54.txt index e009737..ed0c21b 100644 --- a/22/54.txt +++ b/22/54.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 54 Tinyia kiniefunoti inyi ji ko rihoroti inyi iyari kaji lo kadwarani lahitok. Ijifita Petero lo lomaje. \v 55 Ati kalinohahini kima kiji lo sita manyu itongohinoti ara lobito, itongohino ko icieng. -======= -\v 54 Tinyia kiniefunoti inyi ji ko rihoroti inyi iyari kaji lo kadwarani lahitok. Ijifita Petero lo lomaje. \v 55 Ati -kalinohahini kima kiji lo sita manyu itongohinoti ara lobito, itongohino ko icieng ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 54 Tinyia kiniefunoti inyi ji ko rihoroti inyi iyari kaji lo kadwarani lahitok. Ijifita Petero lo lomaje. \v 55 Ati kalinohahini kima kiji lo sita manyu itongohinoti ara lobito, itongohino ko icieng. \ No newline at end of file diff --git a/22/63.txt b/22/63.txt index 94a79e0..c318c8d 100644 --- a/22/63.txt +++ b/22/63.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 63 Iciak kuna asegere likura Yesu kwenitare ko lumo inyi. \v 64 Imuhi konyeha kunenge olumi kode onangi itifi hati ojimi, “Imoca, ngai lohilum isi?” \v 65 Otenyitenyi tenyi becek kulo kwenitare ko moro inyi. -======= -\v 63 Iciak kuna asegere likura Yesu kwenitare ko lumo inyi. \v 64 Imuhi konyeha kunenge olumi kode onangi -itifi hati ojimi, “Imoca, ngai lohilum isi?” \v 65 Otenyitenyi tenyi becek kulo kwenitare ko moro inyi. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 63 Iciak kuna asegere likura Yesu kwenitare ko lumo inyi. \v 64 Imuhi konyeha kunenge olumi kode onangi itifi hati ojimi, “Imoca, ngai lohilum isi?” \v 65 Otenyitenyi tenyi becek kulo kwenitare ko moro inyi. \ No newline at end of file diff --git a/22/66.txt b/22/66.txt index 14ef63a..197ab6f 100644 --- a/22/66.txt +++ b/22/66.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 66 Kiwanyi berien, lokiho lo lohitwaha kulo cio, kadwarak kuna hitoha ko katiyenak kulo cik ko kifuro ara lobito, ko kiyaunoti Yesu ketemoni neicieng. \v 67 Oto icieng ojo diho Yesu, “Kalira isi Kristo irihohi ohoi”. Inyiahahi Yesu ojo, “Kalahirihohi nan ite ida ca ite iruk tenya nei, \v 68 manyi kalahitifi nan ite ida ite itirang. -======= -\v 66 Kiwanyi berien, lokiho lo lohitwaha kulo cio, kadwarak kuna hitoha ko katiyenak kulo cik ko kifuro ara lobito, ko kiyaunoti Yesu ketemoni neicieng. \v 67 Oto icieng ojo diho Yesu, “Kalira isi Kristo irihohi ohoi”. Inyiahahi Yesu ojo, “Kalahirihohi nan ite ida ca ite iruk tenya nei, \v 68 manyi kalahitifi nan ite ida ite itirang ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 66 Kiwanyi berien, lokiho lo lohitwaha kulo cio, kadwarak kuna hitoha ko katiyenak kulo cik ko kifuro ara lobito, ko kiyaunoti Yesu ketemoni neicieng. \v 67 Oto icieng ojo diho Yesu, “Kalira isi Kristo irihohi ohoi”. Inyiahahi Yesu ojo, “Kalahirihohi nan ite ida ca ite iruk tenya nei, \v 68 manyi kalahitifi nan ite ida ite itirang. \ No newline at end of file diff --git a/22/69.txt b/22/69.txt index f77a77a..e4bc55d 100644 --- a/22/69.txt +++ b/22/69.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 69 Ati kicaha tone far itongo ca kito lo tungani iteten lo Lobanga na lilany fad”. \v 70 Itifi icieng fad ojo, “Ira hati isi kito lo Lobanga?” Inyiahahi inyi ojo, “Ibehi ite jimitan inyi nan”. \v 71 Oto ojimi. “nyio manyu kirihe kitahitare lobo saden? Lohining manyu ohoi to kutuk nenge”. -======= -\v 69 Ati kicaha tone far itongo ca kito lo tungani iteten lo Lobanga na lilany fad”. \v 70 Itifi icieng fad ojo, “Ira -hati isi kito lo Lobanga?” Inyiahahi inyi ojo, “Ibehi ite jimitan inyi nan”. \v 71 Oto ojimi. “nyio manyu kirihe -kitahitare lobo saden? Lohining manyu ohoi to kutuk nenge”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 69 Ati kicaha tone far itongo ca kito lo tungani iteten lo Lobanga na lilany fad”. \v 70 Itifi icieng fad ojo, “Ira hati isi kito lo Lobanga?” Inyiahahi inyi ojo, “Ibehi ite jimitan inyi nan”. \v 71 Oto ojimi. “nyio manyu kirihe kitahitare lobo saden? Lohining manyu ohoi to kutuk nenge”. \ No newline at end of file diff --git a/manifest.json b/manifest.json index fbe9d86..cabcc2e 100644 --- a/manifest.json +++ b/manifest.json @@ -483,15 +483,26 @@ "22-17", "22-19", "22-21", + "22-24", + "22-26", + "22-28", "22-31", "22-33", + "22-35", + "22-37", + "22-39", + "22-41", + "22-43", "22-45", "22-47", "22-49", "22-52", + "22-54", "22-56", "22-59", "22-61", + "22-63", + "22-66", "23-title", "23-06", "23-08",