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

More Russian #128

Merged
merged 19 commits into from
Aug 2, 2018
Merged

More Russian #128

merged 19 commits into from
Aug 2, 2018

Conversation

dadap
Copy link
Collaborator

@dadap dadap commented Aug 2, 2018

No description provided.

@dadap dadap merged commit a3ecbc8 into De7vID:master Aug 2, 2018
@@ -7680,10 +7768,10 @@ This verb is used for improvement of a more abstract nature, such as in status,
<column name="part_of_speech">n:1</column>
<column name="definition">ship, vessel</column>
<column name="definition_de">Schiff, Raumschiff</column>
<column name="definition_fa">船輛、車輛</column>
Copy link
Owner

Choose a reason for hiding this comment

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

Thanks for catching this.

@@ -4329,7 +4362,9 @@ Watch Gowron say this: {YouTube video:url:http://youtu.be/7qXuTn9HpP4}</column>
<column name="examples_de"></column>
<column name="examples_fa"></column>
<column name="examples_sv"></column>
<column name="examples_ru"></column>
<column name="examples_ru">
▶ {Dochvetlh DIlmeH Huch 'ar DaneH?:sen} "Сколько ты хочешь за это?"[1]
Copy link
Owner

Choose a reason for hiding this comment

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

This should not have been translated here. The other examples were also removed.

I've filed a bug to improve the handling of examples (which will, again, probably have to wait for a database redesign from scratch):
De7vID/klingon-assistant#463

@De7vID
Copy link
Owner

De7vID commented Aug 2, 2018

Also, as a general comment, please squash related commits and/or give them (somewhat) meaningful messages, like "ru translations for {D}" and not "finished at 10262". (The _id numbers are no longer meaningful anyway.)

The above sequence of commits contains a merge to master in the middle(!), and it looks like the changes made before that had already been committed previously. There's basically now a cycle of commits which result in no change, which one can see by doing the following:

git reset --hard 90adfb0 # one of the commits above, July 28
git diff --no-ext-diff f612cbd # master branch, July 23

A squash would've removed the unnecessary commits.

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