search

cashmusic / platform

A free and open platform giving all musicians access to tools that let them manage, promote, and sell their music online.
https://cashmusic.org
Other
1.32k stars 266 forks source link

Cashmusicplatform translation cn #1288

Closed susanli3769 closed 6 years ago

susanli3769 commented 6 years ago

Hi there,

I have translated more sub folders in text folder, pls review and approve. thanks and best

Susan

susanli3769 commented 6 years ago

hi there,

sorry that I didn't check this until now. Not sure how I can resolve the conflicts? My local file didn't have the duplicated English version and have Chinese only. I tried to delete the English one by clicking on resolve conflicts, but after I closed it, the change can't be saved. Any help or guidance would be much appreciated.

thanks and best Susan

susanli3769 commented 6 years ago

hi there,

sorry me again. In the interface/admin/components/text folder, I created a separate folder as CN and did translation in there when I started to translate the text folder. But in the same text folder, there is EN & IS folder too. Am wondering whether I shouldn't have had duplicated a CN sub folder and should have just changed IS to CN and translate in there? Am not sure if this is why we are now seeing conflicts? Sorry am new to Git and isn't very sure if what I did is right. Not sure how other people do? Do you mind to offer some insights?

Thanks and best Susan

susanli3769 commented 6 years ago

hi there,

Hope all is well. Wondering when this can be merged? Without it being merged, I can't submit more pull request. thanks and best

Susan

paperscissors commented 6 years ago

Hey Susan, thanks for the reminder --- been a busy week. All set, thank you!

susanli3769 commented 6 years ago

Thank you! Have a good one. Best, Susan

Sent from my iPhone

On Feb 19, 2018, at 6:43 PM, paperscissors notifications@github.com<mailto:notifications@github.com> wrote:

Hey Susan, thanks for the reminder --- been a busy week. All set, thank you!

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHubhttps://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fcashmusic%2Fplatform%2Fpull%2F1288%23issuecomment-366828102&data=02%7C01%7C%7C48b63a5ee87848d1104008d577f29f0c%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636546806285475683&sdata=vDT6aq0jpdAVDCqqRWgFtzoZxylxPyrkCqz1eHYZlP0%3D&reserved=0, or mute the threadhttps://eur03.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAhvS3U5uvDzTCFv8tuVJcNHGKhIDYyQXks5tWgbrgaJpZM4SEsbd&data=02%7C01%7C%7C48b63a5ee87848d1104008d577f29f0c%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C636546806285475683&sdata=W5WQYJd1xAZ8LjwSCuVOtsSOCHwKUmmyLi4HTkzSD6s%3D&reserved=0.