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

Update Brazilian translation #315

Merged
merged 1 commit into from Apr 17, 2019

Conversation

@Forgon2100
Copy link
Contributor

commented Apr 9, 2019

Forum user Tucalipe has submitted a new Brazilian translation.

I modified it to avoid a bug caused by mismatching format specifiers
(details in db95329 and ticket:4872).

Edit:

I removed all changes to source reference comments, which only affected
the wrapping of long lines, but made the patch more difficult to review.
Also, tucalipe is now credited as a co-author.

po/pt_BR.po Outdated
@@ -1660,64 +1643,55 @@ msgid "Bunker Blaster"
msgstr "Arrasa-Defesas"

#: data/base/messages/strings/resstrings.txt:31
#: data/mp/messages/strings/resstrings.txt:1
#: po/custom/fromJson.txt:378
#: data/mp/messages/strings/resstrings.txt:1 po/custom/fromJson.txt:378

This comment has been minimized.

Copy link
@past-due

past-due Apr 9, 2019

Contributor

There are many lines with a change like this (removing a newline). Is it Poedit 2.2.1 doing it?

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 10, 2019

Author Contributor

There are many lines with a change like this (removing a newline).

PO is no linewise format and source reference comments are ignored.

Is it Poedit 2.2.1 doing it?

Poedit support stated that it does not (they were not pleased I asked).
So that was done by the translator, maybe while using another editor.

This comment has been minimized.

Copy link
@past-due

past-due Apr 10, 2019

Contributor

There are many lines with a change like this (removing a newline).

PO is no linewise format and source reference comments are ignored.

Right, but it makes it much more cumbersome to review the diff. (Which, admittedly, is not the ideal way of reviewing changes to a .po file - for multiple reasons.)

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Apr 17, 2019

Author Contributor

There are many lines with a change like this (removing a newline).

PO is no linewise format and source reference comments are ignored.

Right, but it makes it much more cumbersome to review the diff. (Which, admittedly, is not the ideal way of reviewing changes to a .po file - for multiple reasons.)

I have removed this annoyance.
Unless you understand Portuguese, there is little left to review.

@past-due past-due added this to the 3.3.0_beta2 milestone Apr 9, 2019

@tucalipe

This comment has been minimized.

Copy link
Contributor

commented Apr 15, 2019

I am, indeed, only using Poedit 2.1.1 (build 5661, free version) to translate. Could it be a setting? Mind my installation is brand new, with all the default settings.

EDIT: Yeah, poked around a bit, found the default setting breaks lines after 79 characters. Disabling it should do it.

@Forgon2100 Forgon2100 force-pushed the Forgon2100:brazilian_translation branch from bd9a042 to 7fe4fcf Apr 16, 2019

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Apr 16, 2019
Update Brazilian translation
Fixes Warzone2100#315

Co-authored-by: tucalipe <tucalipe@users.noreply.github.com>
Update Brazilian translation
Fixes #315

Co-authored-by: tucalipe <tucalipe@users.noreply.github.com>

@Forgon2100 Forgon2100 force-pushed the Forgon2100:brazilian_translation branch from 7fe4fcf to 233a08f Apr 16, 2019

@Forgon2100

This comment has been minimized.

Copy link
Contributor Author

commented Apr 17, 2019

I am, indeed, only using Poedit 2.1.1 (build 5661, free version) to translate. Could it be a setting? Mind my installation is brand new, with all the default settings.

EDIT: Yeah, poked around a bit, found the default setting breaks lines after 79 characters. Disabling it should do it.

Could you tell me where the setting is?

@tucalipe

This comment has been minimized.

Copy link
Contributor

commented Apr 17, 2019

I am, indeed, only using Poedit 2.1.1 (build 5661, free version) to translate. Could it be a setting? Mind my installation is brand new, with all the default settings.
EDIT: Yeah, poked around a bit, found the default setting breaks lines after 79 characters. Disabling it should do it.

Could you tell me where the setting is?

File -> Preferences -> Advanced Tab

@past-due past-due merged commit b00b17c into Warzone2100:master Apr 17, 2019

8 checks passed

LGTM analysis: C/C++ No code changes detected
Details
LGTM analysis: JavaScript No code changes detected
Details
LGTM analysis: Python No code changes detected
Details
WIP Ready for review
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
freebsd_build FreeBSD:freebsd-11-2-release-amd64 Task Summary
Details
freebsd_build FreeBSD:freebsd-12-0-release-amd64 Task Summary
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.