Merge pull request 'Publish v17' (#2) from prePubv17 into master

Reviewed-on: https://git.door43.org/Door43-Catalog/en_tw/pulls/2

bible/config.yaml

@@ -7,9 +7,6 @@
   - rc://*/*/book/luk/22/30
   - rc://*/*/book/mat/19/28
   - rc://*/*/book/rev/21/12
-lord:
-  false_positives: []
-  occurrences:
 aaron:
   false_positives: []
   occurrences:

bible/kt/abomination.md

@@ -2,7 +2,7 @@
 
 ## Definition:
 
-The term “abomination” is used to refer to something that causes disgust or extreme dislike.
+The term “abomination” is used to refer to something that causes disgust or extreme dislike.    
 
 * The Egyptians considered the Hebrew people to be an “abomination.” This means that the Egyptians disliked the Hebrews and didn’t want to associate with them or be near them.
 * Some of the things that the Bible calls “an abomination to Yahweh” include lying, pride, sacrificing humans, worship of idols, murder, and sexual sins such as adultery and homosexual acts.

bible/kt/spirit.md

@@ -1,18 +1,13 @@
-# spirit, spiritual
+# spirit, wind, breath
 
 ## Definition:
 
-The term “spirit” refers to the non-physical part of people which cannot be seen. When a person dies, his spirit leaves his body. “Spirit” can also refer to an attitude or emotional state.
+The term “spirit” refers to the non-physical part of a person which cannot be seen. In biblical times, the concept of a person's spirit was closely related to the concept of a person's breath.  The term can also refer to wind, that is, the movement of air in the natural world. 
 
-* The term “spirit” can refer to a being that does not have a physical body, especially an evil spirit.
-* A person’s spirit is the part of him that can know God and believe in him.
-* In general, the term “spiritual” describes anything in the non-physical world.
-* In the Bible, it especially refers to anything that relates to God, specifically to the Holy Spirit.
-* For example, “spiritual food” refers to God’s teachings, which give nourishment to a person’s spirit, and “spiritual wisdom” refers to the knowledge and righteous behavior that come from the power of the Holy Spirit.
-* God is a spirit and he created other spirit beings, who do not have physical bodies.
-* Angels are spirit beings, including those who rebelled against God and became evil spirits.
-* The term “spirit of” can also mean “having the characteristics of,” such as in “spirit of wisdom” or “in the spirit of Elijah.”
-* Examples of “spirit” as an attitude or emotion would include “spirit of fear” and “spirit of jealousy.”
+* The term “spirit” can refer to a being that does not have a physical body, such as an evil spirit.
+* In general, the term “spiritual” describes things in the non-physical world.
+* The term “spirit of” can also mean “having the characteristics of,” such as in “spirit of wisdom” or “in the spirit of Elijah." Sometimes the Bible applies this term in the context of a person's attitude or emotional state, such as “spirit of fear” and “spirit of jealousy.”
+* Jesus said that God is a spirit.
 
 ## Translation Suggestions:
 
@@ -22,9 +17,10 @@ The term “spirit” refers to the non-physical part of people which cannot be
 * The phrase “spirit of” could be translated as “character of” or “influence of” or “attitude of” or “thinking (that is) characterized by.”
 * Depending on the context, “spiritual” could be translated as “non-physical” or “from the Holy Spirit” or “God’s” or “part of the non-physical world.”
 * The phrase “spiritual maturity” could be translated as “godly behavior that shows obedience to the Holy Spirit.”
-* The term “spiritual gift” could be translated as “special ability that the Holy Spirit gives
+* The term “spiritual gift” could be translated as “special ability that the Holy Spirit gives."
+* Sometimes this term can be translated as "wind" when referring to the simple movement of air or "breath" when referring to air movement caused by living beings.
 
-(See also: [angel](../kt/angel.md), [demon](../kt/demon.md), [Holy Spirit](../kt/holyspirit.md), [soul](../kt/soul.md))
+(See also: [soul](../kt/soul.md), [Holy Spirit](../kt/holyspirit.md), [demon](../kt/demon.md), [breath](../other/breath.md))
 
 ## Bible References:
 
@@ -35,6 +31,7 @@ The term “spirit” refers to the non-physical part of people which cannot be
 * [Colossians 01:09](rc://en/tn/help/col/01/09)
 * [Ephesians 04:23](rc://en/tn/help/eph/04/23)
 * [Genesis 07:21-22](rc://en/tn/help/gen/07/21)
+* [Genesis 08:01](rc://en/tn/help/gen/08/01)
 * [Isaiah 04:04](rc://en/tn/help/isa/04/04)
 * [Mark 01:23-26](rc://en/tn/help/mrk/01/23)
 * [Matthew 26:41](rc://en/tn/help/mat/26/41)

bible/kt/test.md

@@ -37,4 +37,4 @@ The term “test” refers to a difficult or painful experience that reveals a p
 
 ## Word Data:
 
-* Strong’s: H5713, H5715, H5749, H6030, H8584, G1242, G1263, G1303, G1382, G1957, G3140, G3141, G3142, G3143, G3984, G4303, G4451, G4828, G6020
+* Strong’s: H5254, H5713, H5715, H5749, H6030, H8584, G1242, G1263, G1303, G1382, G1957, G3140, G3141, G3142, G3143, G3984, G4303, G4451, G4828, G6020

bible/kt/works.md

@@ -34,4 +34,4 @@ The term “work” refers generally either to the action of expending effort in
 
 ## Word Data:
 
-* Strong’s: H4566, H4567, H4611, H4659, H5949, G2041
+* Strong’s: H4399, H4566, H4567, H4611, H4659, H5949, G2041

bible/names/moses.md

@@ -2,7 +2,7 @@
 
 ## Facts:
 
-Moses was a prophet and leader of the Israelite people for over 40 years.  
+Moses was a prophet and leader of the Israelite people for over 40 years. He was the leader of the Israelite people when they came out of Egypt, as described in the book of Exodus. 
 
 * When Moses was a baby, Moses’ parents put him in a basket in the reeds of the Nile River to hide him from the Egyptian Pharaoh. Moses’ sister Miriam watched over him there. Moses’ life was spared when the pharaoh’s daughter found him and took him to the palace to raise him as her son.
 * God chose Moses to free the Israelites from slavery in Egypt and to lead them to the Promised Land.

bible/names/redsea.md

@@ -1,4 +1,4 @@
-# Sea of Reeds, Red Sea
+# sea of reeds, Sea of Reeds, Red Sea
 
 ## Facts:
 

bible/other/arrogant.md

@@ -1,4 +1,4 @@
-# arrogant, arrogance
+# arrogant, presumptuous
 
 ## Definition:
 

bible/other/biblicaltimeday.md

@@ -2,14 +2,18 @@
 
 ## Definition:
 
-The term “day” literally refers to a period of time lasting 24 hours beginning at sundown. It is also used figuratively.
+The term “day” generally refers to the time it takes for the alternating periods of light and darkness in the sky to complete one cycle (that is, 24 hours).  However, in the Bible the same term is often used to refer to a shorter period of time (such as the time between sunrise and sunset) or a longer period of time that is often not specified.
 
-* For the Israelites and the Jews, a day began at sunset of one day and ended at sunset of the next day.
-* Sometimes the term “day” is used figuratively to refer to a longer period of time, such as the “day of Yahweh” or “last days.”
-* Some languages will use a different expression to translate these figurative uses or will translate “day” nonfiguratively.
-* Other translations of “day” could include, “time” or “season” or “occasion” or “event,” depending on the context.
+* “Day” is sometimes used in contrast to “night."  In these cases, the term refers to the period of time when the sky is light.
+* The term may also refer to a specific point in time, such as “today.”
+* Sometimes the term “day” is used figuratively to refer to a longer period of time, such as the “day of Yahweh” or “last days.” Some languages will use a different expression to translate these figurative uses or will translate “day” non-figuratively.
 
-(See also: [judgment day](../kt/judgmentday.md), [last day](../kt/lastday.md))
+## Translation Suggestions:
+
+* It is best to translate this term literally as “day” or “daytime” using the word in your language that refers to the part of the day when there is light.
+* Other translations of “day” could include “daytime,” “time,” “season,” “occasion” or “event,” depending on the context.
+
+(See also: [time](../other/time.md), [judgment day](../kt/judgmentday.md), [last day](../kt/lastday.md))
 
 ## Bible References:
 

bible/other/cupbearer.md

@@ -4,7 +4,7 @@
 
 In Old Testament times, a “cupbearer” was a king’s servant who was given the task of bringing the king his cup of wine, usually tasting the wine first to make sure it had not been poisoned.
 
-* The literal meaning of this term is “cup bringer” or “someone who brings the cup.”
+* In English, the term cupbearer literally means “cup bringer” or “someone who brings the cup.”
 * A cupbearer was known for being very trustworthy and loyal to his king.
 * Because of his trusted position, a cupbearer would often have influence in the decisions the ruler made.
 * Nehemiah was the cupbearer for King Artaxerxes of Persia during the time when some of the Israelites were in captivity in Babylon.

bible/other/deliverer.md

@@ -1,4 +1,4 @@
-# deliver, deliverer, deliverance, hand over, turn over, released, rescue
+# deliver, hand over, turn over, release, rescue
 
 ## Definition:
 

bible/other/earth.md

@@ -1,13 +1,13 @@
-# earth, earthen, earthly
+# earth, land
 
 ## Definition:
 
-The term “earth” refers to the world that human beings live on, along with all other forms of life.
+The term “earth” refers to the world on which human beings and other living things live. In the Bible, this term is sometimes translated as "land" when used in a general way to refer to the ground or the soil, or when used in a specific way to refer to a particular geographical area, usually a country or nation.
 
-* “Earth” can also refer to the ground or soil that covers the land.
-* This term is often used figuratively to refer to the people who live on the earth. (See: [metonymy](rc://en/ta/man/translate/figs-metonymy))
-* The expressions “let the earth be glad” and “he will judge the earth” are examples of figurative uses of this term.
-* The term “earthly” usually refers to physical things in contrast to spiritual things.
+* In the Bible, the term "earth" is often paired with the term "heaven" as a way of indicating the abode of humankind on the earth in contrast with the abode of God in heaven.
+* This term is usually translated "land" when paired with the name of people group to denote the territory belonging to those people, such as “the land of Canaan.”
+* The term “earthly” is sometimes used to refer to things that are physical and/or visible in contrast to things that are non-physical and/or invisible.
+* This term can be used figuratively to refer to the people who live on the earth or what the earth contains, such as in “let the earth be glad” and “he will judge the earth.”
 
 ## Translation Suggestions:
 
@@ -16,7 +16,7 @@ The term “earth” refers to the world that human beings live on, along with a
 * When used figuratively, “earth” could be translated as “people on the earth” or “people living on earth” or “everything on earth.”
 * Ways to translate “earthly” could include “physical” or “things of this earth” or “visible.”
 
-(See also: [spirit](../kt/spirit.md), [world](../kt/world.md))
+(See also: [world](../kt/world.md), [heaven](../kt/heaven.md))
 
 ## Bible References:
 

bible/other/king.md

@@ -1,4 +1,4 @@
-# king, kingdom, kingship
+# king, kingship
 
 ## Definition:
 

bible/other/oppress.md

@@ -29,4 +29,4 @@ The terms “oppress” and “oppression” refer to treating people harshly. A
 
 ## Word Data:
 
-* Strong’s: H1790, H1792, H2541, H2555, H3238, H3905, H3906, H4642, H5065, H6125, H6184, H6206, H6216, H6217, H6231, H6233, H6234, H6693, H7429, H7533, H7701, G2616, G2669
+* Strong’s: H1790, H1792, H2541, H2555, H3238, H3905, H3906, H4642, H5065, H6031, H6125, H6184, H6206, H6216, H6217, H6231, H6233, H6234, H6693, H7429, H7533, H7701, G2616, G2669

bible/other/persecute.md

@@ -1,4 +1,4 @@
-# persecute, persecuted, persecution, persecutor, chase, pursue
+# persecute
 
 ## Definition:
 

bible/other/rebuke.md

@@ -1,4 +1,4 @@
-# rebuke
+# rebuke, reprove
 
 ## Definition:
 
@@ -15,6 +15,7 @@ The term "rebuke" refers to correcting someone verbally, usually with sternness
 
 ## Bible References:
 
+* [Genesis 21:25](rc://en/tn/help/gen/21/25)
 * [Mark 01:23-26](rc://en/tn/help/mrk/01/23)
 * [Mark 16:14](rc://en/tn/help/mrk/16/14)
 * [Matthew 08:26-27](rc://en/tn/help/mat/08/26)

bible/other/return.md

@@ -1,10 +1,10 @@
-# return
+# return, turn back
 
 ## Definition:
 
 The term “return” means to go back or to give something back.
 
-* To “return to” something means to start doing that activity again. To “return to” a place or person means to bo back to that place or person again.
+* To “return to” something means to start doing that activity again. To “return to” a place or person means to go back to that place or person again.
 * When the Israelites returned to their worship of idols, they were starting to worship them again.
 * When they returned to Yahweh, they repented and were worshiping Yahweh again.
 * To return land or things that were taken or received from someone else means to give that property back to the person it belongs to.

bible/other/sex.md

@@ -1,4 +1,4 @@
-# had relations with, lovemaking, sleep with
+# had relations with, lovemaking, sleep with, lie with
 
 ## Definition:
 

bible/other/shepherd.md

@@ -1,30 +1,28 @@
-# shepherd, chief shepherd
+# shepherd, herder
 
 ## Definition:
 
-A shepherd is a person who takes care of sheep. The verb to “shepherd” means to protect the sheep and provide them with food and water.
-Shepherds watch over the sheep, leading them to places with good food and water. Shepherds also keep the sheep from getting lost and protect them from wild animals.
-
-* This term is often used metaphorically in the Bible to refer to taking care of people’s spiritual needs. This includes teaching them what God has told them in the Bible and guiding them in the way they should live.
-* In the Old Testament, God was called the “shepherd” of his people because he took care of all their needs and protected them. He also led and guided them. (See: [Metaphor](rc://en/ta/man/translate/figs-metaphor))
-* Moses was a shepherd for the Israelites as he guided them spiritually in their worship of Yahweh and led them physically on their journey to the land of Canaan.
-* In the New Testament, Jesus called himself the “good shepherd.” The apostle Paul also referred to him as the “great shepherd” over the Church.
-* Also, in the New Testament, the term “shepherd” was used to refer to a person who was a spiritual leader over other believers. The word translated as “pastor” is the same word that is translated as “shepherd.” The elders and overseers were also called shepherds.
+A "shepherd" is a person who takes care of sheep. In the Old Testament, this word can also refer to a "herder" who takes care of other kinds of domestic livestock such as goats or cattle. 
 
+* As a verb, the term “shepherd” means to lead sheep (or other livestock) to places with good food and water, protect them from wild animals, keep them from getting lost and other duties necessary to keep livestock alive and healthy.
+* In the Bible, this term is often used figuratively to refer to taking care of the needs of people (not only animals), both physical and spiritual.
+* In the Old Testament, God was called the “shepherd” of his people because he took care of them. In the New Testament, Jesus called himself the “good shepherd,” and in other places Jesus is called the “great shepherd” of the Church.
+* The term “shepherd” is also used in the New Testament to refer to a person who is a spiritual leader over other believers. The word translated as “pastor” is the same word that is translated as “shepherd.” Elders and overseers are also called shepherds.
 
 ## Translation Suggestions
 
-* When used literally, the action “shepherd” could be translated as “take care of sheep” or “watch over sheep.”
-* The person “shepherd” could be translated as “person who takes care of sheep” or “sheep tender” or “sheep caregiver.”
-* When used as a metaphor, different ways to translate this term could include “spiritual shepherd” or “spiritual leader” or “one who is like a shepherd” or “one who cares for his people like a shepherd cares for his sheep” or “one who leads his people like a shepherd guides his sheep” or “one who takes care of God’s sheep.”
-* In some contexts, “shepherd” could be translated as “leader” or “guide” or “caregiver.”
-* The spiritual expression to “shepherd” could be translated as to “take care of” or to “spiritually nourish” or to “guide and teach” or to “lead and take care of (like a shepherd cares for sheep).”
-* In figurative uses, it is best to use or include the literal word for “shepherd” in the translation of this term.
+* The noun “shepherd” can be translated as “person who takes care of sheep” or “sheep tender” or “sheep caregiver.”
+* When referring to someone who cares for livestock other than sheep, the term can be translated as "herder," "tender of livestock" or "person who takes care of livestock."
+* When used as a verb, the term “shepherd” could be translated as “take care of sheep” or “watch over sheep.”
+* In some contexts, the term “shepherd” could be translated as “leader” or “guide” or “caregiver.”
+* When used figuratively, the noun "shepherd" could be translated in different ways, including “spiritual shepherd” or “spiritual leader” or “one who is like a shepherd” or “one who cares for his people like a shepherd cares for his sheep” or “one who leads his people like a shepherd guides his sheep” or “one who takes care of God’s sheep.”
+When used figuratively, the verb "shepherd" could be translated as to “take care of” or to “spiritually nourish” or to “guide and teach” or to “lead and take care of (like a shepherd cares for sheep).”
 
-(See also: [believe](../kt/believe.md), [Canaan](../names/canaan.md), [church](../kt/church.md), [Moses](../names/moses.md), [pastor](../kt/pastor.md), [sheep](../other/sheep.md), [spirit](../kt/spirit.md))
+(See also: [sheep](../other/sheep.md), [livestock](../other/livestock.md), [pastor](../kt/pastor.md))
 
 ## Bible References:
 
+* [Genesis 13:7](rc://en/tn/help/gen/13/07)
 * [Genesis 49:24](rc://en/tn/help/gen/49/24)
 * [Luke 02:09](rc://en/tn/help/luk/02/09)
 * [Mark 06:34](rc://en/tn/help/mrk/06/34)

bible/other/watch.md

@@ -1,4 +1,4 @@
-# watch, guard, take heed, beware
+# watch, guard, keep, take heed, beware
 
 ## Definition:
 

bible/other/water.md

@@ -1,4 +1,4 @@
-# water
+# water, deep
 
 ## Definition:
 
@@ -8,6 +8,7 @@ In addition to its primary meaning, “water” also often refers to a body of w
 * A figurative use of “waters” refers to great distress, difficulties, and suffering. For example, God promises that when we “go through the waters” he will be with us.
 * The phrase “many waters” emphasizes how great the difficulties are.
 * To “water” livestock and other animals means to “provide water for” them. In Bible times, this usually involved drawing water from a well with a bucket and pouring the water into a trough or other container for the animals to drink from.
+* The "deep" refers to a deep body of water, such as the watery depths at the beginning of creation or bodies of water that extend deep under the earth's surface such as oceans, seas, etc.
 * In the Old Testament, God is referred to as the spring or fountain of “living waters” for his people. This means he is the source of spiritual power and refreshment.
 * In the New Testament, Jesus used the phrase “living water” to refer to the Holy Spirit working in a person to transform and bring new life.
 
@@ -31,4 +32,4 @@ In addition to its primary meaning, “water” also often refers to a body of w
 
 ## Word Data:
 
-* Strong’s: H2222, H4325, H4529, H4857, H7301, H7783, H8248, G504, G4215, G4222, G5202, G5204
+* Strong’s: H2222, H4325, H4529, H4857, H7301, H7783, H8248, H8415, G504, G4215, G4222, G5202, G5204

manifest.yaml

@@ -16,29 +16,29 @@ dublin_core:
   description: 'A basic Bible lexicon that provides translators with clear, concise definitions and translation suggestions for every important word in the Bible. It provides translators and checkers with essential lexical information to help them make the best possible translation decisions.'
   format: 'text/markdown'
   identifier: 'tw'
-  issued: '2020-07-23'
+  issued: '2020-10-28'
   language:
     identifier: 'en'
     title: 'English'
     direction: 'ltr'
-  modified: '2020-07-23'
+  modified: '2020-10-28'
   publisher: 'unfoldingWord'
   relation:
     - 'en/ult'
     - 'en/ust'
     - 'en/obs'
-    - 'el-x-koine/ugnt?v=0.13'
-    - 'hbo/uhb?v=2.1.14'
+    - 'el-x-koine/ugnt?v=0.15'
+    - 'hbo/uhb?v=2.1.15'
   rights: 'CC BY-SA 4.0'
   source:
     -
       identifier: 'tw'
       language: 'en'
-      version: '15'
+      version: '16'
   subject: 'Translation Words'
   title: 'unfoldingWord® Translation Words'
   type: 'dict'
-  version: '16'
+  version: '17'
 
 checking:
   checking_entity: