dan
/
en_ult
1
0
Fork 0
Files Issues Pull Requests Packages Projects Releases Wiki Activity See in Reader

Merge pull request 'Checked footnote text in James, 1,2 Peter, 1,2,3 John, Jude' (#3021) from nt_footnotes into master 

Reviewed-on: https://git.door43.org/unfoldingWord/en_ult/pulls/3021
This commit is contained in:
Larry Sallee 2022-08-22 14:42:28 +00:00
parent c3d2a0b609 4731780b9d
commit 85bd5ab68e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
61-1PE.usfm
View File

@ -495,7 +495,7 @@
\zaln-s |x-strong="G15370" x-lemma="ἐκ" x-morph="Gr,P,,,,,G,,," x-occurrence="1" x-occurrences="1" x-content="ἐκ"\*\w from|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G25130" x-lemma="καθαρός" x-morph="Gr,AA,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="καθαρᾶς"\*\w a|x-occurrence="1" x-occurrences="1"\w*
\w pure|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G25880" x-lemma="καρδία" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="καρδίας"\*\w heart|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*,\f + \ft Some older versions have \fqa You made your souls pure by the obedience to the truth through the Spirit.\fqa*\f*
\zaln-s |x-strong="G25880" x-lemma="καρδία" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="καρδίας"\*\w heart|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*,\f + \ft Some older versions have \fqa Having purified your souls by the obedience to the truth through the Spirit.\fqa*\f*
\v 23 \zaln-s |x-strong="G03130" x-lemma="ἀναγεννάω" x-morph="Gr,V,PEP,NMP," x-occurrence="1" x-occurrences="1" x-content="ἀναγεγεννημένοι"\*\w having|x-occurrence="1" x-occurrences="1"\w*
\w been|x-occurrence="1" x-occurrences="1"\w*
\w born|x-occurrence="1" x-occurrences="1"\w*

2
62-2PE.usfm
View File

@ -810,7 +810,7 @@
\w feasting|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2D,P," x-occurrence="1" x-occurrences="1" x-content="ὑμῖν"\*\w with|x-occurrence="1" x-occurrences="1"\w*
\w you|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*;
\f + \ft Other versions read, \fqa They enjoy their actions while they are feasting with you in love feasts.\fqa*\f*
\f + \ft Other versions read, \fqa enjoying their actions while they are feasting with you in love feasts.\fqa*\f*
\v 14 \zaln-s |x-strong="G21920" x-lemma="ἔχω" x-morph="Gr,V,PPA,NMP," x-occurrence="1" x-occurrences="2" x-content="ἔχοντες"\*\w having|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
\zaln-s |x-strong="G37880" x-lemma="ὀφθαλμός" x-morph="Gr,N,,,,,AMP," x-occurrence="1" x-occurrences="1" x-content="ὀφθαλμοὺς"\*\w eyes|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G33240" x-lemma="μεστός" x-morph="Gr,NS,,,,AMP," x-occurrence="1" x-occurrences="1" x-content="μεστοὺς"\*\w full|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*

8
63-1JN.usfm
View File

@ -1025,7 +1025,7 @@
\w God|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*,
\zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="καὶ"\*\w and|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA1,,P," x-occurrence="1" x-occurrences="1" x-content="ἐσμέν"\*\w we|x-occurrence="2" x-occurrences="2"\w*
\w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.
\w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft Some older versions leave out, \fq and we are.\fq*\f*
\zaln-s |x-strong="G12230" x-lemma="διά" x-morph="Gr,P,,,,,A,,," x-occurrence="1" x-occurrences="1" x-content="διὰ"\*\zaln-s |x-strong="G37780" x-lemma="οὗτος" x-morph="Gr,RD,,,,ANS," x-occurrence="1" x-occurrences="1" x-content="τοῦτο"\*\w For|x-occurrence="1" x-occurrences="1"\w*
\w this|x-occurrence="1" x-occurrences="1"\w*
\w reason|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*
@ -1040,7 +1040,7 @@
\w did|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G37560" x-lemma="οὐ" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="οὐκ"\*\w not|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
\zaln-s |x-strong="G10970" x-lemma="γινώσκω" x-morph="Gr,V,IAA3,,S," x-occurrence="1" x-occurrences="1" x-content="ἔγνω"\*\w know|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
\zaln-s |x-strong="G08460" x-lemma="αὐτός" x-morph="Gr,RP,,,3AMS," x-occurrence="1" x-occurrences="1" x-content="αὐτόν"\*\w him|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft Some older versions leave out, \fq and we are\fq*.\f*
\zaln-s |x-strong="G08460" x-lemma="αὐτός" x-morph="Gr,RP,,,3AMS," x-occurrence="1" x-occurrences="1" x-content="αὐτόν"\*\w him|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.
\v 2 \zaln-s |x-strong="G00270" x-lemma="ἀγαπητός" x-morph="Gr,NS,,,,VMP," x-occurrence="1" x-occurrences="1" x-content="ἀγαπητοί"\*\w Beloved|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*,
\zaln-s |x-strong="G35680" x-lemma="νῦν" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="νῦν"\*\w now|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA1,,P," x-occurrence="1" x-occurrences="1" x-content="ἐσμεν"\*\w we|x-occurrence="1" x-occurrences="4"\w*
@ -2184,7 +2184,7 @@
\zaln-s |x-strong="G51400" x-lemma="τρεῖς" x-morph="Gr,NP,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="τρεῖς"\*\w three|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,RD,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="οἱ"\*\zaln-s |x-strong="G31400" x-lemma="μαρτυρέω" x-morph="Gr,V,PPA,NMP," x-occurrence="1" x-occurrences="1" x-content="μαρτυροῦντες"\*\w who|x-occurrence="1" x-occurrences="1"\w*
\w are|x-occurrence="2" x-occurrences="2"\w*
\w testifying|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*:
\w testifying|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*:\f + \ft Some older versions read \fqa For there are three that bear witness in heaven:\fqa* However, the best copies do not have this reading.\f*
\v 8 \zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NNS," x-occurrence="1" x-occurrences="4" x-content="τὸ"\*\w the|x-occurrence="1" x-occurrences="5"\w*\zaln-e\*
\zaln-s |x-strong="G41510" x-lemma="πνεῦμα" x-morph="Gr,N,,,,,NNS," x-occurrence="1" x-occurrences="1" x-content="Πνεῦμα"\*\w Spirit|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="3" x-content="καὶ"\*\w and|x-occurrence="1" x-occurrences="3"\w*\zaln-e\*
@ -2199,7 +2199,7 @@
\zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA3,,P," x-occurrence="1" x-occurrences="1" x-content="εἰσιν"\*\w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G15190" x-lemma="εἰς" x-morph="Gr,P,,,,,A,,," x-occurrence="1" x-occurrences="1" x-content="εἰς"\*\w unto|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,ANS," x-occurrence="4" x-occurrences="4" x-content="τὸ"\*\w the|x-occurrence="5" x-occurrences="5"\w*\zaln-e\*
\zaln-s |x-strong="G15200" x-lemma="εἷς" x-morph="Gr,NS,,,,ANS," x-occurrence="1" x-occurrences="1" x-content="ἕν"\*\w one|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft Some older versions read \fqa For there are three that bear witness in heaven: the Father, the Word, and the Holy Spirit. These three are one; and there are three that bear witness on earth: the Spirit, the water, and the blood; and these three are as one.\fqa* However, the best copies do not have this reading.\f*
\zaln-s |x-strong="G15200" x-lemma="εἷς" x-morph="Gr,NS,,,,ANS," x-occurrence="1" x-occurrences="1" x-content="ἕν"\*\w one|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft Some older versions read \fqa the Father, the Word, and the Holy Spirit. These three are one; and there are three that bear witness on earth: the Spirit, the water, and the blood; and these three are as one.\fqa* However, the best copies do not have this reading.\f*
\v 9 \zaln-s |x-strong="G14870" x-lemma="εἰ" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="εἰ"\*\w If|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G29830" x-lemma="λαμβάνω" x-morph="Gr,V,IPA1,,P," x-occurrence="1" x-occurrences="1" x-content="λαμβάνομεν"\*\w we|x-occurrence="1" x-occurrences="1"\w*
\w receive|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*