ja: sync translated content

mdn · Feb 8, 2025 · e75c2f3 · e75c2f3
1 parent e0e8900
commit e75c2f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/files/ja/_redirects.txt b/files/ja/_redirects.txt
@@ -3955,7 +3955,7 @@
 /ja/docs/Web/CSS/CSS_Grid_Layout/Box_Alignment_in_CSS_Grid_Layout	/ja/docs/Web/CSS/CSS_grid_layout/Box_alignment_in_grid_layout
 /ja/docs/Web/CSS/CSS_Grid_Layout/CSS_Grid_Layout_and_Accessibility	/ja/docs/Web/CSS/CSS_grid_layout/Grid_layout_and_accessibility
 /ja/docs/Web/CSS/CSS_Grid_Layout/CSS_Grid_Logical_Values_and_Writing_Modes	/ja/docs/Web/CSS/CSS_grid_layout/Grids_logical_values_and_writing_modes
-/ja/docs/Web/CSS/CSS_Grid_Layout/CSS_Grid_and_Progressive_Enhancement	/ja/docs/Web/CSS/CSS_grid_layout/Grid_layout_and_progressive_enhancement
+/ja/docs/Web/CSS/CSS_Grid_Layout/CSS_Grid_and_Progressive_Enhancement	/ja/docs/conflicting/Web/CSS/CSS_grid_layout
 /ja/docs/Web/CSS/CSS_Grid_Layout/Layout_using_Named_Grid_Lines	/ja/docs/Web/CSS/CSS_grid_layout/Grid_layout_using_named_grid_lines
 /ja/docs/Web/CSS/CSS_Grid_Layout/Line-based_Placement_with_CSS_Grid	/ja/docs/Web/CSS/CSS_grid_layout/Grid_layout_using_line-based_placement
 /ja/docs/Web/CSS/CSS_Grid_Layout/Realizing_common_layouts_using_CSS_Grid_Layout	/ja/docs/Web/CSS/CSS_grid_layout/Realizing_common_layouts_using_grids
@@ -3997,6 +3997,7 @@
 /ja/docs/Web/CSS/CSS_charsets	/ja/docs/Web/CSS/CSS_syntax
 /ja/docs/Web/CSS/CSS_container_queries	/ja/docs/Web/CSS/CSS_containment/Container_queries
 /ja/docs/Web/CSS/CSS_flexible_box_layout/Backwards_compatibility_of_flexbox	/ja/docs/Glossary/Flexbox
+/ja/docs/Web/CSS/CSS_grid_layout/Grid_layout_and_progressive_enhancement	/ja/docs/conflicting/Web/CSS/CSS_grid_layout
 /ja/docs/Web/CSS/CSS_miscellaneous	/ja/docs/Web/CSS
 /ja/docs/Web/CSS/CSS_transforms_の利用	/ja/docs/Web/CSS/CSS_transforms/Using_CSS_transforms
 /ja/docs/Web/CSS/CSS_values_serialization	/ja/docs/Web/CSS

diff --git a/...yout_and_progressive_enhancement/index.md → ...flicting/web/css/css_grid_layout/index.md b/...yout_and_progressive_enhancement/index.md → ...flicting/web/css/css_grid_layout/index.md
@@ -1,6 +1,7 @@
 ---
 title: CSS グリッドレイアウトとプログレッシブエンハンスメント
-slug: Web/CSS/CSS_grid_layout/Grid_layout_and_progressive_enhancement
+slug: conflicting/Web/CSS/CSS_grid_layout
+original_slug: Web/CSS/CSS_grid_layout/Grid_layout_and_progressive_enhancement
 l10n:
   sourceCommit: b692821c494fd3a25dd883b6fe14998fa2621f7b
 ---