DCS-Mirror
/
unfoldingWord_en_ult
mirror of https://git.door43.org/unfoldingWord/en_ult
2
0
Fork 0
Files Issues Releases Wiki Activity See in Reader

Merge auto-pjoakes-1JN into master by pjoakes (#3573) 

Co-authored-by: pjoakes <pjoakes@noreply.door43.org>
Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
This commit is contained in:
pjoakes 2023-12-29 20:05:37 +00:00 committed by Perry J Oakes
parent 943eea345e
commit 3c1340c7d8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
63-1JN.usfm
View File

@ -107,14 +107,15 @@
\zaln-s |x-strong="G14730" x-lemma="ἐγώ" x-morph="Gr,RP,,,1N,P," x-occurrence="1" x-occurrences="1" x-content="ἡμεῖς"\*\w we|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G14730" x-lemma="ἐγώ" x-morph="Gr,RP,,,1N,P," x-occurrence="1" x-occurrences="1" x-content="ἡμεῖς"\*\w we|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G11250" x-lemma="γράφω" x-morph="Gr,V,IPA1,,P," x-occurrence="1" x-occurrences="1" x-content="γράφομεν"\*\w are|x-occurrence="1" x-occurrences="1"\w* \zaln-s |x-strong="G11250" x-lemma="γράφω" x-morph="Gr,V,IPA1,,P," x-occurrence="1" x-occurrences="1" x-content="γράφομεν"\*\w are|x-occurrence="1" x-occurrences="1"\w*
\w writing|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \w writing|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G37780" x-lemma="οὗτος" x-morph="Gr,RD,,,,ANP," x-occurrence="1" x-occurrences="1" x-content="ταῦτα"\*\w these|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G37780" x-lemma="οὗτος" x-morph="Gr,RD,,,,ANP," x-occurrence="1" x-occurrences="1" x-content="ταῦτα"\*\w things|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G37780" x-lemma="οὗτος" x-morph="Gr,RD,,,,ANP," x-occurrence="1" x-occurrences="1" x-content="ταῦτα"\*\w these|x-occurrence="1" x-occurrences="1"\w*
\w things|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G24430" x-lemma="ἵνα" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ἵνα"\*\w so|x-occurrence="1" x-occurrences="1"\w* \zaln-s |x-strong="G24430" x-lemma="ἵνα" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ἵνα"\*\w so|x-occurrence="1" x-occurrences="1"\w*
\w that|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \w that|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G14730" x-lemma="ἐγώ" x-morph="Gr,RP,,,1G,P," x-occurrence="1" x-occurrences="1" x-content="ἡμῶν"\*\w our|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G14730" x-lemma="ἐγώ" x-morph="Gr,RP,,,1G,P," x-occurrence="1" x-occurrences="1" x-content="ἡμῶν"\*\w our|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NFS," x-occurrence="1" x-occurrences="1" x-content="ἡ"\*\zaln-s |x-strong="G54790" x-lemma="χαρά" x-morph="Gr,N,,,,,NFS," x-occurrence="1" x-occurrences="1" x-content="χαρὰ"\*\w joy|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\* \zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NFS," x-occurrence="1" x-occurrences="1" x-content="ἡ"\*\zaln-s |x-strong="G54790" x-lemma="χαρά" x-morph="Gr,N,,,,,NFS," x-occurrence="1" x-occurrences="1" x-content="χαρὰ"\*\w joy|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*
\zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,SPA3,,S," x-occurrence="1" x-occurrences="1" x-content="ᾖ"\*\w may|x-occurrence="1" x-occurrences="1"\w* \zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,SPA3,,S," x-occurrence="1" x-occurrences="1" x-content="ᾖ"\*\w may|x-occurrence="1" x-occurrences="1"\w*
\w be|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \w be|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G41370" x-lemma="πληρόω" x-morph="Gr,V,PEP,NFS," x-occurrence="1" x-occurrences="1" x-content="πεπληρωμένη"\*\w fulfilled|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft In place of \fq our joy\fq*, some ancient manuscripts read\fqa your joy.\fqa*\f* \zaln-s |x-strong="G41370" x-lemma="πληρόω" x-morph="Gr,V,PEP,NFS," x-occurrence="1" x-occurrences="1" x-content="πεπληρωμένη"\*\w fulfilled|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft In place of \fq our joy,\fq* some ancient manuscripts read\fqa your joy.\fqa*\f*
\p \p
\v 5 \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="1"\w*\zaln-e\* \v 5 \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="1"\w*\zaln-e\*
\zaln-s |x-strong="G37780" x-lemma="οὗτος" x-morph="Gr,ED,,,,NFS," x-occurrence="1" x-occurrences="1" x-content="αὕτη"\*\w this|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G37780" x-lemma="οὗτος" x-morph="Gr,ED,,,,NFS," x-occurrence="1" x-occurrences="1" x-content="αὕτη"\*\w this|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
@ -755,8 +756,8 @@
\zaln-s |x-strong="G53190" x-lemma="φανερόω" x-morph="Gr,V,SAP3,,P," x-occurrence="1" x-occurrences="1" x-content="φανερωθῶσιν"\*\w they|x-occurrence="4" x-occurrences="5"\w* \zaln-s |x-strong="G53190" x-lemma="φανερόω" x-morph="Gr,V,SAP3,,P," x-occurrence="1" x-occurrences="1" x-content="φανερωθῶσιν"\*\w they|x-occurrence="4" x-occurrences="5"\w*
\w would|x-occurrence="2" x-occurrences="2"\w* \w would|x-occurrence="2" x-occurrences="2"\w*
\w be|x-occurrence="1" x-occurrences="1"\w* \w be|x-occurrence="1" x-occurrences="1"\w*
\w made|x-occurrence="1" x-occurrences="1"\w* \w made|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\w apparent|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \w apparent|x-occurrence="1" x-occurrences="1"\w*
\zaln-s |x-strong="G37540" x-lemma="ὅτι" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ὅτι"\*\w that|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G37540" x-lemma="ὅτι" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ὅτι"\*\w that|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
\zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA3,,P," x-occurrence="1" x-occurrences="1" x-content="εἰσὶν"\*\w they|x-occurrence="5" x-occurrences="5"\w* \zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA3,,P," x-occurrence="1" x-occurrences="1" x-content="εἰσὶν"\*\w they|x-occurrence="5" x-occurrences="5"\w*
\w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
@ -1636,7 +1637,7 @@
\zaln-s |x-strong="G22350" x-lemma="ἤδη" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ἤδη"\*\w already|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G22350" x-lemma="ἤδη" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ἤδη"\*\w already|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G17220" x-lemma="ἐν" x-morph="Gr,P,,,,,D,,," x-occurrence="1" x-occurrences="1" x-content="ἐν"\*\w in|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G17220" x-lemma="ἐν" x-morph="Gr,P,,,,,D,,," x-occurrence="1" x-occurrences="1" x-content="ἐν"\*\w in|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,DMS," x-occurrence="1" x-occurrences="1" x-content="τῷ"\*\w the|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,DMS," x-occurrence="1" x-occurrences="1" x-content="τῷ"\*\w the|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
\zaln-s |x-strong="G28890" x-lemma="κόσμος" x-morph="Gr,N,,,,,DMS," x-occurrence="1" x-occurrences="1" x-content="κόσμῳ"\*\w world|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft Some ancient manuscripts read \fqa and every spirit that does not acknowledge that Jesus has come in the flesh is not from God. This is the spirit of the antichrist, which you have heard is coming, and now is already in the world.\fqa*\f* \zaln-s |x-strong="G28890" x-lemma="κόσμος" x-morph="Gr,N,,,,,DMS," x-occurrence="1" x-occurrences="1" x-content="κόσμῳ"\*\w world|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.\f + \ft Some ancient manuscripts read, \fqa and every spirit that does not acknowledge that Jesus has come in the flesh is not from God. This is the spirit of the antichrist, which you have heard is coming, and now is already in the world.\fqa*\f*
\v 4 \zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="1" x-occurrences="1" x-content="ὑμεῖς"\*\w You|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \v 4 \zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="1" x-occurrences="1" x-content="ὑμεῖς"\*\w You|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA2,,P," x-occurrence="1" x-occurrences="1" x-content="ἐστε"\*\w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA2,,P," x-occurrence="1" x-occurrences="1" x-content="ἐστε"\*\w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
\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="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\*
@ -2186,7 +2187,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="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* \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 are|x-occurrence="2" x-occurrences="2"\w*
\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* \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\* \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="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\* \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\*
@ -2201,7 +2202,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="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="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="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 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\* \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* \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\* \w receive|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*