From 37073a24302fb367ea9d95fd7639dfb1757035cf Mon Sep 17 00:00:00 2001 From: pjoakes Date: Tue, 23 Jan 2024 22:46:26 +0000 Subject: [PATCH] Merge auto-pjoakes-1JN into master by pjoakes (#3576) Co-authored-by: pjoakes Co-committed-by: pjoakes --- 63-1JN.usfm | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/63-1JN.usfm b/63-1JN.usfm index 36febc32..9074135a 100644 --- a/63-1JN.usfm +++ b/63-1JN.usfm @@ -756,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* \w would|x-occurrence="2" x-occurrences="2"\w* \w be|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* +\w made|x-occurrence="1" x-occurrences="1"\w* +\w apparent|x-occurrence="1" x-occurrences="1"\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* \w are|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* @@ -851,30 +851,30 @@ \zaln-s |x-strong="G21920" x-lemma="ἔχω" x-morph="Gr,V,IPA3,,S," x-occurrence="2" x-occurrences="2" x-content="ἔχει"\*\w has|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,AMS," x-occurrence="4" x-occurrences="4" x-content="τὸν"\*\w the|x-occurrence="4" x-occurrences="4"\w*\zaln-e\* \zaln-s |x-strong="G39620" x-lemma="πατήρ" x-morph="Gr,N,,,,,AMS," x-occurrence="2" x-occurrences="2" x-content="Πατέρα"\*\w Father|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*. -\v 24 {\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="1" x-occurrences="2" x-content="ὑμεῖς"\*\w As|x-occurrence="1" x-occurrences="1"\w* -\w for|x-occurrence="1" x-occurrences="1"\w*} -\w you|x-occurrence="1" x-occurrences="6"\w*\zaln-e\*, -\zaln-s |x-strong="G37390" x-lemma="ὅς" x-morph="Gr,RR,,,,ANS," x-occurrence="1" x-occurrences="2" x-content="ὃ"\*\w what|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* -\zaln-s |x-strong="G01910" x-lemma="ἀκούω" x-morph="Gr,V,IAA2,,P," x-occurrence="1" x-occurrences="2" x-content="ἠκούσατε"\*\w you|x-occurrence="2" x-occurrences="6"\w* -\w have|x-occurrence="1" x-occurrences="2"\w* -\w heard|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* -\zaln-s |x-strong="G05750" x-lemma="ἀπό" x-morph="Gr,P,,,,,G,,," x-occurrence="1" x-occurrences="2" x-content="ἀπ’"\*\w from|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G07460" x-lemma="ἀρχή" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="2" x-content="ἀρχῆς"\*\w the|x-occurrence="1" x-occurrences="4"\w* -\w beginning|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*, -\zaln-s |x-strong="G33060" x-lemma="μένω" x-morph="Gr,V,MPA3,,S," x-occurrence="1" x-occurrences="1" x-content="μενέτω"\*\w let|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* {\zaln-s |x-strong="G33060" x-lemma="μένω" x-morph="Gr,V,MPA3,,S," x-occurrence="1" x-occurrences="1" x-content="μενέτω"\*\w it|x-occurrence="1" x-occurrences="1"\w*} +\v 24 \zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="1" x-occurrences="2" x-content="ὑμεῖς"\*\w You|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*, +\zaln-s |x-strong="G33060" x-lemma="μένω" x-morph="Gr,V,MPA3,,S," x-occurrence="1" x-occurrences="1" x-content="μενέτω"\*\w let|x-occurrence="1" x-occurrences="1"\w* \w remain|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G17220" x-lemma="ἐν" x-morph="Gr,P,,,,,D,,," x-occurrence="1" x-occurrences="4" x-content="ἐν"\*\w in|x-occurrence="1" x-occurrences="4"\w*\zaln-e\* -\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2D,P," x-occurrence="1" x-occurrences="2" x-content="ὑμῖν"\*\w you|x-occurrence="3" x-occurrences="6"\w*\zaln-e\*. +\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2D,P," x-occurrence="1" x-occurrences="2" x-content="ὑμῖν"\*\w you|x-occurrence="1" x-occurrences="5"\w*\zaln-e\* +\zaln-s |x-strong="G37390" x-lemma="ὅς" x-morph="Gr,RR,,,,ANS," x-occurrence="1" x-occurrences="2" x-content="ὃ"\*\w what|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* +\zaln-s |x-strong="G01910" x-lemma="ἀκούω" x-morph="Gr,V,IAA2,,P," x-occurrence="1" x-occurrences="2" x-content="ἠκούσατε"\*\w you|x-occurrence="2" x-occurrences="5"\w* +\w have|x-occurrence="1" x-occurrences="2"\w* +\w heard|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* +\zaln-s |x-strong="G05750" x-lemma="ἀπό" x-morph="Gr,P,,,,,G,,," x-occurrence="1" x-occurrences="2" x-content="ἀπ’"\*\w from|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* +\zaln-s |x-strong="G07460" x-lemma="ἀρχή" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="2" x-content="ἀρχῆς"\*\w the|x-occurrence="1" x-occurrences="4"\w* +\w beginning|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*. \zaln-s |x-strong="G14370" 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="G37390" x-lemma="ὅς" x-morph="Gr,RR,,,,ANS," x-occurrence="2" x-occurrences="2" x-content="ὃ"\*\w what|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* -\zaln-s |x-strong="G01910" x-lemma="ἀκούω" x-morph="Gr,V,IAA2,,P," x-occurrence="2" x-occurrences="2" x-content="ἠκούσατε"\*\w you|x-occurrence="4" x-occurrences="6"\w* +\zaln-s |x-strong="G01910" x-lemma="ἀκούω" x-morph="Gr,V,IAA2,,P," x-occurrence="2" x-occurrences="2" x-content="ἠκούσατε"\*\w you|x-occurrence="3" x-occurrences="5"\w* \w have|x-occurrence="2" x-occurrences="2"\w* \w heard|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* -\zaln-s |x-strong="G05750" x-lemma="ἀπό" x-morph="Gr,P,,,,,G,,," x-occurrence="2" x-occurrences="2" x-content="ἀπ’"\*\w from|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G07460" x-lemma="ἀρχή" x-morph="Gr,N,,,,,GFS," x-occurrence="2" x-occurrences="2" x-content="ἀρχῆς"\*\w the|x-occurrence="2" x-occurrences="4"\w* +\zaln-s |x-strong="G05750" x-lemma="ἀπό" x-morph="Gr,P,,,,,G,,," x-occurrence="2" x-occurrences="2" x-content="ἀπ’"\*\w from|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* +\zaln-s |x-strong="G07460" x-lemma="ἀρχή" x-morph="Gr,N,,,,,GFS," x-occurrence="2" x-occurrences="2" x-content="ἀρχῆς"\*\w the|x-occurrence="2" x-occurrences="4"\w* \w beginning|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G33060" x-lemma="μένω" x-morph="Gr,V,SAA3,,S," x-occurrence="1" x-occurrences="1" x-content="μείνῃ"\*\w remains|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G17220" x-lemma="ἐν" x-morph="Gr,P,,,,,D,,," x-occurrence="2" x-occurrences="4" x-content="ἐν"\*\w in|x-occurrence="2" x-occurrences="4"\w*\zaln-e\* -\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2D,P," x-occurrence="2" x-occurrences="2" x-content="ὑμῖν"\*\w you|x-occurrence="5" x-occurrences="6"\w*\zaln-e\*, -\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="2" x-occurrences="2" x-content="ὑμεῖς"\*\w you|x-occurrence="6" x-occurrences="6"\w*\zaln-e\* +\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2D,P," x-occurrence="2" x-occurrences="2" x-content="ὑμῖν"\*\w you|x-occurrence="4" x-occurrences="5"\w*\zaln-e\*, +\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="2" x-occurrences="2" x-content="ὑμεῖς"\*\w you|x-occurrence="5" x-occurrences="5"\w*\zaln-e\* \zaln-s |x-strong="G33060" x-lemma="μένω" x-morph="Gr,V,IFA2,,P," x-occurrence="1" x-occurrences="1" x-content="μενεῖτε"\*\w will|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="2" x-content="καὶ"\*\w also|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G33060" x-lemma="μένω" x-morph="Gr,V,IFA2,,P," x-occurrence="1" x-occurrences="1" x-content="μενεῖτε"\*\w remain|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* @@ -908,9 +908,8 @@ \zaln-s |x-strong="G41050" x-lemma="πλανάω" x-morph="Gr,V,PPA,GMP," x-occurrence="1" x-occurrences="1" x-content="πλανώντων"\*\w leading|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2A,P," x-occurrence="1" x-occurrences="1" x-content="ὑμᾶς"\*\w you|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G41050" x-lemma="πλανάω" x-morph="Gr,V,PPA,GMP," x-occurrence="1" x-occurrences="1" x-content="πλανώντων"\*\w astray|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*. -\v 27 \zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="5" x-content="καὶ"\*\w And|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* {\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="1" x-occurrences="1" x-content="ὑμεῖς"\*\w as|x-occurrence="1" x-occurrences="3"\w* -\w for|x-occurrence="1" x-occurrences="1"\w*} -\w you|x-occurrence="1" x-occurrences="7"\w*\zaln-e\*, +\v 27 \zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="5" x-content="καὶ"\*\w And|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* +\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="7"\w*\zaln-e\*, \zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NNS," x-occurrence="1" x-occurrences="2" x-content="τὸ"\*\w the|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G55450" x-lemma="χρῖσμα" x-morph="Gr,N,,,,,NNS," x-occurrence="1" x-occurrences="2" x-content="χρῖσμα"\*\w anointing|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G37390" x-lemma="ὅς" x-morph="Gr,RD,,,,ANS," x-occurrence="1" x-occurrences="1" x-content="ὃ"\*\w that|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* @@ -933,13 +932,14 @@ \w teach|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2A,P," x-occurrence="1" x-occurrences="3" x-content="ὑμᾶς"\*\w you|x-occurrence="5" x-occurrences="7"\w*\zaln-e\*. \zaln-s |x-strong="G02350" x-lemma="ἀλλά" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ἀλλ’"\*\w But|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* -\zaln-s |x-strong="G56130" x-lemma="ὡς" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ὡς"\*\w as|x-occurrence="2" x-occurrences="3"\w*\zaln-e\* +\zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2N,P," x-occurrence="1" x-occurrences="1" x-content="ὑμεῖς"\*\w as|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G08460" x-lemma="αὐτός" x-morph="Gr,RP,,,3GMS," x-occurrence="2" x-occurrences="2" x-content="αὐτοῦ"\*\w his|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NNS," x-occurrence="2" x-occurrences="2" x-content="τὸ"\*\zaln-s |x-strong="G55450" x-lemma="χρῖσμα" x-morph="Gr,N,,,,,NNS," x-occurrence="2" x-occurrences="2" x-content="χρῖσμα"\*\w anointing|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*\zaln-e\* \zaln-s |x-strong="G13210" x-lemma="διδάσκω" x-morph="Gr,V,IPA3,,S," x-occurrence="1" x-occurrences="1" x-content="διδάσκει"\*\w teaches|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2A,P," x-occurrence="2" x-occurrences="3" x-content="ὑμᾶς"\*\w you|x-occurrence="6" x-occurrences="7"\w*\zaln-e\* \zaln-s |x-strong="G40120" x-lemma="περί" x-morph="Gr,P,,,,,G,,," x-occurrence="1" x-occurrences="1" x-content="περὶ"\*\w about|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* -\zaln-s |x-strong="G39560" x-lemma="πᾶς" x-morph="Gr,RI,,,,GNP," x-occurrence="1" x-occurrences="1" x-content="πάντων"\*\w all|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G39560" x-lemma="πᾶς" x-morph="Gr,RI,,,,GNP," x-occurrence="1" x-occurrences="1" x-content="πάντων"\*\w things|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* +\zaln-s |x-strong="G39560" x-lemma="πᾶς" x-morph="Gr,RI,,,,GNP," x-occurrence="1" x-occurrences="1" x-content="πάντων"\*\w all|x-occurrence="1" x-occurrences="1"\w* +\w things|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* \zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="3" x-occurrences="5" x-content="καὶ"\*\w and|x-occurrence="2" x-occurrences="4"\w*\zaln-e\* \zaln-s |x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IPA3,,S," x-occurrence="1" x-occurrences="1" x-content="ἐστιν"\*\w is|x-occurrence="1" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G02270" x-lemma="ἀληθής" x-morph="Gr,NP,,,,NNS," x-occurrence="1" x-occurrences="1" x-content="ἀληθές"\*\w true|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* @@ -949,8 +949,8 @@ \zaln-s |x-strong="G55790" x-lemma="ψεῦδος" x-morph="Gr,N,,,,,NNS," x-occurrence="1" x-occurrences="1" x-content="ψεῦδος"\*\w a|x-occurrence="1" x-occurrences="1"\w* \w lie|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*, \zaln-s |x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="5" x-occurrences="5" x-content="καὶ"\*\w and|x-occurrence="4" x-occurrences="4"\w*\zaln-e\* -\zaln-s |x-strong="G25310" x-lemma="καθώς" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="καθὼς"\*\w just|x-occurrence="1" x-occurrences="1"\w* -\w as|x-occurrence="3" x-occurrences="3"\w*\zaln-e\* +\zaln-s |x-strong="G25310" x-lemma="καθώς" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="καθὼς"\*\w just|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* +\zaln-s |x-strong="G56130" x-lemma="ὡς" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ὡς"\*\w as|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* \zaln-s |x-strong="G13210" x-lemma="διδάσκω" x-morph="Gr,V,IAA3,,S," x-occurrence="1" x-occurrences="1" x-content="ἐδίδαξεν"\*\w it|x-occurrence="1" x-occurrences="1"\w* \w has|x-occurrence="1" x-occurrences="1"\w* \w taught|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*