diff --git a/06/16.txt b/06/16.txt index 817bbcc4..94ac39ea 100644 --- a/06/16.txt +++ b/06/16.txt @@ -1 +1,5 @@ -\v 16 Unu wilakgolh xtakuwinikan xlakgawasan Leví, xliputum xlikilhtsukun. Amakgolh wa xwankgonit Gersón, Coat chu Merari. Leví latamalh akgtumciento akgpuxamakutujun kata. \v 17 wa xlakawasan Gersón xwankgonit Libni chu Simei. \v 18 xlakgawasan Cohat xwankgonit Amram, Izhar, Hebrón chu Uziel. Cohat latamalh akgtumciento akgpuxamakututu xkata . \v 19 wa xlakgawasan Merari xwankgonit Mahli, Musi. Wa uma litaxtukgolh xakgxakga xlikilhtsukun Levitas, xlipaks xlikihltsukun. \ No newline at end of file +<<<<<<< HEAD +\v 16 Unu wilakgolh xtakuwinikan xlakgawasan Leví, xliputum xlikilhtsukun. Amakgolh wa xwankgonit Gersón, Coat chu Merari. Leví latamalh akgtumciento akgpuxamakutujun kata. \v 17 wa xlakawasan Gersón xwankgonit Libni chu Simei. \v 18 xlakgawasan Cohat xwankgonit Amram, Izhar, Hebrón chu Uziel. Cohat latamalh akgtumciento akgpuxamakututu xkata . \v 19 wa xlakgawasan Merari xwankgonit Mahli, Musi. Wa uma litaxtukgolh xakgxakga xlikilhtsukun Levitas, xlipaks xlikihltsukun. +======= +\v 16 16 Unu wilakgolh xtakuwinikan xlakgawasan Leví, xliputum xlikilhtsukun. Amakgolh wa xwankgonit Gersón, Coat chu Merari. Leví latamalh akgtumciento akgpuxamakutujun kata. \v 17 17 wa xlakawasan Gersón xwankgonit Libni chu Simei. \v 18 18 xlakgawasan Cohat xwankgonit Amram, Izhar, Hebrón chu Uziel. Cohat latamalh akgtumciento akgpuxamakututu xkata . \v 19 19 wa xlakgawasan Merari xwankgonit Mahli, Musi. Wa uma litaxtukgolh xakgxakga xlikilhtsukun Levitas, xlipaks xlikihltsukut . +>>>>>>> 165acd6083aa6502f991998c9a83bf07be60d639 diff --git a/06/26.txt b/06/26.txt index ec24ad84..f9fc1ae8 100644 --- a/06/26.txt +++ b/06/26.txt @@ -1 +1,5 @@ -\v 26 wa uma chati chixkuwin xwankgonit Aarón chu Moisés wanti PUCHINÁ tikawanilh: katamakaxtutit Israelitas xtiyat Egipcios, wa kakamamakxtumi ti katsikgoy taratlawanankgoy . \v 27 Aarón chu Moisés tachiwinankgolh Faraón , mapekgsina xalak Egipto, laki pi nakamaxki talakaskin natamakxtukgoy Israelitas nak xtiyat Egipto. Watiya umakgolh Moisés chu Aarón . \ No newline at end of file +<<<<<<< HEAD +\v 26 wa uma chati chixkuwin xwankgonit Aarón chu Moisés wanti PUCHINÁ tikawanilh: katamakaxtutit Israelitas xtiyat Egipcios, wa kakamamakxtumi ti katsikgoy taratlawanankgoy . \v 27 Aarón chu Moisés tachiwinankgolh Faraón , mapekgsina xalak Egipto, laki pi nakamaxki talakaskin natamakxtukgoy Israelitas nak xtiyat Egipto. Watiya umakgolh Moisés chu Aarón . +======= +\v 26 wa uma chati chixkuwin xwankgonit Aarón chu Moisés wanti PUCHINÁ tikawanilh: katamakaxtutit Israelitas xtiyat Egipcios, pulakatunu ti lalilakgapasa kakamamakxtumitit . \v 27 27 Aarón chu Moisés tachiwinankgolh Faraón , mapekgsina xalak Egipto, laki pi nakamaxki talakaskin natamakxtukgoy Israelitas nak xtiyat Egipto. Watiya umakgolh Moisés chu Aarón . +>>>>>>> 165acd6083aa6502f991998c9a83bf07be60d639 diff --git a/17/01.txt b/17/01.txt new file mode 100644 index 00000000..c3dca231 --- /dev/null +++ b/17/01.txt @@ -0,0 +1,2 @@ +\c 17 \v 1 \v 2 \v 3 1. Xlipaks latamani xalak Israelitas ankgolh anta nak kamunsayatni nak Sin , chuna tlawakgolh tu xkalimapeksinit PUCHINA. Anta tawilakgolh nak Refidim, wampi anta nitu xhuanit chuchut tu xlikgokgnankgoy . 2 chan chú , limakankgolh Moisés wan tu xtitaxtumakgolh chu tiwankgolh; kakilamaxkiw chuchut tu naklikgotnanaw '' Moisés wa; ¿ tuxpalakata kilalitalatlawayaw? ¿tuxpalakata liputsaniyatit PUCHINA? 3 wa latamani snún xtlakgwankgonit chu xkalhputimakgohl , takglhuwikgolh xlakatin Moisés . waxlakan wankgolh ; +tuxpalakata kilalitamakaxtunitaw nak Egipto ? lakimpi nakilamakgniyau akinan, kínkamankan chu kintakgalhinkan natakgalhputixní. ? \ No newline at end of file diff --git a/17/04.txt b/17/04.txt new file mode 100644 index 00000000..fabae7d3 --- /dev/null +++ b/17/04.txt @@ -0,0 +1 @@ +\v 4 \v 5 \v 6 \v 7 4. hua chu Moisés palha kilhanilh PUCHINA ; Tunakatatlaway uma tachixkuwitat? chaskgalhalh huilakgolh lakimpi na kintaaktalay '. 5 . Hua PUCHINA wanilh Moisés ; '' kapulani kachikin , chu kakalipi amakgapitsin lakkgolun xalak Israel . kalipi min kiwi wantu lilaksnokgti kalhtuchokgo chu kapit . 6 akit nak tayay milakatin xkalhni tlanka chiwix nak Horeb, chu wix nasnokga tlaka chiwix . Anta nataxtuy chuchut laki pi nalikgotnankgoy . chuna chu tlawalh Moisés kalimassinilh lakkgolun xalak Israel . 7 limapakwilh tama pulataman Masah chu Meriba xpalakata xtaklhuwimakgolh Israelitas wampi waxlakan xputsananikgonit PUCHINA xkilhwamakgolh ; ¿ kinkgatawilan PUCHINA kilakstipankan unikinkatawilan ? \ No newline at end of file diff --git a/17/08.txt b/17/08.txt new file mode 100644 index 00000000..834fc93c --- /dev/null +++ b/17/08.txt @@ -0,0 +1 @@ +\v 8 \v 9 \v 10 wan chu makgtakalhnanin xalak kachikin Amalecitas milh talataway Israel nak Refidim . 9 wan chu Moisés wanilh Josué kakalaksakti amakgapisin chixkuwin chu kataxtu. katalatlawa Amelec. Chali nakan sipi nak litamakayaway xlixtokgo Dios. 10 Josué talatawalh Amelec lata Moisés xlimapeksinit, xlimakgwa Moisés, Aarón chu Ur tawakgakgolh nak akstipun sipi. \ No newline at end of file diff --git a/17/11.txt b/17/11.txt new file mode 100644 index 00000000..32f3861e --- /dev/null +++ b/17/11.txt @@ -0,0 +1 @@ +\v 11 \v 12 \v 13 11. xlimakgwa Moisés xchaxnit xmakan, Israel xtatayánimanalh nak putalatlaw; akgxni xmakty xmakanin la kimpi najaxa, Amalec xtlajakgoy. 12. akxni xmakanin Moisés xmakxpatlakgwankgoy , lakgtlakgwalh , Aarón chu Hur putsanikgol aktum chiwix chu wilinikgolh la kimpi natawilay. watiya ama kilhtamaku, Aarón chu Hur chaxnikgolh xmakxpanin, chatum nak xpekstakat chu chatum xpekgxuki, chuna chu xmakanin Moisés chaxnikgolh astaxni tsankalh chichiní . chuna chu Josué makgatlajalh xkachikin Amalec chu kalakawililh. \ No newline at end of file diff --git a/17/14.txt b/17/14.txt new file mode 100644 index 00000000..195ca63a --- /dev/null +++ b/17/14.txt @@ -0,0 +1 @@ +\v 14 \v 15 \v 16 Wa PUCHINA wanilh Moisés ; kasokgti uma nak maktum likalhtawakga chu kalikalhtawakgani Josué lakimpi nakaxmata, wampi nakxapanikgoy putum xtalakapastakni Amalec xtampin kakgapun . 15 . Wan chu Moisés titlawahl actum antani nalakgtakilhputay PUCHINA ti limapakuwilh wa Puchina nak lakglakan. 16 wan tihuá ; wampi wa akgtum makan tichaxkalh nakxputawilh PUCHINA, wa PUCHINA natatlaway takglhuwit Amelec wanti natitalakgachinkgoykú . \ No newline at end of file diff --git a/17/title.txt b/17/title.txt new file mode 100644 index 00000000..64809c04 --- /dev/null +++ b/17/title.txt @@ -0,0 +1 @@ +CAPITULO 17 \ No newline at end of file diff --git a/21/01.txt b/21/01.txt new file mode 100644 index 00000000..d123fcbc --- /dev/null +++ b/21/01.txt @@ -0,0 +1 @@ +\c 21 \v 1 “lawku cho wa uyma limapagsin tuku nawna nak xlakatinkan: \ No newline at end of file diff --git a/21/02.txt b/21/02.txt new file mode 100644 index 00000000..91c23ada --- /dev/null +++ b/21/02.txt @@ -0,0 +1 @@ +\v 2 ´Palpi nakiyatit chatum skujni hebreo, wa xla nakaskujniyan akgchaxan kata, cho xli akgtujun kata wa xla nalagtaxtuy cho nitu kat xokgolh. \v 3 Palpi wa xakstu milh, wa xla xakstu nataxtuy; palpi wa tapuchuwnit, wancho xpuskat natataxtuy xlakajtaxtuni. \v 4 Palpi wa xmalana maxkilh xpuskat cho xla maxkilh xkaman xlakgawasan cho xlaktsumajan, wa xpuskat cho xkaman wa natapagsinkgoy xmalana puskat, cho xakstu chixku nalajtaxtuy. \ No newline at end of file diff --git a/21/05.txt b/21/05.txt new file mode 100644 index 00000000..f98bc3d4 --- /dev/null +++ b/21/05.txt @@ -0,0 +1 @@ +\v 5 palpi wancho skujni tenks nawan: “akit kpaxkiy ki malana, kinpuskat cho kinkaman; akit nik titaxtulh”, \v 6 wancho xmalana nalimin nak xlakatin Dios. Wa malana nalimin nak malakcha o anta nakxkilhtun malakcha, cho xmalana nalilaglhukiniy xtakgan akgtum litspan. Chuna cho wa skujni naskujnaniy xaxlipan xkilhtamaku. \ No newline at end of file diff --git a/21/07.txt b/21/07.txt new file mode 100644 index 00000000..80290d88 --- /dev/null +++ b/21/07.txt @@ -0,0 +1 @@ +\v 7 palpi chatum chixku nastay xtsumat la chatum skujni, wa xla nilay kat taxtulh xalagtaxtuni, chuna nantla tlawakgoy skujnin lakchixkuin. \v 8 palpi wa puskat nitlan likatsinilh xmalana, tinta mana wa makamxkikanit, wancho xla namastay talkaskin ampi tlan nakipalkan. Wa xla nitu kgalhiy talkaskin nastamxkikan tachikuitat tiku ni anta xala. Wa xla nitu kgalhiy talkaskin, xpalakata ampi ka akgsaninanit. \ No newline at end of file diff --git a/21/09.txt b/21/09.txt new file mode 100644 index 00000000..f44c94fa --- /dev/null +++ b/21/09.txt @@ -0,0 +1 @@ +\v 9 palpi wa xmalana namkamxkiy laku xpuskat nawan xkgawasa, wa xla la chatum xtsumat nalikatsiniy. \v 10 palpi wa tunuk xpuskat naputsay, wa xla nilay katimaktsuwinilh xtaway, xtalhakgan, xpuskat naliukxilha. \v 11 palpi wa xla nikat maxkilh uyma tipat´tu xpuskat, wa xla puskat tlan nataxtuy nitu kat lixokgonalh tumin. \ No newline at end of file diff --git a/21/12.txt b/21/12.txt new file mode 100644 index 00000000..36fe5bd5 --- /dev/null +++ b/21/12.txt @@ -0,0 +1 @@ +\v 12 Wantinta nanika chatum chixku cho xla naniy, waxla tiyma chixku na namagnikan. \v 13 palpi wancho chixku ni chuna xlak´kaxtlawanit, palpi nika chun katsiy, wancho kit nak kaxtaway ninta wa tlan natatsekga. \v 14 palpi wi chixku tinta ka chun katsiy nal katawkay xlilkatsu cho namagniy tuku xlakaxtlawanita nantla namagniy, chuna xlitatiyat, chuna maski anta wi nak xlikakniy Dios, xpalkata wa naniy. \ No newline at end of file diff --git a/21/15.txt b/21/15.txt new file mode 100644 index 00000000..d3d0af0e --- /dev/null +++ b/21/15.txt @@ -0,0 +1 @@ +\v 15 chunta tinta nanika xtlat o xtsi lu xlitamagnit. \v 16 chunta tinta palh nakgalhan chatum xtaltaman cho nastay, o palh anta manoglhuka nak xtiyat, wantiyma kgalhana xlitamagnit. \v 17 wantinta nitlan tu katmawkancha xtlat o palh wa xtsi, wantiyma xlitamagnit. \ No newline at end of file diff --git a/21/18.txt b/21/18.txt new file mode 100644 index 00000000..33cebaf0 --- /dev/null +++ b/21/18.txt @@ -0,0 +1 @@ +\v 18 palpi wa tachixkuitat latalatlawmakgolh cho chatum nalinika akgtum chiwix achatum o palh wa nalinika xmakan, cho palh wa tiyma xtaltaman nina niy, ampi palh anta natamay cho nak putma; \v 19 palpi wancho natatlaniy cho palpi wa tlan nalitayay xlixtokgo, wa chixku tiku tinikli xlixokgot xpalkata ampi mamkgasankganilh kilhtamaku; wa naxlixokgot xpalkata tlan natatlaniy. Ampi wantiyma chixku nitu liwi kuenta xla tamagnin. \ No newline at end of file diff --git a/21/20.txt b/21/20.txt new file mode 100644 index 00000000..a7c72898 --- /dev/null +++ b/21/20.txt @@ -0,0 +1 @@ +\v 20 palpi chatum chixku nalinika xlixtokgo kgskujni chixku o kgskujni puskat, cho palpi wa skujni naniy xpaltaka am nik´ka, chunacho wa tiyma chixku xlita akgastakyawat. \v 21 palpi wancho skujni nalatmay akgtum kilhtamaku o akgtuy, wa malana ni xlita akgastakyawat, xpalpkata ampi wa xla makgatsankgalh xkskujni. \ No newline at end of file diff --git a/21/22.txt b/21/22.txt new file mode 100644 index 00000000..dd39f65d --- /dev/null +++ b/21/22.txt @@ -0,0 +1 @@ +\v 22 palpi wa lakchixkuin lanikmakgolh cho masipanikgolh chatum puskat wantinta kgalhkgalhima skgata cho xla namakgatsankgay , ampalpi nitu palh tuntlat nat tuku lanpa puskat, chuna cho wa chixku tiku chuna tlawalh namaxokgoken, chuna nantla nawan xchixku puskat, cho wa xla naxokgoy nantla nawankgoy xlakaxtlawana talakgapatsit. \v 23 ampalpi wintunta lanpa , chuna cho wix milimastat akgtum latamat xpalkata akgtum latamat, \v 24 akgtum lakgastapu xpalakata akgtum lakgastapu, kgantum tatsan xpalakata akgantum tatsan, kgatum makan xpalakata akgantum makan, kgantum tuwan xpalakata akgantum tuwan, \v 25 akgtum tachichin xpalakata akgtum tachichin, akgtum tatasipanin xpalakata akgtum tatasipanin, akgtum takgaxin xpalakata akgtum takgaxin. \ No newline at end of file diff --git a/21/26.txt b/21/26.txt new file mode 100644 index 00000000..64537361 --- /dev/null +++ b/21/26.txt @@ -0,0 +1 @@ +\v 26 palpi chatum chixku nakgaxiy xlakgastapu kskujni chixku o kskujni puskat cho palpi lagpipintagxli, wancho xla nalkaskin ampi wa skujni nalagtaxtuy xpalakata nalilagxokgonkan xlakastapu. \v 27 palpi nakilhmaktiy xtatsan kskujni chixku o kskujni puskat, wa xla namastay talkaskin ampi wa skujni nalagtaxtuy xpalakata nalilagxokgo xtasan. \ No newline at end of file diff --git a/21/28.txt b/21/28.txt new file mode 100644 index 00000000..c96dadef --- /dev/null +++ b/21/28.txt @@ -0,0 +1 @@ +\v 28 palpi tantum wakax malilhtukuy xakgalkgot chatum chixku o chatum puskat cho awyu namagniy, wa wakax xlita aktalat, cho wa xliway ni xla taway xliwnat; ampi wancho tiku xla wakax ni lay naliwlikan. \v 29 ampi palpi wa wakax luka chuna klhtukunan la makgasa, cho wa xmalana tiwanika ampi wancho xla natilakgachinulh cho wa wakax magnilha chatum chixku o puskat, wa xla tiyma wakax xlita aktalat, cho nachuna xmalana xlitamagnit. \v 30 palpi nalkaskinkan akgtum taxokgon xpalakata xlatamat, wa xla naxokgoy nantla naskinkan naxokgoy. \ No newline at end of file diff --git a/21/31.txt b/21/31.txt new file mode 100644 index 00000000..8d0262dc --- /dev/null +++ b/21/31.txt @@ -0,0 +1 @@ +\v 31 palpi wa wakax lilhtukulh xakgalkgot xkgawsa o xtsumat chatum chixku, wa xmalana wakax natlaway tunta xwan limapagsin. \v 32 palpi wa wakax nalilhtukuy xakgalkgot chatum skujni chixku o skujni puskat, wa xmalana wakax naxokgoy puxamakaw siclos xla plata, cho wa wakax na aktalakan \ No newline at end of file diff --git a/21/33.txt b/21/33.txt new file mode 100644 index 00000000..437f6ac2 --- /dev/null +++ b/21/33.txt @@ -0,0 +1 @@ +\v 33 palpi chatum chixku tlaway akgtum tapuwaxni, o palpi chatum chixku napuwaxa akgtum tapuwaxni cho nina magchuway, cho tantum wakax o axnu anta natamokgosa, \v 34 wa xmalana tapuwaxni xlixokgot xpalakata tamkgasankgan. Wa xla xlimaxkit tumin xmalana takgalhin xanin, cho wa xa nin takgalhin xla nawan. \ No newline at end of file diff --git a/21/35.txt b/21/35.txt new file mode 100644 index 00000000..533faa2b --- /dev/null +++ b/21/35.txt @@ -0,0 +1 @@ +\v 35 palpi wa xwakax chatum chixku namasipaniy xwakax achatum chixku cho naniy, wancho xlakan nastakgoy xastakna wakax cho namapapitsiy xtapalh, cho xlakan nanamapapitsikgoy wakax xanin. \v 36 ampi palpi wancho wakax xlitalakgapasa am luka chuna xlilhtukun xakgalkgot la xa makgasa,cho wa xmalana nix tamkanuy , wa xla xlilixokgot wakax xpalakata wakax, cho wa takgalhin xanin xla natlaway \ No newline at end of file diff --git a/21/title.txt b/21/title.txt index c7270d7c..40b22e18 100644 --- a/21/title.txt +++ b/21/title.txt @@ -1 +1,5 @@ -Capítulo 21 \ No newline at end of file +<<<<<<< HEAD +Capítulo 21 +======= +Capitulo 21 +>>>>>>> 165acd6083aa6502f991998c9a83bf07be60d639 diff --git a/LICENSE.md b/LICENSE.md index ac132aa4..f39ded91 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,38 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +# 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/. + +### You are free to: + + * **Share** — copy and redistribute the material in any medium or format + * **Adapt** — remix, transform, and build upon the material + +for any purpose, even commercially. + +The licensor cannot revoke these freedoms as long as you follow the license terms. + +### Under the following conditions: + + * **Attribution** — You must attribute the work as follows: "Original work available at https://door43.org/." Attribution statements in derivative works should not in any way suggest that we endorse you or your use of this work. + * **ShareAlike** — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original. + +**No additional restrictions** — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. + +### Notices: + +You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation. + +No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material. + +This PDF was generated using Prince (https://www.princexml.com/). +======= +>>>>>>> 165acd6083aa6502f991998c9a83bf07be60d639 ## Creative Commons Attribution-ShareAlike 4.0 International ### Human-Readable Summary @@ -39,6 +71,7 @@ http://creativecommons.org/licenses/by-sa/4.0/. This PDF was generated using Prince (https://www.princexml.com/). +<<<<<<< HEAD ======= # License ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) @@ -78,3 +111,6 @@ No warranties are given. The license may not give you all of the permissions nec This PDF was generated using Prince (https://www.princexml.com/). >>>>>>> ee7d6f18f80f95eb18b39271a9d5f113c62419b1 +======= +>>>>>>> f24247f4b114eeb0a115f7d6c92c64356caafab4 +>>>>>>> 165acd6083aa6502f991998c9a83bf07be60d639 diff --git a/manifest.json b/manifest.json index ebb59571..6f06d034 100644 --- a/manifest.json +++ b/manifest.json @@ -47,7 +47,8 @@ "Lucero Edith Santes Luna", "MASTACER03", "MASTACER04", - "Juan Gaona Lobato " + "Juan Gaona Lobato ", + "paco" ], "finished_chunks": [ "front-title", @@ -109,10 +110,8 @@ "06-08", "06-10", "06-14", - "06-16", "06-20", "06-23", - "06-26", "06-28", "07-title", "07-01", @@ -208,7 +207,6 @@ "18-title", "19-title", "20-title", - "21-title", "22-title", "22-01", "22-05", @@ -235,6 +233,27 @@ "32-title", "33-title", "34-title", - "18-01" + "18-01", + "21-01", + "21-02", + "21-05", + "21-07", + "21-09", + "21-12", + "21-15", + "21-18", + "21-20", + "21-22", + "21-26", + "21-28", + "21-31", + "21-33", + "21-35", + "17-title", + "17-01", + "17-04", + "17-08", + "17-11", + "17-14" ] } \ No newline at end of file