Conflicts resolved
This commit is contained in:
Tom Warren 2016-09-06 09:27:58 -04:00
commit 3d9634f76e
21 changed files with 76 additions and 66 deletions

View File

@ -3,7 +3,7 @@
\s5
\c 7
\p
\v 1 When the wall was finished and I had set up the doors in place, and the gatekeepers and singers and Levites were appointed,
\v 1 When the wall was finished and I had set up the doors in place, and the gatekeepers and singers and Levites had been appointed,
\v 2 I gave my brother Hanani charge over Jerusalem, along with Hananiah who had oversight of the citadel, for he was a faithful man and feared God more than many.
\s5

View File

@ -13,7 +13,7 @@
\v 6 Ezra gave thanks to Yahweh, the great God, and all the people lifted up their hands and answered, "Amen! Amen!" Then they bowed their heads and worshiped Yahweh with their faces to the ground.
\v 7 Also Jeshua, Bani, Sherebiah, Jamin, Akkub, Shabbethai, Hodiah, Maaseiah, Kelita, Azariah, Jozabad, Hanan, Pelaiah—the Levites—helped the people understand the law, while the people remained in their place.
\f + \ft Most modern versions, including the ULB and UDB, translate so as to identify as Levites all the persons named in this verse. However, some modern versions translate so as to put \fqa the Levites \fqb in the same list as the individuals first named. \f*
\v 8 And they read in the book, the law of God, making it clear with interpretation and giving the meaning so they understood the reading.
\v 8 They read in the book, the law of God, making it clear with interpretation and giving the meaning so the people understood the reading.
\s5
\p

View File

@ -37,7 +37,7 @@ The people from Judah included: Athaiah son of Uzziah son of Zechariah son of Am
\v 16 and Shabbethai and Jozabad, who were from the leaders of the Levites and were in charge of the outside work of the house of God.
\s5
\v 17 There was Mattaniah son of Mica son of Zabdi, a descendant of Asaph, who was the director who led the thanksgiving in prayer, and Bakbukiah, the second among his associates, and Abda son of Shammua son of Galal son of Jeduthun.
\v 17 There was Mattaniah son of Mica son of Zabdi, a descendant of Asaph, who was the director who began the thanksgiving in prayer, and Bakbukiah, the second among his associates, and Abda son of Shammua son of Galal son of Jeduthun.
\v 18 In all the holy city were 284 Levites.
\s5

View File

@ -1,12 +1,12 @@
\c 12
\s5
\p
\v 1 These are the priests and Levites who came up with Zerubbabel son of Shealtiel and with Jeshua: Seraiah, Jeremiah, Ezra,
\v 1 These were the priests and Levites who came up with Zerubbabel son of Shealtiel and with Jeshua: Seraiah, Jeremiah, Ezra,
\v 2 Amariah, Malluch, Hattush,
\v 3 Shecaniah, Rehum, and Meremoth.
\s5
\v 4 There was Iddo, Ginnethoi, Abijah,
\v 4 There were Iddo, Ginnethoi, Abijah,
\v 5 Mijamin, Maadiah, Bilgah,
\v 6 Shemaiah, and Joiarib, Jedaiah.
\v 7 Sallu, Amok, Hilkiah, and Jedaiah. These were the leaders of the priests and their associates in the days of Jeshua.
@ -22,18 +22,20 @@
\s5
\p
\v 12 In the days of Joiakim these were the priests, the heads of fathers' families: Meraiah was leader of Seraiah, Hananiah was leader of Jeremiah,
\v 13 Meshullam was leader of Ezra, Jehohanan was leader of Amariah,
\v 14 Jonathan was leader of Malluchi, and Joseph was leader of Shebaniah.
\v 12 In the days of Joiakim these were the priests, the leaders of the families: Meraiah was the leader of Seraiah, Hananiah was the leader of Jeremiah,
\v 13 Meshullam was the leader of Ezra, Jehohanan was the leader of Amariah,
\v 14 Jonathan was the leader of Malluch, and Joseph was the leader of Shebaniah.
\f + \ft Many modern versions, including the ULB and UDB, have \fqa Malluch \fqb as a correction for \fqa Malluchi \fqb in the Hebrew text. The correct form of this name appears in Neh. 12:2. \f*
\s5
\v 15 To continue, Adna was leader of Harim, Helkai leader of Meraioth,
\v 16 Zechariah was leader of Iddo, Meshullam was leader of Ginnethon, and
\v 17 Zichri was leader of Abijah. There was also a leader of Miniamin. Piltai was leader of Moadiah.
\v 18 Shammua was leader of Bilgah, Jehonathan was leader of Shemaiah,
\v 19 Mattenai was leader of Joiarib, Uzzi was leader of Jedaiah,
\v 20 Kallai was leader of Sallai, Eber was leader of Amok,
\v 21 Hashabiah was leader of Hilkiah, and Nethanel was leader of Jedaiah.
\v 15 To continue, Adna was the leader of Harim, Helkai the leader of Meraioth,
\v 16 Zechariah was the leader of Iddo, Meshullam was the leader of Ginnethon, and
\v 17 Zichri was the leader of Abijah. ... of Miniamin. Piltai was the leader of Moadiah.
\f + \ft The expression \fqa ... of Miniamin \fqb is incomplete, because no leader of that family is named in the Hebrew text. \f*
\v 18 Shammua was the leader of Bilgah, Jehonathan was the leader of Shemaiah,
\v 19 Mattenai was the leader of Joiarib, Uzzi was the leader of Jedaiah,
\v 20 Kallai was the leader of Sallai, Eber was the leader of Amok,
\v 21 Hashabiah was the leader of Hilkiah, and Nethanel was the leader of Jedaiah.
\s5
\p
@ -41,8 +43,8 @@
\v 23 The descendants of Levi and their leaders of families were recorded in The Book of the Annals up to the days of Johanan son of Eliashib.
\s5
\v 24 And the leaders of the Levites were Hashabiah, Sherebiah, and Jeshua son of Kadmiel, with their associates who stood opposite them to give praise and to give thanks, responding section by section, in obedience to the command of David, the man of God.
\v 25 Mattaniah, Bakbukiah, Obadiah, Meshullam, Talmon, and Akkub were gatekeepers standing guard at the storerooms of the gates.
\v 24 The leaders of the Levites were Hashabiah, Sherebiah, and Jeshua son of Kadmiel, with their associates, who stood opposite them to give praise and to give thanks, responding section by section, in obedience to the command of David, the man of God.
\v 25 Mattaniah, Bakbukiah, Obadiah, Meshullam, Talmon, and Akkub were gatekeepers standing guard at the storerooms by the gates.
\v 26 They served in the days of Joiakim son of Jeshua son of Jozadak, and in the days of Nehemiah the governor and of Ezra the priest and scribe.
\s5

View File

@ -28,7 +28,7 @@
\q
\v 7 There can be hope for a tree;
\q if it is cut down, it might sprout again,
\q that its tender branch will not cease.
\q so that its tender stalk does not disappear.
\q
\v 8 Though its root grows old in the earth,
\q and its stump dies in the ground,

View File

@ -115,8 +115,10 @@
\q not even his shadow will last on the earth.
\q
\v 30 He will not depart out of darkness;
\q a flame will dry up his branches;
\f + \ft Several modern versions leave out \fqa He will not depart out of darkness \fqb , because they believe that this expression was mistakenly copied from 15:22. \f*
\q a flame will dry up his stalks;
\q at the breath of God's mouth he will go away.
\f + \ft The Hebrew text has \fqa He will go away by the breath of his mouth \fqb , which some modern versions, including the ULB and UDB, interpret as meaning the breath of God's mouth. However, other modern versions follow an ancient Greek reading, \fqa his flower will fall with the wind \fqb . \f*
\s5
\q

View File

@ -43,11 +43,12 @@
\s5
\q
\v 11 My days are past, my plans are over,
\q even the wishes of my heart.
\v 11 My days are past; my plans are over.
\q As for the wishes of my heart ...
\f + \ft Some modern versions have \fqa My days are past, as are my plans. The wishes of my heart are finished \fqb or \fqa ... the strings of my heart have been broken \fqb . Others have \fqa My days are past; my plans are over, as are the wishes of my heart \fqb \f*
\q
\v 12 These people, these mockers, change the night into day;
\q the light, they say, is near to the darkness.
\q light is near to darkness.
\s5
\q

View File

@ -91,7 +91,8 @@
\s5
\q
\v 22 You lift me up to the wind and cause it to drive me along;
\q you melt me in the storm.
\q you throw me back and forth in a storm.
\f + \ft Some modern versions have \fqa you dissolve me in a storm \fqb . \f*
\q
\v 23 For I know that you will bring me to death,
\q to the house destined for all living things.

View File

@ -110,13 +110,14 @@
\s5
\q
\v 27 For he draws up the drops of water
\q that distill as rain from his vapor,
\q that he distills as rain from his vapor,
\f + \ft Some modern versions have \fqa that distill as rain from his vapor \fqb . \f*
\q
\v 28 which the clouds pour down
\q and drop in abundance on mankind.
\q
\v 29 Indeed, can anyone understand the extensive spread of the clouds
\q and the thunder from his tent?
\q and the thunder from his hut?
\s5
\q

View File

@ -5,7 +5,7 @@
\p
\v 1 Then Yahweh called to Job out of a fierce storm and said,
\q
\v 2 "Who is this who brings darkness to my plans
\v 2 "Who is this who brings darkness to plans
\q by means of words without knowledge?
\q
\v 3 Now gird up your loins like a man

View File

@ -8,8 +8,8 @@
\v 2 "I know that you can do all things,
\q that no purpose of yours can be stopped.
\q
\v 3 You asked me, 'Who is this without knowledge who brings darkness to my plans?'
\q Therefore I have spoken things that I did not understand,
\v 3 'Who is this who without knowledge conceals plans?'
\q Indeed, I have spoken things that I did not understand,
\q things too difficult for me to understand, which I did not know about.
\s5

View File

@ -48,7 +48,8 @@ the day that Yahweh rescued him from the hand of all his enemies and from the ha
\s5
\q
\v 13 Yahweh thundered in the heavens! The Most High shouted and sent hailstones and lightning.
\v 13 Yahweh thundered in the heavens! The Most High gave forth his voice, hailstones and lightning.
\f + \ft Many modern versions leave out \fqa hailstones and lightning \fqa, believing this expression to be an accidental repetition from the previous verse. \f*
\q
\v 14 He shot his arrows and scattered his enemies; many lightning bolts dispersed them.

View File

@ -25,3 +25,4 @@
\q Hope in God, for again I will praise him who is my salvation and my God.

View File

@ -38,13 +38,13 @@
\v 8 I would hurry to a shelter
\q from the stormy wind and tempest."
\q
\v 9 Destroy them, Lord, and confuse their languages,
\q for I have seen violence and strife in the city.
\v 9 Devour them, Lord, confuse their language!
\q For I have seen violence and strife in the city.
\s5
\q
\v 10 Day and night they go about on her walls;
\q iniquity and mischief are in the middle of her.
\v 10 Day and night they go about on its walls;
\q iniquity and mischief are in the middle of it.
\q
\v 11 Wickedness is in the middle of it;
\q oppression and deceit do not leave its streets.
@ -81,11 +81,11 @@
\s5
\q
\v 19 God, he who remains from ancient times,
\q will hear and respond to them.
\v 19 God, the one who rules from eternity,
\q will hear them and humiliate them.
\qs Selah\qs*
\q Those men do not change;
\q they do not fear God.
\q They never change,
\q and they do not fear God.
\s5
\q

View File

@ -5,7 +5,7 @@
\d For the chief musician; set to Shushan Eduth. A michtam of David, for teaching. When he fought with Aram Naharaim and with Aram Zobah, and Joab returned and killed twelve thousand Edomites in the valley of Salt.
\b
\q
\v 1 God, you have cast us off; you have broken us down;
\v 1 God, you have cast us off; you have broken through our defenses;
\q you have been angry; restore us again.
\s5

View File

@ -33,8 +33,8 @@
\s5
\q
\v 8 My mouth will be filled with your praise
\q and with your honor all the day.
\v 8 My mouth will be filled with your praise,
\q all the day with your honor.
\q
\v 9 Do not throw me away in my time of old age;
\q do not abandon me when my strength fails.
@ -52,7 +52,7 @@
\v 12 God, do not be far from me;
\q my God, hurry to help me.
\q
\v 13 Let them be put to shame and consumed, those who are hostile to my life;
\v 13 Let them be put to shame and destroyed, those who are hostile to my life;
\q let them be covered with rebuke and dishonor, those who seek my hurt.
\s5
@ -64,7 +64,7 @@
\q and your salvation all the day,
\q although I cannot understand it.
\q
\v 16 I will go to them with the mighty acts of the Lord Yahweh;
\v 16 I will come with the mighty acts of the Lord Yahweh;
\q I will make mention of your righteousness, yours alone.
\s5
@ -98,7 +98,7 @@
\s5
\q
\v 23 My lips will shout for joy when I sing praises to you—
\q even I whom you have redeemed.
\q even my soul, which you have redeemed.
\q
\v 24 My tongue will also talk about your righteousness all day long;
\q for they have been put to shame and are confused, those who sought my hurt.

View File

@ -59,17 +59,18 @@
\s5
\q
\v 15 May the king live! May the gold of Sheba be given to him.
\v 15 May he live! May the gold of Sheba be given to him.
\q May people always pray for him;
\q may God bless him all day long.
\q
\v 16 May there be abundance of grain in the earth on the mountaintops;
\q may their crops wave in the breeze like the trees of Lebanon,
\q and the people in the cities flourish like grass on the earth.
\v 16 May there be abundance of grain in the land;
\q on the mountaintops may their crops wave;
\q may they be like Lebanon;
\q may the people in the cities flourish like grass on the earth.
\s5
\q
\v 17 May the king's name endure forever;
\v 17 May his name endure forever;
\q may his name continue as long as the sun;
\q may people be blessed in him;
\q may all nations call him blessed.

View File

@ -96,9 +96,9 @@
\v 26 Meshech, Tubal, and all their servants are there! Their graves surround them!
\q All of them are uncircumcised, killed by the sword, because they had brought their terrors on the land of the living!
\q
\v 27 Do they not lie with the fallen warriors of the uncircumcised who have gone down to sheol
\q with all their weapons of war, and with their swords placed under their heads?
\q Their shields were placed over their bones. For they were the terror of warriors in the land of the living!
\v 27 They do not lie with the fallen warriors of the uncircumcised who have gone down to sheol
\q with all their weapons of war, and with their swords placed under their heads
\q and their shields placed over their bones. For they were the terror of warriors in the land of the living!
\s5
\q

View File

@ -57,7 +57,7 @@
\s5
\v 29 For I will save you from all of your uncleanness. I will summon the grain and multiply it. I will no longer put famine upon you.
\v 30 I will multiply the fruit of the tree and the produce of the field so that you will no longer bear the shame of famine among the nations.
\v 31 Then you will think of your wicked ways and your deeds that were not good, and you will hate yourselves because of your own sins and your disgusting deeds.
\v 31 Then you will think of your wicked ways and your deeds that were not good, and you will show loathing on your faces because of your own sins and your disgusting deeds.
\s5
\p
@ -66,7 +66,7 @@
\v 34 For you will plow the ruined land until it is no longer a ruin before the eyes of all who pass by.
\s5
\v 35 Then they will say, "This land was desolate, but it has become like the garden of Eden; the desolate cities and the uninhabited ruins that were inaccessible are now inhabited."
\v 35 Then they will say, "This land was desolate, but it has become like the garden of Eden; the desolate cities and the uninhabited ruins that were torn down are now fortified and inhabited."
\v 36 Then the other nations around you will know that I am Yahweh, that I built up the ruins and replanted the abandoned places. I am Yahweh. I have declared it and I will do it.
\s5

View File

@ -13,22 +13,22 @@
\p
\v 5 There was a wall surrounding the temple complex, and there was a measuring stick in the man's hand, six cubits in length—each "long" cubit equaling a cubit and a handbreadth. The man measured the width of the wall—one stick—and the height—one stick.
\v 6 Then he went to the temple gate that faced east and up its steps. He measured the threshold of the gate—one stick in depth.
\v 7 The guards' niches were each one stick long and one stick wide; there were five cubits between any two of the niches, and the threshold of the temple gate by the temple portico was one stick deep.
\v 7 The guard chambers were each one stick long and one stick wide; there were five cubits between any two of the chambers, and the threshold of the temple gate by the temple portico was one stick deep.
\s5
\v 8 He measured the portico of the gate; it was one stick long.
\v 9 He measured the portico of the gate; it was one stick deep. And the doorposts were two cubits wide. This was the portico of the gate facing the temple.
\v 10 The guards' niches at the gate were three in number on either side of the gate, and they all measured the same, and the wall separating them all from each other measured the same, also.
\v 10 The guard chambers at the gate were three in number on either side of the gate, and they all measured the same, and the wall separating them all from each other measured the same, also.
\s5
\v 11 Then the man measured the width of the gateway entrance—ten cubits; and he measured the length of the gateway entrance—thirteen cubits.
\v 12 He measured the wall that was bordering the front of the niches—one cubit high. And the niches—six cubits on every side.
\v 13 Then he measured the gateway from the roof of one niche to that of the next niche—twenty-five cubits, from the entrance of the first niche to that of the second.
\v 12 He measured the wall that was bordering the front of the chambers—one cubit high. And the chambers—six cubits on every side.
\v 13 Then he measured the gateway from the roof of one chamber to that of the next chamber—twenty-five cubits, from the entrance of the first chamber to that of the second.
\s5
\v 14 Then he measured the wall that went between the guard's niches—sixty cubits long; he measured as far as the gate's portico.
\v 14 Then he measured the wall that went between the guard chambers—sixty cubits long; he measured as far as the gate's portico.
\v 15 The entrance from the front of the gate to the other end of the gate's portico was fifty cubits.
\v 16 There were narrow windows in the niches, and in the walls that separated them all around; it was the same for the portico, and all the windows were on the inner side. There were carvings of palm trees on the walls.
\v 16 There were narrow windows in the chambers, and in the walls that separated them all around; it was the same for the portico, and all the windows were on the inner side. There were carvings of palm trees on the walls.
\s5
\p
@ -39,10 +39,10 @@
\s5
\p
\v 20 Then he measured the length and width of the gate that was at the north of the outer court.
\v 21 There were three niches on either side of that gate, and the gate and its portico measured the same as the main gate—fifty cubits in total length and twenty-five cubits in width.
\v 21 There were three chambers on either side of that gate, and the gate and its portico measured the same as the main gate—fifty cubits in total length and twenty-five cubits in width.
\s5
\v 22 Its windows, portico, niches, and its palm trees corresponded to the gate that faced east. Seven steps went up to it and to its portico.
\v 22 Its windows, portico, chambers, and its palm trees corresponded to the gate that faced east. Seven steps went up to it and to its portico.
\v 23 There was a gate to the inner courtyard in front of the gate facing north, just as also there was a gate to the east; the man measured from one gate to the other gate—one hundred cubits in distance.
\s5
@ -57,20 +57,20 @@
\s5
\p
\v 28 Then the man brought me to the inner courtyard by way of its southern gate, which had the same measurements as the other gates.
\v 29 Its niches, walls, and porticos measured the same as the other gates; there were windows all around in the portico. The inner gate and its portico measured fifty cubits long and twenty-five cubits wide.
\v 29 Its chambers, walls, and porticos measured the same as the other gates; there were windows all around in the portico. The inner gate and its portico measured fifty cubits long and twenty-five cubits wide.
\v 30 There were also porticos all around the inner wall; these were twenty-five cubits long and five cubits wide.
\v 31 This portico faced the outer courtyard with carved palm trees on its walls and eight steps going up to it.
\s5
\p
\v 32 Then the man brought me to the inner courtyard by the eastern way and measured the gate, which had the same measurements as the other gates.
\v 33 Its niches, walls, and portico measured the same as the other gates, and there were windows all around. The inner gate and its portico measured fifty cubits long and twenty-five cubits wide.
\v 33 Its chambers, walls, and portico measured the same as the other gates, and there were windows all around. The inner gate and its portico measured fifty cubits long and twenty-five cubits wide.
\v 34 Its portico faced the outer courtyard; it had palm trees on either side of it and eight steps going up it.
\s5
\p
\v 35 Next the man brought me to the northern gate and measured it; it measured the same as the other gates.
\v 36 Its niches, walls, and portico measured the same as the other gates, and there were windows all around. The gateway and its portico measured fifty cubits long and twenty-five cubits wide.
\v 36 Its chambers, walls, and portico measured the same as the other gates, and there were windows all around. The gateway and its portico measured fifty cubits long and twenty-five cubits wide.
\v 37 Its portico faced the outer courtyard; it had palm trees on either side of it and eight steps going up it.
\s5

View File

@ -23,8 +23,8 @@
\s5
\p
\v 10 I greatly rejoice in the Lord because now at last you have renewed your concern for me. You had indeed been concerned for me before, but there was no opportunity for you to help.
\v 11 It is not for my needs that I am saying this. For I have learned to be content in all circumstances.
\v 12 I know how to be needy, and I also know how to have abundance. In every way and in all things I have learned the secret how both to eat plenty and to be hungry, how both to abound and to be needy.
\v 11 I am not saying this because I am in need. For I have learned to be content in all circumstances.
\v 12 I know what it is to be poor, and I also know what it is to have plenty. In every way and in all things I have learned the secret of how to be well-fed or to be hungry, and how to have an abundance or to be in need.
\v 13 I can do all things through him who strengthens me.
\s5