Talo
/
bi_act_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Fri May 05 2023 12:29:02 GMT+1100 (Solomon Islands Time)

This commit is contained in:
Talo 2023-05-05 12:29:02 +11:00
parent 5304687efb
commit 2bf4dce576
12 changed files with 24 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
24/01.txt
View File

@ -1,6 +1 @@
<<<<<<< HEAD
\c 24 \v 1 \v 2 \v 3
=======
\v 1 Faef dei i pas,hae pris ya Ananaeas wetem sam elda blong laen blong Israel,mo wan loya we nem blong hem,Tetalas .oli go long caesarea blong putum sam poen i go agens long Pol long gavna.\v 2 Nao,oli singaotem Pol i kam insaed ,mo Tetalas i stat blong talem ol poin blong olgeta igo long gavna felix,i talem se ''yu we yu haeman,mo from we yu mekem ol man ,oli harem gud,mo plante samting we i nogud,yu bin mekem i kam gud bakegen long waes blong yu.\v 3
Nao from samtibng ya,mifala i wantem talem bigfala tankyu from evri samting we yu stap mekem .
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\c 24 \v 1 Faef dei i pas,hae pris ya Ananaeas wetem sam elda blong laen blong Israel,mo wan loya we nem blong hem,Tetalas .oli go long caesarea blong putum sam poen i go agens long Pol long gavna. \v 2 Nao,oli singaotem Pol i kam insaed ,mo Tetalas i stat blong talem ol poin blong olgeta igo long gavna felix,i talem se ''yu we yu haeman,mo from we yu mekem ol man ,oli harem gud,mo plante samting we i nogud,yu bin mekem i kam gud bakegen long waes blong yu. \v 3 Nao from samtibng ya,mifala i wantem talem bigfala tankyu from evri samting we yu stap mekem .

6
24/04.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 4 \v 5 \v 6
=======
\v 4 Be mifala i no wantem spolem taem blong yu mifala i wantem talem smol tok nomo,plis yu save lesin long mifala.\v 5 Man ya hemi wan rabis man hemi stap mekem trabol wetem ol jiu olbaot long wol. Hemi lida blong ol grup blong Nazaret.\v 6 Mo hemi traem blong mekem haos blong God i doti,nao mifala i holem hem.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 4 Be mifala i no wantem spolem taem blong yu mifala i wantem talem smol tok nomo,plis yu save lesin long mifala. \v 5 Man ya hemi wan rabis man hemi stap mekem trabol wetem ol jiu olbaot long wol. Hemi lida blong ol grup blong Nazaret. \v 6 Mo hemi traem blong mekem haos blong God i doti,nao mifala i holem hem.

6
24/07.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 7 \v 8 \v 9
=======
\v 7 Be chif capten Lysias,i kam long mifala mo i fes blong karemaot Pol long hand blong mifala i go.\v 8 Mo spos yu askem kwesten long hem,yu save harem ol point we mifala stap talem long yu,stret long maot blong hem.\v 9 Nao ol narafala Jiu,oli agri mo oli talem se'hemi tru ya."
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 7 Be chif capten Lysias,i kam long mifala mo i fes blong karemaot Pol long hand blong mifala i go. \v 8 Mo spos yu askem kwesten long hem,yu save harem ol point we mifala stap talem long yu,stret long maot blong hem. \v 9 Nao ol narafala Jiu,oli agri mo oli talem se'hemi tru ya."

9
24/10.txt
View File

@ -1,8 +1 @@
<<<<<<< HEAD
\v 10 \v 11 \v 12 \v 13
=======
\v 10 Nao hed gavna ya i mekem saen long Pol blong i save toktok.Nao Pol i talem se "mi save se long plante yia i pass,ol man ples ya,oli bin stap jajem mi mo from fasin ya mi glad tumas blong talemaot ol point blong mi long yu.\v 11
I gat twelef dei nomo i pass we mi bin go antap long Jerusalem blong mekem wosip.Nao yu save tingting long ol tok blong mi ya se i tru o nogat.\v 12
Taem ol Jiu,oli luk mi insaed long haos blong God ya mi no rao wetem ol man,mo mi no mekem ol man ,oli go agens long olgeta insaed long haos blong prea ,mo ol ples olbaot long taon ya.\v 13
Mo bae oli no save pruvum se,ol samting we oli talem agens long mi.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 10 Nao hed gavna ya i mekem saen long Pol blong i save toktok.Nao Pol i talem se "mi save se long plante yia i pass,ol man ples ya,oli bin stap jajem mi mo from fasin ya mi glad tumas blong talemaot ol point blong mi long yu. \v 11 I gat twelef dei nomo i pass we mi bin go antap long Jerusalem blong mekem wosip.Nao yu save tingting long ol tok blong mi ya se i tru o nogat. \v 12 Taem ol Jiu,oli luk mi insaed long haos blong God ya mi no rao wetem ol man,mo mi no mekem ol man ,oli go agens long olgeta insaed long haos blong prea ,mo ol ples olbaot long taon ya. \v 13 Mo bae oli no save pruvum se,ol samting we oli talem agens long mi.

7
24/14.txt
View File

@ -1,6 +1 @@
<<<<<<< HEAD
\v 14 \v 15 \v 16
=======
\v 14 Be mi save talem long yu se,mi stap mekem wosip long hae God ya we ol olfala blong yumi bifo,oli stap folem hem,we ol Jiu oli talem se hemi no wan gudfala rod ya.Mo mi bilivim evri samting we i stap insaed long ol Loa blong Moses,mo evri samting we oli raetem insaed long ol buk blong profet.\v 15
Mi gat sem hop long God olsem we ol Jiu oli gat ,we bambae hae God i mekem olgeta we oli ded bambae oli laef bakegen,olgeta we oli stret mo olgeta we oli no stret. \v 16 Hem ya nao,from wanem mi stap traem blong kasem se,wanem we mi stap mekem,i stret long foret blong God,mo long evri man o nogat.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 14 Be mi save talem long yu se,mi stap mekem wosip long hae God ya we ol olfala blong yumi bifo,oli stap folem hem,we ol Jiu oli talem se hemi no wan gudfala rod ya.Mo mi bilivim evri samting we i stap insaed long ol Loa blong Moses,mo evri samting we oli raetem insaed long ol buk blong profet. \v 15 Mi gat sem hop long God olsem we ol Jiu oli gat ,we bambae hae God i mekem olgeta we oli ded bambae oli laef bakegen,olgeta we oli stret mo olgeta we oli no stret. \v 16 Hem ya nao,from wanem mi stap traem blong kasem se,wanem we mi stap mekem,i stret long foret blong God,mo long evri man o nogat.

8
24/17.txt
View File

@ -1,7 +1 @@
<<<<<<< HEAD
\v 17 \v 18 \v 19
=======
\v 17 Mi bin aot long Jerusalem blong plante yia i pass finis,be mi kambak mi tekem mani blong helpem ol man ples blong mi. Mo mi gat sam presen tu blong givim i go long haos blong God.\v 18
Mo taem mi stap mekem ol samting ya, i gat sam Jiu blong ples ya Esia, we oli bin stap lukluk,we mi stap clinim fes blong mi i go long God,insaed long haos blong hem. Mo i nogat plante man,oli stap wetem mi, mo i nogat raorao tu.\v 19
Be spos ol Jiu long ples ua Esia, oli stap long ples ya nao ya,olgeta ya nao bae oli save talem se mi bin mekem sam nogud samting long taem ya, nogat mo olgeta nao oli sut kam putum sam nogud point agens long mi, from oli stap long taem ya.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 17 Mi bin aot long Jerusalem blong plante yia i pass finis,be mi kambak mi tekem mani blong helpem ol man ples blong mi. Mo mi gat sam presen tu blong givim i go long haos blong God. \v 18 Mo taem mi stap mekem ol samting ya, i gat sam Jiu blong ples ya Esia, we oli bin stap lukluk,we mi stap clinim fes blong mi i go long God,insaed long haos blong hem. Mo i nogat plante man,oli stap wetem mi, mo i nogat raorao tu. \v 19 Be spos ol Jiu long ples ua Esia, oli stap long ples ya nao ya,olgeta ya nao bae oli save talem se mi bin mekem sam nogud samting long taem ya, nogat mo olgeta nao oli sut kam putum sam nogud point agens long mi, from oli stap long taem ya.

6
24/20.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 20 \v 21
=======
\v 20 Spos olsem ya,yu askem long ol man ya,blong oli talemaot sam samting nogud we mi bin mekem ,taem mi stap stanap long fes blong kaonsel blong ol Jiu.\v 21Be mi save se mi bin talem wan samting, taem mi stanap long foret blong yufala, mosingaot bigwan se "yufala i stap jajem mi tedei, from mi biliv se ol ded man bae oli save laef bakegen."
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 20 Spos olsem ya,yu askem long ol man ya,blong oli talemaot sam samting nogud we mi bin mekem ,taem mi stap stanap long fes blong kaonsel blong ol Jiu. \v 21 Be mi save se mi bin talem wan samting, taem mi stanap long foret blong yufala, mosingaot bigwan se "yufala i stap jajem mi tedei, from mi biliv se ol ded man bae oli save laef bakegen."

6
24/22.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 22 \v 23
=======
\v 22 Gavna Felix, hemi wan man we i save gud ol nius blong ol rod blong Jisas, nao i girap i stopem kot blong bisnis ya,mo i talem se,"taem kamanda Lysias i kamtru long Jerusalem,bambae mi save givim ansa blong mi long binis ya."\v 23 Nao, Felix i talem long ol soldia we i stap gad long Pol, blong i mas gad gud long pol, be talem hemi gat smol fridom,blong ol fren blong hem,oli save kam givim sam samting long hem we hemi nidim.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 22 Gavna Felix, hemi wan man we i save gud ol nius blong ol rod blong Jisas, nao i girap i stopem kot blong bisnis ya,mo i talem se,"taem kamanda Lysias i kamtru long Jerusalem,bambae mi save givim ansa blong mi long binis ya." \v 23 Nao, Felix i talem long ol soldia we i stap gad long Pol, blong i mas gad gud long pol, be talem hemi gat smol fridom,blong ol fren blong hem,oli save kam givim sam samting long hem we hemi nidim.

7
24/24.txt
View File

@ -1,6 +1 @@
<<<<<<< HEAD
\v 24 \v 25
=======
\v 24 Nao sam dei i pas ,felix i tekem woman blong hem Drusilla i kam,we hem i wan Jiu.Nao i talem long hem olgeta blong oli tekem Pol i kam mo i stap lesin long Pol we i stap tokbat feth abaot Jisas Kraes.
\v 25 Be taem Pol i stap tokbaot ol gud gudfala fasin blong wan man ,man i mas controlem hem wan long ol wantem blong hem,mo jaj man we i stap kam yet,Felix i fraet mo i talem se"i naf,yu save go aot nao!be taem mi gat janis,bambae mi singaotem yu bakegen.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 24 Nao sam dei i pas ,felix i tekem woman blong hem Drusilla i kam,we hem i wan Jiu.Nao i talem long hem olgeta blong oli tekem Pol i kam mo i stap lesin long Pol we i stap tokbat feth abaot Jisas Kraes. \v 25 Be taem Pol i stap tokbaot ol gud gudfala fasin blong wan man ,man i mas controlem hem wan long ol wantem blong hem,mo jaj man we i stap kam yet,Felix i fraet mo i talem se"i naf,yu save go aot nao!be taem mi gat janis,bambae mi singaotem yu bakegen.

6
24/26.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 26 \v 27
=======
\v 26 NAo long sem taem ,Felix i wantem blong Pol i givim mani long hem ,nao i sendem olgeta blong oli tekem Pol i kam,mo i toktok wetem hem.\v 27 Be taem tu yia i pass,Posias Festas ,hemi kam gavna afta Felix.Be Felix i lego Pol i stap insaed long presinblong mekem ol Jiu,oli harem gud.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\v 26 NAo long sem taem ,Felix i wantem blong Pol i givim mani long hem ,nao i sendem olgeta blong oli tekem Pol i kam,mo i toktok wetem hem. \v 27 Be taem tu yia i pass,Posias Festas ,hemi kam gavna afta Felix.Be Felix i lego Pol i stap insaed long presinblong mekem ol Jiu,oli harem gud.

6
25/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\c 25 \v 1 \v 2 \v 3 Conflict Parsing Error
=======
\v 1Nao Festas i go tru long profins ya.Afta tri dei i pass hemi go long Sisaria mo hemi go antap long Jerusalem.\v 2 Nao long ples ya ,i gat ol jif pris mo ol lida blong ol laen blong Israel oli stap talemaot sam samting i go akensem Pol.\v 3 Nao oli talem long Festas se , plis yu harem mifala. Mifala wantem tumas blong yu tekem Pol i go long Jerusalem .From oli wantem kilim Pol , taem hemi stap go long Jerusalem.
>>>>>>> 216a61a0c172883d9fa299c1784887a3348618b5
\c 25 \v 1 Nao Festas i go tru long profins ya.Afta tri dei i pass hemi go long Sisaria mo hemi go antap long Jerusalem. \v 2 Nao long ples ya ,i gat ol jif pris mo ol lida blong ol laen blong Israel oli stap talemaot sam samting i go akensem Pol. \v 3 Nao oli talem long Festas se , plis yu harem mifala. Mifala wantem tumas blong yu tekem Pol i go long Jerusalem .From oli wantem kilim Pol , taem hemi stap go long Jerusalem.

15
manifest.json
View File

@ -387,7 +387,19 @@
"23-28",
"23-31",
"23-34",
"24-title",
"24-01",
"24-04",
"24-07",
"24-10",
"24-14",
"24-17",
"24-20",
"24-22",
"24-24",
"24-26",
"25-title",
"25-01",
"25-04",
"25-06",
"25-09",
@ -440,7 +452,6 @@
"28-25",
"28-27",
"28-28",
"28-30",
"24-title"
"28-30"
]
}