diff --git a/06/15.txt b/06/15.txt index 4d4d9281..fd710eee 100644 --- a/06/15.txt +++ b/06/15.txt @@ -1,6 +1 @@ -<<<<<<< HEAD -\v 15 Xli aktujun kilhtamaku takikgol lakatzisa latá taxtuy chichiní, makgstilitlawakgol kachikin lantlá tlawakgol pulana, chu umá tlawakgol makgtujun. Wa uma kilhtamaku makgstilitlawakgol kachikín makgtujun. \v 16 Xli akgtujun kilhtamaku, axni curaní matasikgol xliskgolkan, tu Josué limapakgsilh kachikin cawanil: !ka ákgtazatit! Xpalcata Puchiná kamakamaxkinitan una kachikin. -======= -\v 15 Xli aktujun kilhtamaku takikgol lakatzisa latá taxtuy chichiní, makgstilitlawakgol kachikin lantlá tlawakgol pulana, chu umá tlawakgol makgtujun. Wa uma kilhtamaku makgstilitlawakgol kachikín makgtujun. \v 16 Xli akgtujun kilhtamaku, axni curaní matasikgol xliskgolkan, tu Josué limapakgsilh kachikin cawanil: !ka ákgtazatit! -Xpalcata Puchiná kamakamaxkinitan una kachikin. ->>>>>>> df326f886ff93d9a3e9e3d95e8fa52bb7fe2cb42 +\v 15 Xli aktujun kilhtamaku takikgol lakatzisa latá taxtuy chichiní, makgstilitlawakgol kachikin lantlá tlawakgol pulana, chu umá tlawakgol makgtujun. Wa uma kilhtamaku makgstilitlawakgol kachikín makgtujun. \v 16 Xli akgtujun kilhtamaku, axni curaní matasikgol xliskgolkan, tu Josué limapakgsilh kachikin cawanil: !ka ákgtazatit! Xpalcata Puchiná kamakamaxkinitan una kachikin. \ No newline at end of file diff --git a/06/17.txt b/06/17.txt index 35ed4b0d..38b6bfd4 100644 --- a/06/17.txt +++ b/06/17.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 17 wa Puchiná limapaksinal, piwa putum kachikin chu putum tu anan antá, na laksputkgoy. man wa Rahab xa aktzan puskan na latamay xlá chú putum ti tawailakgol chik xpalakata xlá kamatzelí lakgchixkuwin tiku kimalakachakgohu. \v 18 Chu wixin, lu naukxatit, wan tu ni na xamayatit, wantu litapulhkanit pi nalakgtzankgay, ni tú katiyatit. Pala na tlawayatit, na litanatit talakgaputzit ni ku maxtum wilatit wixin Israel chuna chu xlitalakgtlawat na wan. \v 19 Putum plata, chu oro chu putum tu litatlawanit bronce chu hierro tanú na wiliyatit xla Puchiná na wan. Uma xlí anat xpumakin Puchiná. -======= -\v 17 17 wa Puchiná limapaksinal, piwa putum kachikin chu putum tu anan antá, na laksputkgoy. man wa Rahab xa aktzan puskan na latamay xlá chú putum ti tawailakgol chik xpalakata xlá kamatzelí lakgchixkuwin tiku kimalakachakgohu. \v 18 Chu wixin, lu naukxatit, wan tu ni na xamayatit, wantu litapulhkanit pi nalakgtzankgay, ni tú katiyatit. Pala na tlawayatit, na litanatit talakgaputzit ni ku maxtum wilatit wixin Israel chuna chu xlitalakgtlawat na wan. \v 19 Putum plata, chu oro chu putum tu litatlawanit bronce chu hierro tanú na wiliyatit xla Puchiná na wan. Uma xlí anat xpumakin Puchiná. ->>>>>>> df326f886ff93d9a3e9e3d95e8fa52bb7fe2cb42 +\v 17 wa Puchiná limapaksinal, piwa putum kachikin chu putum tu anan antá, na laksputkgoy. man wa Rahab xa aktzan puskan na latamay xlá chú putum ti tawailakgol chik xpalakata xlá kamatzelí lakgchixkuwin tiku kimalakachakgohu. \v 18 Chu wixin, lu naukxatit, wan tu ni na xamayatit, wantu litapulhkanit pi nalakgtzankgay, ni tú katiyatit. Pala na tlawayatit, na litanatit talakgaputzit ni ku maxtum wilatit wixin Israel chuna chu xlitalakgtlawat na wan. \v 19 Putum plata, chu oro chu putum tu litatlawanit bronce chu hierro tanú na wiliyatit xla Puchiná na wan. Uma xlí anat xpumakin Puchiná. \ No newline at end of file diff --git a/06/23.txt b/06/23.txt index 38a31f4b..57a802ff 100644 --- a/06/23.txt +++ b/06/23.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 23 Chunanchú amá lak`kgausan wanty xankgonil uxkgol tiyat tanukgocha chu tamaxtokgol Rahab. Xlakan tamakgxtokgol wa xtlab, stzé, xnatalan chu putum xtalilakgapasní wantí xtawilakgol xla. Kalínka aktum pulataman xkiltín nikú maxtum xwilakgon Israel. \v 24 Chú lhkuyokgol wa kachikín chuputúm wan tu xwi antá. Xman wa plata, oro chu limakaskuní xlhá bronce chu xlha hierro tamakikgol xpumakín anta chik Puchiná. -======= -\v 23 Chunanchú amá lak`kgausan wanty xankgonil uxkgol tiyat tanukgocha chu tamaxtokgol Rahab. Xlakan tamakgxtokgol wa xtlab, stzé, xnatalan chu putum xtalilakgapasní wantí xtawilakgol xla. Kalínka aktum pulataman xkiltín nikú maxtum xwilakgon Israel. 24 \v 24 Chú lhkuyokgol wa kachikín chuputúm wan tu xwi antá. Xman wa plata, oro chu limakaskuní xlhá bronce chu xlha hierro tamakikgol xpumakín anta chik Puchiná. ->>>>>>> df326f886ff93d9a3e9e3d95e8fa52bb7fe2cb42 +\v 23 Chunanchú amá lak`kgausan wanty xankgonil uxkgol tiyat tanukgocha chu tamaxtokgol Rahab. Xlakan tamakgxtokgol wa xtlab, stzé, xnatalan chu putum xtalilakgapasní wantí xtawilakgol xla. Kalínka aktum pulataman xkiltín nikú maxtum xwilakgon Israel. \v 24 Chú lhkuyokgol wa kachikín chuputúm wan tu xwi antá. Xman wa plata, oro chu limakaskuní xlhá bronce chu xlha hierro tamakikgol xpumakín anta chik Puchiná. \ No newline at end of file diff --git a/07/02.txt b/07/02.txt index 0f981ff2..e55dbe7f 100644 --- a/07/02.txt +++ b/07/02.txt @@ -1,2 +1 @@ -\v 2 \v 3 Josué kamalakgachalh tachixkuitat nima taxtukgolh nak Jericó chu chankgolh nak Hai, nima lakatsu xtawi Bet Avén xpakgs'takgat Betel. -Xla kawanilh: "kapitit chu ka'akxilhtit tiyat". Chunancho tachixkuitat ankgolh chu akxilhkgolh Hai. 3 Latá xlakan taspitparkgolh xlakatin Josué, wanikgolh: "Ni'paks ka'kamakapi tachixcuitat nak Hai. Watiya kamakapi akgtiy'mil o akgtutu'mil tachixkuitat xpalakata ka'ankgolh chu katalachapakgolh Hai. Ni'putum kakamaskuju nak uma litalachapat, xpalakata xalakán nix'khalhuwakan. \ No newline at end of file +\v 2 Josué kamalakgachalh tachixkuitat nima taxtukgolh nak Jericó chu chankgolh nak Hai, nima lakatsu xtawi Bet Avén xpakgs'takgat Betel. Xla kawanilh: "kapitit chu ka'akxilhtit tiyat". Chunancho tachixkuitat ankgolh chu akxilhkgolh Hai. \v 3 Latá xlakan taspitparkgolh xlakatin Josué, wanikgolh: "Ni'paks ka'kamakapi tachixcuitat nak Hai. Watiya kamakapi akgtiy'mil o akgtutu'mil tachixkuitat xpalakata ka'ankgolh chu katalachapakgolh Hai. Ni'putum kakamaskuju nak uma litalachapat, xpalakata xalakán nix'khalhuwakan. \ No newline at end of file diff --git a/07/04.txt b/07/04.txt index db3e2fd9..e5cf4c78 100644 --- a/07/04.txt +++ b/07/04.txt @@ -1 +1 @@ -\v 4 \v 5 Chunancho ka la'akgtutumilh tachixkuitat ankgolh, xlakán tzalanikgolh tachixkuitat xlak Hai. 5 Xpalakata tachixkuitat xalak Hai makgnikgolh la'puxamakuchaxan tachixkuitat nima takatsi lachapay latá xkakstalamakgolh lakatsu nak xmálakcha kachikin, lu'makgat la'niku tamaxtukan chiwix, chu kamakgnika latá xtaktamakgocha nak'jkasipijní. Chu kachikin lu'pekuankgolh nak'xnakukan chu tamakpua. \ No newline at end of file +\v 4 Chunancho ka la'akgtutumilh tachixkuitat ankgolh, xlakán tzalanikgolh tachixkuitat xlak Hai. \v 5 Xpalakata tachixkuitat xalak Hai makgnikgolh la'puxamakuchaxan tachixkuitat nima takatsi lachapay latá xkakstalamakgolh lakatsu nak xmálakcha kachikin, lu'makgat la'niku tamaxtukan chiwix, chu kamakgnika latá xtaktamakgocha nak'jkasipijní. Chu kachikin lu'pekuankgolh nak'xnakukan chu tamakpua. \ No newline at end of file diff --git a/07/06.txt b/07/06.txt index 9a61df01..42fb0e0e 100644 --- a/07/06.txt +++ b/07/06.txt @@ -1,2 +1,2 @@ -\v 6 \v 7 Alistalh Josué lakxtitlhi xlhakgat. Xla chu lajkgolón xlak Israel walikgolh pokgxne nak xakgxekgakan, takilhputakgolh xlakatin xpumakim Puchina, anta tamakgxtajkgolh latá chalh kgakgotanut. +\v 6 \v 7 Alistalh Josué lakxtitlhi xlhakgat. Xla chu lajkgolón xlak Israel walikgolh pokgxne nak xakgxekgakan, takilhputakgolh xlakatin xpumakim Puchina, anta tamakgxtajkgolh latá chalh kgakgotanut. 7 Alistalh Josué wa: "¡Puchina Dios! ¿Wan chu masta talakaskin xpalakata uma latamanin xtitaxtukgolh nak Jordán? ¿Xpalakata nakin'kamakamastaya nak xmakankan Amorreos xpalakata na'kinkamalaksputokgoyan? ¡lhakg lhan xaktatimakgxtakgwi xa'kilhtutu Jordán \ No newline at end of file diff --git a/manifest.json b/manifest.json index cd3592bd..6f4d28ab 100644 --- a/manifest.json +++ b/manifest.json @@ -116,15 +116,17 @@ "06-08", "06-10", "06-12", + "06-15", + "06-17", "06-20", "06-22", + "06-23", "06-25", "06-26", "07-title", "07-01", "07-02", "07-04", - "07-06", "07-08", "07-10", "07-13", @@ -142,6 +144,10 @@ "08-10", "08-13", "08-15", + "08-18", + "08-20", + "08-22", + "08-24", "08-27", "08-29", "08-30", @@ -161,6 +167,30 @@ "09-24", "09-26", "10-title", + "10-01", + "10-03", + "10-05", + "10-06", + "10-08", + "10-09", + "10-11", + "10-12", + "10-13", + "10-15", + "10-18", + "10-20", + "10-22", + "10-24", + "10-26", + "10-28", + "10-29", + "10-31", + "10-33", + "10-34", + "10-36", + "10-38", + "10-40", + "10-42", "11-title", "11-01", "11-04", @@ -291,6 +321,11 @@ "21-13", "21-17", "21-20", + "21-34", + "21-36", + "21-39", + "21-41", + "21-43", "22-title", "22-01", "22-04", @@ -329,39 +364,6 @@ "24-13", "24-14", "24-16", - "10-22", - "10-24", - "10-26", - "10-28", - "10-29", - "10-31", - "10-33", - "10-34", - "10-36", - "10-38", - "10-40", - "10-42", - "21-34", - "21-36", - "21-39", - "21-41", - "21-43", - "08-18", - "08-20", - "08-22", - "08-24", - "10-01", - "10-03", - "10-05", - "10-06", - "10-08", - "10-09", - "10-11", - "10-12", - "10-13", - "10-15", - "10-18", - "10-20", "24-19", "24-21", "24-31",