diff --git a/01/01.txt b/01/01.txt index e113c1b..e3f19a9 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1,5 @@ -\c 1 \v 1 Pablo, ucharami kristo Jesusi mapo rija nawisama mapo riga ani onoruami, kuirali echi rijimala, \v 2 echi Iglesia riosi echona korinto, aboni ma biwarami nili kristo Jesusi , ayerami nili' ni'ima pueblochi Jala. Tamuje ayenacho asali osowa karika Tanika onoruami rala jiti karika buchuwini, nije niwali jesukristo . \v 3 yarami echi Kili' nira riosi ni 'wali onoruami jesukristo ni'ima yemi' yua'. \ No newline at end of file +<<<<<<< HEAD +\c 1 \v 1 Pablo, ucharami kristo Jesusi mapo rija nawisama mapo riga ani onoruami, kuirali echi rijimala, \v 2 echi Iglesia riosi echona korinto, aboni ma biwarami nili kristo Jesusi , ayerami nili' ni'ima pueblochi Jala. Tamuje ayenacho asali osowa karika Tanika onoruami rala jiti karika buchuwini, nije niwali jesukristo . \v 3 yarami echi Kili' nira riosi ni 'wali onoruami jesukristo ni'ima yemi' yua'. +======= +\c 1 \v 1 Pablo Bayerami nili Jesukristo jiti Bile apostol nimamoa echiriga Riosi nirak nima, rijimari, \v 2 echona Napawikuachi echona Corinto enkuachi echi Kristo we santo inili. Tamuje ayenacho ichiriga osoya mapi carki bayere echi onoruame karga buchuwini echi onoruame walubeala. \v 3 Echi natetari ali Kanilkuam echi onoruame yua iyem nisare. +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/01/04.txt b/01/04.txt index b3c934c..8e1e8d7 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1 +1,5 @@ -\v 4 Sinibi naterara ya riosi yemi' jiti,echi jiti riosi ,gala kale yali binoy rawala ji'ti \v 5 Binoi niraa yali, riosi nijili'i we nateami ijala mapu raichami ni'ima machiwawami, \v 6 Muje raichali ma'a riwirtami nili'. \ No newline at end of file +<<<<<<< HEAD +\v 4 Sinibi naterara ya riosi yemi' jiti,echi jiti riosi ,gala kale yali binoy rawala ji'ti \v 5 Binoi niraa yali, riosi nijili'i we nateami ijala mapu raichami ni'ima machiwawami, \v 6 Muje raichali ma'a riwirtami nili'. +======= +\v 4 Nije chulubi natetara iya echi binoi onoruame mapuriga emi nira´a, map riga Binoy onoruami echi Jesusi nijilampa tamoje i´ya´a. \v 5 Binoi ka´la mi yali wika namuti wabe simá rika, wabe ka´la machika ra´ichami alí wabe ka´la machím karunt namuti jiti, \v 6 ayenacho mapurika echi wabe ka´la ra´ichalí echi Kristo jiti ne we ka´la bichiwali nirá ruwerami ju yemi. +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/01/07.txt b/01/07.txt index c3d7568..d6586e9 100644 --- a/01/07.txt +++ b/01/07.txt @@ -1 +1,5 @@ -\v 7 Echiriga, yemi' niwi karika igala kristo maporiga buwe echi jesukristo ku nawama. \v 8 Binoi nijima jiweroami ni'i juba' , maporiga ke ni'ima chati olaloami ali' ku nawasa jesukristo. \v 9 riosi we kala ju, Binoi bayeli raichaga ranala'a , walubela kristo. \ No newline at end of file +<<<<<<< HEAD +\v 7 Echiriga, yemi' niwi karika igala kristo maporiga buwe echi jesukristo ku nawama. \v 8 Binoi nijima jiweroami ni'i juba' , maporiga ke ni'ima chati olaloami ali' ku nawasa jesukristo. \v 9 riosi we kala ju, Binoi bayeli raichaga ranala'a , walubela kristo. +======= +\v 7 Map riga i´yemi ke biri a la aliwemi ju, map ali buyesatm kanilka nira´a echi onoruame. \v 8 Echi ayenacho echiriga olamare jubarawe, mapuriga ke wesi chokila inimampa echi rawe binoy onoruame ku nawalachi. \v 9 Binoy echi Riosi ko ni wabe gara ju. Map echi bayeri ko echi ranara yua Jesusi nira´a. +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/01/10.txt b/01/10.txt index 5863d5b..07327ac 100644 --- a/01/10.txt +++ b/01/10.txt @@ -1 +1,5 @@ -\v 10 jipi mi anema'a yemi', rijimala, tanama' riosi rawala ji'ti , aboni Jala anisa'a,. ke rojasa yemi'. Nije ane'e natasi napawika bilepi mo'oli nira'a bilepi nataga. \v 11 Ali je rika ni'mare , nije rijimala , echi ralamuli kloe niru'u nasipi rojaka aboni'i nira . \ No newline at end of file +<<<<<<< HEAD +\v 10 jipi mi anema'a yemi', rijimala, tanama' riosi rawala ji'ti , aboni Jala anisa'a,. ke rojasa yemi'. Nije ane'e natasi napawika bilepi mo'oli nira'a bilepi nataga. \v 11 Ali je rika ni'mare , nije rijimala , echi ralamuli kloe niru'u nasipi rojaka aboni'i nira . +======= +\v 10 Ali Jipiko chanema iyemi, rijimara Binoy Jesukristo nira´a echiriga Bilempi nira´a anataga isispo. Ali ke wika nira´a ali nule karka napawika bilempi nira´a anataka iyempo. \v 11 Ali echiriga ma ala tibisa, nije rijimara karka echomi pire´ame napawika iyemi nira´a. +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/01/12.txt b/01/12.txt index 6f26697..7eb4edf 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1 +1,5 @@ -\v 12 Jipi Jena ji'ti anime : ibilini nira yemi ani : " nije yua ju Pablo" , ali " nije yua ju apolos" , ali " nije yua ju sefas" , ali " nije yua ju kristo. " \v 13 ¿ Ju kristo okona rojonarami ? ¿ ni'ili yemi pagotami Pablo rawala ji'ti? \ No newline at end of file +<<<<<<< HEAD +\v 12 Jipi Jena ji'ti anime : ibilini nira yemi ani : " nije yua ju Pablo" , ali " nije yua ju apolos" , ali " nije yua ju sefas" , ali " nije yua ju kristo. " \v 13 ¿ Ju kristo okona rojonarami ? ¿ ni'ili yemi pagotami Pablo rawala ji'ti? +======= +\v 12 Ali echiriga animea: Karka suwaba iyemi ibili nira echani: "Nije echi Pablo yuha ju", o la "Nije echi Apolos yuha ju", o la "Nije echi Cristo yuhá jú." \v 13 ¿Ali Kristo ko walubeala ju? ¿Echi Pablo michontame nili emti nira´a? ¿Pagotame nilire echi Pablo raola nira´a? +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/01/14.txt b/01/14.txt new file mode 100644 index 0000000..096e80d --- /dev/null +++ b/01/14.txt @@ -0,0 +1 @@ +\v 14 Walu natetara iya nije mapu rig nike pagolini emi jit, Bilepi Crispo ali Gayo. \v 15 Ali nili ko nili mapiriga ke wesa Chanimea echiriga pagotamo nili nije raola jiti. \v 16 (Ali nije ayenacho pagoki Estefano bitelchi. Mi nap cho nira´a echiriga, ne kemachi ache jare pagolan jareku.) \ No newline at end of file diff --git a/01/17.txt b/01/17.txt new file mode 100644 index 0000000..06881ed --- /dev/null +++ b/01/17.txt @@ -0,0 +1 @@ +\v 17 Jesukristo tami ke ju´uli echiriga pagoma ali pi ra´ichali bi ruyenla kaka. Echi ko ke ju´uli tami echiriga ruyenla raichali ne machirutame nira´a ralamuli, mapiri echi sukurusti ke suwilotam nisa jiwerli. \ No newline at end of file diff --git a/01/18.txt b/01/18.txt new file mode 100644 index 0000000..f01bc41 --- /dev/null +++ b/01/18.txt @@ -0,0 +1 @@ +\v 18 Ali echi raichaliko mulipi nira´a echi Cruzichi ke ala oloka pi suwibi mukuwa. Nop echi Rioso kuwira echi jiwerli bi ju Riosi. \v 19 Ali echiriga osuratami chuku: "NIJE SUWABMARE ECHI MACHIWARE WA MACHIME; NIJE IYIEMARE ECHI NATALI ECHI WABE BINEAME." \ No newline at end of file diff --git a/01/20.txt b/01/20.txt new file mode 100644 index 0000000..d339b9e --- /dev/null +++ b/01/20.txt @@ -0,0 +1 @@ +\v 20 ¿Comi ati echi we machimi? ¿Comi ati echi we binemi? ¿Cami ati echi kie ala raicha anim a iyena ala raichamisi jena kawichi? ¿Ke su nakiliwa Riosi echi we machiyame na´i kawi natami? \v 21 Ali ma nili kawi echi we machiyame kie machili echi Riosi, we gara nirali echi Riosi riga ku kuwima rua echi ke ala oluami echiriga ruye napi ayena bichiwa. \ No newline at end of file diff --git a/01/22.txt b/01/22.txt new file mode 100644 index 0000000..41755d6 --- /dev/null +++ b/01/22.txt @@ -0,0 +1 @@ +\v 22 Ali echi Judas nakie riwirtam nisa bayoame ali echi griegos ko a´a echi we machiwame nira´a. \v 23 Napi tomoko ruye echi Jesukristo raichali nira´a. Bile ritie nachopli echi Judio ke a ala natga alami echiriga griegos si´i. \ No newline at end of file diff --git a/01/24.txt b/01/24.txt new file mode 100644 index 0000000..d6764a7 --- /dev/null +++ b/01/24.txt @@ -0,0 +1 @@ +\v 24 Nop Riosi ku bayeli ko, nop riga echi Judios nopriga echi griegos, tamojoko echiriga ruye echi Riosi jiweraliti ali echi Riosi machiliti. \v 25 Map ich ke natam jukla. Riosiko wa minapi machiame ju ralamuli yua, ali Riosi ko waminapi jiweri nop ir Ralamuli we jiwera. \ No newline at end of file diff --git a/01/26.txt b/01/26.txt new file mode 100644 index 0000000..11128f1 --- /dev/null +++ b/01/26.txt @@ -0,0 +1 @@ +\v 26 Ali ineka nokisi nopir bayerami ju Rijimara. Ke ni wikabe iyemi machiimi echiriga niwarami nira´a. Keni wikabe iyemi we jiwerame ju keni wikabe ni ara nira´a Ranaruame ju. \v 27 Ali Riosi chapika Isili nap ir keni natami ju jena kawichi napiriga Riwel yama Rúa echi wabe machiáami. Rioso ko chapika wisili napi ira ke me jiwerame ju jena kawichi. Napi echiriga riweltami iyama rua maioi ira wabe jiwerame ju. \ No newline at end of file diff --git a/01/28.txt b/01/28.txt new file mode 100644 index 0000000..f2ba1ec --- /dev/null +++ b/01/28.txt @@ -0,0 +1 @@ +\v 28 Riosi ko chapika wisili echi petabe ali nopiriiira ke. Natem niranka echi walubeala onoriame jena kawichi, ali ni nali si chapika sili caronti ke biri natiga iyenami ju, echiriga biwama Rua Caronti nopi ira olayankua ni wabe jiwerami nira´a. \v 29 Ali binoi ko echirika wisili mapuriga ke wesi ni gara a la machimea ni wabe nira´a nilami ju ali echi Binoi ni gualubeala onoruami yuga. \ No newline at end of file diff --git a/01/30.txt b/01/30.txt new file mode 100644 index 0000000..34711a9 --- /dev/null +++ b/01/30.txt @@ -0,0 +1 @@ +\v 30 Echiriga Riosigo binoi niwalampa kar´ka suwaba ali jipi ke iyemi pire´mpa mapiriga Kristo Jesusi kitra napi ir nawali tamujer yua a la natali nisijia echi onoruamiti. Binoy ko nawali nima ruá ni garanira ali sinibi bitemi, rojaka echi Riosi ju ni kebiri chati olami. \v 31 Nopiriga aniruami nira´a chukuka re´e Binoi osoluala: "ECHI NI GUABE NIRA´A NIRA NILAMI JUKO. GUABE NIRA´A BINOI ONORUAME YU´A." \ No newline at end of file diff --git a/01/title.txt b/01/title.txt index b74ca25..b29e623 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1 +1,5 @@ -Bile Rojanarami. \ No newline at end of file +<<<<<<< HEAD +Bile Rojanarami. +======= +Rojanarami 1 +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/02/01.txt b/02/01.txt new file mode 100644 index 0000000..f23eccb --- /dev/null +++ b/02/01.txt @@ -0,0 +1 @@ +\c 2 \v 1 Napali, nawali yemi rijimala ke nawali niwika niwili raichali kanilkuami chorikare nije nimi ruweki nibichiwali nimi Yama, ayenacho nibichiwali onoruwami. \v 2 Echirika nakili ke biri machimea napali asali echirika yemi. Nakiwili echi Jesucristo ali binoy kuirisi. \ No newline at end of file diff --git a/02/03.txt b/02/03.txt new file mode 100644 index 0000000..fcee304 --- /dev/null +++ b/02/03.txt @@ -0,0 +1 @@ +\v 3 Ali asaki yemi yuka echirika keji werka ali masaka, ali we nokali. \v 4 Ali nije nimiruwe ali nije rachi li ke nili echi raichili ruweli ni ala machika. Ayenacho ke simili echirika nersia echi iwikala ali omerili. \v 5 Echerika echi bichikuami yemi ke nisa echirika kanilkuami echi ralamuli ayenacho binoy omerma Riyosi bino. \ No newline at end of file diff --git a/02/06.txt b/02/06.txt new file mode 100644 index 0000000..5c4ef41 --- /dev/null +++ b/02/06.txt @@ -0,0 +1 @@ +\v 6 Jipi tamuje raichaka, kanilika echirika nijiweriká. napirika kiecho kaniliká jenaiba kawichili. Ayenacho ke siriami jenajiti echiriga. Chika simili echirika. Ikimea. \v 7 Ke raichasa nimachika echi Riosi raichali nibichiwali nimi yasa. Ali nimachika nimi yasa echi Riosi manatili nibacha echiko ikili napirika jiti ripa. \ No newline at end of file diff --git a/02/08.txt b/02/08.txt new file mode 100644 index 0000000..4e44e39 --- /dev/null +++ b/02/08.txt @@ -0,0 +1 @@ +\v 8 Kebile ichi siriyami jenali machili jenali namachika. Chorikare nisa namisa echali rawe echiko ke nisa kurisichi uchati Jesúsi echirika Riosi niwali. \v 9 Mapali chorika orosuta chukú: "KARUNTI KE, BILÉ BUSILA JI RIWALI, KEBILE NAKALA JITI NAMILI, KEBILE NATILI BINOY ICHINILA NILI. ICHI KARUTI NAPIICHI RIOSI KARIWELI MAPIRIKA JARE NAPIICHI KALELI," \ No newline at end of file diff --git a/02/10.txt b/02/10.txt new file mode 100644 index 0000000..95c6576 --- /dev/null +++ b/02/10.txt @@ -0,0 +1 @@ +\v 10 Jenali ju echi korunti nopuri onoruwami simirili tomoje echirika iwikala ayenacho iwikala karika nerili napiyena si karunti nibachami onoruwami yuka. \v 11 Churikare, ¿chiká machi echi natili echirika bile rijoy nareli echi onoruwami, iwikala. \ No newline at end of file diff --git a/02/12.txt b/02/12.txt new file mode 100644 index 0000000..15a5a69 --- /dev/null +++ b/02/12.txt @@ -0,0 +1 @@ +\v 12 Echirika tomoje jiti nareli echi iwikala jenaiba kawichili. Ayenacho iwi´kala napoichi nawa Riosi moporika omeribo machiya echi namuti yarami tamoje kebi´iri natetaka echi Riosi Jiti. \v 13 Tamoje raichaka jenali jiti karunti raichali chuiri nikanilika echi rijoy ke omera bineria, kebile ichi chuiri Binoy iwakala echirika binerili. Binoy iwikala ruweli raichali kekala ruweli echirika machika kekala ruweli. \ No newline at end of file diff --git a/02/14.txt b/02/14.txt new file mode 100644 index 0000000..c1b534d --- /dev/null +++ b/02/14.txt @@ -0,0 +1 @@ +\v 14 Echi Rijoy kekala ruweli ke narema echi karunti echi niwali echi iwikala Riosi kenatami churikare nopirikare binoy niwale. Binoy ke omeri machiya churikare echi machisa aliwala kekala. \v 15 Binoy chuiri ju aliwala kekala karika echi nomuti napurika echi kekalá ti kastigartomi nima achebile. \v 16 Ayenacho: "¿CHÍKA OMERI MACHIYA BINOY NATIKA ECHI TIJOY NAPIRIKA ECHE RISUA OLAMA?" alicho tomoje niwi echi natili Jesúkristo. \ No newline at end of file diff --git a/02/title.txt b/02/title.txt index 9d6d48f..cf84ca3 100644 --- a/02/title.txt +++ b/02/title.txt @@ -1 +1,5 @@ -Okua Rojanarami. \ No newline at end of file +<<<<<<< HEAD +Okua Rojanarami. +======= +Rojanarami 2 +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/LICENSE.md b/LICENSE.md index 93d2e9f..da9424f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,6 +4,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -64,16 +65,21 @@ This is a human-readable summary of (and not a substitute for) the [license](htt <<<<<<< HEAD <<<<<<< HEAD ======= +======= +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 # License ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/. +<<<<<<< HEAD >>>>>>> ece55236883e0e49145df98c0866e195c596ed54 ======= >>>>>>> edd63b28973144f994bbf69b4ac188144d932961 ======= >>>>>>> c3146612b721a02584ba2826fe28ce2a059d96c9 +======= +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 ### You are free to: @@ -101,6 +107,7 @@ No warranties are given. The license may not give you all of the permissions nec <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b86eeef16eb4008d8132c02e32d11d97442118e1 ======= >>>>>>> 10baeef5d83d32e11bba9c57c2422dacb6d9706d @@ -135,3 +142,7 @@ If you would like to notify unfoldingWord regarding your translation of this wor >>>>>>> beeaa34f24be1e50031a64dd7d3adf1084b71b14 ======= >>>>>>> c3146612b721a02584ba2826fe28ce2a059d96c9 +======= + +This PDF was generated using Prince (https://www.princexml.com/). +>>>>>>> a6d7bed283bc1881ff3c5122f003bafa40f06384 diff --git a/manifest.json b/manifest.json index 8c51258..7db074f 100644 --- a/manifest.json +++ b/manifest.json @@ -42,16 +42,10 @@ "Karina Rojas Galeano", "Ineyda Garcia Amador", "m", - "Héctor Alberto reyes Valenzuela" + "Héctor Alberto reyes Valenzuela", + "Amara Lebron" ], "finished_chunks": [ - "01-title", - "01-01", - "01-04", - "01-07", - "01-10", - "01-12", - "02-title", "03-title", "03-01", "03-03", @@ -155,6 +149,22 @@ "16-01", "16-03", "16-05", - "16-07" + "16-07", + "01-14", + "01-17", + "01-18", + "01-20", + "01-22", + "01-24", + "01-26", + "01-28", + "01-30", + "02-01", + "02-03", + "02-06", + "02-08", + "02-10", + "02-12", + "02-14" ] } \ No newline at end of file