search

carpentries / glosario

A multilingual glossary for computing and data science terms.
https://glosario.carpentries.org
Other
104 stars 227 forks source link

Change capitalisation in Ukrainian translation of "dictionary" #739

Closed kashpit0507 closed 1 month ago

kashpit0507 commented 1 month ago

Імменики у глосаріо пишуться з малої букви

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

Author:

Language:

Terms defined:

YehorBoiar commented 1 month ago

@olexandr-konovalov please merge

olexandr-konovalov commented 1 month ago

@kashpit0507 @YehorBoiar there are various issues here (4 commits where one will be enough) and it's submitted from the main branch in @kashpit0507's fork (I wonder why)? I will see if I can fix that myself when merging.

olexandr-konovalov commented 1 month ago

@kashpit0507 @YehorBoiar sorry, ignore the last comment, that was nonsense - I have realised that it will not work this way. What you need to do is to refactor the main branch in your fork to remove unwanted commits. Oh well, I may try to merge this using "squash & merge" strategy instead, it will have untidy commits in this PR, but just one commit in the main branch of the main Glosario repository. Please let me know what do you want to try.

olexandr-konovalov commented 1 month ago

@kashpit0507 Also note that the main branch of your fork now has commits which are not in the central Glosario repository. That may cause problems in the future. You may want to reset it.

My suggestion is that initially you have tried to submit PR to yourself, not to the main Glosario repository, and also the 1st commit had some unfinished work elsewhere, what you did figured out later and removed.

In your #738, everything went well - the PR was submitted from a branch in your fork to the main Glosario repository. That is the way to do it.

olexandr-konovalov commented 1 month ago

@kashpit0507 At the end I've decided that "squash & merge" is easier if you don't have yet working setup on you machine. Next time, ok to continue via web-interface, but please be careful when submitting PRs from/to right branches and repositories. In addition to using the basic GitHub web-interface, you can also use web-based VSCode - see contributing guide, linked from the README at https://github.com/carpentries/glosario