From 48b49ddb0c62ecef471f662afbc15f9a4a51fd71 Mon Sep 17 00:00:00 2001 From: michael_rodriguez Date: Thu, 22 Apr 2021 16:04:54 -0400 Subject: [PATCH] Thu Apr 22 2021 16:04:53 GMT-0400 (Eastern Daylight Time) --- 01/01.txt | 6 +----- 01/04.txt | 6 +----- 01/07.txt | 6 +----- 01/09.txt | 6 +----- 01/12.txt | 6 +----- 01/14.txt | 6 +----- 01/17.txt | 6 +----- manifest.json | 11 +++++++++-- 8 files changed, 16 insertions(+), 37 deletions(-) diff --git a/01/01.txt b/01/01.txt index bb358c6d..c86fd957 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 Ja'ito ja te bila ya yak' ta na'el te Jesucristo te ja ak'bot yu'un te Dios yu'un te ya yak'bey snastojol te abatetik yu'une te bila nopol ya xk'ot ta pasel. Ja la yak' ta na'estojol ta swenta te xch'ul abat te la stikuntel ta stojol te yabat Juan. \v 2 Te Juan la yalbey sk'oplal spisil te bila la yil ta stojol te sk'op te Dios sok te sk'oplal te Jesus. \v 3 Binaxme yutsil te mach'a ya sk'opon ta tulan k'op, sok te mach'a ya yay stojol te kopetik te yich'oj alel ta namey k'inal sok te mach'a ya xch'uun spasel te bina ts'ibubil le'a, melel nopol ayix te sk'alelal. -======= -\v 1 Ja' in to, ja' te bila ya yak' ta na'el te Jesucristo te ja' ak'bot yu'un te Dios yu'un te ya yak'bey sna' stojol te abatetik yu'une te bila nopol ya xk'ot ta pasel. Ja la yak' ta na'es tojol ta swenta te xch'ul abat te la stikun tel ta stojol te yabat Juan. \v 2 Te Juan la yalbey sk'oplal spisil te bila la yil ta swenta te sk'op te Dios sok te sk'oplal te Jesus. \v 3 Binaxme yutsil te mach'a ya sk'opon ta tulan k'op, sok te mach'a ya yay stojol te kopetik in to sok te mach'a ya xch'uunik spasel te bina ts'ibubil le'a, melel nopol ayix te sk'alelal. ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\c 1 \v 1 Ja' in to, ja' te bila ya yak' ta na'el te Jesucristo te ja' ak'bot yu'un te Dios yu'un te ya yak'bey sna' stojol te abatetik yu'une te bila nopol ya xk'ot ta pasel. Ja la yak' ta na'es tojol ta swenta te xch'ul abat te la stikun tel ta stojol te yabat Juan. \v 2 Te Juan la yalbey sk'oplal spisil te bila la yil ta swenta te sk'op te Dios sok te sk'oplal te Jesus. \v 3 Binaxme yutsil te mach'a ya sk'opon ta tulan k'op, sok te mach'a ya yay stojol te kopetik in to sok te mach'a ya xch'uunik spasel te bina ts'ibubil le'a, melel nopol ayix te sk'alelal. \ No newline at end of file diff --git a/01/04.txt b/01/04.txt index 05aafd3f..ff793a7b 100644 --- a/01/04.txt +++ b/01/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Juan, te juk kum ch'unjeletike ta Asia : Te ja'exe ich'ajik te yutsil ot'anil sok lama k'inal yu'un te mach'a stalel aye, sok te mach'a ay ta sbajt'el k'inal, sok te mach'a nopol ya xtale, sok te jukeb ch'unjeletik te ay ta stojol te muk'ul snaktijib, \v 6 sok yu'un te Jesucristo, ja te testigo te jun yot'an, te ja snelal te chakuxtel yu'un te mach'atik lajeme, sok te ajwaliletik yu'un te muk'ul ajwaliletik ta bay balumilal. \v 5 Ja te mach'a k'uxotik ta yot'an sok te la skoltayotik lok'el ta bay jmultik ta swenta xch'ul ch'ich'el, Ja la yak'otikix ta ajwalil, sacerdote'il ta stojol te Dios sok te state - jalawenuk me yutsil sok ayuk me tulan yat'el ta ora to sok ta sbajt'el k'inal. Jichuk. -======= -\v 4 Juan, te juk kum ch'unjeletik ta Asia : Te ja'exe ich'aik te yutsil ot'anil sok lamal k'inal yu'un te mach'a stalel aye, sok te mach'a ay ta sbajt'el k'inal, sok te mach'a nopol ya xtale, sok te jukeb ch'ulelaletik te ay ta stojol te muk'ul snaktijib, \v 5 sok te Jesucristo, ja te testigo te jun yot'an, te ja' snelal te chakuxtel yu'un te mach'atik lajeme, sok te ajwaliletik yu'un te muk'ul ajwaliletik ta bay balumilal. Ja te mach'a k'uxotik ta yot'an sok te la skoltayotik lok'el ta bay jmultik ta swenta xch'ul xch'ich'el, \v 6 Ja la xchajp'anbotik jun awilal, ja la spasotikixa sacerdote'il ta stojol te Dios sok te state - jelawenuk me yutsil sok ayuk me tulan yat'el ta ora to sok ta sbajt'el k'inal. Jichuk. ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\v 4 Juan, te juk kum ch'unjeletik ta Asia : Te ja'exe ich'aik te yutsil ot'anil sok lamal k'inal yu'un te mach'a stalel aye, sok te mach'a ay ta sbajt'el k'inal, sok te mach'a nopol ya xtale, sok te jukeb ch'ulelaletik te ay ta stojol te muk'ul snaktijib, \v 5 sok te Jesucristo, ja te testigo te jun yot'an, te ja' snelal te chakuxtel yu'un te mach'atik lajeme, sok te ajwaliletik yu'un te muk'ul ajwaliletik ta bay balumilal. Ja te mach'a k'uxotik ta yot'an sok te la skoltayotik lok'el ta bay jmultik ta swenta xch'ul xch'ich'el, \v 6 Ja la xchajp'anbotik jun awilal, ja la spasotikixa sacerdote'il ta stojol te Dios sok te state - jelawenuk me yutsil sok ayuk me tulan yat'el ta ora to sok ta sbajt'el k'inal. Jichuk. \ No newline at end of file diff --git a/01/07.txt b/01/07.txt index 45e98f1c..7ec0a818 100644 --- a/01/07.txt +++ b/01/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Ilawilik, ja me ya xtal ta bay tokaletik; spisil ants-winiketik ya me yilik, sok nixuk te mach'atik la slowike. spisil chajb tsumbalil ta balumilal ya me yok'tey sba'ik yu'un. jich, jichuk. \v 8 "Jo'on te mach'a stalel aye ta sok te kuxul ta sbajt'el k'inal," jich la yal te kajwaltik Diose , "te mach'a ay ta xjajch'ebal sok te mach'a ay ta slajebal sok te mach'a kechel ya xtal , te mach'a spisl ya xu yu'une." -======= -\v 7 Ilawilik, ja me ya xtal ta bay tokaletik; spisil ants-winiketik ya me yilik, sok nixuk te mach'atik la slowike. spisil chajb tsumbalil ta balumilal ya me yok'tey sba'ik yu'un. jich, jichuk. \v 8 "Jo'on te mach'a stalel aye sok te kuxul ta sbajt'el k'inal," jich la yal te kajwaltik Diose , "te mach'a ay ta xjajch'ebal sok te mach'a ay ta slajibal sok te mach'a kechel ya xtal , te mach'a spisil ya xu yu'une." ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\v 7 Ilawilik, ja me ya xtal ta bay tokaletik; spisil ants-winiketik ya me yilik, sok nixuk te mach'atik la slowike. spisil chajb tsumbalil ta balumilal ya me yok'tey sba'ik yu'un. jich, jichuk. \v 8 "Jo'on te mach'a stalel aye sok te kuxul ta sbajt'el k'inal," jich la yal te kajwaltik Diose , "te mach'a ay ta xjajch'ebal sok te mach'a ay ta slajibal sok te mach'a kechel ya xtal , te mach'a spisil ya xu yu'une." \ No newline at end of file diff --git a/01/09.txt b/01/09.txt index 5f5918ae..96a1d0ec 100644 --- a/01/09.txt +++ b/01/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 Jo'on , Juan - te awermano'on sok te pajal ay ta jwentatik te woklajele sok te ajwalineje sok te jun kot'antik yakotik ta smaleyel ta swenta te Jesus - le ayon tabay ch'in tsob lum te ay ta yolil muk'ul ja' te Patmos sbi'ile ta swenta te sk'op Dios sok te sk'plal te Jesus. \v 10 Te bit'il ayon ta wenta inel yu'un te espiritu sanato ja k'ot ta pasel te bi k'a'alil yu'una te kajwaltik. La jkay stojol te ay mach'a tulan k'opaj ta jpat jich bit'il jun ok'es. La yal : \v 11 Tsibuya ta bay jun te bila ya awile, sok tikumbeya bel te juk kum ch'unjeletike - ta Efeso, ta Esmira , ta Pergamo , ta Tiatira, ta Sardis, ta Filadelfia, y Laodicea" -======= -\v 9 Jo'on , Juan - te awermano'on sok te pajal ay ta jwentatik woklajele sok te pajal ya jointik ta ajwalil te Cristoe sok te jun kot'antik yakotik ta smaleyel ta swenta te Jesus - le ayon tabay ch'in k'inal te ay ta yolil muk'ul ja' te Patmos sbi'ile ta swenta te sk'op Dios sok te sk'plal te Jesus. \v 10 Te bit'il ayon ta wentainel yu'un te ch'ul espiritue ja k'ot ta pasel te bi k'a'alil yu'una te kajwaltike. La jkay stojol te ay mach'a tulan k'opoj ta jpat jich bit'il jun ok'es. \v 11 La yal : Tsibuya ta bay jun te bek ya awile, sok tikumbeya bael te juk kum ch'unjeletike - ta Efeso, ta Esmira , ta Pergamo , ta Tiatira, ta Sardis, ta Filadelfia, y Laodicea" ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\v 9 Jo'on , Juan - te awermano'on sok te pajal ay ta jwentatik woklajele sok te pajal ya jointik ta ajwalil te Cristoe sok te jun kot'antik yakotik ta smaleyel ta swenta te Jesus - le ayon tabay ch'in k'inal te ay ta yolil muk'ul ja' te Patmos sbi'ile ta swenta te sk'op Dios sok te sk'plal te Jesus. \v 10 Te bit'il ayon ta wentainel yu'un te ch'ul espiritue ja k'ot ta pasel te bi k'a'alil yu'una te kajwaltike. La jkay stojol te ay mach'a tulan k'opoj ta jpat jich bit'il jun ok'es. \v 11 La yal : Tsibuya ta bay jun te bek ya awile, sok tikumbeya bael te juk kum ch'unjeletike - ta Efeso, ta Esmira , ta Pergamo , ta Tiatira, ta Sardis, ta Filadelfia, y Laodicea" \ No newline at end of file diff --git a/01/12.txt b/01/12.txt index 309452cb..4724316b 100644 --- a/01/12.txt +++ b/01/12.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 12 La jsutbabel jkil te macha la sk'apnone, sok te kalal la jsutbabele la jkil jukeb stuch tijibal k'ajk te pasbil ta oro. \v 13 Ta yolil te stuch tijibal k'ajk'e ay tul te la jkil te jich bit'il yilel te snich'an winike, k'alal to ta yakan k'oem te palal pak' slapoje, sok jun chujk'il chujt'ul te pasbil ta oro te bech'bil k'axel ta stan. -======= -\v 12 La jsutbabel jkil te macha yak ta 'oponbelone, sok te k'alal la jsutbabele la jkil jukeb stuch tijibal k'ajk te pasbil ta oro. \v 13 Ta yolil te stuch-tijibal k'ajk'e ay ch'a la jkil te jich yilel te bit'il snich'an winike, k'alal to ta yakan k'oem te palal pak' slapoje, sok jun xchujk'il chujt' te pasbil ta oro te bech'bil k'axel ta stan. ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\v 12 La jsutbabel jkil te macha yak ta 'oponbelone, sok te k'alal la jsutbabele la jkil jukeb stuch tijibal k'ajk te pasbil ta oro. \v 13 Ta yolil te stuch-tijibal k'ajk'e ay ch'a la jkil te jich yilel te bit'il snich'an winike, k'alal to ta yakan k'oem te palal pak' slapoje, sok jun xchujk'il chujt' te pasbil ta oro te bech'bil k'axel ta stan. \ No newline at end of file diff --git a/01/14.txt b/01/14.txt index b66f16a6..3403db89 100644 --- a/01/14.txt +++ b/01/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 te sjol sok te stsil sjole sak nax jich bi'til te tunim chije - mero sak jich bint'il te tu'ibe, sok te site jich bint'il te yat k'ajk. te \v 15 yakane jich bint'il te bronce te xlem naxe, jich bit'il te lekubtesbilix ta k'ajk'e, sok te sk'ope jich bit'il te yip yok ja'etike. \v 16 Ja yich'oj ta swa'el sk'ap jukeb ek'etik, sok lok'tel ta yej jun espada te xcha mejch'el yej juxbile. Te sit yelawe xlemet nax xojobil jich' bit'il k'a-al te bayal yip ya xtile. -======= -\v 14 Te sjol sok te stsotsil sjole sak nax jich bi'til te tunim chije - mero sak jich bint'il te tu'ibe, sok te site jich bit'il te yat k'ajke. \v 15 Te yakane jich bit'il te bronce te xlem naxe, jich bit'il te lekubtesbilix ta k'ajk'e, sok te sk'ope jich bit'il te yip yok ja'etike. \v 16 Ja yich'oj ta swa'el sk'ap jukeb ek'etik, sok lok'tel ta yej jun espada te xcha mejch'el yej juxbile. Te sit yelawe xlemet nax xojobil jich' bit'il k'a-al te bayal yip ya xtile. ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\v 14 Te sjol sok te stsotsil sjole sak nax jich bi'til te tunim chije - mero sak jich bint'il te tu'ibe, sok te site jich bit'il te yat k'ajke. \v 15 Te yakane jich bit'il te bronce te xlem naxe, jich bit'il te lekubtesbilix ta k'ajk'e, sok te sk'ope jich bit'il te yip yok ja'etike. \v 16 Ja yich'oj ta swa'el sk'ap jukeb ek'etik, sok lok'tel ta yej jun espada te xcha mejch'el yej juxbile. Te sit yelawe xlemet nax xojobil jich' bit'il k'a-al te bayal yip ya xtile. \ No newline at end of file diff --git a/01/17.txt b/01/17.txt index 68c3f8fb..3617442a 100644 --- a/01/17.txt +++ b/01/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 Te k'alal la jkile, ch'ayon koel ta yakan jich bint'il jun winik te lajeme. La skajan te swa'el sk'ab ta jtojol sok la yal: Ma xiwat. Jo'on ayon ta xjajch'ibal sok jo'on nix te slajibal, sok te mach'a kuxul . \v 18 Te jo'one lajemon a , ja'uk meto ilawil , ¡Jo'on te kuxulon ta sbajt'el k'inal! sok jo'on jkich'oj te sjamjib al te lajele sok te yawil aelmeeletik. -======= -\v 17 Te k'alal la jkile, ch'ayon koel ta yakan, jich bit'il jun winik te lajeme. La skajan te swa'el sk'ab ta jtojol sok la yal: "Ma xiwat. Jo'on ayon ta xjajch'ibal sok jo'on nix te slajibal,\v 18 sok te mach'a kuxul . Te jo'one lajemon a , ja'uk me to ilawil, ¡Jo'on te kuxulon ta sbajt'el k'inal! sok jo'on jkich'oj te sjamjibal te lajele sok te yawil ailmeletike. ->>>>>>> f49b71bfc4759a872ade0451546be991d9af441f +\v 17 Te k'alal la jkile, ch'ayon koel ta yakan, jich bit'il jun winik te lajeme. La skajan te swa'el sk'ab ta jtojol sok la yal: "Ma xiwat. Jo'on ayon ta xjajch'ibal sok jo'on nix te slajibal, \v 18 sok te mach'a kuxul . Te jo'one lajemon a , ja'uk me to ilawil, ¡Jo'on te kuxulon ta sbajt'el k'inal! sok jo'on jkich'oj te sjamjibal te lajele sok te yawil ailmeletike. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 74a388ea..ed9f2c49 100644 --- a/manifest.json +++ b/manifest.json @@ -47,6 +47,14 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", + "01-04", + "01-07", + "01-09", + "01-12", + "01-14", + "01-17", + "01-19", "02-title", "02-01", "02-03", @@ -247,7 +255,6 @@ "22-16", "22-17", "22-18", - "22-20", - "01-19" + "22-20" ] } \ No newline at end of file