search

SoltauFintel / blockpuzzle

Block Puzzle (Android game)
MIT License
38 stars 12 forks source link

strings.xml (en) #1

Closed pkoutsos closed 3 years ago

pkoutsos commented 3 years ago

Hello, I am a student of informatics and I try to improve my programming skills, I like your game and I have made an English version also. I want to upload my files and i will like to take your feedback.

SoltauFintel commented 3 years ago

Thank you, great! It looks like you have replaced the German texts by the English texts. But both languages should exist at the same time. I don't know how to do it myself. Is my first Android app. The language should be selected automatically by the device. I guess Android does this automatically.

pkoutsos commented 3 years ago

I have done a version with both german and English , but i need your permission in order to upload my files and to see my changes.

SoltauFintel commented 3 years ago

I cannot see your changes in Your repo. https://github.com/pkoutsos/blockpuzzle/commits/patch-1

step 1: Please push all your changes to Your repo in Your branch patch-1. (You have the rights, because it's your repo.) You can check that with the above URL.

step 2: The PR in my repo must be updated. I don't know if that happens automatically or if someone has to do something.

pkoutsos commented 3 years ago

I commit my version of your project i hope i have done it right

SoltauFintel commented 3 years ago

Phew, that doesn't look good. In your master commit https://github.com/pkoutsos/blockpuzzle/commit/a3cd8c88e0b1b7e8f9eb914fb5f5727f304f5ccf you can see that you (apparently) changed a lot of files. That makes checking your changes difficult for me.

You kind of re-added the blockpuzzle-master folder. As a result, files are now duplicated in your repository.

Basically I am ready to accept your changes, but not in this state.

My advice: back up your changed files. Delete your forked repository on Github and on your computer. Start over. Fork my repo and create a new branch. Etc.

pkoutsos commented 3 years ago

I have not done a lot of commits and this is the reason that I make mistakes.

pkoutsos commented 3 years ago

I have deleted the blockpuzzle-master folder from my repository and I have done two extra commits. One with only my new files and the second one the new files into yours. I hope it is ok.

SoltauFintel commented 3 years ago

In Germany we say: "No master has fallen from the sky yet." and "Practice creates masters."

Maybe YouTube videos will help. If you do this properly, I'll apply your changes. 😃

SoltauFintel commented 3 years ago

I have deleted the blockpuzzle-master folder from my repository and I have done two extra commits. One with only my new files and the second one the new files into yours. I hope it is ok.

let me have a look...

SoltauFintel commented 3 years ago

Please raise a new PR and then check if only your changes are listed.

SoltauFintel commented 3 years ago

Do you know how to raise the new PR?

After you have raised the PR I will comment your code changes. ;-)