diff --git a/01/01.txt b/01/01.txt index a2c1df06..57723963 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1,5 @@ -\c 1 \v 1 Moises meetar khurr mʉgtà ajim, chi ihog Ēwandanden, Ēwandamau iekhajim Josueeg Nun iewa, Moises dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jēb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jēb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai. \ No newline at end of file +<<<<<<< HEAD +\c 1 \v 1 Moises meetar khurr mʉgtà ajim, chi ihog Ēwandanden, Ēwandamau iekhajim Josueeg Nun iewa, Moises dʉi nʉrraa jeemau, Mug jim: \v 2 "Moises, mʉ chog mee jim mag sim aawei phiidiba, durbaba mug Jordan gaar, pʉ mai mua chi phoboor khʉʉn ar mua jēb deetarr gar Israel pienaag. \v 3 Paanau dʉnʉi bam jēb paan den ajú Pʉrug mʉruu deejim, Moises dee taorjo awai. +======= +\c 1 \v 1 Yefrid \v 2 David \v 3 Escobar ÄäÃãẼẽĨĩÕõŨũɄʉɄ̃ʉ̃ +>>>>>>> 7b1f0467ba93f362b95e7a21d4e24aa25bff0a20 diff --git a/01/title.txt b/01/title.txt index 807cb702..bf1c72e4 100644 --- a/01/title.txt +++ b/01/title.txt @@ -1 +1,5 @@ -Kapítulo 1 \ No newline at end of file +<<<<<<< HEAD +Kapítulo 1 +======= +Capitulo 1 +>>>>>>> 7b1f0467ba93f362b95e7a21d4e24aa25bff0a20 diff --git a/05/01.txt b/05/01.txt new file mode 100644 index 00000000..c325e8fe --- /dev/null +++ b/05/01.txt @@ -0,0 +1 @@ +\c 5 \v 1 Jaig mua thumwe chi reynaan amorreon aigim khʉʉn majirram doochaar, Jordanag maig mʉa chi reynaan kananeo pieen joobaanar ai phuas mediterraneog, amau unjierram Ẽwandamau jʉʉphuithar Jordan eem do, magta Israel pien thumwe dichjierram ag khinphe. Am thãr japhierthunajierram maimugua khukhamapha najierram phobor Israel preen gaai mua. \ No newline at end of file diff --git a/05/02.txt b/05/02.txt new file mode 100644 index 00000000..5dbc3088 --- /dev/null +++ b/05/02.txt @@ -0,0 +1 @@ +\v 2 Mag wai Ẽwandamau jaujim Josueg: Wauathaajim thuthui mokden, magua sirkunsidan khĩĩr (me eu phʉrbichag) enkhor thumwe. \v 3 Magta Josueg thuthi mokden waujim, maata enkhor thumwe Israel pien, me eu phʉrbicchim dursi aralot ai. \ No newline at end of file diff --git a/05/04.txt b/05/04.txt new file mode 100644 index 00000000..d55af15c --- /dev/null +++ b/05/04.txt @@ -0,0 +1 @@ +\v 4 Magta Josue me eu thʉʉjim: thum chi enkhon Egipto mua obertharkhʉʉnta, desierto ar meekhajierram, obertharkhʉʉr Egipto mua. \v 5 Enkhon obertharkhʉʉr Egipto mua, makhʉʉnaan me eu phʉrbiich sii deejim, mamʉ mʉ khʉʉn chaan thabʉʉthar khʉʉn desierto ar, me eu thʉʉbasiideejim. \ No newline at end of file diff --git a/05/06.txt b/05/06.txt index 23178cf9..6d529aac 100644 --- a/05/06.txt +++ b/05/06.txt @@ -1 +1,5 @@ -\v 6 \v 7 Makhʉʉn meethar khʉʉn chaanta, ma Aayau ich jeb deeju atharr ar, magartha ausujim, mʉkhʉʉnta Josue me eu phʉrbichthar khʉʉnau, makhʉʉntha khʉd ee wetbamua me eu pod thʉbaatharkhʉʉn ajim. \ No newline at end of file +<<<<<<< HEAD +\v 6 \v 7 Makhʉʉn meethar khʉʉn chaanta, ma Aayau ich jeb deeju atharr ar, magartha ausujim, mʉkhʉʉnta Josue me eu phʉrbichthar khʉʉnau, makhʉʉntha khʉd ee wetbamua me eu pod thʉbaatharkhʉʉn ajim. +======= +\v 6 Magta chi phobor Israel pien wenʉrrajierram desierto ee kuarentena ayos, magta thumwe chi khukhajem khʉʉn meekhajierram maach Ẽwandam iek ʉrhabathargaimua. Magta maach Ẽwandamua jaujim irua bʉrja chi jeb oopibam ajim anʉm, jooinag jeb deeju athar, mag jeb gai thʉnʉm leche miel, nempom khĩrphierragam deesim. \v 7 +>>>>>>> 7b1f0467ba93f362b95e7a21d4e24aa25bff0a20 diff --git a/08/01.txt b/08/01.txt new file mode 100644 index 00000000..0b976d23 --- /dev/null +++ b/08/01.txt @@ -0,0 +1 @@ +\c 8 \v 1 Ẽwandamua Josueg magjim : oob japhierram. Pʉich ithe õor werbʉajem khʉʉn thumwe atha. Haig majim. ooba mua pʉ jua ee chi rey hai den deegpam chi phobor, maigmua pʉ jẽb. \p \v 2 Mua haiig ich rey dʉi deeju, jerikoog chi rey dʉi deetarrojo awia. mamʉ wainaajú neminaam wajapham, maigmua phakja pãar thumaam khʉʉn ithee. phobor durrag thãrap ogkha siubat. \ No newline at end of file diff --git a/08/03.txt b/08/03.txt new file mode 100644 index 00000000..27d58b25 --- /dev/null +++ b/08/03.txt @@ -0,0 +1 @@ +\v 3 Magta Josue phiidʉwia ich õor werbʉajem khʉʉn haig warrjim. Magwieta Josue ich õor werbʉajem khʉʉn 30.000 mil jʉrawia, maig daau jʉrkhʉʉi pʉijim. \v 4 Ich deu jaaujim: oobat, phobor eeugar tãrap ogkha subathʉ. Chi phobor aigmua warp wetmiethu, pari pãar thumwe khĩir khaubat. \ No newline at end of file diff --git a/08/05.txt b/08/05.txt new file mode 100644 index 00000000..dee16a3c --- /dev/null +++ b/08/05.txt @@ -0,0 +1 @@ +\v 5 Mʉ, maigmua õor thumwe mʉ aig nʉm khʉʉn, phobor dakha wettarrau. Maach dʉi werbʉag pabaadeewai maach khaphidjuarrau nacha atarrjo awia. \v 6 Am maach ẽ udee khaphidjuarrau, mamʉ amkhayãu maach phobor warp naaju. Maigta maigta magjuarrau: amach maach ugkhau ereujierram bieg ãp wautarrjo awia. magan nacharamjo awia deeu khaphierram. \v 7 Magbaadeewai pãar dʉrnarr khʉʉn oberdʉgkhabat, maig chi phobor phʉʉrthuur aujierram. Maach aai Ẽwandamau mʉg phobor am jua ee deeju. \ No newline at end of file diff --git a/manifest.json b/manifest.json index a9a9bae9..0f8d4713 100644 --- a/manifest.json +++ b/manifest.json @@ -42,12 +42,11 @@ "Michael A. Rodriguez", "jhonny conquista", "Gabriela", - "Sara Escobar Navarro" + "Sara Escobar Navarro", + "Yefrid David" ], "finished_chunks": [ "front-title", - "01-title", - "01-01", "01-04", "01-06", "01-08", @@ -135,6 +134,12 @@ "21-title", "22-title", "23-title", - "24-title" + "24-title", + "05-01", + "05-02", + "05-04", + "08-01", + "08-03", + "08-05" ] } \ No newline at end of file