Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

locale(es): Typos/grammar review #689

Merged
merged 7 commits into from
Mar 6, 2022
Merged

Conversation

drChelo
Copy link
Contributor

@drChelo drChelo commented Mar 3, 2022

Full review of the ES language.

Full review of the ES language.
dw-0
dw-0 previously requested changes Mar 3, 2022
Copy link
Member

@dw-0 dw-0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, thank you for your contribution.
Sadly there went something wrong with all indentations. I assume your Editor/IDE you use replaced all indentations with spaces with indentations with tabs. We can't merge that this way.

Please make sure your Editor/IDE follows our file formatting.

If you struggle to make the appropriate changes, please let me know.

Replaced all indentations with correct number of spaces.
@drChelo
Copy link
Contributor Author

drChelo commented Mar 3, 2022

Hi!

I changed the file by replacing the indentations with spaces, as per the original file.
I don't know if I have to make the Pull request again (I uploaded the modified file to my fork).

Cheers,
-M

@dw-0
Copy link
Member

dw-0 commented Mar 3, 2022

Hi!

I changed the file by replacing the indentations with spaces, as per the original file. I don't know if I have to make the Pull request again (I uploaded the modified file to my fork).

Cheers, -M

Okay that worked. But now i saw that there is still an issue. You seem to use CRLF as linefeeds. We need LF linefeeds.
If you have a look at the file here: https://github.com/mainsail-crew/mainsail/pull/689/files you can see that your PR replaces the full content of the file. I didn't saw the possibly wrong linefeeds before you had the indents fixed. But now it points to wrong linefeeds.

@drChelo
Copy link
Contributor Author

drChelo commented Mar 3, 2022

Ok, third time's the charm! (maybe, haha)

I used VSC to change to LF, but I'm not sure I've done things correctly, cause now I see that I Merged the branch, maybe?

@dw-0
Copy link
Member

dw-0 commented Mar 3, 2022

I think it is okay now. It's hard to tell because a lot of blocks seem to have changed their position inside of that file.

@meteyou meteyou changed the title ES Typos/grammar review locale(es): Typos/grammar review Mar 6, 2022
@meteyou meteyou merged commit 0d19dff into mainsail-crew:develop Mar 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants