salesagility / SuiteDocs

SuiteCRM - Open source CRM for the world
https://docs.suitecrm.com/
Other
60 stars 287 forks source link

Update Russian docs for ver. 8.x #646

Open likhobory opened 6 months ago

serhiisamko091184 commented 6 months ago

Hello @likhobory,

thanks for contributing to SuiteCRM project,

I've noticed there are conflicts present: image

Would you be so kind to fix them?

We'd like to update master branch, is it enough to pull these 2 commits to make branches synced (russian & master) from the content point of view? image

Thanks in advance!

likhobory commented 6 months ago

Hi @serhiisamko091184 Yes, it will be enough.

serhiisamko091184 commented 5 months ago

Hello @likhobory,

thanks for your quick reply,

that's great, I'll pull them.

When the conflicts are resolved, I'll be ready to test, approve, and get this PR merged.

Thanks a lot!

Regards, Serhii

serhiisamko091184 commented 5 months ago

Hey @likhobory,

allow me to draw your attention to this particular commit:

https://github.com/salesagility/SuiteDocs/pull/646/commits/bf46be15398480e9ab04bbf8b031f0a441caada3

could you please update it to eliminate typos?

image

image

Many thanks!

Regards, Serhii

likhobory commented 5 months ago

Hi @serhiisamko091184 Thank you for paying attention, fixed.

serhiisamko091184 commented 4 months ago

Hello @likhobory,

Would you kindly give me an update on fixing conflicts, please?

image

Thanks in advance!

likhobory commented 4 months ago

Hi @serhiisamko091184 The contents of russian branch are not in sync with master branch, please force update russian branch.