Merge branch '2018.02.07' of Door43/en_tn into master

2018-02-08 15:23:24 +00:00 · 2018-02-08 15:23:24 +00:00 · 34e560386a
parent 25334c90e7 ca67019038
commit 34e560386a
36 changed files with 103 additions and 58 deletions
--- a/1ch/01/07.md
+++ b/1ch/01/07.md
@ -1,6 +1,6 @@
 # Elishah ... Tarshish

-These are all names of men. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

 # Kittites ... Rodanites

--- a/1ch/01/11.md
+++ b/1ch/01/11.md
@ -1,4 +1,4 @@
 # Ludites ... Anamites ... Lehabites ... Naphtuhites

-names of people groups (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of people groups. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/12.md
+++ b/1ch/01/12.md
@ -1,8 +1,8 @@
 # Pathrusites ... Kasluhites ... Philistines ... Caphtorites

-names of people groups (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of people groups. (See: [[rc://en/ta/man/translate/translate-names]])

 # from whom the Philistines came

-"the ancestors of the Philistines,"
+"the ancestors of the Philistines"

--- a/1ch/01/13.md
+++ b/1ch/01/13.md
@ -1,8 +1,8 @@
-# Sidon
+# Canaan ... Sidon

-This is the name of a man (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

-# Hittites ... Jebusites ... Amorites ... Girgashites ... Hivites ... Arkites ... Sinites ... Arvadites ... Zemarites ... Hamathites
+# Hittites

-names of people groups (See: [[rc://en/ta/man/translate/translate-names]])
+This is the name of a people group. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/14.md
+++ b/1ch/01/14.md
@ -1,4 +1,4 @@
-# Jebusites ... Amorites ... Girgashites ... 
+# Jebusites ... Amorites ... Girgashites 

-names of people groups (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of people groups. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/15.md
+++ b/1ch/01/15.md
@ -1,4 +1,4 @@
 # Hivites ... Arkites ... Sinites

-names of people groups (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of people groups. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/16.md
+++ b/1ch/01/16.md
@ -1,4 +1,4 @@
 # Arvadites ... Zemarites ... Hamathites

-names of people groups (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of people groups. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/33.md
+++ b/1ch/01/33.md
@ -0,0 +1,3 @@
+# General Information:
+
+All of the names here except for Keturah are names of men. Keturah is the name of a woman. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/01/38.md
+++ b/1ch/01/38.md
@ -1,4 +1,4 @@
 # General Information:

-All of the names here are names of men, execpt for Timna. Timna is the name of a woman. (See: [[rc://en/ta/man/translate/translate-names]])
+All of the names in this verse are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/39.md
+++ b/1ch/01/39.md
@ -0,0 +1,3 @@
+# General Information:
+
+All of the names here are names of men, execpt for Timna. Timna is the name of a woman. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/01/40.md
+++ b/1ch/01/40.md
@ -0,0 +1,3 @@
+# General Information:
+
+All of the names here are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/01/43.md
+++ b/1ch/01/43.md
@ -1,8 +1,10 @@
+# Edom ... Dinhabah
+
+These are the names of places. (See: [[rc://en/ta/man/translate/translate-names]])
+
 # Bela ... Beor

 These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

-# Dinhabah ... Bozrah

-These are the names of places. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/44.md
+++ b/1ch/01/44.md
@ -1,8 +1,8 @@
-# Bela ... Beor ... Jobab ... Zerah ... Husham
+# Bela ... Jobab ... Zerah

 These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

-# Dinhabah ... Bozrah
+# Bozrah

-These are the names of places. (See: [[rc://en/ta/man/translate/translate-names]])
+This is the name of a place. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/45.md
+++ b/1ch/01/45.md
@ -1,6 +1,6 @@
-# Bela ... Beor ... Jobab ... Zerah ... Husham
+# Jobab ... Husham

-These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

 # Husham of the land of the Temanites reigned in his place

--- a/1ch/01/46.md
+++ b/1ch/01/46.md
@ -1,6 +1,6 @@
 # Husham ... Hadad ... Bedad

-These are the names of people. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

 # Avith

--- a/1ch/01/47.md
+++ b/1ch/01/47.md
@ -1,8 +1,8 @@
-# Husham ... Hadad ... Bedad ... Samlah ... Shaul
+# Hadad ... Samlah

-These are the names of people. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

-# Avith ... Masrekah ... Rehoboth
+# Masrekah

-These are the names of places. (See: [[rc://en/ta/man/translate/translate-names]])
+This is the name of a place. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/48.md
+++ b/1ch/01/48.md
@ -1,8 +1,8 @@
-# Husham ... Hadad ... Bedad ... Samlah ... Shaul
+# Samlah ... Shaul

-These are the names of people. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

-# Avith ... Masrekah ... Rehoboth
+# Rehoboth

-These are the names of places. (See: [[rc://en/ta/man/translate/translate-names]])
+This is the name of a place. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/49.md
+++ b/1ch/01/49.md
@ -1,4 +1,4 @@
-# Shaul ... Baal-Hanan ... Akbor ... Hadad ... Matred ... Me-Zahab
+# Shaul ... Baal-Hanan ... Akbor

 These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/50.md
+++ b/1ch/01/50.md
@ -1,4 +1,4 @@
-# Shaul ... Baal-Hanan ... Akbor ... Hadad ... Matred ... Me-Zahab
+# Baal-Hanan ... Akbor ... Hadad ... Me-Zahab

 These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

@ -6,7 +6,7 @@ These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

 This is the name of a place. (See: [[rc://en/ta/man/translate/translate-names]])

-# Mehetabel
+# Mehetabel ... Matred

-This is the name of a woman. (See: [[rc://en/ta/man/translate/translate-names]])
+These are the names of women. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/01/51.md
+++ b/1ch/01/51.md
@ -1,4 +1,7 @@
-# General Information:
+# Hadad ... Timna ... Alvah ... Jetheth

-All of the names here except Edom are names of men. Edom is a place name. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

+# Edom
+
+This is the name of a place. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/01/52.md
+++ b/1ch/01/52.md
@ -0,0 +1,3 @@
+# Oholibamah ... Elah ... Pinon
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/01/53.md
+++ b/1ch/01/53.md
@ -0,0 +1,3 @@
+# Kenaz ... Teman ... Mibzar
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/01/54.md
+++ b/1ch/01/54.md
@ -0,0 +1,7 @@
+# Magdiel ... Iram
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
+
+# Edom
+
+This is the name of a place. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/02/02.md
+++ b/1ch/02/02.md
@ -0,0 +1,3 @@
+# General Information:
+
+All of the names here are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/02/03.md
+++ b/1ch/02/03.md
@ -1,14 +1,10 @@
-# General Information:
-
-This list includes the names of both men and women names. (See: [[rc://en/ta/man/translate/translate-names]])
-
-# Er, Onan, and Shelah ... Shua ... Perez ... Zerah
+# Er ... Onan ... Shelah ... Shua ... Judah

 These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

-# who were born to him by Shua's daughter
+# who were born to him by Shua's daughter, a Canaanite woman

-This can be translated in active form. AT: "his sons whom Shua bore" (See: [[rc://en/ta/man/translate/figs-activepassive]])
+This can be translated in active form. AT: "his sons whom Shua's daughter, a Canaanite woman, bore" (See: [[rc://en/ta/man/translate/figs-activepassive]])

 # Yahweh

@ -20,5 +16,5 @@ The sight of Yahweh represents his judgment or evaluation. AT: "as Yahweh judged

 # Yahweh killed him

-The reader should understand that Yahweh probably had a person kill Er. (See: [[rc://en/ta/man/translate/figs-metonymy]])
+The reader should understand that Yahweh may have had a person kill Er. (See: [[rc://en/ta/man/translate/figs-metonymy]])

--- a/1ch/02/04.md
+++ b/1ch/02/04.md
@ -1,4 +1,12 @@
-# Er, Onan, and Shelah ... Shua ... Perez ... Zerah
+# Tamar
+
+This is the name of a woman. (See: [[rc://en/ta/man/translate/translate-names]])
+
+# daughter-in-law
+
+This refers to the wife of his son.
+
+# Perez ... Zerah ... Judah

 These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

@ -6,14 +14,6 @@ These are the names of men. (See: [[rc://en/ta/man/translate/translate-names]])

 "gave birth to his sons Perez and Zerah"

-# Tamar
-
-This is the name of a woman. (See: [[rc://en/ta/man/translate/translate-names]])
-
-# daughter-in-law
-
-This is a reference to the wife of his son.
-
 # five sons

 "5 sons" (See: [[rc://en/ta/man/translate/translate-numbers]])
--- a/1ch/02/05.md
+++ b/1ch/02/05.md
@ -1,4 +1,4 @@
-# General Information:
+# Perez ... Hezron ... Hamul

-All of the names here are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/02/06.md
+++ b/1ch/02/06.md
@ -0,0 +1,3 @@
+# Zerah ... Zimri ... Ethan ... Heman ... Kalkol ... Darda
+
+These are all names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/02/07.md
+++ b/1ch/02/07.md
@ -1,3 +1,7 @@
+# Karmi ... Achar
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
+
 # what was reserved for God

 what God had said he wanted the people to destroy
--- a/1ch/02/08.md
+++ b/1ch/02/08.md
@ -0,0 +1,3 @@
+# Ethan ... Azariah
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/02/09.md
+++ b/1ch/02/09.md
@ -1,4 +1,4 @@
-# General Information:
+# Hezron ... Jerahmeel ... Ram ... Caleb

-All of the names here are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])

--- a/1ch/02/10.md
+++ b/1ch/02/10.md
@ -0,0 +1,3 @@
+# Ram ... Amminadab ... Nahshon ... Judah 
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/02/11.md
+++ b/1ch/02/11.md
@ -0,0 +1,3 @@
+# Nahshon ... Salmon ... Boaz 
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/02/12.md
+++ b/1ch/02/12.md
@ -0,0 +1,3 @@
+# Boaz ... Obed ... Jesse
+
+These are names of men. (See: [[rc://en/ta/man/translate/translate-names]])
--- a/1ch/21/03.md
+++ b/1ch/21/03.md
@ -4,7 +4,7 @@ Joab expresses the desire for an army the size of 100 armies to say he would lik

 # But my master the king, do they not all serve my master? Why does my master want this? Why bring guilt on Israel?

-Job uses these three rhetorical questions to tell David that the census was a bad idea. It appears that David was trusting the size of his army instead of trusting Yahweh, and thus making Israel guilty of sin. These rhetorical questions can be translated as statements. AT: But my master the king, they all serve you already. My master should not request this. You will only bring guilt on the people of Israel by trusting your military power." (See: [[rc://en/ta/man/translate/figs-rquestion]])
+Joab uses these three rhetorical questions to tell David that the census was a bad idea. It appears that David was trusting the size of his army instead of trusting Yahweh, and thus making Israel guilty of sin. These rhetorical questions can be translated as statements. AT: But my master the king, they all serve you already. My master should not request this. You will only bring guilt on the people of Israel by trusting your military power." (See: [[rc://en/ta/man/translate/figs-rquestion]])

 # Why does my master want this?

--- a/php/01/22.md
+++ b/php/01/22.md
@ -8,5 +8,5 @@ The word "flesh" here is a metonym for the body, and "living in the flesh" is a

 # that means fruitful labor for me

-The word "fruit" here refers to the good results of Paul's work. AT: "that means I will be able to work and my work will produce good results" or "then I will have more chances to encourage people to believe in Christ" (See: [[rc://en/ta/man/translate/figs-metaphor]] and [[rc://en/ta/man/translate/figs-explicit]])
+The word "fruit" here refers to the good results of Paul's work. AT: "that means I will be able to work and my work will produce good results" (See: [[rc://en/ta/man/translate/figs-metaphor]] and [[rc://en/ta/man/translate/figs-explicit]])