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 Russian translation #382

Merged
merged 12 commits into from Jun 27, 2019

Conversation

@vaut
Copy link
Contributor

commented Jun 12, 2019

No description provided.

@@ -1197,8 +1197,7 @@ msgstr "Артиллерист"
msgid "Demolish"
msgstr "Снести"

#: data/base/messages/strings/names.txt:156
#: po/custom/fromJson.txt:926
#: data/base/messages/strings/names.txt:156 po/custom/fromJson.txt:926

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Jun 12, 2019

Contributor

As you can see, Poedit joins source reference comment lines.
This can make reviewing patches much more cumbersome.
According to tucalipe, this behavior can be disabled by a setting in
Poedit's "File->Preferences->Advanced" tab.

Fortunately, this commit contains no changes to the translation.
Therefore, this can stay as it is right now.

This comment has been minimized.

Copy link
@vaut

vaut Jun 12, 2019

Author Contributor

Thanks, I could not find this button, and for this half year did not offer these changes :(
Can you tell me how to return the translation to the old formatting style?

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Jun 12, 2019

Contributor

Thanks, I could not find this button, and for this half year did not offer these changes :(
Can you tell me how to return the translation to the old formatting style?

I have installed Poedit and checked this myself.
Apparently, Tucalipe was wrong. The "Preferences" menu is part of the
"Edit" tab, not the "File" tab.

Inside the "Edit->Preferences->Advanced" menu, there is a checkbox
labelled "Wrap at 79" (not sure whether the number defaults to 79).
Yet if this box is not ticked, the source reference comment lines are
merged anyway :| It is probably best if I fix this with a shell script.
So far, I got rid of these merged lines by resetting hunks in git, with
either git reset -p REVISION PO_FILE or git checkout -p PO_FILE.

poedit_edit_tab
poedit_preferences_window

Forgon2100 added a commit to Forgon2100/warzone2100 that referenced this pull request Jun 12, 2019
@Forgon2100

This comment has been minimized.

Copy link
Contributor

commented Jun 12, 2019

6 messages have changed since our translation files were last updated.
One only changed format specifiers, which could cause problems (read
http://developer.wz2100.net/ticket/4872 for more details), but it would
still be good if you double-check that its grammar is still correct.
I should have sent you an up-to-date PO file :|

My pull request in your repository includes all these recent changes.

po/ru.po Outdated
@@ -11353,6 +11353,7 @@ msgid "Reveal map at mouse position"
msgstr ""

#: src/keymap.cpp:459
#, fuzzy

This comment has been minimized.

Copy link
@Forgon2100

Forgon2100 Jun 12, 2019

Contributor

Is this new fuzzy flag intentional?

This comment has been minimized.

Copy link
@vaut

vaut Jun 13, 2019

Author Contributor

yes

@vaut vaut force-pushed the vaut:update_Ru_translate branch from 7aa4bd5 to 110b25f Jun 27, 2019

andrvaut and others added 12 commits Jun 12, 2019
Update PO file for Russian translation
Refs ticket:4872
Refs #263
Refs #329
Fixes #382
Update ru.po
Consistently translate:
"Collective" as "Альянс"
Update ru.po
Consistently translate:
"Body" as "Kорпус"
Update ru.po
Consistently translate "body points" as "прочность корпуса"
and other fix

@vaut vaut force-pushed the vaut:update_Ru_translate branch from 110b25f to a9feb72 Jun 27, 2019

@vaut vaut changed the title [WIP] Update Russian translation Update Russian translation Jun 27, 2019

@vaut

This comment has been minimized.

Copy link
Contributor Author

commented Jun 27, 2019

The translation still needs some work, but I can’t do it now.
Changes are ready to merge.

@Forgon2100

This comment has been minimized.

Copy link
Contributor

commented Jun 27, 2019

The translation still needs some work, but I can’t do it now.
Changes are ready to merge.

Thanks for translating so many messages.
I know from my own experience how time-consuming this can be.

@KJeff01 KJeff01 added this to the 3.3.0_beta2 milestone Jun 27, 2019

@KJeff01 KJeff01 merged commit dfd973d into Warzone2100:master Jun 27, 2019

5 of 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
KJeff01 added a commit that referenced this pull request Jun 27, 2019
Update PO file for Russian translation
Refs ticket:4872
Refs #263
Refs #329
Fixes #382
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.