Merge branch 'fix_markers' of unfoldingWord/en_ult into master

This commit is contained in:
Larry Sallee 2018-05-16 17:40:00 +00:00 committed by Gogs
commit 0d8cbf07ba
1 changed files with 48 additions and 22 deletions

View File

@ -189,7 +189,8 @@
\zaln-s | x-strong="G49900" x-lemma="σωτήρ" x-morph="Gr,N,,,,,GMS," x-occurrence="1" x-occurrences="1" x-content="Σωτῆρος"
\w Savior|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 4
\zaln-s | x-strong="G51030" x-lemma="Τίτος" x-morph="Gr,N,,,,,DMS," x-occurrence="1" x-occurrences="1" x-content="Τίτῳ"
\w To|x-occurrence="1" x-occurrences="1"\w*
@ -316,7 +317,8 @@
\zaln-e\*
\zaln-s | x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2D,S," x-occurrence="1" x-occurrences="1" x-content="σοι"
\w you|x-occurrence="3" x-occurrences="3"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 6
\zaln-s | x-strong="G14870" x-lemma="εἰ" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="εἴ"
\zaln-s | x-strong="G51000" x-lemma="τις" x-morph="Gr,RI,,,,NMS," x-occurrence="1" x-occurrences="1" x-content="τίς"
@ -448,7 +450,8 @@
\w a|x-occurrence="2" x-occurrences="2"\w*
\w greedy|x-occurrence="1" x-occurrences="1"\w*
\w man|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 8
\zaln-s | x-strong="G02350" x-lemma="ἀλλά" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ἀλλὰ"
\w Instead|x-occurrence="1" x-occurrences="1"\w*
@ -559,7 +562,9 @@
\w oppose|x-occurrence="1" x-occurrences="1"\w*
\w him|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*.\p
\zaln-e\*.
\s5
\p
\v 10
\zaln-s | x-strong="G10630" x-lemma="γάρ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="γὰρ"
\w For|x-occurrence="1" x-occurrences="1"\w*
@ -651,7 +656,8 @@
\zaln-e\*
\zaln-s | x-strong="G33610" x-lemma="μή" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="μὴ"
\w not|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 12
\zaln-s | x-strong="G51000" x-lemma="τις" x-morph="Gr,RI,,,,NMS," x-occurrence="1" x-occurrences="1" x-content="τις"
\w One|x-occurrence="1" x-occurrences="1"\w*
@ -786,7 +792,8 @@
\zaln-e\*
\zaln-s | x-strong="G02250" x-lemma="ἀλήθεια" x-morph="Gr,N,,,,,AFS," x-occurrence="1" x-occurrences="1" x-content="ἀλήθειαν"
\w truth|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 15
\zaln-s | x-strong="G39560" x-lemma="πᾶς" x-morph="Gr,RI,,,,NNP," x-occurrence="1" x-occurrences="1" x-content="πάντα"
\w All|x-occurrence="1" x-occurrences="1"\w*
@ -914,7 +921,8 @@
\zaln-e\*
\zaln-s | x-strong="G20410" x-lemma="ἔργον" x-morph="Gr,N,,,,,ANS," x-occurrence="1" x-occurrences="1" x-content="ἔργον"
\w work|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\c 2
\v 1
\zaln-s | x-strong="G11610" x-lemma="δέ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="δὲ"
@ -983,7 +991,8 @@
\w in|x-occurrence="3" x-occurrences="3"\w*
\w perseverance|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 3
\zaln-s | x-strong="G17220" x-lemma="ἐν" x-morph="Gr,P,,,,,D,,," x-occurrence="1" x-occurrences="1" x-content="ἐν"
\zaln-s | x-strong="G26880" x-lemma="κατάστημα" x-morph="Gr,N,,,,,DNS," x-occurrence="1" x-occurrences="1" x-content="καταστήματι"
@ -1132,7 +1141,8 @@
\zaln-s | x-strong="G09870" x-lemma="βλασφημέω" x-morph="Gr,V,SPP3,,S," x-occurrence="1" x-occurrences="1" x-content="βλασφημῆται"
\w be|x-occurrence="2" x-occurrences="2"\w*
\w insulted|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 6
\zaln-s | x-strong="G56150" x-lemma="ὡσαύτως" x-morph="Gr,D,,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ὡσαύτως"
\w In|x-occurrence="1" x-occurrences="1"\w*
@ -1254,7 +1264,8 @@
\zaln-e\*
\zaln-s | x-strong="G14730" x-lemma="ἐγώ" x-morph="Gr,RP,,,1G,P," x-occurrence="1" x-occurrences="1" x-content="ἡμῶν"
\w us|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 9
\zaln-s | x-strong="G52930" x-lemma="ὑποτάσσω" x-morph="Gr,V,NPM,,,,," x-occurrence="1" x-occurrences="1" x-content="ὑποτάσσεσθαι"
\w Teach|x-occurrence="1" x-occurrences="1"\w*
@ -1366,7 +1377,8 @@
\w Savior|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 11
\zaln-s | x-strong="G10630" x-lemma="γάρ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="γὰρ"
\w For|x-occurrence="1" x-occurrences="1"\w*
@ -1530,7 +1542,8 @@
\zaln-e\*
\zaln-s | x-strong="G55470" x-lemma="χριστός" x-morph="Gr,N,,,,,GMS," x-occurrence="1" x-occurrences="1" x-content="Χριστοῦ"
\w Christ|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 14
\zaln-s | x-strong="G37390" x-lemma="ὅς" x-morph="Gr,RR,,,,NMS," x-occurrence="1" x-occurrences="1" x-content="ὃς"
\w Jesus|x-occurrence="1" x-occurrences="1"\w*
@ -1600,7 +1613,9 @@
\zaln-e\*
\zaln-s | x-strong="G20410" x-lemma="ἔργον" x-morph="Gr,N,,,,,GNP," x-occurrence="1" x-occurrences="1" x-content="ἔργων"
\w works|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\p
\zaln-e\*.
\s5
\p
\v 15
\zaln-s | x-strong="G29800" x-lemma="λαλέω" x-morph="Gr,V,MPA2,,S," x-occurrence="1" x-occurrences="1" x-content="λάλει"
\w Speak|x-occurrence="1" x-occurrences="1"\w*
@ -1647,7 +1662,8 @@
\zaln-e\*
\zaln-s | x-strong="G47710" x-lemma="σύ" x-morph="Gr,RP,,,2G,S," x-occurrence="1" x-occurrences="1" x-content="σου"
\w you|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\c 3
\v 1
\zaln-s | x-strong="G52790" x-lemma="ὑπομιμνῄσκω" x-morph="Gr,V,MPA2,,S," x-occurrence="1" x-occurrences="1" x-content="ὑπομίμνῃσκε"
@ -1737,7 +1753,8 @@
\zaln-s | x-strong="G04440" x-lemma="ἄνθρωπος" x-morph="Gr,N,,,,,AMP," x-occurrence="1" x-occurrences="1" x-content="ἀνθρώπους"
\w everyone|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 3
\zaln-s | x-strong="G10630" x-lemma="γάρ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="γάρ"
\w For|x-occurrence="1" x-occurrences="1"\w*
@ -1812,7 +1829,8 @@
\zaln-s | x-strong="G02400" x-lemma="ἀλλήλων" x-morph="Gr,RC,,,,AMP," x-occurrence="1" x-occurrences="1" x-content="ἀλλήλους"
\w one|x-occurrence="1" x-occurrences="1"\w*
\w another|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 4
\zaln-s | x-strong="G11610" x-lemma="δέ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="δὲ"
\w But|x-occurrence="1" x-occurrences="1"\w*
@ -1932,7 +1950,8 @@
\w Holy|x-occurrence="1" x-occurrences="1"\w*
\w Spirit|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*,\s5
\zaln-e\*,
\s5
\v 6
\zaln-s | x-strong="G37390" x-lemma="ὅς" x-morph="Gr,RR,,,,GNS," x-occurrence="1" x-occurrences="1" x-content="οὗ"
\w whom|x-occurrence="1" x-occurrences="1"\w*
@ -2012,7 +2031,8 @@
\zaln-e\*
\zaln-s | x-strong="G22220" x-lemma="ζωή" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="ζωῆς"
\w life|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 8
\zaln-s | x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NMS," x-occurrence="1" x-occurrences="1" x-content="ὁ"
\w This|x-occurrence="1" x-occurrences="1"\w*
@ -2098,7 +2118,8 @@
\w for|x-occurrence="1" x-occurrences="1"\w*
\w everyone|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 9
\zaln-s | x-strong="G11610" x-lemma="δέ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="δὲ"
\w But|x-occurrence="1" x-occurrences="1"\w*
@ -2214,7 +2235,9 @@
\zaln-e\*-
\zaln-s | x-strong="G08430" x-lemma="αὐτοκατάκριτος" x-morph="Gr,NP,,,,NMS," x-occurrence="1" x-occurrences="1" x-content="αὐτοκατάκριτος"
\w condemned|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\p
\zaln-e\*.
\s5
\p
\v 12
\zaln-s | x-strong="G37520" x-lemma="ὅταν" x-morph="Gr,CS,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="ὅταν"
\w When|x-occurrence="1" x-occurrences="1"\w*
@ -2311,7 +2334,8 @@
\zaln-e\*
\zaln-s | x-strong="G33670" x-lemma="μηδείς" x-morph="Gr,RI,,,,NNS," x-occurrence="1" x-occurrences="1" x-content="μηδὲν"
\w nothing|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\s5
\zaln-e\*.
\s5
\v 14
\zaln-s | x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="οἱ"
\zaln-s | x-strong="G22510" x-lemma="ἡμέτερος" x-morph="Gr,RP,,,1NMP," x-occurrence="1" x-occurrences="1" x-content="ἡμέτεροι"
@ -2365,7 +2389,9 @@
\zaln-e\*
\zaln-s | x-strong="G01750" x-lemma="ἄκαρπος" x-morph="Gr,NP,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="ἄκαρποι"
\w unfruitful|x-occurrence="1" x-occurrences="1"\w*
\zaln-e\*.\p
\zaln-e\*.
\s5
\p
\v 15
\zaln-s | x-strong="G39560" x-lemma="πᾶς" x-morph="Gr,RI,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="πάντες"
\w All|x-occurrence="1" x-occurrences="1"\w*