Merge remote-tracking branch 'origin/master'

# Conflicts:
#	63-1JN/05.usfm
This commit is contained in:
Henry Whitney 2016-06-01 10:39:30 +01:00
commit 9cc7084ae3
7 changed files with 11 additions and 15 deletions

View File

@ -6,7 +6,7 @@
\v 1 Meanwhile, many thousands of people gathered around Jesus. There were so many that they were stepping on each other. But first he said to his disciples, "Be careful that you do not become like the Pharisees who act religious in public, but do evil things in secret. Just like yeast causes a lump of dough to rise, their evil behavior causes others to be hypocrites like they are. \v 1 Meanwhile, many thousands of people gathered around Jesus. There were so many that they were stepping on each other. But first he said to his disciples, "Be careful that you do not become like the Pharisees who act religious in public, but do evil things in secret. Just like yeast causes a lump of dough to rise, their evil behavior causes others to be hypocrites like they are.
\s5 \s5
\v 2 People will not be able to continue covering up their sins the way they can now. Someday God will let everyone know the things that people hide now. \v 2 People cannot cover up their sins. Someday God will let everyone know the things that people are trying to hide.
\v 3 Everything you say in the dark, someday people will hear in the daylight. Whatever you whisper in your room will someday be as public as if it were shouted from the rooftops." \v 3 Everything you say in the dark, someday people will hear in the daylight. Whatever you whisper in your room will someday be as public as if it were shouted from the rooftops."
\s5 \s5

View File

@ -10,7 +10,7 @@
\s5 \s5
\v 3 You are already pure because of the message I spoke to you. \v 3 You are already pure because of the message I spoke to you.
\v 4 If you remain joined to me, and I will remain joined to you. As the branch cannot bear any fruit on its own, neither can you unless you stay joined to me and depend upon me for everything. \v 4 Remain joined to me, and I will remain joined to you. As the branch cannot bear any fruit on its own, neither can you unless you stay joined to me and depend upon me for everything.
\s5 \s5
\p \p

View File

@ -38,7 +38,7 @@
\v 16 In a little while, you will not see me. Then after a little while, you will see me again." \v 16 In a little while, you will not see me. Then after a little while, you will see me again."
\s5 \s5
\v 17 So some of his disciples said to one another, "What does Jesus mean when he says to us, 'n a little while, you will not see me,' and 'after a little while, you will see me again' and what does he mean by 'because I am going back to my Father'?" \v 17 So some of his disciples said to one another, "What does Jesus mean when he says to us, 'In a little while, you will not see me,' and 'after a little while, you will see me again' and what does he mean by 'because I am going back to my Father'?"
\v 18 They kept asking, "What does he mean by saying, 'after a little while'? We do not understand what he is saying." \v 18 They kept asking, "What does he mean by saying, 'after a little while'? We do not understand what he is saying."
\s5 \s5

View File

@ -11,8 +11,6 @@
\v 4 Then all of the believers were filled with the Holy Spirit and began to speak different languages, in the way that the Spirit made each one able to. \v 4 Then all of the believers were filled with the Holy Spirit and began to speak different languages, in the way that the Spirit made each one able to.
\s5 \s5
\p \p
\v 5 At that time many Jews were staying in Jerusalem to celebrate the Pentecost festival. They were Jewish people who always worshiped God. They had come from many different countries. \v 5 At that time many Jews were staying in Jerusalem to celebrate the Pentecost festival. They were Jewish people who always worshiped God. They had come from many different countries.
\v 6 When they heard the loud noise like a wind, a crowd of them came together at the place where the believers were. The crowd was amazed because each of them was hearing one of the believers speaking in his own language. \v 6 When they heard the loud noise like a wind, a crowd of them came together at the place where the believers were. The crowd was amazed because each of them was hearing one of the believers speaking in his own language.
@ -38,11 +36,11 @@
\s5 \s5
\v 16 Instead, what has happened to us is the miraculous thing that the prophet Joel wrote about long ago. He wrote: \v 16 Instead, what has happened to us is the miraculous thing that the prophet Joel wrote about long ago. He wrote:
\p God says, \p God says,
\v 17 'During the last days everywhere. I will give my Holy Spirit to all and as a result, your sons and daughters will tell people messages from me, the young men among you will see visions from me, and the old men among you will have dreams that I will give them. \v 17 'During the last days, I will give my Holy Spirit to all people, and your sons and daughters will tell people my messages, and I will give visions to the young men and I will give dreams to the old men.
\s5 \s5
\v 18 During those days I will give my Holy Spirit to my servants, so they can tell people messages from me. \v 18 During those days I will give my Holy Spirit to my servants, so they can tell people my messages.
\v 19 I will cause amazing things to happen in the sky, and I will do miracles on the earth to show that important things will happen. Here on the earth there will be blood, fire, and smoke everywhere. \v 19 I will cause amazing things to happen in the sky, and I will do miracles on the earth to show that important and amazing things will happen. Here on the earth there will be blood, fire, and smoke everywhere.
\s5 \s5
\v 20 In the sky the sun will appear dark to people and the moon will appear red to them. Those things will happen before I, the Lord God, will come to judge everyone. \v 20 In the sky the sun will appear dark to people and the moon will appear red to them. Those things will happen before I, the Lord God, will come to judge everyone.
@ -74,11 +72,9 @@
\p \p
\v 29 Peter continued, "My fellow Jews, I am sure that our forefather, King David, died, and that the people buried him. And the place where they buried his body is still here today. \v 29 Peter continued, "My fellow Jews, I am sure that our forefather, King David, died, and that the people buried him. And the place where they buried his body is still here today.
\v 30 King David was a prophet and he knew that God promised to him that one of his descendants would become king. \v 30 King David was a prophet and he knew that God promised to him that one of his descendants would become king.
\v 31 A long time ago, David knew what God would do, so said that God would cause Jesus the Messiah to live again after he died. He said that God would not make Jesus the Messiah remain in the place of the dead, nor let his body waste away." \v 31 A long time ago, David knew what God would do. He said that God would cause Jesus the Messiah to live again after he died. God would not allow him to remain in a grave, and he would not let his body waste away."
\s5 \s5
\p \p
\v 32 "After this man Jesus had died, God caused him to become alive again. All of us, his followers, know this because we saw him. \v 32 "After this man Jesus had died, God caused him to become alive again. All of us, his followers, know this because we saw him.
\v 33 God has greatly honored Jesus by placing him at his right hand to rule with him, his Father. He has given us the Holy Spirit, and that is what you are seeing and hearing here today. \v 33 God has greatly honored Jesus by placing him at his right hand to rule with him, his Father. He has given us the Holy Spirit, and that is what you are seeing and hearing here today.

View File

@ -36,7 +36,7 @@
\s5 \s5
\v 11 When I wanted to sin, I thought that I would live forever if I obeyed the law enough. But I was mistaken: I thought I could keep sinning at the same time. In fact, God was going to separate me from him forever because I did not truly obey the law. \v 11 When I wanted to sin, I thought that I would live forever if I obeyed the law enough. But I was mistaken: I thought I could keep sinning at the same time. In fact, God was going to separate me from him forever because I did not truly obey the law.
\v 12 So we know that the law that God gave to Moses is perfectly good. Everything that God commands us to do is also holy, just, and good. \v 12 So we know that the law that God gave to Moses is perfectly good. Everything that God commands us to do is also without fault, just, and good.

View File

@ -29,7 +29,7 @@
\v 14 We apostles have seen God's Son, and we solemnly tell others that the Father sent him to save the people in the world from suffering eternally for their sins. \v 14 We apostles have seen God's Son, and we solemnly tell others that the Father sent him to save the people in the world from suffering eternally for their sins.
\s5 \s5
\v 15 So God remains joined with those who say the truth about Jesus, that he is the Son of God, and they remain joined with God. \v 15 So God remains joined with those who say the truth about Jesus. They say, "He is the Son of God." And so they remain joined with God.
\v 16 We have experienced how God loves us and we believe that he loves us. As a result, we love others. Because God's nature is to love people, those who continue to love others are joined with God, and God is joined with them. \v 16 We have experienced how God loves us and we believe that he loves us. As a result, we love others. Because God's nature is to love people, those who continue to love others are joined with God, and God is joined with them.
\s5 \s5

View File

@ -32,8 +32,8 @@
\s5 \s5
\p \p
\v 16 Those who see one of their fellow believers sinning in a way that does not result in eternal separation from God should ask God to help that fellow believer; and as a result God will help that fellow believer and enable him or her to live eternally. But some people sin in a manner that causes them to be separated from God eternally. I am not saying that you should ask God to help people who sin like that. \v 16 Those who see one of their fellow believers sinning in a way that does not result in eternal separation from God should ask God to help that fellow believer; and as a result God will help that fellow believer and enable him or her to live eternally. But some people sin in a manner that causes them to be separated from God eternally. I am not saying that you should ask God to help people who sin like that.
\v 17 Everyone who does what is wrong is sinning, but a person is not eternally separated from God because of every time that he sins. \v 17 Everything that is wrong is a sin against God, but not every bad thing we do can separate us from God forever.
\s5 \s5
\v 18 We know that if a person is a child of God, he does not habitually sin. God protects him so that Satan, the evil one, does not harm him. \v 18 We know that if a person is a child of God, he does not habitually sin. God protects him so that Satan, the evil one, does not harm him.