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

(sync) Resolve conflicts with gatsby-i18n-source @ 90932a0 #38

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

gatsbybot
Copy link
Contributor

@gatsbybot gatsbybot commented Feb 19, 2020

Sync conflicts with the source repo. Please update the translations based on updated source content.

For more information on how to resolve sync conflicts, check out the guide for syncing translations.

The following 23 files have conflicts:
  • docs/tutorial/wordpress-source-plugin-tutorial.md
  • docs/tutorial/using-a-theme.md
  • docs/docs/using-graphql-playground.md
  • docs/docs/upgrading-node-js.md
  • docs/docs/typography-js.md
  • docs/docs/sourcing-from-buttercms.md
  • docs/docs/quick-start.md
  • docs/docs/preparing-your-environment.md
  • docs/docs/path-prefix.md
  • docs/docs/mdx/programmatically-creating-pages.md
  • docs/docs/index.md
  • docs/docs/how-shadowing-works.md
  • docs/docs/gatsby-lifecycle-apis.md
  • docs/docs/gatsby-cli.md
  • docs/docs/bulma.md
  • docs/docs/building-an-e-commerce-site.md
  • docs/docs/browser-support.md
  • docs/docs/babel.md
  • docs/docs/audit-with-lighthouse.md
  • docs/docs/adding-search-with-elasticlunr.md
  • docs/docs/add-custom-webpack-config.md
  • docs/docs/add-404-page.md
  • docs/contributing/organize-a-gatsby-event.md

Once all the commits have been fixed, mark this pull request as "Ready for review" and merge it in!

See all changes since the last sync here:

https://github.com/gatsbyjs/gatsby-i18n-source/compare/d7eb748..90932a0

NOTE: Do NOT squash-merge this pull request. The sync script requires a ref to the source repo in order to work correctly.

Related PRs

#37 PR for syncing non-conflicting files

Copy link
Contributor

@tesseralis tesseralis left a comment

Choose a reason for hiding this comment

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

Hi @lex111 @alexandrtovmach! I created a sync PR for you. Most of the changes were formatting changes in the English version, so I duplicated those changes here. There are just 2-3 files that have text that needs to be translated again.

~@tesseralis

docs/docs/quick-start.md Outdated Show resolved Hide resolved
docs/docs/index.md Outdated Show resolved Hide resolved
@tesseralis tesseralis added the sync Sync with translation source. Used by @gatsbybot to track open sync pull requests. label Mar 28, 2020
Copy link
Contributor

@alexandrtovmach alexandrtovmach left a comment

Choose a reason for hiding this comment

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

Translated requested texts

docs/docs/index.md Outdated Show resolved Hide resolved
docs/docs/quick-start.md Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sync Sync with translation source. Used by @gatsbybot to track open sync pull requests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants