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 tiled_ru.ts #1774

Merged
merged 2 commits into from Oct 17, 2017

Conversation

Projects
None yet
4 participants
@0xPavelTkachenko
Contributor

0xPavelTkachenko commented Oct 7, 2017

No description provided.

0xPavelTkachenko added some commits Oct 7, 2017

@bjorn

This comment has been minimized.

Show comment
Hide comment
@bjorn

bjorn Oct 11, 2017

Owner

@oktonion Maybe you could help reviewing these changes?

Owner

bjorn commented Oct 11, 2017

@oktonion Maybe you could help reviewing these changes?

@oktonion

This comment has been minimized.

Show comment
Hide comment
@oktonion

oktonion Oct 13, 2017

Contributor

@bjorn yep

Contributor

oktonion commented Oct 13, 2017

@bjorn yep

@@ -3265,12 +3265,12 @@ Please select specific format.</source>
<message>
<location line="+4"/>
<source>Group Layer</source>
<translation>Сгруппировать слой</translation>
<translation>Группа слоев</translation>

This comment has been minimized.

@oktonion

oktonion Oct 13, 2017

Contributor

Hard to tell what is 'group' there - a noun or a verb, because in russian that will make difference. You could look it in the redactor in menu Layer->New and Layer->Group.
Layer->New->Group Layer should be a noun, but Layer->Group->Group Layer a verb.

@oktonion

oktonion Oct 13, 2017

Contributor

Hard to tell what is 'group' there - a noun or a verb, because in russian that will make difference. You could look it in the redactor in menu Layer->New and Layer->Group.
Layer->New->Group Layer should be a noun, but Layer->Group->Group Layer a verb.

This comment has been minimized.

@oktonion

oktonion Oct 13, 2017

Contributor

So based on functional of these menu options I assume that for Russian translation should be two different strings for each menu. It will be an equivalent for English Layer->New->Group Layer object and Layer->Group->perform operation Group to Layer.
Maybe @bjorn could clarify what exactly the context is.

@oktonion

oktonion Oct 13, 2017

Contributor

So based on functional of these menu options I assume that for Russian translation should be two different strings for each menu. It will be an equivalent for English Layer->New->Group Layer object and Layer->Group->perform operation Group to Layer.
Maybe @bjorn could clarify what exactly the context is.

This comment has been minimized.

@bjorn

bjorn Oct 16, 2017

Owner

Unfortunately both "AddGroupLayer" and "GroupLayers" actions have the same context and the same text, so it is currently not possible to have different translations for them. I'll fix that for Tiled 1.1 by using a disambiguation string. For this PR, just pick one.

@bjorn

bjorn Oct 16, 2017

Owner

Unfortunately both "AddGroupLayer" and "GroupLayers" actions have the same context and the same text, so it is currently not possible to have different translations for them. I'll fix that for Tiled 1.1 by using a disambiguation string. For this PR, just pick one.

This comment has been minimized.

@oktonion

oktonion Oct 16, 2017

Contributor

@bjorn So it doesn't matter actually, let it be the updated string. One menu option will be ok and other...confusing =)

@oktonion

oktonion Oct 16, 2017

Contributor

@bjorn So it doesn't matter actually, let it be the updated string. One menu option will be ok and other...confusing =)

@oktonion

oktonion approved these changes Oct 13, 2017 edited

All good, two things:

  1. 'е- ё' is a holywar topic, try to avoid it.
  2. Look at my comment to string 3268.
@bjorn

This comment has been minimized.

Show comment
Hide comment
@bjorn

bjorn Oct 17, 2017

Owner

'е- ё' is a holywar topic, try to avoid it.

Does this represent a change still to be made, or can I merge this?

Owner

bjorn commented Oct 17, 2017

'е- ё' is a holywar topic, try to avoid it.

Does this represent a change still to be made, or can I merge this?

@oktonion

This comment has been minimized.

Show comment
Hide comment
@oktonion

oktonion Oct 17, 2017

Contributor

@bjorn no, just for the commiter to keep in mind. You can merge it.

Contributor

oktonion commented Oct 17, 2017

@bjorn no, just for the commiter to keep in mind. You can merge it.

@bjorn bjorn merged commit 9239a01 into bjorn:master Oct 17, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@bjorn

This comment has been minimized.

Show comment
Hide comment
@bjorn

bjorn Oct 17, 2017

Owner

Cool, thanks for the review @oktonion! I hope you and @pavel-tkachenko will be ready once I do the string freeze for Tiled 1.1. :-)

Owner

bjorn commented Oct 17, 2017

Cool, thanks for the review @oktonion! I hope you and @pavel-tkachenko will be ready once I do the string freeze for Tiled 1.1. :-)

@oktonion

This comment has been minimized.

Show comment
Hide comment
@oktonion

oktonion Oct 18, 2017

Contributor

@bjorn You're welcome. Looking forward for the release.

Contributor

oktonion commented Oct 18, 2017

@bjorn You're welcome. Looking forward for the release.

@@ -370,7 +370,7 @@
<message>
<location filename="../src/plugins/gmx/gmxplugin.cpp" line="+82"/>
<source>Could not open file for writing.</source>
<translation>Не удалось открыть файл для записи.</translation>
<translation>Не удается открыть файл для записи.</translation>

This comment has been minimized.

@HellGhost

HellGhost Oct 24, 2017

I think this is post action, and first version is correct

@HellGhost

HellGhost Oct 24, 2017

I think this is post action, and first version is correct

This comment has been minimized.

@0xPavelTkachenko

0xPavelTkachenko Oct 28, 2017

Contributor

That's a moot point as well as "е-ё" topic, and it seems like both of them are correct in this context.

@0xPavelTkachenko

0xPavelTkachenko Oct 28, 2017

Contributor

That's a moot point as well as "е-ё" topic, and it seems like both of them are correct in this context.

</message>
<message>
<location line="+22"/>
<source>Can't parse layer header!</source>
<translation>Не удается распарсить заголовок слоя!</translation>
<translation>Не удается разобрать заголовок слоя!</translation>

This comment has been minimized.

@HellGhost

HellGhost Oct 24, 2017

It would be greet "определить" instead of "разобрать"

@HellGhost

HellGhost Oct 24, 2017

It would be greet "определить" instead of "разобрать"

@@ -5080,7 +5080,7 @@ Please select specific format.</source>
<message>
<location line="+20"/>
<source>Change Layer Opacity</source>
<translation>Изменить прозрачность слоя</translation>
<translation>Изменить непрозрачность слоя</translation>

This comment has been minimized.

@HellGhost

HellGhost Oct 24, 2017

Изменить прозрачность слоя better in this context

@HellGhost

HellGhost Oct 24, 2017

Изменить прозрачность слоя better in this context

This comment has been minimized.

@0xPavelTkachenko

0xPavelTkachenko Oct 29, 2017

Contributor

Now I think so too. My bad.

@0xPavelTkachenko

0xPavelTkachenko Oct 29, 2017

Contributor

Now I think so too. My bad.

@bjorn

This comment has been minimized.

Show comment
Hide comment
@bjorn

bjorn Oct 26, 2017

Owner

@HellGhost Since this pull request has already been merged, would you care to open a new PR with your suggested changes?

Owner

bjorn commented Oct 26, 2017

@HellGhost Since this pull request has already been merged, would you care to open a new PR with your suggested changes?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment