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

translation(jp): 20230824 updated #3095

Closed
wants to merge 139 commits into from
Closed

translation(jp): 20230824 updated #3095

wants to merge 139 commits into from

Conversation

rdlabo
Copy link
Collaborator

@rdlabo rdlabo commented Aug 24, 2023

No description provided.

# Conflicts:
#	docs/angular/config.md
#	docs/angular/lifecycle.md
#	docs/angular/navigation.md
#	docs/angular/overview.md
#	docs/angular/storage.md
#	docs/angular/testing.md
#	docs/angular/your-first-app.md
#	docs/cli/configuration.md
#	docs/cli/using-a-proxy.md
#	docs/core-concepts/cross-platform.md
#	docs/core-concepts/fundamentals.md
#	docs/core-concepts/webview.md
#	docs/deployment/app-store.md
#	docs/deployment/desktop-app.md
#	docs/deployment/play-store.md
#	docs/developer-resources/guides/first-app-v4/ios-android-camera.md
#	docs/developer-resources/guides/first-app-v4/theming.md
#	docs/developing/android.md
#	docs/developing/hardware-back-button.md
#	docs/developing/ios.md
#	docs/developing/keyboard.md
#	docs/developing/tips.md
#	docs/intro/cdn.md
#	docs/intro/cli.md
#	docs/intro/environment.md
#	docs/layout/css-utilities.md
#	docs/react/config.md
#	docs/react/lifecycle.md
#	docs/react/navigation.md
#	docs/react/overview.md
#	docs/react/pwa.md
#	docs/react/quickstart.md
#	docs/reference/browser-support.md
#	docs/reference/glossary.md
#	docs/reference/migration.md
#	docs/reference/support.md
#	docs/reference/versioning.md
#	docs/studio/setup/installation.md
#	docs/theming/advanced.md
#	docs/theming/basics.md
#	docs/theming/colors.md
#	docs/theming/css-variables.md
#	docs/theming/dark-mode.md
#	docs/theming/platform-styles.md
#	docs/theming/themes.md
#	docs/troubleshooting/build.md
#	docs/troubleshooting/native.md
#	docs/troubleshooting/runtime.md
#	docs/vue/config.md
#	docs/vue/lifecycle.md
#	docs/vue/navigation.md
#	docs/vue/overview.md
#	docs/vue/pwa.md
#	docs/vue/quickstart.md
# Conflicts:
#	docs/deployment/desktop-app.md
#	docs/developing/keyboard.md
#	docs/theming/advanced.md
#	docs/vue/your-first-app.md
#	package.json
#	scripts/api.js
rdlabo added 15 commits April 6, 2023 16:05
# Conflicts:
#	docs/api/modal.md
#	docs/api/nav.md
#	docs/api/router-link.md
#	docs/api/searchbar.md
#	docs/api/select.md
#	docs/api/toast.md
#	docs/intro/next.md
#	docs/layout/structure.md
#	docs/react/lifecycle.md
#	docs/react/navigation.md
#	docs/react/overview.md
#	docs/react/pwa.md
#	docs/studio/setup/installation.md
#	docs/theming/css-shadow-parts.md
#	docs/vue/pwa.md
#	docs/vue/quickstart.md
#	versioned_docs/version-v6/studio.md
# Conflicts:
#	docs/angular/lifecycle.md
#	docs/angular/navigation.md
#	docs/api/datetime.md
#	docs/api/input.md
#	docs/api/item-sliding.md
#	docs/api/menu.md
#	docs/api/modal.md
#	docs/api/range.md
#	docs/api/select.md
#	docs/api/spinner.md
#	docs/api/tab.md
#	docs/core-concepts/fundamentals.md
#	docs/deployment/app-store.md
#	docs/deployment/progressive-web-app.md
#	docs/developing/android.md
#	docs/layout/structure.md
#	docs/react/lifecycle.md
#	docs/reference/glossary.md
#	docs/reference/versioning.md
#	docs/theming/css-shadow-parts.md
#	docs/updating/6-0.md
#	docs/updating/7-0.md
#	docs/vue/lifecycle.md
#	docs/vue/quickstart.md
#	package-lock.json
#	package.json
#	versioned_docs/version-v6/intro/upgrading-to-ionic-6.md
# Conflicts:
#	docs/api/button.md
#	docs/developing/android.md
#	docs/developing/ios.md
#	docs/developing/previewing.md
#	docs/react/lifecycle.md
#	docs/react/quickstart.md
#	docs/theming/advanced.md
#	docs/theming/dark-mode.md
#	docs/vue/quickstart.md
#	scripts/i18n.sh
# Conflicts:
#	docs/api/accordion.md
#	docs/api/action-sheet.md
#	docs/api/alert.md
#	docs/api/back-button.md
#	docs/api/badge.md
#	docs/api/button.md
#	docs/api/card-title.md
#	docs/api/checkbox.md
#	docs/api/chip.md
#	docs/api/col.md
#	docs/api/content.md
#	docs/api/fab-button.md
#	docs/api/fab.md
#	docs/api/footer.md
#	docs/api/grid.md
#	docs/api/img.md
#	docs/api/infinite-scroll.md
#	docs/api/input.md
#	docs/api/item-divider.md
#	docs/api/item-option.md
#	docs/api/item-sliding.md
#	docs/api/label.md
#	docs/api/loading.md
#	docs/api/menu-button.md
#	docs/api/menu-toggle.md
#	docs/api/nav-link.md
#	docs/api/nav.md
#	docs/api/picker.md
#	docs/api/popover.md
#	docs/api/progress-bar.md
#	docs/api/radio-group.md
#	docs/api/radio.md
#	docs/api/range.md
#	docs/api/reorder-group.md
#	docs/api/reorder.md
#	docs/api/ripple-effect.md
#	docs/api/route-redirect.md
#	docs/api/router-link.md
#	docs/api/row.md
#	docs/api/searchbar.md
#	docs/api/select-option.md
#	docs/api/skeleton-text.md
#	docs/api/spinner.md
#	docs/api/split-pane.md
#	docs/api/tab-bar.md
#	docs/api/tab.md
#	docs/api/tabs.md
#	docs/api/thumbnail.md
#	docs/api/toast.md
#	docs/api/toggle.md
#	docs/api/toolbar.md
@vercel
Copy link

vercel bot commented Aug 24, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
ionic-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 24, 2023 1:52am

@rdlabo rdlabo enabled auto-merge (squash) August 24, 2023 00:35
@liamdebeasi
Copy link
Contributor

Hey there! Can you fill out the PR description so I can understand what this does?

@rdlabo
Copy link
Collaborator Author

rdlabo commented Aug 29, 2023

This is simply the latest version of the document merged and translated.

However, since we use the main branch of https://github.com/ionic-jp/ionic-docs as our working branch, we always end up with a lot of diffs when we do pull requests.

@liamdebeasi
Copy link
Contributor

liamdebeasi commented Aug 29, 2023

Thanks! Did you mean to merge this into the translation/jp branch instead of main? This PR currently overwrites the English documentation.

Example: https://github.com/ionic-team/ionic-docs/blob/e899a5274c841dc73010ebef3af843532f939e76/docs/angular/navigation.md

@rdlabo rdlabo disabled auto-merge August 31, 2023 07:44
@rdlabo
Copy link
Collaborator Author

rdlabo commented Aug 31, 2023

Sorry, it was an operational error. Terminate this pull request to make the target branch correct. Thanks for letting me know!

@rdlabo rdlabo closed this Aug 31, 2023
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.

5 participants