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 ca.json #1138

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update ca.json #1138

wants to merge 1 commit into from

Conversation

BlueLynx21
Copy link
Contributor

Federation and location sentences updated.

Federation and location sentences updated.
@Reckless-Satoshi
Copy link
Collaborator

Hey @BlueLynx21, amazing this is the first language for the upcoming federated frontend!

This PR is merging the language file into RoboSats:main instead, it would be ideal if it merges it into RoboSats:the-federation-layer-v0.6.0 . Could you close this PR and open it again merging on the federated branch?

@BlueLynx21
Copy link
Contributor Author

Hey @BlueLynx21, amazing this is the first language for the upcoming federated frontend!

This PR is merging the language file into RoboSats:main instead, it would be ideal if it merges it into RoboSats:the-federation-layer-v0.6.0 . Could you close this PR and open it again merging on the federated branch?

How can I do it?

@Reckless-Satoshi
Copy link
Collaborator

Hey @BlueLynx21, now that we merged the-federation-layer it will be easier merging this PR. Unfortunately there seems to be some conflicts with the latest ca.json that we have in main (that means, the same line might have changed in both files). Do you think you could go over it again and make sure only the newest(best) strings remain?

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.

None yet

2 participants