8000 Exclude tokens from gems by tsai146 · Pull Request #55 · tolk/tolk · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

Exclude tokens from gems #55

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

Exclude tokens from gems #55

wants to merge 1 commit into from

Conversation

tsai146
Copy link
Contributor
@tsai146 tsai146 commented Dec 13, 2013

solution for #25 , exclude tokens from gems

But a real solution would be to import translations only included in the project itself. Since most of those translations will be translated within the gems itself it seems a bit pointless to import them to Tolk.

@thomasdarde
Copy link
Member

Thanks !

@tsai146
Copy link
Contributor Author
tsai146 commented Jan 2, 2014

Is there anything I can do to make this merge?

@thomasdarde thomasdarde reopened this Mar 28, 2015
@thomasdarde
Copy link
Member

Hi @tsai146 ,

I'm confused on why this wasn't merged in the first place... It's on master now.

@dnrce
Copy link
Member
dnrce commented Mar 29, 2015

Looks like it was manually merged because of a conflict: 0f3b03e

@thomasdarde
Copy link
Member

Yes I did a manual merge but a year and a half late !

@dnrce
Copy link
Member
dnrce commented Mar 29, 2015

Oh, ha! I didn't look at the date and assumed the merge was from a long time ago.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tsai146 @thomasdarde @dnrce
0