fixed conflicts

1ch/06/49.md

@@ -1,3 +1,7 @@
+# These offerings made atonement for Israel
+
+"They offered these things to make atonement for the sins of the people of Israel"
+
 # translationWords
 
 * [[rc://en/tw/dict/bible/other/aaron]]

1co/03/08.md

@@ -1,3 +1,31 @@
+# he who plants and he who waters are one
+
+Paul speaks of telling people the good news and teaching those who have accepted it as if they were planting and watering plants. (See: [[rc://en/ta/man/translate/figs-metaphor]])
+
+# are one
+
+Possible meanings are "one" are 1) "united in purpose" or 2) "equal in importance."
+
+# wages
+
+an amount of money that a worker receives for his work
+
+# we
+
+This refers to Paul and Apollos but not the Corinthian church. (See: [[rc://en/ta/man/translate/figs-exclusive]])
+
+# God's fellow workers
+
+Paul considers himself and Apollos as working together.
+
+# You are God's garden
+
+Possible meanings are 1) being God's garden represents belonging to God. AT: "You are like a garden that belongs to God" or 2) being God's garden represents God causing us to grow. AT: "You are like a garden that God makes grow" (See: [[rc://en/ta/man/translate/figs-metaphor]])
+
+# God's building
+
+Possible meanings are 1) being God's building represents belonging to God. AT: "and you are like a building that belongs to God" or 2) being God's building represents God causing us to become what he wants. AT: "and you are like a building that God is constructing" (See: [[rc://en/ta/man/translate/figs-metaphor]])
+
 # translationWords
 
 * [[rc://en/tw/dict/bible/other/labor]]

2co/10/15.md

@@ -10,8 +10,8 @@ This is an idiom. AT: "have not boasted about things over which we have no autho
 
 * [[rc://en/tw/dict/bible/kt/boast]]
 * [[rc://en/tw/dict/bible/other/labor]]
-* [[rc://en/tw/dict/bible/kt/hope]]
 * [[rc://en/tw/dict/bible/kt/faith]]
 * [[rc://en/tw/dict/bible/kt/works]]
+* [[rc://en/tw/dict/bible/kt/hope]]
 * [[rc://en/tw/dict/bible/other/preach]]
 * [[rc://en/tw/dict/bible/kt/goodnews]]

2sa/01/14.md

@@ -1,3 +1,27 @@
+# Why were you not afraid to kill Yahweh's anointed ... hand?
+
+This rhetorical question is used to rebuke the man. It can be translated as a statement. AT: "You should have feared Yahweh and not killed his anointed ... hand!" (See: [[rc://en/ta/man/translate/figs-rquestion]])
+
+# Yahweh's anointed king
+
+This refers to Saul.
+
+# with your own hand
+
+This phrase refers to doing something yourself. AT: "yourself" or "personally" (See: [[rc://en/ta/man/translate/figs-metonymy]])
+
+# struck him down
+
+This idiom means "killed him." (See: [[rc://en/ta/man/translate/figs-idiom]])
+
+# Your blood is on your head
+
+Here "blood" is a metonym that implies "shed blood" and is associated with death. Here "your head" is a synecdoche referring to the man and means that he is responsible. AT: "You are responsible for your own death" or "You have caused your own death" (See: [[rc://en/ta/man/translate/figs-metonymy]] and [[rc://en/ta/man/translate/figs-synecdoche]])
+
+# your own mouth has testified against you
+
+Here "your own mouth" refers to the man himself. AT: "you have testified against yourself" (See: [[rc://en/ta/man/translate/figs-synecdoche]])
+
 # translationWords
 
 * [[rc://en/tw/dict/bible/kt/fear]]

ezk/16/60.md

@@ -9,3 +9,11 @@ This idiom means to remember. AT: "remember" (See: [[rc://en/ta/man/translate/fi
 # made in the days of your youth
 
 This can be stated in active form. AT: "that I made with you when you were young" (See: [[rc://en/ta/man/translate/figs-activepassive]])
+
+# translationWords
+
+* [[rc://en/tw/dict/bible/kt/call]]
+* [[rc://en/tw/dict/bible/other/mind]]
+* [[rc://en/tw/dict/bible/kt/covenant]]
+* [[rc://en/tw/dict/bible/kt/eternity]]
+* [[rc://en/tw/dict/bible/other/shame]]

gen/14/03.md

@@ -26,6 +26,10 @@ These are the names of people groups. (See: [[rc://en/ta/man/translate/translate
 
 These are the names of places. (See: [[rc://en/ta/man/translate/translate-names]])
 
+# Ham
+
+This name in Hebrew is different from the name of Noah's son, which is spelled the same way in English.
+
 # El Paran, which is near the desert
 
 This phrase helps readers understand where El Paran was. It can be translated as a separate sentence if necessary. AT: "El Paran. El Paran is near the desert" (See: [[rc://en/ta/man/translate/figs-distinguish]])

job/09/21.md

@@ -1,3 +1,47 @@
+# I am blameless
+
+"I am faultless"
+
+# about myself
+
+"what happens to me"
+
+# It makes no difference
+
+"It is all the same" or "It does not matter"
+
+# he destroys blameless people and wicked people together
+
+Here "blameless" and "wicked" are two extremes for a merism that include everything in between. AT: "he brings everyone to an end, whether they are blameless or wicked" (See: [[rc://en/ta/man/translate/figs-merism]])
+
+# If a plague should suddenly kill
+
+"If a disaster should suddenly kill people"
+
+# at the afflictions of innocent people
+
+The abstract noun "afflictions" can be translated as the verb "afflict." AT: "when innocent people are afflicted" (See: [[rc://en/ta/man/translate/figs-abstractnouns]])
+
+# The earth is given
+
+This can be stated in active form. AT: "God gives the earth" (See: [[rc://en/ta/man/translate/figs-activepassive]])
+
+# The earth is
+
+Here "the earth" is used to represent the people on the earth. AT: "The people of the world are" (See: [[rc://en/ta/man/translate/figs-metonymy]])
+
+# into the hand of
+
+Here "hand" is a metonym for "control." AT: "into the control of" (See: [[rc://en/ta/man/translate/figs-metonymy]])
+
+# God covers the faces of its judges
+
+This idiom means God keeps the judges of the earth from being able to judge the difference between right and wrong. AT: "God makes its judges blind" or "God keeps its judges from judging rightly" (See: [[rc://en/ta/man/translate/figs-idiom]])
+
+# If it is not he who does it, then who is it?
+
+"If it is not God who does these things, then who does them?"
+
 # translationWords
 
 * [[rc://en/tw/dict/bible/kt/blameless]]

php/02/14.md

@@ -1,7 +1,6 @@
-
 # so that you may shine as lights in the world
 
-Light represents goodness and truth. Shining as lights in the world represents living in a good and rigtheous way so that people in the world can see that God is good and true. AT:  "so that you will be like lights in the world" (See: [[rc://en/ta/man/translate/figs-metaphor]])
+Light represents goodness and truth. Shining as lights in the world represents living in a good and righteous way so that people in the world can see that God is good and true. AT:  "so that you will be like lights in the world" (See: [[rc://en/ta/man/translate/figs-metaphor]])
 
 # in the world, in the middle of a crooked and depraved generation
 
@@ -9,14 +8,12 @@ Here the word "world" refers to the people of the world. The words "crooked" and
 
 # Hold tightly to the word of life
 
-"Hold tightly" reperesents firmly believing. AT: "Continue to firmly beleive the word of life"  (See: [[rc://en/ta/man/translate/figs-metaphor]])
-
+"Hold tightly" represents firmly believing. AT: "Continue to firmly believe the word of life"  (See: [[rc://en/ta/man/translate/figs-metaphor]])
 
 # the word of life
 
 "the message that brings life" or "the message that shows how to really live"
 
-
 # translationWords
 
 * [[rc://en/tw/dict/bible/kt/blameless]]