From 9134ae1222ef887f407e93c7bc380c7321bff39f Mon Sep 17 00:00:00 2001 From: TomWarren Date: Tue, 13 Mar 2018 09:34:44 -0400 Subject: [PATCH 1/3] Missing backslash on verse 1:4, Now reads: \v 4 --- 53-1TH.usfm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/53-1TH.usfm b/53-1TH.usfm index 985e435c..a3936512 100644 --- a/53-1TH.usfm +++ b/53-1TH.usfm @@ -36,10 +36,10 @@ \s5 \v 3 For our exhortation was not from error, nor from impurity, nor from deceit. -v 4 Instead, just as we have been approved by God to be trusted with the gospel, so we speak, not to please men, but God. He is the one who examines our hearts. +\v 4 Instead, just as we have been approved by God to be trusted with the gospel, so we speak, not to please men, but God. He is the one who examines our hearts. \s5 -\v 5 For we never came with words of flattery, as you know, nor with a pretext to cover up greed- God is our witness. +\v 5 For we never came with words of flattery, as you know, nor with a pretext to cover up greed—God is our witness. \v 6 Nor did we seek glory from people, either from you or from others. We could have claimed privileges as apostles of Christ. \s5 @@ -67,7 +67,7 @@ v 4 Instead, just as we have been approved by God to be trusted with the gospel, \s5 \p \v 17 But we, brothers, were separated from you for a short time, in person not in heart. We were especially eager, with great desire, to see your faces. -\v 18 For we wished to come to you- indeed I, Paul, once and again- but Satan stopped us. +\v 18 For we wished to come to you—indeed I, Paul, once and again- but Satan stopped us. \v 19 For what is our hope, or joy, or crown of pride in front of our Lord Jesus at his coming? Is it not you? \v 20 For you are our glory and joy. From 12d315974417e1b3da3c3d2195905e45a19d7b61 Mon Sep 17 00:00:00 2001 From: TomWarren Date: Tue, 13 Mar 2018 09:53:02 -0400 Subject: [PATCH 2/3] Assorted checks where the ULB and Trainer were not aligned --- 10-2SA.usfm | 30 +++++++++++++++--------------- 42-MRK.usfm | 2 +- 43-LUK.usfm | 2 +- 67-REV.usfm | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/10-2SA.usfm b/10-2SA.usfm index 6b00a9ae..b31005de 100644 --- a/10-2SA.usfm +++ b/10-2SA.usfm @@ -390,29 +390,29 @@ \v 2 the king said to Nathan the prophet, "Look, I am living in a house of cedar, but the ark of God is staying in the middle of a tent." \s5 -\v 3 Then Nathan said to the king, "Go, do what is in your heart, for Yahweh is with you." -\v 4 But that same night the word of Yahweh came to Nathan, saying, +\s5 +\v 3 Then Nathan said to the king, "Go, do what is in your heart, for Yahweh is with you." +\v 4 But that same night the word of Yahweh came to Nathan, saying: \v 5 "Go and tell David my servant, 'This is what Yahweh says: Will you build me a house in which to live? -\s5 -\v 6 For I have not lived in a house from the day that I brought up the people of Israel out of Egypt until this present day; instead, I have been moving about in a tent, a tabernacle. -\v 7 In all places where I have moved among all the people of Israel, did I ever say anything to any of Israel's leaders whom I appointed to shepherd my people Israel, saying, "Why have you not built me a house of cedar?"'" +\s5 +\v 6 For I have not lived in a house from the day that I brought up the people of Israel out of Egypt until this present day; instead, I have been moving about in a tent, a tabernacle. +\v 7 In all places where I have moved among all the people of Israel, did I ever say anything to any of Israel's leaders whom I appointed to shepherd my people Israel, saying, "Why have you not built me a house of cedar?"' -\s5 -\v 8 Now then, tell my servant David, "This is what Yahweh of hosts says: 'I took you from the pasture, from following the sheep, so that you would be ruler over my people Israel. -\v 9 I have been with you wherever you went. I have cut off all your enemies from before you. Now I will make your name great, like the names of the great ones of the earth. +\s5 +\v 8 Now then, tell my servant David, 'This is what Yahweh of hosts says: I took you from the pasture, from following the sheep, so that you would be ruler over my people Israel. +\v 9 I have been with you wherever you went. I have cut off all your enemies from before you. Now I will make your name great, like the names of the great ones of the earth. -\s5 -\v 10 I will appoint a place for my people Israel and will plant them there, so that they may live in their own place and be troubled no more. No longer will wicked people oppress them, as they did before, +\s5 +\v 10 I will appoint a place for my people Israel and will plant them there, so that they may live in their own place and be troubled no more. No longer will wicked people oppress them, as they did before, \v 11 as they were doing from the days that I commanded judges to be over my people Israel. Now I will give you rest from all your enemies. Moreover, I, Yahweh declare to you that I will make you a house. -\s5 -\v 12 When your days are fulfilled and you lie down with your fathers, I will raise up a descendant after you, one who will come out from your body, and I will establish his kingdom. -\v 13 He will build a house for my name, and I will establish the throne of his kingdom forever. +\s5 +\v 12 When your days are fulfilled and you lie down with your fathers, I will raise up a descendant after you, one who will come out from your body, and I will establish his kingdom. \v 13 He will build a house for my name, and I will establish the throne of his kingdom forever. \v 14 I will be a father to him, and he will be my son. When he sins, I will discipline him with the rod of men and with the whipping of the sons of men. -\s5 -\v 15 But my covenant faithfulness will not leave him, as I took it from Saul, whom I removed from before you. +\s5 +\v 15 But my covenant faithfulness will not leave him, as I took it from Saul, whom I removed from before you. \v 16 Your house and kingdom will be confirmed forever before you. Your throne will be established forever.'" \v 17 Nathan spoke to David and reported to him all these words, and he told him about the entire vision. diff --git a/42-MRK.usfm b/42-MRK.usfm index 042433e1..832f752e 100644 --- a/42-MRK.usfm +++ b/42-MRK.usfm @@ -239,7 +239,7 @@ \v 2 He taught them many things in parables, and in his teaching, this is what he said to them. \s5 -\v 3 "Listen, the farmer went out to sow his seed. +\v 3 "Listen! A farmer went out to sow his seed. \v 4 As he sowed, some seed fell on the road, and the birds came and devoured it. \v 5 Other seed fell on the rocky ground, where it did not have much soil. Immediately it sprang up, because it did not have deep soil. diff --git a/43-LUK.usfm b/43-LUK.usfm index b290b214..52c6e626 100644 --- a/43-LUK.usfm +++ b/43-LUK.usfm @@ -771,7 +771,7 @@ \s5 \v 7 Some fell among thorns, and the thorns grew up together with the seed and choked it. -\v 8 But some fell on good soil and produced a crop that was a hundred times greater." After Jesus had said these things, he called out, "He who has ears to hear, let him hear." +\v 8 But some fell on good soil and produced a crop that was a hundred times greater." After Jesus had said these things, he called out, "Whoever has ears to hear, let him hear." \s5 \p diff --git a/67-REV.usfm b/67-REV.usfm index 416dec67..e3297860 100644 --- a/67-REV.usfm +++ b/67-REV.usfm @@ -92,7 +92,7 @@ \s5 \v 16 Repent, therefore! If you do not, I will quickly come to you, and I will wage war against them with the sword in my mouth. -\v 17 Let the one who has an ear listen to what the Spirit is saying to the churches. To the one who conquers, I will give some of the hidden manna, and I will give a white stone with a new name written on the stone, a name which no one knows but the one who receives it."'" +\v 17 Let the one who has an ear hear to what the Spirit is saying to the churches. To the one who conquers, I will give some of the hidden manna, and I will give a white stone with a new name written on the stone, a name which no one knows but the one who receives it."'" \s5 \p @@ -175,7 +175,7 @@ \s5 \v 21 The one who conquers, I will give him the right to sit down with me on my throne, just as I also conquered and sat down with my Father on his throne. -\v 22 Let the one who has an ear listen to what the Spirit is saying to the churches."'" +\v 22 Let the one who has an ear hear to what the Spirit is saying to the churches."'" \s5 @@ -582,7 +582,7 @@ \v 8 All who live on the earth will worship it, everyone whose name was not written, since the creation of the world, in the Book of Life, which belongs to the Lamb, who had been slaughtered. \s5 -\v 9 If anyone has an ear, let him listen. +\v 9 If anyone has an ear, let him hear. \q \v 10 If anyone is to be taken into captivity, \q2 into captivity he will go. From 00ee67f637e9607cd32f511fffa9495ac5fc8607 Mon Sep 17 00:00:00 2001 From: TomWarren Date: Tue, 13 Mar 2018 11:13:23 -0400 Subject: [PATCH 3/3] Retry on commits --- 10-2SA.usfm | 4 ++-- 42-MRK.usfm | 2 +- 43-LUK.usfm | 2 +- 67-REV.usfm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10-2SA.usfm b/10-2SA.usfm index b31005de..8ca8e638 100644 --- a/10-2SA.usfm +++ b/10-2SA.usfm @@ -389,7 +389,6 @@ \v 1 It happened that after the king had settled in his house, and after Yahweh had given him rest from all his surrounding enemies, \v 2 the king said to Nathan the prophet, "Look, I am living in a house of cedar, but the ark of God is staying in the middle of a tent." -\s5 \s5 \v 3 Then Nathan said to the king, "Go, do what is in your heart, for Yahweh is with you." \v 4 But that same night the word of Yahweh came to Nathan, saying: @@ -408,7 +407,8 @@ \v 11 as they were doing from the days that I commanded judges to be over my people Israel. Now I will give you rest from all your enemies. Moreover, I, Yahweh declare to you that I will make you a house. \s5 -\v 12 When your days are fulfilled and you lie down with your fathers, I will raise up a descendant after you, one who will come out from your body, and I will establish his kingdom. \v 13 He will build a house for my name, and I will establish the throne of his kingdom forever. +\v 12 When your days are fulfilled and you lie down with your fathers, I will raise up a descendant after you, one who will come out from your body, and I will establish his kingdom. +\v 13 He will build a house for my name, and I will establish the throne of his kingdom forever. \v 14 I will be a father to him, and he will be my son. When he sins, I will discipline him with the rod of men and with the whipping of the sons of men. \s5 diff --git a/42-MRK.usfm b/42-MRK.usfm index 832f752e..0056cc1d 100644 --- a/42-MRK.usfm +++ b/42-MRK.usfm @@ -239,7 +239,7 @@ \v 2 He taught them many things in parables, and in his teaching, this is what he said to them. \s5 -\v 3 "Listen! A farmer went out to sow his seed. +\v 3 "Listen! A farmer went out to sow his seed. \v 4 As he sowed, some seed fell on the road, and the birds came and devoured it. \v 5 Other seed fell on the rocky ground, where it did not have much soil. Immediately it sprang up, because it did not have deep soil. diff --git a/43-LUK.usfm b/43-LUK.usfm index 52c6e626..34ff9c87 100644 --- a/43-LUK.usfm +++ b/43-LUK.usfm @@ -771,7 +771,7 @@ \s5 \v 7 Some fell among thorns, and the thorns grew up together with the seed and choked it. -\v 8 But some fell on good soil and produced a crop that was a hundred times greater." After Jesus had said these things, he called out, "Whoever has ears to hear, let him hear." +\v 8 But some fell on good soil and produced a crop that was a hundred times greater." After Jesus had said these things, he called out, "Whoever has ears to hear, let him hear." \s5 \p diff --git a/67-REV.usfm b/67-REV.usfm index e3297860..f97c28e7 100644 --- a/67-REV.usfm +++ b/67-REV.usfm @@ -92,7 +92,7 @@ \s5 \v 16 Repent, therefore! If you do not, I will quickly come to you, and I will wage war against them with the sword in my mouth. -\v 17 Let the one who has an ear hear to what the Spirit is saying to the churches. To the one who conquers, I will give some of the hidden manna, and I will give a white stone with a new name written on the stone, a name which no one knows but the one who receives it."'" +\v 17 Let the one who has an ear, hear to what the Spirit is saying to the churches. To the one who conquers, I will give some of the hidden manna, and I will give a white stone with a new name written on the stone, a name which no one knows but the one who receives it."'" \s5 \p @@ -175,7 +175,7 @@ \s5 \v 21 The one who conquers, I will give him the right to sit down with me on my throne, just as I also conquered and sat down with my Father on his throne. -\v 22 Let the one who has an ear hear to what the Spirit is saying to the churches."'" +\v 22 Let the one who has an ear, hear to what the Spirit is saying to the churches."'" \s5