From a3d0e390c2e96e1f8943fdf584147515726cde1b Mon Sep 17 00:00:00 2001 From: klero Date: Wed, 2 Nov 2022 14:38:25 +0200 Subject: [PATCH] Wed Nov 02 2022 14:38:25 GMT+0200 (Central Africa Time) --- 10/29.txt | 7 +------ 10/31.txt | 7 +------ 11/01.txt | 7 +------ 11/02.txt | 6 +----- 11/03.txt | 6 +----- 11/11.txt | 6 +----- 11/21.txt | 7 +------ 11/24.txt | 6 +----- 11/31.txt | 8 +------- 11/32.txt | 7 +------ 11/39.txt | 6 +----- 11/43.txt | 8 +------- 11/47.txt | 8 +------- manifest.json | 12 ++++++++++++ 14 files changed, 25 insertions(+), 76 deletions(-) diff --git a/10/29.txt b/10/29.txt index d3603e7..eb62b84 100644 --- a/10/29.txt +++ b/10/29.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 29 Ati owak inyi kitibira ken nenge, oto itifi Yesu ojo, “ngai loriehat nei?” \v 30 Lo kinyahahino ojo Yesu, “oloro afa lobo tungani to Jerusalem iya Jeriko, ourohino inyi kac kulo kabelak. Oto ko pucaroti kyelani kunenge olumi ko ngerihinoti lomana weyaru. -======= -\v 29 Ati owak inyi kitibira ken nenge, oto itifi Yesu ojo, “ngai loriehat nei?” \v 30 Lo kinyahahino ojo -Yesu, “oloro afa lobo tungani to Jerusalem iya Jeriko, ourohino inyi kac kulo kabelak. Oto ko pucaroti kyelani kunenge olumi ko ngerihinoti lomana weyaru. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 29 Ati owak inyi kitibira ken nenge, oto itifi Yesu ojo, “ngai loriehat nei?” \v 30 Lo kinyahahino ojo Yesu, “oloro afa lobo tungani to Jerusalem iya Jeriko, ourohino inyi kac kulo kabelak. Oto ko pucaroti kyelani kunenge olumi ko ngerihinoti lomana weyaru. \ No newline at end of file diff --git a/10/31.txt b/10/31.txt index 1d5b543..02c9e38 100644 --- a/10/31.txt +++ b/10/31.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 31 Oloro manyu lobo kadwarani ara na kikoi bito ojo olotu orumahi na tungani ko geraru ara kalele. \v 32 Levini manyu ji ojo ogoru na faji ko geraru ara kalele ongerihi na tungani. -======= -\v 31 Oloro manyu lobo kadwarani ara na kikoi bito -ojo olotu orumahi na tungani ko geraru ara kalele. \v 32 Levini manyu ji ojo ogoru na faji ko geraru ara kalele ongerihi na tungani. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 31 Oloro manyu lobo kadwarani ara na kikoi bito ojo olotu orumahi na tungani ko geraru ara kalele. \v 32 Levini manyu ji ojo ogoru na faji ko geraru ara kalele ongerihi na tungani. \ No newline at end of file diff --git a/11/01.txt b/11/01.txt index 07148ae..f54b15a 100644 --- a/11/01.txt +++ b/11/01.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\c 11 \v 1 Lobo far ilifa Yesu tolobo faji. Langun lokeru inyi ojo jayona nenge lobito diho inyi, “Lahitok kitiyen ohoi kilifa iya na litiyenare Jon jayona kunenge”. -======= -\c 11 \v 1 Lobo far ilifa Yesu tolobo faji. Langun lokeru inyi ojo jayona nenge lobito diho inyi, “Lahitok kitiyen -ohoi kilifa iya na litiyenare Jon jayona kunenge”. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\c 11 \v 1 Lobo far ilifa Yesu tolobo faji. Langun lokeru inyi ojo jayona nenge lobito diho inyi, “Lahitok kitiyen ohoi kilifa iya na litiyenare Jon jayona kunenge”. \ No newline at end of file diff --git a/11/02.txt b/11/02.txt index 20c18d1..7e2e70f 100644 --- a/11/02.txt +++ b/11/02.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 2 Ojo inyi diho icieng, “kalilifa itijo; Apa Karana nino obangiti Okabwe nino olotu. -======= -\v 2 Ojo inyi diho icieng, “kalilifa itijo; Apa Karana nino obangiti Okabwe nino olotu ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 2 Ojo inyi diho icieng, “kalilifa itijo; Apa Karana nino obangiti Okabwe nino olotu. \ No newline at end of file diff --git a/11/03.txt b/11/03.txt index ff3264a..8024c54 100644 --- a/11/03.txt +++ b/11/03.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 3 Kicio ohoi to faritin daha niyang lo tik tik. \v 4 kilau ohoi kipali pali kuniyang Tonyio kilau manyu ohoi kuna lipal diho ohoi Manyu kehirihoro ohoi diho lab.'''' -======= -\v 3 Kicio ohoi to faritin daha niyang lo tik tik. \v 4 kilau ohoi kipali pali kuniyang Tonyio kilau manyu ohoi kuna lipal diho ohoi Manyu kehirihoro ohoi diho lab ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 3 Kicio ohoi to faritin daha niyang lo tik tik. \v 4 kilau ohoi kipali pali kuniyang Tonyio kilau manyu ohoi kuna lipal diho ohoi Manyu kehirihoro ohoi diho lab.'''' \ No newline at end of file diff --git a/11/11.txt b/11/11.txt index 5fbed9a..505ee98 100644 --- a/11/11.txt +++ b/11/11.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 11 Ngai to kiji ningi apaico, kalilifia kito nino kayamiti icorihi munu? \v 12 Kode kali tifia katarati icorihi lokidokoro? \v 13 Adiha ite kileng lirohori kaliyen kicwara tee kuningi sangite kuna ijiri, many baya ca Apa ningi na longon kai icio okorif na Inyu diho cio kuna litifia inyi?” -======= -\v 11 Ngai to kiji ningi apaico, kalilifia kito nino kayamiti icorihi munu? \v 12 Kode kali tifia katarati icorihi lokidokoro? \v 13 Adiha ite kileng lirohori kaliyen kicwara tee kuningi sangite kuna ijiri, many baya ca Apa ningi na longon kai icio okorif na Inyu diho cio kuna litifia inyi!” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 11 Ngai to kiji ningi apaico, kalilifia kito nino kayamiti icorihi munu? \v 12 Kode kali tifia katarati icorihi lokidokoro? \v 13 Adiha ite kileng lirohori kaliyen kicwara tee kuningi sangite kuna ijiri, many baya ca Apa ningi na longon kai icio okorif na Inyu diho cio kuna litifia inyi?” \ No newline at end of file diff --git a/11/21.txt b/11/21.txt index 18a2005..ef5cd6e 100644 --- a/11/21.txt +++ b/11/21.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 21 Kalikura tungani ka goloni kalenge otehita sangita kiremita kunenge inyi jimitan otuba sangite kunenge. \v 22 Ati kololotu lobo lilany golun nenge inyi odume ko kuladi kiremita kunenge ligeno inyi ojo kilwak cia inyi ko sangite dot to kalenge. \v 23 Tungani na lida kingon ko nan, kiberu nan manyu na lida kitutuba ko nan, ara katisarani. -======= -\v 21 Kalikura tungani ka goloni kalenge otehita sangita kiremita kunenge inyi jimitan otuba sangite -kunenge. \v 22 Ati kololotu lobo lilany golun nenge inyi odume ko kuladi kiremita kunenge ligeno inyi ojo kilwak cia inyi ko sangite dot to kalenge. \v 23 Tungani na lida kingon ko nan, kiberu nan manyu na lida kitutuba ko nan, ara katisarani. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 21 Kalikura tungani ka goloni kalenge otehita sangita kiremita kunenge inyi jimitan otuba sangite kunenge. \v 22 Ati kololotu lobo lilany golun nenge inyi odume ko kuladi kiremita kunenge ligeno inyi ojo kilwak cia inyi ko sangite dot to kalenge. \v 23 Tungani na lida kingon ko nan, kiberu nan manyu na lida kitutuba ko nan, ara katisarani. \ No newline at end of file diff --git a/11/24.txt b/11/24.txt index bf7e58c..4f1db61 100644 --- a/11/24.txt +++ b/11/24.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 24 Kolorutu okorif na irohoi to ken lo tungani, olo ilor fajihit kuna itowi otak lohiyomare ida orumu. Oto ojo, “aite ca lafa kaji langerihi nan” \v 25 kololotu orumu kaji ofiaru onyu ikukumahino. \v 26 Oto ko itoro olo iyauno okorifi kuna kude mietare kuna irohori ilany inyi ko rutoroti kitongo ija. Oto warun tona tungani ko rohojun ilany lafa lo ketemoni.” -======= -\v 24 Kolorutu okorif na irohoi to ken lo tungani, olo ilor fajihit kuna itowi otak lohiyomare ida orumu. Oto ojo, “aite ca lafa kaji langerihi nan” \v 25 kololotu orumu kaji ofiaru onyu ikukumahino. \v 26 Oto ko itoro olo iyauno okorifi kuna kude mietare kuna irohori ilany inyi ko rutoroti kitongo ija. Oto warun tona tungani ko rohojun ilany lafa lo ketemoni” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 24 Kolorutu okorif na irohoi to ken lo tungani, olo ilor fajihit kuna itowi otak lohiyomare ida orumu. Oto ojo, “aite ca lafa kaji langerihi nan” \v 25 kololotu orumu kaji ofiaru onyu ikukumahino. \v 26 Oto ko itoro olo iyauno okorifi kuna kude mietare kuna irohori ilany inyi ko rutoroti kitongo ija. Oto warun tona tungani ko rohojun ilany lafa lo ketemoni.” \ No newline at end of file diff --git a/11/31.txt b/11/31.txt index ecb7144..798e168 100644 --- a/11/31.txt +++ b/11/31.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 31 Lafa kabu ngorwani lolotu to ngati lo orof owoita mute lokiho ko ene kofiangiti ongotohi icieng tenya tonyio olotu afa inyi many to lohicungi lo kof ningo genyun lo Solomon, manyu jija ongon na lilany Solomon ene. -======= -\v 31 Lafa kabu ngorwani lolotu to ngati lo orof owoita -mute lokiho ko ene kofiangiti ongotohi icieng tenya tonyio olotu afa inyi many to lohicungi lo kof ningo -genyun lo Solomon, manyu jija ongon na lilany Solomon ene. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 31 Lafa kabu ngorwani lolotu to ngati lo orof owoita mute lokiho ko ene kofiangiti ongotohi icieng tenya tonyio olotu afa inyi many to lohicungi lo kof ningo genyun lo Solomon, manyu jija ongon na lilany Solomon ene. \ No newline at end of file diff --git a/11/32.txt b/11/32.txt index 2641388..788045f 100644 --- a/11/32.txt +++ b/11/32.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 32 Owoju mute cio kulo Nineve owoita ko ene kofiangiti ongotohi icieng tenya to lokiho tonyio irwo afa icieng kolonigi tenya lo Jona. Manyu jija ongon na lilanyu Jona ene. -======= -\v 32 Owoju mute cio kulo Nineve owoita ko ene kofiangiti ongotohi icieng tenya to lokiho tonyio irwo afa icieng kolonigi tenya lo Jona. Manyu jija -ongon na lilanyu Jona ene. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 32 Owoju mute cio kulo Nineve owoita ko ene kofiangiti ongotohi icieng tenya to lokiho tonyio irwo afa icieng kolonigi tenya lo Jona. Manyu jija ongon na lilanyu Jona ene. \ No newline at end of file diff --git a/11/39.txt b/11/39.txt index f8b2977..d7e0bf4 100644 --- a/11/39.txt +++ b/11/39.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 39 Tinya ojo lahitok diho inyi, “jija ite Parisihin ilala ite oleng lo kubayahin ko sahani ati katwa ifut ite ko kingaru ko rohojun. \v 40 Ite cio kuna idataruha! Ida afa inyi na likukum oleng ikukum ko katwa fad? \v 41 Ati icwarata tohi na longon katwa diho kakidahak oto ca sangite fad ko nyujon diho isi. -======= -\v 39 Tinya ojo lahitok diho inyi, “jija ite Parisihin ilala ite oleng lo kubayahin ko sahani ati katwa ifut ite ko kingaru ko rohojun. \v 40 Ite cio kuna idataruha! Ida afa inyi na likukum oleng ikukum ko katwa fad? \v 41 Ati icwarata tohi na longon katwa diho kakidahak oto ca sangite fad ko nyujon diho isi ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 39 Tinya ojo lahitok diho inyi, “jija ite Parisihin ilala ite oleng lo kubayahin ko sahani ati katwa ifut ite ko kingaru ko rohojun. \v 40 Ite cio kuna idataruha! Ida afa inyi na likukum oleng ikukum ko katwa fad? \v 41 Ati icwarata tohi na longon katwa diho kakidahak oto ca sangite fad ko nyujon diho isi. \ No newline at end of file diff --git a/11/43.txt b/11/43.txt index bd540d0..24a39bc 100644 --- a/11/43.txt +++ b/11/43.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 43 Kidak diho ite Parisihin tonyio imaru ite lohitongorehin kuna hitoha to lotubarehin manyu kifonyoti to cuhi. \v 44 Kidak diho ite tonyio iri ite iya kwecerehin kuna lo ru tohi na litotoro onyona cio manyu orangitati ida kileng oyeniti.” -======= -\v 43 Kidak diho ite Parisihin tonyio imaru ite -lohitongorehin kuna hitoha to lotubarehin manyu kifonyoti to cuhi. \v 44 Kidak diho ite tonyio iri ite iya -kwecerehin kuna lo ru tohi na litotoro onyona cio manyu orangitati ida kileng oyeniti” ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 43 Kidak diho ite Parisihin tonyio imaru ite lohitongorehin kuna hitoha to lotubarehin manyu kifonyoti to cuhi. \v 44 Kidak diho ite tonyio iri ite iya kwecerehin kuna lo ru tohi na litotoro onyona cio manyu orangitati ida kileng oyeniti.” \ No newline at end of file diff --git a/11/47.txt b/11/47.txt index 69cc1ee..d86519b 100644 --- a/11/47.txt +++ b/11/47.txt @@ -1,7 +1 @@ -<<<<<<< HEAD -\v 47 Kidak diho ite tonyio iduk ite kwecerehinkulo kamocak ara manyu munyiri lifade icieng. \v 48 Inyi jimitan itisadeno ite tohi na litii munyiri, ifade icieng kamocak, iduk manyu ite kwecerehin kuneicieng. -======= -\v 47 Kidak diho ite tonyio iduk ite kwecerehinkulo -kamocak ara manyu munyiri lifade icieng. \v 48 Inyi jimitan itisadeno ite tohi na litii munyiri, ifade icieng -kamocak, iduk manyu ite kwecerehin kuneicieng. ->>>>>>> 57f03ae7c0a14a1a834d2cbf1aee011e85bb8037 +\v 47 Kidak diho ite tonyio iduk ite kwecerehinkulo kamocak ara manyu munyiri lifade icieng. \v 48 Inyi jimitan itisadeno ite tohi na litii munyiri, ifade icieng kamocak, iduk manyu ite kwecerehin kuneicieng. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 31b966d..dbb966c 100644 --- a/manifest.json +++ b/manifest.json @@ -257,21 +257,33 @@ "10-22", "10-23", "10-25", + "10-29", + "10-31", "10-33", "10-36", "10-38", "10-40", "11-title", + "11-01", + "11-02", + "11-03", "11-05", "11-09", + "11-11", "11-14", "11-16", "11-18", + "11-21", + "11-24", "11-27", "11-29", + "11-31", + "11-32", "11-33", "11-37", + "11-39", "11-42", + "11-43", "11-45", "11-49", "11-52",