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 sqlb_ru.ts #1581

Merged
merged 1 commit into from Oct 20, 2018

Conversation

Projects
None yet
3 participants
@schdub
Copy link
Contributor

schdub commented Oct 19, 2018

@mgrojo mgrojo merged commit ebe3c17 into sqlitebrowser:v3.11.x Oct 20, 2018

mgrojo added a commit that referenced this pull request Oct 20, 2018

@mgrojo

This comment has been minimized.

Copy link
Contributor

mgrojo commented Oct 20, 2018

Thanks @schdub. It's already merged and cherry-picked to the master branch.

Nevertheless, if you want the translation to be complete for the 3.11 release, you'll need to include the translations for this commit: d6c08d4 It was a pull request that we included after opening the branch.

@schdub

This comment has been minimized.

Copy link
Contributor Author

schdub commented Oct 22, 2018

Hi, @mgrojo. I've just translated strings untranslated in my previous commit:

https://github.com/schdub/sqlitebrowser/blob/v3.11.x/src/translations/sqlb_ru.ts

But when I'm trying 'Open a pull request', message 'Can’t automatically merge. Don’t worry, you can still create the pull request.' pops up under 'base fork <- head fork' bar.

It's ok, if I'll create PR (I'm working with v3.11.x branch)?
Maybe this PR should created different way?

@justinclift

This comment has been minimized.

Copy link
Member

justinclift commented Oct 22, 2018

Hmmm, it sounds like the "target branch" in the PR settings might be wrong. Since you're working with the v3.11.x branch, check if the GitHub interface is automatically setting it to v3.11.x or master. I suspect it will be getting set to master.

If that's the case, you should be able to click the target branch setting and change it. In theory 😉, that should be a drop down and show all of the branches in our repo. If that doesn't work... then I'm not sure. We'll work out something though. 😄

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