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

ES - Title and difficulty translated #101

Merged
merged 3 commits into from Feb 26, 2023

Conversation

Toranks
Copy link
Contributor

@Toranks Toranks commented Feb 26, 2023

Being the first thing the player sees, it's the most important thing, so I send it since it's just a moment

Being the first thing the player sees, it's the most important thing, so I send it since it's just a moment
@Toranks Toranks changed the title Title and difficulty translated ES - Title and difficulty translated Feb 26, 2023
@cooljeanius
Copy link
Collaborator

uh, it says it's too big to view the diff...

@cooljeanius
Copy link
Collaborator

Did you change the line endings or something? Viewing it locally, it looks like the entire file got reformatted...

@Toranks
Copy link
Contributor Author

Toranks commented Feb 26, 2023

Probably, I've edited it on poedit. Looking with winmerge it is seen that the type of line break has changed for example.
In any case, don't worry about it, Wesnoth reads it the same, poedit is one of the most used tools.

imagen

@cooljeanius
Copy link
Collaborator

If you go into Poedit's preferences, there ought to be an option for line ending style under "Advanced":
Screen Shot 2023-02-25 at 22 23 50

@Toranks
Copy link
Contributor Author

Toranks commented Feb 26, 2023

I have exactly the same as you xD
imagen

@celerini
Copy link
Contributor

@Toranks , you may have the same settings (Unix line endings), but I guess you did not use it when saving your es.po for this PR.

Please, drop this PR and create a new one, without non-standard line endings (without Carriage Returns), which polluted git with over 21k changes.

Or I can do it for you on my own.

@Toranks
Copy link
Contributor Author

Toranks commented Feb 26, 2023

Done, see the changes again.
Also fixed the turn variable in S04.
The format mess is strange, since I have translated practically all the po files of the main game and it had never happened to me. But I did it again exactly the same way and now its correct.

@celerini
Copy link
Contributor

Thank you, I am content with this.

@cooljeanius or @nemaara , can you please squash this PR to dispose all the back and forth changes?

@cooljeanius cooljeanius merged commit 2a74c5d into nemaara:master Feb 26, 2023
@cooljeanius
Copy link
Collaborator

Thank you, I am content with this.

@cooljeanius or @nemaara , can you please squash this PR to dispose all the back and forth changes?

Done.

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.

None yet

3 participants