Skip to content

chore(jp): merge recent update#2883

Merged
rdlabo merged 487 commits intotranslation/jpfrom
translation/jp-20230406
Jul 25, 2023
Merged

chore(jp): merge recent update#2883
rdlabo merged 487 commits intotranslation/jpfrom
translation/jp-20230406

Conversation

@rdlabo
Copy link
Collaborator

@rdlabo rdlabo commented Apr 6, 2023

merge recent update and some translate. (A few commits are in there for https://ionicframework.jp/docs/, but they don't affect https://ionicframework.com/docs/ja/)

sean-perkins and others added 30 commits February 27, 2023 17:16
docs(many): add Ionic v6.6 docs
# Conflicts:
#	docs/angular/overview.md
#	docs/api/action-sheet.md
#	docs/api/alert.md
#	docs/api/back-button.md
#	docs/api/button.md
#	docs/api/datetime.md
#	docs/api/loading.md
#	docs/api/modal.md
#	docs/api/picker.md
#	docs/api/range.md
#	docs/api/route-redirect.md
#	docs/api/route.md
#	docs/api/router-outlet.md
#	docs/api/router.md
#	docs/api/select.md
#	docs/api/split-pane.md
#	docs/api/tab-bar.md
#	docs/api/tab-button.md
#	docs/api/tab.md
#	docs/api/tabs.md
#	docs/api/toast.md
#	docs/components.md
#	docs/developing/scaffolding.md
#	docs/native-community.md
#	docs/native-faq.md
#	docs/native.md
#	docs/react.md
#	docs/react/quickstart.md
#	docs/reference/versioning.md
#	scripts/native.js
#	sidebars.js
#	versioned_docs/version-v6/api/slide.md
#	versioned_docs/version-v6/reference/migration.md
…o translation/jp

# Conflicts:
#	docs/api/accordion-group.md
#	docs/api/accordion.md
#	docs/api/action-sheet.md
#	docs/api/alert.md
#	docs/api/app.md
#	docs/api/avatar.md
#	docs/api/back-button.md
#	docs/api/backdrop.md
#	docs/api/badge.md
#	docs/api/breadcrumb.md
#	docs/api/breadcrumbs.md
#	docs/api/button.md
#	docs/api/buttons.md
#	docs/api/card-content.md
#	docs/api/card-header.md
#	docs/api/card-subtitle.md
#	docs/api/card-title.md
#	docs/api/card.md
#	docs/api/checkbox.md
#	docs/api/chip.md
#	docs/api/col.md
#	docs/api/content.md
#	docs/api/datetime.md
#	docs/api/fab-button.md
#	docs/api/fab-list.md
#	docs/api/fab.md
#	docs/api/footer.md
#	docs/api/grid.md
#	docs/api/header.md
#	docs/api/img.md
#	docs/api/infinite-scroll-content.md
#	docs/api/infinite-scroll.md
#	docs/api/input.md
#	docs/api/item-divider.md
#	docs/api/item-group.md
#	docs/api/item-option.md
#	docs/api/item-options.md
#	docs/api/item-sliding.md
#	docs/api/item.md
#	docs/api/label.md
#	docs/api/list-header.md
#	docs/api/list.md
#	docs/api/loading.md
#	docs/api/menu-button.md
#	docs/api/menu-toggle.md
#	docs/api/menu.md
#	docs/api/modal.md
#	docs/api/nav-link.md
#	docs/api/nav.md
#	docs/api/note.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/refresher-content.md
#	docs/api/refresher.md
#	docs/api/reorder-group.md
#	docs/api/reorder.md
#	docs/api/ripple-effect.md
#	docs/api/route-redirect.md
#	docs/api/route.md
#	docs/api/router-link.md
#	docs/api/router-outlet.md
#	docs/api/router.md
#	docs/api/row.md
#	docs/api/searchbar.md
#	docs/api/segment-button.md
#	docs/api/segment.md
#	docs/api/select-option.md
#	docs/api/select.md
#	docs/api/skeleton-text.md
#	docs/api/slide.md
#	docs/api/spinner.md
#	docs/api/split-pane.md
#	docs/api/tab-bar.md
#	docs/api/tab-button.md
#	docs/api/tab.md
#	docs/api/tabs.md
#	docs/api/text.md
#	docs/api/textarea.md
#	docs/api/thumbnail.md
#	docs/api/title.md
#	docs/api/toast.md
#	docs/api/toggle.md
#	docs/api/toolbar.md
#	scripts/api-playground-init.js
#	static/usage/breadcrumbs/styling/color/angular.md
#	static/usage/breadcrumbs/styling/color/demo.html
#	static/usage/breadcrumbs/styling/color/index.md
#	static/usage/breadcrumbs/styling/color/javascript.md
#	static/usage/breadcrumbs/styling/color/react.md
#	static/usage/breadcrumbs/styling/color/vue.md
#	static/usage/breadcrumbs/styling/css-props/angular/angular_css.md
#	static/usage/breadcrumbs/styling/css-props/angular/angular_html.md
#	static/usage/breadcrumbs/styling/css-props/demo.html
#	static/usage/breadcrumbs/styling/css-props/javascript.md
#	static/usage/breadcrumbs/styling/css-props/react/react_css.md
#	static/usage/breadcrumbs/styling/css-props/react/react_ts.md
#	static/usage/breadcrumbs/styling/css-props/vue.md
#	static/usage/breadcrumbs/theming/colors/angular.md
#	static/usage/breadcrumbs/theming/colors/demo.html
#	static/usage/breadcrumbs/theming/colors/index.md
#	static/usage/breadcrumbs/theming/colors/javascript.md
#	static/usage/breadcrumbs/theming/colors/react.md
#	static/usage/breadcrumbs/theming/colors/vue.md
#	static/usage/breadcrumbs/theming/css-properties/angular/angular_css.md
#	static/usage/breadcrumbs/theming/css-properties/angular/angular_html.md
#	static/usage/breadcrumbs/theming/css-properties/demo.html
#	static/usage/breadcrumbs/theming/css-properties/index.md
#	static/usage/breadcrumbs/theming/css-properties/javascript.md
#	static/usage/breadcrumbs/theming/css-properties/react/react_css.md
#	static/usage/breadcrumbs/theming/css-properties/react/react_ts.md
#	static/usage/breadcrumbs/theming/css-properties/vue.md
#	static/usage/range/css-shadow-parts/angular/app_component_css.md
#	static/usage/range/css-shadow-parts/demo.html
#	static/usage/range/css-shadow-parts/index.md
#	static/usage/range/css-shadow-parts/javascript.md
#	static/usage/range/css-shadow-parts/react/main_css.md
#	static/usage/range/css-shadow-parts/vue.md
#	static/usage/range/css-variables/angular/app_component_css.md
#	static/usage/range/css-variables/demo.html
#	static/usage/range/css-variables/index.md
#	static/usage/range/css-variables/javascript.md
#	static/usage/range/css-variables/react/main_css.md
#	static/usage/range/css-variables/vue.md
#	static/usage/range/theming/css-properties/angular/app_component_css.md
#	static/usage/range/theming/css-properties/angular/app_component_html.md
#	static/usage/range/theming/css-properties/demo.html
#	static/usage/range/theming/css-properties/index.md
#	static/usage/range/theming/css-properties/javascript.md
#	static/usage/range/theming/css-properties/react/main_css.md
#	static/usage/range/theming/css-properties/react/main_tsx.md
#	static/usage/range/theming/css-properties/vue.md
#	static/usage/range/theming/css-shadow-parts/angular/app_component_css.md
#	static/usage/range/theming/css-shadow-parts/angular/app_component_html.md
#	static/usage/range/theming/css-shadow-parts/demo.html
#	static/usage/range/theming/css-shadow-parts/index.md
#	static/usage/range/theming/css-shadow-parts/javascript.md
#	static/usage/range/theming/css-shadow-parts/react/main_css.md
#	static/usage/range/theming/css-shadow-parts/react/main_tsx.md
#	static/usage/range/theming/css-shadow-parts/vue.md
#	static/usage/v6/breadcrumbs/theming/colors/angular.md
#	static/usage/v6/breadcrumbs/theming/colors/demo.html
#	static/usage/v6/breadcrumbs/theming/colors/index.md
#	static/usage/v6/breadcrumbs/theming/colors/javascript.md
#	static/usage/v6/breadcrumbs/theming/colors/react.md
#	static/usage/v6/breadcrumbs/theming/colors/vue.md
#	static/usage/v6/breadcrumbs/theming/css-properties/angular/example_component_css.md
#	static/usage/v6/breadcrumbs/theming/css-properties/angular/example_component_html.md
#	static/usage/v6/breadcrumbs/theming/css-properties/demo.html
#	static/usage/v6/breadcrumbs/theming/css-properties/javascript.md
#	static/usage/v6/breadcrumbs/theming/css-properties/react/main_css.md
#	static/usage/v6/breadcrumbs/theming/css-properties/react/main_tsx.md
#	static/usage/v6/breadcrumbs/theming/css-properties/vue.md
#	static/usage/v6/datetime/theming/index.md
#	static/usage/v6/range/theming/css-properties/angular/example_component_css.md
#	static/usage/v6/range/theming/css-properties/demo.html
#	static/usage/v6/range/theming/css-properties/javascript.md
#	static/usage/v6/range/theming/css-properties/react/main_css.md
#	static/usage/v6/range/theming/css-properties/vue.md
#	static/usage/v6/range/theming/css-shadow-parts/angular/example_component_css.md
#	static/usage/v6/range/theming/css-shadow-parts/demo.html
#	static/usage/v6/range/theming/css-shadow-parts/javascript.md
#	static/usage/v6/range/theming/css-shadow-parts/react/main_css.md
#	static/usage/v6/range/theming/css-shadow-parts/vue.md
#	static/usage/v7/loading/theming/index.md
#	versioned_docs/version-v6/api/slides.md
#	versioned_docs/version-v6/api/virtual-scroll.md
Co-authored-by: Liam DeBeasi <liamdebeasi@users.noreply.github.com>
# Conflicts:
#	docs/api/datetime.md
brandyscarney and others added 6 commits July 18, 2023 15:24
# 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
@rdlabo rdlabo merged commit d8f8cc4 into translation/jp Jul 25, 2023
@rdlabo rdlabo deleted the translation/jp-20230406 branch July 25, 2023 13:12
@liamdebeasi
Copy link
Contributor

Thanks for taking care of this!

@rdlabo rdlabo restored the translation/jp-20230406 branch August 24, 2023 00:17
@brandyscarney brandyscarney deleted the translation/jp-20230406 branch August 8, 2025 21:35
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.