diff --git a/11/01.txt b/11/01.txt index c4e28ea3..ff583d9b 100644 --- a/11/01.txt +++ b/11/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 11 \v 1 .PUCHINA wanil Moisés:"Ti wi ha yakgtum masputuna tw nakyakgstipulimin Faraón chu Egipto.Alistan la yuma, shla na masta talakaskin na pina,yakxni tanks namakgaxtakgan,na yakgstiliyanan kgepun. \v 2 Ka kamasini mi kachikin chi pokgtu lakgchixkuin chu pokgtu puskat na kaskinekgo xhtalatamtkan tu lilanit plata chu oro". \v 3 Tama yakxni wa PUCHINA xmalananit pi wa egipcios, xkamapaxuwiputonkgoy israelitas.Maskiwa chu, wa chixku, xmatlaninit pi wa xlakskujni Faraón chu xkachikin tlan na wakxekgo. -======= -\c 11 \v 1 \v 2 \v 3 1.PUCHINA wanil Moisés:"Ti wi ha yakgtum masputuna tw nakyakgstipulimin Faraón chu Egipto.Alistan la yuma, xla na masta talakaskin na pina,yakxni tanks namakgaxtakgan,na pul'linan kilhtin.2 Ka kamasini mi kachikin chi pokgtu lakgchixkuin chu pokgtu puskat na kaskinekgo xhtalatamtkan wantu tu lilanit plata chu oro".3 Tama yakxni wa PUCHINA xkawalininit nak xlistaknakan egipcios,xplakata xkamapaxuwiputonkgoy israelitas. Maskiwa chu, wa chixku, Moises xtlaganit talagkatsa nak xlakatinkan kgskujnanin Faraon cho nak xkacikin Egipto. ->>>>>>> c0259ce1b2367bac08be81e64b8a849db3aaedf4 +\c 11 \v 1 .PUCHINA wanil Moisés:"Ti wi ha yakgtum masputuna tw nakyakgstipulimin Faraón chu Egipto.Alistan la yuma, shla na masta talakaskin na pina,yakxni tanks namakgaxtakgan,na yakgstiliyanan kgepun. \v 2 Ka kamasini mi kachikin chi pokgtu lakgchixkuin chu pokgtu puskat na kaskinekgo xhtalatamtkan tu lilanit plata chu oro". \v 3 Tama yakxni wa PUCHINA xmalananit pi wa egipcios, xkamapaxuwiputonkgoy israelitas.Maskiwa chu, wa chixku, xmatlaninit pi wa xlakskujni Faraón chu xkachikin tlan na wakxekgo. \ No newline at end of file diff --git a/11/04.txt b/11/04.txt index f10029b7..4f107a67 100644 --- a/11/04.txt +++ b/11/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Moisés wa: "PUCHINA wan: xyatat tsisni naktitaxtu nak Egipto. \v 5 Pokgtu xapuxku kaman xla xtiyat Egipto na nekgo,la wi xapuxku xkgawasa Faraón, ti tawila nak xputawilh, na chuna xapuxku kgawasa puskat skitiwana ti tawila nak xken puswakgan chu wantu pulalakachilh xtakgalhin. -======= -\v 4 \v 5 4 Moisés wa: "PUCHINA wan: xyatat tsisni naktitaxtu nak Egipto.5 Pokgtu xapuxku kaman xla xtiyat Egipto na nekgo,la wi xapuxku xkgawasa Faraón, ti tawila nak xputawilh, na chuna xapuxku kgawasa puskat skitiwana ti tawila nak xken puswakgan chu wantu pulna alakachilh xtakgalhin. ->>>>>>> c0259ce1b2367bac08be81e64b8a849db3aaedf4 +\v 4 Moisés wa: "PUCHINA wan: xyatat tsisni naktitaxtu nak Egipto. \v 5 Pokgtu xapuxku kaman xla xtiyat Egipto na nekgo,la wi xapuxku xkgawasa Faraón, ti tawila nak xputawilh, na chuna xapuxku kgawasa puskat skitiwana ti tawila nak xken puswakgan chu wantu pulalakachilh xtakgalhin. \ No newline at end of file diff --git a/11/06.txt b/11/06.txt index d78293cd..e183ad1e 100644 --- a/11/06.txt +++ b/11/06.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 6 Chu na tawila tlanka tatasa lakgatum xtiyat Egipto, la niatu tawila chuna ya amagtum xtawilay chu yalh magtum katitawilapa. \v 7 Ni t palh wa tantum chichi katmawgaanilh wa xhka xkachikin Isarel,nipalh wa xixku ni pal wa takgalin.Na ma na kasekgo pi xla xla kalikasini egipcios la israelitas . \v 8 Pokgtw mi lakgskugni ,Faraón,na ki lakgmenkgo y nakitakilputanekgo.Shlakan na wankgo:!Ka pintit,wishinin y pokgtu mi kachikin wanti kastalanimakgon!.Alistan yikit naktaxtu".Alistan snun sizitawtulh la nak xlakatin Faraón. -======= -\v 6 \v 7 \v 8 6 Chu na tawila tlanka tatasa lakgatum xtiyat Egipto, la niatu tawila chuna ya amagtum xtawilay chu yalh magtum katitawilapa.7 Ni palh wa tantum chichi kat mawganilh wa xkachikin Israel,nipalh wa chixku ni pal wa takgalhin.Na ma na kasekgo pi xla kalikasini egipcios la israelitas .8 Pokgtw mi lakgskugni ,Faraón,na ki lakgmenkgo y nakitakilputanekgo.Shlakan na wankgo:!Ka pintit,wishinin y pokgtu mi kachikin wanti kastalanimakgon!.Alistan yikit naktaxtu".Alistan snun sizitawtulh la nak xlakatin Faraón. ->>>>>>> c0259ce1b2367bac08be81e64b8a849db3aaedf4 +\v 6 Chu na tawila tlanka tatasa lakgatum xtiyat Egipto, la niatu tawila chuna ya amagtum xtawilay chu yalh magtum katitawilapa. \v 7 Ni t palh wa tantum chichi katmawgaanilh wa xhka xkachikin Isarel,nipalh wa xixku ni pal wa takgalin.Na ma na kasekgo pi xla xla kalikasini egipcios la israelitas . \v 8 Pokgtw mi lakgskugni ,Faraón,na ki lakgmenkgo y nakitakilputanekgo.Shlakan na wankgo:!Ka pintit,wishinin y pokgtu mi kachikin wanti kastalanimakgon!.Alistan yikit naktaxtu".Alistan snun sizitawtulh la nak xlakatin Faraón. \ No newline at end of file diff --git a/11/09.txt b/11/09.txt index 5fe6f328..5ef17e8c 100644 --- a/11/09.txt +++ b/11/09.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 9 PUCHINA wanil Moisés:"Farón ni katikgasmatni yuma wa lila laktlankatamazit nak lawa nak xtiyat Egipto".1 \v 10 Moisés chu Arón tlawakgol lankatamzit nakxlakatin Faraón.Wa PUCHINA tlang tlawualh xyanima Faraón y wa Faraón ni mastal talakaskin pi xkachikin Israel xtashtwilh la wi xtiyat. -======= -\v 9 \v 10 9 PUCHINA wanil Moisés:"Faraón ni katikgaxmatni. yuma wa lila lak tlanka tamasiy nak tlawa nak xtiyat Egipto".10 Moisés chu Aarón tlawakgolh tlanka tamasiy nak xlakatin Faraón.Wa PUCHINA mapalhilh xyanima Faraón y wa Faraón ni mastalh talakaskin pi xkachikin Israel xtaxtulh la wi xtiyat. ->>>>>>> c0259ce1b2367bac08be81e64b8a849db3aaedf4 +\v 9 PUCHINA wanil Moisés:"Farón ni katikgasmatni yuma wa lila laktlankatamazit nak lawa nak xtiyat Egipto".1 \v 10 Moisés chu Arón tlawakgol lankatamzit nakxlakatin Faraón.Wa PUCHINA tlang tlawualh xyanima Faraón y wa Faraón ni mastal talakaskin pi xkachikin Israel xtashtwilh la wi xtiyat. \ No newline at end of file diff --git a/12/01.txt b/12/01.txt index aa1fe52a..6d8d1e88 100644 --- a/12/01.txt +++ b/12/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 12 \v 1 . Wa Puchina kaxakgatlil Moisés chu Aaron nak´x tiyat Egipto. Xla kawanilh . \v 2 Wa wixinin yuma papa nalimapiliyatit makgapitsisn papa, wa yuma papa nakalipulaniyan wishinin tu yakgtum kata -======= -\c 12 \v 1 \v 2 1. Wa Puchina kaxakgatlil Moisés chu Aaron nak´x tiyat Egipto. Xla kawanilh 2. Wa wixinin yuma papa nalimapuliyatit makgapitsisn papa, wa yuma papa nakalipulaniyan wishinin tu yakgtum kata ->>>>>>> ab34ab22645fcf83fba1c7d431dbbd61be758493 +\c 12 \v 1 . Wa Puchina kaxakgatlil Moisés chu Aaron nak´x tiyat Egipto. Xla kawanilh . \v 2 Wa wixinin yuma papa nalimapiliyatit makgapitsisn papa, wa yuma papa nakalipulaniyan wishinin tu yakgtum kata \ No newline at end of file diff --git a/12/15.txt b/12/15.txt index bcfc2f76..a26ccbfb 100644 --- a/12/15.txt +++ b/12/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Akgtujún kiltamuku na´wayatin kaxlanchu tu ni kgalhi limaxkutin. Xli akgtum kiltamuku na´ mapanuyatin limaxkutin nak mi chikikan. Wa ti pal wal kawua kaxlanchu tu kgalhi limaxkutin la xli akgtum hasta xli akgtujun kiltamuku na tamakxtuya nak´ Israel. \v 16 .Xli akgtúm kiltamuku natamakxtupiyatit ki palakata na chuna na kitlawapalayatir xli akgtujún kiltamuku. Pakz yuma kiltamuku nitu katilizkuhtit, xmanwa na tlawayatit mi liwatkan, ni tu akgampatu. -======= -\v 15 \v 16 15 Akgtujún kiltamuku na´wayatin kaxlanchu tu ni kgalhi limaxkutin. Xli akgtum kiltamuku na´ mapanayatit limaxkutin nak mi chikikan. Wa ti pahl walh kawua kaxlanchu tu kgalhi limaxkutin la xli akgtum hasta xli akgtujun kilhtamuku na tamakaxtuya nak´ Israel. 16.Xli akgtúm kiltamuku natamakaxtupiyatit ki palakata na chuna na kitlawapalayatit xli akgtujún kiltamuku. Pakz yuma kiltamuku nitu katilizkuhtit, xmanwa na tlawayatit mi liwatkan, ni tu akgampatu. ->>>>>>> ab34ab22645fcf83fba1c7d431dbbd61be758493 +\v 15 Akgtujún kiltamuku na´wayatin kaxlanchu tu ni kgalhi limaxkutin. Xli akgtum kiltamuku na´ mapanuyatin limaxkutin nak mi chikikan. Wa ti pal wal kawua kaxlanchu tu kgalhi limaxkutin la xli akgtum hasta xli akgtujun kiltamuku na tamakxtuya nak´ Israel. \v 16 .Xli akgtúm kiltamuku natamakxtupiyatit ki palakata na chuna na kitlawapalayatir xli akgtujún kiltamuku. Pakz yuma kiltamuku nitu katilizkuhtit, xmanwa na tlawayatit mi liwatkan, ni tu akgampatu. \ No newline at end of file