Merge auto-pjoakes-JOL into master by pjoakes (#1618)
Co-authored-by: pjoakes <pjoakes@noreply.door43.org> Co-committed-by: pjoakes <pjoakes@noreply.door43.org>
This commit is contained in:
parent
7f68580aad
commit
741d2e669c
72
29-JOL.usfm
72
29-JOL.usfm
|
@ -1788,58 +1788,56 @@
|
||||||
\zaln-s |x-strong="c:H3389" x-lemma="יְרוּשָׁלִַ͏ם" x-morph="He,C:Np" x-occurrence="1" x-occurrences="1" x-content="וִירוּשָׁלִָֽם"\*\w from|x-occurrence="1" x-occurrences="2"\w*
|
\zaln-s |x-strong="c:H3389" x-lemma="יְרוּשָׁלִַ͏ם" x-morph="He,C:Np" x-occurrence="1" x-occurrences="1" x-content="וִירוּשָׁלִָֽם"\*\w from|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\w Jerusalem|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w Jerusalem|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="H0853" x-lemma="אֵת" x-morph="He,To" x-occurrence="1" x-occurrences="1" x-content="אֶת"\*\w and|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\zaln-s |x-strong="H0853" x-lemma="אֵת" x-morph="He,To" x-occurrence="1" x-occurrences="1" x-content="אֶת"\*\w and|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="H3063" x-lemma="יְהוּדָה" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יְהוּדָ֖ה"\*\w from|x-occurrence="2" x-occurrences="2"\w*
|
\zaln-s |x-strong="H3063" x-lemma="יְהוּדָה" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יְהוּדָ֖ה"\*\w from|x-occurrence="2" x-occurrences="2"\w*\zaln-e\* {\zaln-s |x-strong="H3063" x-lemma="יְהוּדָה" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יְהוּדָ֖ה"\*\w other|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w other|x-occurrence="1" x-occurrences="1"\w*
|
|
||||||
\w places|x-occurrence="1" x-occurrences="1"\w*
|
\w places|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w in|x-occurrence="1" x-occurrences="1"\w*
|
\w in|x-occurrence="1" x-occurrences="1"\w*}
|
||||||
\w Judah|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.
|
\w Judah|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.
|
||||||
\q1
|
\q1
|
||||||
\v 2 \zaln-s |x-strong="H6010" x-lemma="עֵמֶק" x-morph="He,Ncmsc" x-occurrence="1" x-occurrences="1" x-content="עֵ֖מֶק"\*\w Then|x-occurrence="1" x-occurrences="1"\w*
|
\v 2 \zaln-s |x-strong="c:H3381" x-lemma="יָרַד" x-morph="He,C:Vhp1cs:Sp3mp" x-occurrence="1" x-occurrences="1" x-content="וְה֣וֹרַדְתִּ֔ים"\*\zaln-s |x-strong="H0413" x-lemma="אֵל" x-morph="He,R" x-occurrence="1" x-occurrences="1" x-content="אֶל"\*\w Then|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w in|x-occurrence="1" x-occurrences="1"\w*
|
\w in|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*
|
||||||
\w the|x-occurrence="1" x-occurrences="3"\w*
|
\zaln-s |x-strong="H6010" x-lemma="עֵמֶק" x-morph="He,Ncmsc" x-occurrence="1" x-occurrences="1" x-content="עֵ֖מֶק"\*\w the|x-occurrence="1" x-occurrences="3"\w*
|
||||||
\w Valley|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w Valley|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="H3092" x-lemma="יְהוֹשָׁפָט" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יְהֽוֹשָׁפָ֑ט"\*\w of|x-occurrence="1" x-occurrences="2"\w*
|
\zaln-s |x-strong="H3092" x-lemma="יְהוֹשָׁפָט" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יְהֽוֹשָׁפָ֑ט"\*\w of|x-occurrence="1" x-occurrences="3"\w*
|
||||||
\w Jehoshaphat|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w Jehoshaphat|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="c:H6908" x-lemma="קָבַץ" x-morph="He,C:Vpq1cs" x-occurrence="1" x-occurrences="1" x-content="וְקִבַּצְתִּי֙"\*\w I|x-occurrence="1" x-occurrences="2"\w*
|
\zaln-s |x-strong="c:H6908" x-lemma="קָבַץ" x-morph="He,C:Vpq1cs" x-occurrence="1" x-occurrences="1" x-content="וְקִבַּצְתִּי֙"\*\w I|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\w will|x-occurrence="1" x-occurrences="2"\w*
|
\w will|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\w gather|x-occurrence="1" x-occurrences="1"\w*
|
\w gather|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w together|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w together|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* {\zaln-s |x-strong="H0853" x-lemma="אֵת" x-morph="He,To" x-occurrence="1" x-occurrences="1" x-content="אֶת"\*\zaln-s |x-strong="H3605" x-lemma="כֹּל" x-morph="He,Ncmsc" x-occurrence="1" x-occurrences="1" x-content="כָּל"\*\w the|x-occurrence="2" x-occurrences="3"\w*
|
||||||
\zaln-s |x-strong="H8033" x-lemma="שָׁם" x-morph="He,D" x-occurrence="1" x-occurrences="1" x-content="שָׁ֗ם"\*\w the|x-occurrence="2" x-occurrences="3"\w*
|
\w people|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\w people|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
|
\w of|x-occurrence="2" x-occurrences="3"\w*}
|
||||||
\zaln-s |x-strong="H5921a" x-lemma="עַל" x-morph="He,R" x-occurrence="1" x-occurrences="1" x-content="עַל"\*\w of|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
\w all|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\zaln-s |x-strong="H3605" x-lemma="כֹּל" x-morph="He,Ncmsc" x-occurrence="1" x-occurrences="1" x-content="כָּל"\*\w all|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w of|x-occurrence="3" x-occurrences="3"\w*\zaln-e\*\zaln-e\*
|
||||||
\zaln-s |x-strong="H0834a" x-lemma="אֲשֶׁר" x-morph="He,Tr" x-occurrence="1" x-occurrences="1" x-content="אֲשֶׁ֣ר"\*\w the|x-occurrence="3" x-occurrences="3"\w*
|
\zaln-s |x-strong="d:H1471a" x-lemma="גּוֹי" x-morph="He,Td:Ncmpa" x-occurrence="1" x-occurrences="1" x-content="הַגּוֹיִ֔ם"\*\w the|x-occurrence="3" x-occurrences="3"\w*
|
||||||
\w other|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
|
\w other|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\zaln-s |x-strong="d:H1471a" x-lemma="גּוֹי" x-morph="He,Td:Ncmpa" x-occurrence="1" x-occurrences="1" x-content="הַגּוֹיִ֔ם"\*\w nations|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*;
|
\w nations|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*;
|
||||||
\q2 \zaln-s |x-strong="c:H8199" x-lemma="שָׁפַט" x-morph="He,C:VNp1cs" x-occurrence="1" x-occurrences="1" x-content="וְנִשְׁפַּטְתִּ֨י"\*\w I|x-occurrence="2" x-occurrences="2"\w*
|
\q2 \zaln-s |x-strong="H8033" x-lemma="שָׁם" x-morph="He,D" x-occurrence="1" x-occurrences="1" x-content="שָׁ֗ם"\*\w there|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
|
\zaln-s |x-strong="c:H8199" x-lemma="שָׁפַט" x-morph="He,C:VNp1cs" x-occurrence="1" x-occurrences="1" x-content="וְנִשְׁפַּטְתִּ֨י"\*\w I|x-occurrence="2" x-occurrences="2"\w*
|
||||||
\w will|x-occurrence="2" x-occurrences="2"\w*
|
\w will|x-occurrence="2" x-occurrences="2"\w*
|
||||||
\w judge|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w judge|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* {\zaln-s |x-strong="c:H8199" x-lemma="שָׁפַט" x-morph="He,C:VNp1cs" x-occurrence="1" x-occurrences="1" x-content="וְנִשְׁפַּטְתִּ֨י"\*\w and|x-occurrence="1" x-occurrences="3"\w*
|
||||||
\zaln-s |x-strong="H0853" x-lemma="אֵת" x-morph="He,To" x-occurrence="1" x-occurrences="1" x-content="אֶת"\*\w and|x-occurrence="1" x-occurrences="3"\w*\zaln-e\*
|
\w punish|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*}
|
||||||
\zaln-s |x-strong="c:H3381" x-lemma="יָרַד" x-morph="He,C:Vhp1cs:Sp3mp" x-occurrence="1" x-occurrences="1" x-content="וְה֣וֹרַדְתִּ֔ים"\*\w punish|x-occurrence="1" x-occurrences="1"\w*
|
\zaln-s |x-strong="H5973a" x-lemma="עִם" x-morph="He,R:Sp3mp" x-occurrence="1" x-occurrences="1" x-content="עִמָּ֜ם"\*\w them|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
|
||||||
\w them|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
|
\q1 \zaln-s |x-strong="H5921a" x-lemma="עַל" x-morph="He,R" x-occurrence="1" x-occurrences="1" x-content="עַל"\*\w because|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
|
||||||
\q1 \zaln-s |x-strong="H2505a" x-lemma="חָלַק" x-morph="He,Vpp3cp" x-occurrence="1" x-occurrences="1" x-content="חִלֵּֽקוּ"\*\w because|x-occurrence="1" x-occurrences="2"\w*
|
\zaln-s |x-strong="H5971a" x-lemma="עַם" x-morph="He,Ncmsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="עַמִּ֨י"\*\w they|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\w they|x-occurrence="1" x-occurrences="2"\w*
|
\w scattered|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w scattered|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w my|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="H3478" x-lemma="יִשְׂרָאֵל" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יִשְׂרָאֵל֙"\*\w my|x-occurrence="1" x-occurrences="2"\w*
|
\zaln-s |x-strong="c:H5159" x-lemma="נַחֲלָה" x-morph="He,C:Ncfsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="וְנַחֲלָתִ֤י"\*\zaln-s |x-strong="H3478" x-lemma="יִשְׂרָאֵל" x-morph="He,Np" x-occurrence="1" x-occurrences="1" x-content="יִשְׂרָאֵל֙"\*\w Israelite|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*
|
||||||
\w Israelite|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
|
||||||
\zaln-s |x-strong="H5971a" x-lemma="עַם" x-morph="He,Ncmsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="עַמִּ֨י"\*\w people|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
\zaln-s |x-strong="H5971a" x-lemma="עַם" x-morph="He,Ncmsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="עַמִּ֨י"\*\w people|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
||||||
\q2 \zaln-s |x-strong="H5971a" x-lemma="עַם" x-morph="He,Ncmsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="עַמִּ֨י"\*\w and|x-occurrence="2" x-occurrences="3"\w*\zaln-e\*
|
\q2 \zaln-s |x-strong="H0834a" x-lemma="אֲשֶׁר" x-morph="He,Tr" x-occurrence="1" x-occurrences="1" x-content="אֲשֶׁ֣ר"\*\w and|x-occurrence="2" x-occurrences="3"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="c:H5159" x-lemma="נַחֲלָה" x-morph="He,C:Ncfsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="וְנַחֲלָתִ֤י"\*\w forced|x-occurrence="1" x-occurrences="1"\w*
|
\zaln-s |x-strong="H6340" x-lemma="פָּזַר" x-morph="He,Vpp3cp" x-occurrence="1" x-occurrences="1" x-content="פִּזְּר֣וּ"\*\w forced|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w them|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
\w them|x-occurrence="2" x-occurrences="2"\w*
|
||||||
\zaln-s |x-strong="H0413" x-lemma="אֵל" x-morph="He,R" x-occurrence="1" x-occurrences="1" x-content="אֶל"\*\w to|x-occurrence="1" x-occurrences="2"\w*
|
\w to|x-occurrence="1" x-occurrences="2"\w*
|
||||||
\w go|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w go|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\zaln-s |x-strong="H5973a" x-lemma="עִם" x-morph="He,R:Sp3mp" x-occurrence="1" x-occurrences="1" x-content="עִמָּ֜ם"\*\w to|x-occurrence="2" x-occurrences="2"\w*
|
\w to|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
||||||
\w other|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
\zaln-s |x-strong="b:H1471a" x-lemma="גּוֹי" x-morph="He,Rd:Ncmpa" x-occurrence="1" x-occurrences="1" x-content="בַגּוֹיִ֔ם"\*\w other|x-occurrence="2" x-occurrences="2"\w*
|
||||||
\zaln-s |x-strong="b:H1471a" x-lemma="גּוֹי" x-morph="He,Rd:Ncmpa" x-occurrence="1" x-occurrences="1" x-content="בַגּוֹיִ֔ם"\*\w countries|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*,
|
\w countries|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*,
|
||||||
\q2 \zaln-s |x-strong="c:H0853" x-lemma="אֵת" x-morph="He,C:To" x-occurrence="1" x-occurrences="1" x-content="וְאֶת"\*\w and|x-occurrence="3" x-occurrences="3"\w*
|
\q2 \zaln-s |x-strong="c:H0853" x-lemma="אֵת" x-morph="He,C:To" x-occurrence="1" x-occurrences="1" x-content="וְאֶת"\*\w and|x-occurrence="3" x-occurrences="3"\w*
|
||||||
\w because|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
\w because|x-occurrence="2" x-occurrences="2"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="H6340" x-lemma="פָּזַר" x-morph="He,Vpp3cp" x-occurrence="1" x-occurrences="1" x-content="פִּזְּר֣וּ"\*\w they|x-occurrence="2" x-occurrences="2"\w*
|
\zaln-s |x-strong="H2505a" x-lemma="חָלַק" x-morph="He,Vpp3cp" x-occurrence="1" x-occurrences="1" x-content="חִלֵּֽקוּ"\*\w they|x-occurrence="2" x-occurrences="2"\w*
|
||||||
\w divided|x-occurrence="1" x-occurrences="1"\w*
|
\w divided|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w up|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w up|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
\zaln-s |x-strong="H0776" x-lemma="אֶרֶץ" x-morph="He,Ncbsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="אַרְצִ֖י"\*\w my|x-occurrence="2" x-occurrences="2"\w*
|
\zaln-s |x-strong="H0776" x-lemma="אֶרֶץ" x-morph="He,Ncbsc:Sp1cs" x-occurrence="1" x-occurrences="1" x-content="אַרְצִ֖י"\*\w my|x-occurrence="2" x-occurrences="2"\w*
|
||||||
\w land|x-occurrence="1" x-occurrences="1"\w*
|
\w land|x-occurrence="1" x-occurrences="1"\w*\zaln-e\* {\zaln-s |x-strong="H2505a" x-lemma="חָלַק" x-morph="He,Vpp3cp" x-occurrence="1" x-occurrences="1" x-content="חִלֵּֽקוּ"\*\w among|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w among|x-occurrence="1" x-occurrences="1"\w*
|
\w themselves|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*}.
|
||||||
\w themselves|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*.
|
|
||||||
\q1
|
\q1
|
||||||
\v 3 \zaln-s |x-strong="c:H0413" x-lemma="אֵל" x-morph="He,C:R" x-occurrence="1" x-occurrences="1" x-content="וְאֶל"\*\w They|x-occurrence="1" x-occurrences="1"\w*
|
\v 3 \zaln-s |x-strong="c:H0413" x-lemma="אֵל" x-morph="He,C:R" x-occurrence="1" x-occurrences="1" x-content="וְאֶל"\*\w They|x-occurrence="1" x-occurrences="1"\w*
|
||||||
\w played|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
\w played|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
|
||||||
|
|
Loading…
Reference in New Issue