Translating "histogram", "accuracy", "correlation" and "correlation coefficient" into Ukrainian

[mariyaspatar]

Fill in each of the sections (using NA for those that are not applicable).

Author:

• @mariyaspatar

Language:

• Ukrainian

Terms defined:

• Histogram

[olexandr-konovalov]

@VeronikaShevc @YehorBoiar could you review this please?

[YehorBoiar]

You have conflicts with the main branch. This probably happened because your current branch is not up to date with the main Glosario branch. To resolve it, you need to:

Run git remote -v to check which remotes you have. In my case, I have:

origin    git@github.com:Dod900ls1/glosario.git (fetch)
origin    git@github.com:Dod900ls1/glosario.git (push)
upstream  git@github.com:carpentries/glosario.git (fetch)
upstream  git@github.com:carpentries/glosario.git (push)

Then, you need to rebase on the original remote carpentries/glosario.git. In this case, the original remote is called upstream, so you would write: git rebase upstream/main

After you do that, just write git push -f to upload your changes. Check if you have any more conflicts. If so, I can help you resolve them.

[olexandr-konovalov]

Another option would be to add by agreement one or more of @VeronikaShevc @YehorBoiar @Herobread to your fork as collaborators (see https://ukrainian-carpentries.github.io/git-novice/08-collab.html for instructions) and then they can push new commits to your branch and update your PR. It might be the easiest and cleanest way to ensure that we merge this PR before the STEP ends.

[YehorBoiar]

@mariyaspatar @olexandr-konovalov Done :+1:

[olexandr-konovalov]

@YehorBoiar I see your force-push, but the files are not changed - have you forgot to call git add?

[YehorBoiar]

@olexandr-konovalov I just resolved a conflict. I thought that @mariyaspatar would to finish it. However, I can do it too if you want.

[olexandr-konovalov]

Let's do the following:

1) meld first three commits for "histogram" into one (make 2nd and 3rd "fixup" commits) 2) check, force-push, check again 3) now add your own commit fixing translation of all the 3 other terms 4) push 5) we will review it and merge the branch, preserving @mariyaspatar and @YehorBoiar's contributions as separate commits

Alternatively, you can just add your commit to fix things, and after review we will merge it using "squash and merge" strategy, adding in a commit message that this includes your changes. Then, of course, all 4 terms will be translated in a single commit. We can also cope with that.

[YehorBoiar]

@olexandr-konovalov Corrected terms, please review

[YehorBoiar]

@olexandr-konovalov corrected, please review.