diff --git a/.envrc b/.envrc
index 6b4944e6..c7b1741e 100644
--- a/.envrc
+++ b/.envrc
@@ -27,3 +27,5 @@ envrc=$(find_up .envrc)
 export ROOT_DIR=${envrc%/.envrc}
 
 export REFS_JA_PATH=$PWD/translation/refs.ja.yaml
+
+export USE_GUIX=yes
diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml
new file mode 100644
index 00000000..c4e9677e
--- /dev/null
+++ b/.github/workflows/pages.yaml
@@ -0,0 +1,74 @@
+name: Build and deploy to GitHub Pages
+on:
+  push:
+    branches: [ "ja" ]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install --yes \
+            lua5.3 luarocks liblua5.3-dev libyaml-dev libcmark-dev cpanminus po4a
+
+      - name: Install CommonMark Perl module
+        run: |
+          sudo cpanm CommonMark
+
+      - name: Install LuaRocks
+        run: |
+          ./translation/bin/install
+
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.4'
+
+      - name: Build pages
+        # Run twice to correctly reflect link references
+        run: |
+          eval "$(luarocks path --bin)"
+          export REFS_JA_PATH=$PWD/translation/refs.ja.yaml
+          echo "---\n" > translation/refs.translatable.yaml
+          git clone https://github.com/mquinson/po4a
+          export PERL5LIB="$PWD/po4a/lib:$PERL5LIB"
+          export PATH="$PWD/po4a:$PATH"
+          make --directory translation
+          touch translation/po4a.cfg
+          make --directory translation
+          mkdir -p tmp-for-github-pages
+          mv translation/ja/spec.html tmp-for-github-pages/
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: tmp-for-github-pages
+
+  deploy:
+    if: github.ref == 'refs/heads/ja'
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy to GitHub Pages
+        uses: actions/deploy-pages@v4
+    permissions:
+      id-token: write
+      pages: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
diff --git a/tools/make_spec.lua b/tools/make_spec.lua
index 7a3608c4..04a30897 100644
--- a/tools/make_spec.lua
+++ b/tools/make_spec.lua
@@ -4,14 +4,14 @@ local lyaml = require('lyaml')
 
 local format = arg[1] or 'html'
 
--- io.stderr:write(os.getenv("PWD"))
+local jarefs = {}
 local jarefs_file = io.open(os.getenv("REFS_JA_PATH", "r"))
-if not jarefs_file then
-   io.stderr:write("WARNING: ja refs file not open\n")
-   os.exit(1)
+if jarefs_file then
+   jarefs = lyaml.load(jarefs_file:read("a"))
+   jarefs_file:close()
+else
+   io.stderr:write("WARNING: ja refs file not open.  Please rerun\n")
 end
-local jarefs = lyaml.load(jarefs_file:read("a")) or {}
-jarefs_file:close()
 
 local trim = function(s)
   return s:gsub("^%s+",""):gsub("%s+$","")
diff --git a/translation/Makefile b/translation/Makefile
index bbbeb35c..ab286205 100644
--- a/translation/Makefile
+++ b/translation/Makefile
@@ -1,3 +1,4 @@
+PO4A ?= po4a
 outdir	:=	ja
 
 all: ${outdir}/spec.txt \
@@ -6,8 +7,6 @@ all: ${outdir}/spec.txt \
 		ja/tools/make_spec.lua \
 		refs.ja.yaml
 	${MAKE} --directory ja spec.html
-	ssh pi mkdir -p /srv/www/CommonMark
-	rsync -av ./ja/spec.html pi:/srv/www/CommonMark/spec.html
 .PHONY: all
 
 ja/tools/make_spec.lua: ../tools/make_spec.lua
@@ -27,7 +26,7 @@ ${outdir}/spec.txt: po/ja.po po/en.pot po4a.cfg
 translate: credit.md
 	cp ../spec.txt spec.txt
 	lua ../tools/make_spec.lua refblock < ../spec.txt >> spec.txt
-	po4a po4a.cfg
+	$(PO4A) po4a.cfg
 .PHONY: translate
 
 po/en.pot:
diff --git a/translation/bin/install b/translation/bin/install
index c633f9b6..b664b6de 100755
--- a/translation/bin/install
+++ b/translation/bin/install
@@ -1,4 +1,11 @@
 #!/bin/sh
 set -eu
+
 luarocks install --local lcmark
-luarocks install --local lyaml "YAML_LIBDIR=$YAML_LIBDIR"
+
+if [ "${USE_GUIX:-}" = yes ]
+then
+    luarocks install --local lyaml "YAML_LIBDIR=$YAML_LIBDIR"
+else
+    luarocks install --local lyaml
+fi
diff --git a/translation/generate-translated-refs b/translation/generate-translated-refs
index 02704bf2..2e11c757 100755
--- a/translation/generate-translated-refs
+++ b/translation/generate-translated-refs
@@ -1,9 +1,13 @@
 #!/usr/bin/env ruby
 require "yaml"
 
-doc = YAML.load_file(File.join(__dir__, "refs.translatable.ja.yaml"))
+doc = {}
+path = File.join(__dir__, "refs.translatable.ja.yaml")
+if File.file?(path)
+  doc.replace(YAML.load_file(path))
+end
 refs = {}
-doc&.each do |entry|
+doc.each do |entry|
   # entry has en, id, ja
   ja = entry["ja"]
   refs[ja] and raise "duplicated entry: #{entry.inspect}"
diff --git a/translation/po/ja.po b/translation/po/ja.po
index 0a56ef80..e8cbc328 100644
--- a/translation/po/ja.po
+++ b/translation/po/ja.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: commonmark-ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-05 09:42+0900\n"
+"POT-Creation-Date: 2026-04-05 10:52+0900\n"
 "PO-Revision-Date: 2026-04-05 09:42+0900\n"
 "Last-Translator: gemmaro <gemmaro.dev@gmail.com>\n"
 "Language-Team: none\n"
@@ -37,170 +37,200 @@ msgstr ""
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "character"
-msgstr "文字"
+msgid "link text"
+msgstr "リンクテキスト"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:3682
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Block quotes"
-msgstr "ブロック引用"
+msgid "tight"
+msgstr "窮屈"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "full reference link"
-msgstr "完全参照リンク"
+msgid "declaration"
+msgstr "宣言"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:1726
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Indented code blocks"
-msgstr "字下げコードブロックについて"
+msgid "ordered list"
+msgstr "順序付きリスト"
+
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:3662
+#, no-wrap
+msgid "Container blocks"
+msgstr "入れ物ブロック"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "principle of uniformity"
-msgstr "一律性の原則"
+msgid "can close strong emphasis"
+msgstr "強い強調の閉止可能"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "inline link"
-msgstr "行内リンク"
+msgid "attribute value"
+msgstr "属性値"
+
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:3638
+#, no-wrap
+msgid "Blank lines"
+msgstr "空白行"
+
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:248
+#, no-wrap
+msgid "About this document"
+msgstr "本文書について"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "HTML tag"
-msgstr "HTMLタグ"
+msgid "blank line"
+msgstr "空行"
+
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:3
+#, no-wrap
+msgid "What is Markdown?"
+msgstr "マークダウンとは"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "Entity references"
-msgstr "実体参照"
+msgid "start condition"
+msgstr "開始条件"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "list"
-msgstr "リスト"
+msgid "list marker"
+msgstr "リストの印"
+
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:1
+#, no-wrap
+msgid "Introduction"
+msgstr "はしがき"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "absolute URI"
-msgstr "絶対URI"
+msgid "open tag"
+msgstr "開始タグ"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:864
+#: refs.translatable.yaml:1 spec.txt:1926
 #, no-wrap
-msgid "Thematic breaks"
-msgstr "主題分割について"
+msgid "Fenced code blocks"
+msgstr "有塀コードブロックについて"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:9421
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Textual content"
-msgstr "テキストの内容"
+msgid "matches"
+msgstr "合致"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "HTML block"
-msgstr "HTMLブロック"
+msgid "code fence"
+msgstr "コード塀"
 
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:5862
+#. type: heading3
+#: refs.translatable.yaml:1 spec.txt:5044
 #, no-wrap
-msgid "Inlines"
-msgstr "行内要素"
+msgid "Motivation"
+msgstr "狙い"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "can close emphasis"
-msgstr "強調の閉止可能"
+msgid "Autolink"
+msgstr "自動リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "scheme"
-msgstr "スキーム"
+msgid "inline link"
+msgstr "行内リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "indented chunk"
-msgstr "字下げされた塊"
+msgid "email autolink"
+msgstr "電子メールの自動リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "can close strong emphasis"
-msgstr "強い強調の閉止可能"
+msgid "paragraph"
+msgstr "段落"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "loose"
-msgstr "ゆるやか"
+msgid "lazy continuation line"
+msgstr "不精な継続行"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "paragraph"
-msgstr "段落"
+msgid "double-quoted attribute value"
+msgstr "二重引用符の属性値"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "matches"
-msgstr "合致"
+msgid "look for link or image"
+msgstr "リンクないし画像の探索"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:471
+#: refs.translatable.yaml:1 spec.txt:1310
 #, no-wrap
-msgid "Insecure characters"
-msgstr "安全でない文字"
+msgid "Setext headings"
+msgstr "Setext見出し"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:826
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Precedence"
-msgstr "優先順位"
+msgid "attribute name"
+msgstr "属性名"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "of the same type"
-msgstr "同じ型を持つ"
+msgid "thematic break"
+msgstr "主題分割"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "ordered list"
-msgstr "順序付きリスト"
+msgid "can open strong emphasis"
+msgstr "強い強調の開始可能"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "delimiter stack"
-msgstr "区切りスタック"
+msgid "info string"
+msgstr "情報文字列"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:852
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Container blocks and leaf blocks"
-msgstr "入れ物ブロックと葉ブロック"
+msgid "of the same type"
+msgstr "同じ型を持つ"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "single-quoted attribute value"
-msgstr "単一引用符の属性値"
+msgid "URI autolink"
+msgstr "URIの自動リンク"
 
 # To stand at the flank or side of; to border upon.
 #. type: Hash Value: ja
@@ -212,44 +242,45 @@ msgstr "右側の区切り連"
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "link label"
-msgstr "リンクラベル"
+msgid "delimiter run"
+msgstr "区切り連"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "processing instruction"
-msgstr "処理命令"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:335
-#, no-wrap
-msgid "Tabs"
-msgstr "タブ"
+msgid "hard line break"
+msgstr "固い改行"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:615
+#: refs.translatable.yaml:1 spec.txt:1088
 #, no-wrap
-msgid "Entity and numeric character references"
-msgstr "実体と、数値による文字参照"
+msgid "ATX headings"
+msgstr "ATX見出しについて"
 
+# 文字はつけません
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "attribute name"
-msgstr "属性名"
+msgid "Unicode whitespace"
+msgstr "ユニコードの空白"
+
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:859
+#, no-wrap
+msgid "Leaf blocks"
+msgstr "葉ブロック"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:3528
+#: refs.translatable.yaml:1 spec.txt:2352
 #, no-wrap
-msgid "Paragraphs"
-msgstr "段落について"
+msgid "HTML blocks"
+msgstr "HTMLブロックについて"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "ASCII punctuation character"
-msgstr "アスキーの約物文字"
+msgid "character"
+msgstr "文字"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
@@ -260,69 +291,81 @@ msgstr "開始番号"
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "Paragraph continuation text"
-msgstr "段落継続テキスト"
+msgid "blocks"
+msgstr "ブロック"
 
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:3662
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:615
 #, no-wrap
-msgid "Container blocks"
-msgstr "入れ物ブロック"
+msgid "Entity and numeric character references"
+msgstr "実体と、数値による文字参照"
+
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
+#, no-wrap
+msgid "ASCII control character"
+msgstr "アスキーの制御文字"
 
+# あえて「コード区域」のみにしません
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:9636
+#: refs.translatable.yaml:1 spec.txt:5879
 #, no-wrap
-msgid "Phase 2: inline structure"
-msgstr "段階2：行内の構造"
+msgid "Code spans"
+msgstr "コード区域について"
+
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:9451
+#, no-wrap
+msgid "Appendix: A parsing strategy"
+msgstr "補遺：構文解析の戦略"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:2352
+#: refs.translatable.yaml:1 spec.txt:852
 #, no-wrap
-msgid "HTML blocks"
-msgstr "HTMLブロックについて"
+msgid "Container blocks and leaf blocks"
+msgstr "入れ物ブロックと葉ブロック"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "bullet list marker"
-msgstr "中黒リストの印"
+msgid "backtick string"
+msgstr "抑音符の文字列"
+
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:9456
+#, no-wrap
+msgid "Overview"
+msgstr "概観"
 
-# 文字はつけません
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "Unicode whitespace"
-msgstr "ユニコードの空白"
+msgid "link destination"
+msgstr "リンク先"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "setext heading"
-msgstr "setext見出し"
+msgid "Entity references"
+msgstr "実体参照"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:9236
-#, no-wrap
-msgid "Hard line breaks"
-msgstr "固い改行について"
-
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:859
+#: refs.translatable.yaml:1 spec.txt:284
 #, no-wrap
-msgid "Leaf blocks"
-msgstr "葉ブロック"
+msgid "Characters and lines"
+msgstr "文字と行"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:1726
 #, no-wrap
-msgid "attribute value"
-msgstr "属性値"
+msgid "Indented code blocks"
+msgstr "字下げコードブロックについて"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "list marker"
-msgstr "リストの印"
+msgid "loose"
+msgstr "ゆるやか"
 
 #. type: heading2
 #: refs.translatable.yaml:1 spec.txt:8773
@@ -331,178 +374,167 @@ msgid "Autolinks"
 msgstr "自動リンクについて"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:8546
+#: refs.translatable.yaml:1 spec.txt:335
 #, no-wrap
-msgid "Images"
-msgstr "画像"
+msgid "Tabs"
+msgstr "タブ"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "end condition"
-msgstr "終了条件"
+msgid "full reference link"
+msgstr "完全参照リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "space"
-msgstr "空白文字"
+msgid "link reference definition"
+msgstr "リンク参照定義"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:8546
 #, no-wrap
-msgid "tight"
-msgstr "窮屈"
+msgid "Images"
+msgstr "画像"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+# any distinct time period in a sequence of events; "we are in a
+# transitional stage in which many former ideas must be revised or
+# rejected"
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:9494
 #, no-wrap
-msgid "inline"
-msgstr "行内"
+msgid "Phase 1: block structure"
+msgstr "段階1：ブロックの構造"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "double-quoted attribute value"
-msgstr "二重引用符の属性値"
+msgid "ATX heading"
+msgstr "ATX見出し"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "blank line"
-msgstr "空行"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:8960
-#, no-wrap
-msgid "Raw HTML"
-msgstr "素のHTML"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:4111
-#, no-wrap
-msgid "List items"
-msgstr "リスト項目"
+msgid "block quote marker"
+msgstr "ブロック引用の印"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "line"
-msgstr "行"
+msgid "softbreak"
+msgstr "柔らかい分割"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "hard line break"
-msgstr "固い改行"
+msgid "list"
+msgstr "リスト"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "ordered list marker"
-msgstr "順序付きリストの印"
+msgid "ASCII punctuation character"
+msgstr "アスキーの約物文字"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "reference link"
-msgstr "参照リンク"
+msgid "code span"
+msgstr "コード区域"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:3682
 #, no-wrap
-msgid "link text"
-msgstr "リンクテキスト"
+msgid "Block quotes"
+msgstr "ブロック引用"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:248
+#: refs.translatable.yaml:1 spec.txt:95
 #, no-wrap
-msgid "About this document"
-msgstr "本文書について"
+msgid "Why is a spec needed?"
+msgstr "なぜ仕様が必要とされているのか"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "left-flanking delimiter run"
-msgstr "左側の区切り連"
+msgid "space"
+msgstr "空白文字"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "setext heading underline"
-msgstr "setext見出しの下線"
+msgid "absolute URI"
+msgstr "絶対URI"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:1926
+#: refs.translatable.yaml:1 spec.txt:8960
 #, no-wrap
-msgid "Fenced code blocks"
-msgstr "有塀コードブロックについて"
+msgid "Raw HTML"
+msgstr "素のHTML"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "blocks"
-msgstr "ブロック"
+msgid "HTML block"
+msgstr "HTMLブロック"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "code span"
-msgstr "コード区域"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:5230
-#, no-wrap
-msgid "Lists"
-msgstr "リストについて"
+msgid "closing tag"
+msgstr "閉止タグ"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "email autolink"
-msgstr "電子メールの自動リンク"
+msgid "indented code block"
+msgstr "字下げコードブロック"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "link title"
-msgstr "リンク題"
+msgid "Decimal numeric character references"
+msgstr "10進数の数値的な文字参照"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:3638
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Blank lines"
-msgstr "空白行"
+msgid "link label"
+msgstr "リンクラベル"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "email address"
-msgstr "電子メールアドレス"
+msgid "image description"
+msgstr "画像の説明"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:3173
+#: refs.translatable.yaml:1 spec.txt:3528
 #, no-wrap
-msgid "Link reference definitions"
-msgstr "リンク参照定義について"
+msgid "Paragraphs"
+msgstr "段落について"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "block quote marker"
-msgstr "ブロック引用の印"
+msgid "single-quoted attribute value"
+msgstr "単一引用符の属性値"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:5862
 #, no-wrap
-msgid "backtick string"
-msgstr "抑音符の文字列"
+msgid "Inlines"
+msgstr "行内要素"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+# 前置き<
+# denoting an action or event preceding or in preparation for something
+# more important; designed to orient or acquaint with a situation before
+# proceeding; "a preliminary investigation"
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:282
 #, no-wrap
-msgid "shortcut reference link"
-msgstr "簡略参照リンク"
+msgid "Preliminaries"
+msgstr "下準備"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
@@ -513,61 +545,56 @@ msgstr "強調の開始可能"
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "HTML comment"
-msgstr "HTMLコメント"
+msgid "Unicode whitespace character"
+msgstr "ユニコードの空白文字"
 
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:477
+#. type: heading1
+#: refs.translatable.yaml:1 spec.txt:817
 #, no-wrap
-msgid "Backslash escapes"
-msgstr "バックスラッシュのエスケープ"
+msgid "Blocks and inlines"
+msgstr "ブロックと行内"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "code fence"
-msgstr "コード塀"
+msgid "unquoted attribute value"
+msgstr "引用符のない属性値"
 
-# あえて「コード区域」のみにしません
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:5879
+#: refs.translatable.yaml:1 spec.txt:9386
 #, no-wrap
-msgid "Code spans"
-msgstr "コード区域について"
+msgid "Soft line breaks"
+msgstr "柔らかい改行"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "info string"
-msgstr "情報文字列"
-
-# 前置き<
-# denoting an action or event preceding or in preparation for something
-# more important; designed to orient or acquaint with a situation before
-# proceeding; "a preliminary investigation"
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:282
+msgid "attribute"
+msgstr "属性"
+
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Preliminaries"
-msgstr "下準備"
+msgid "Paragraph continuation text"
+msgstr "段落継続テキスト"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "process emphasis"
-msgstr "強調の処理"
+msgid "reference link"
+msgstr "参照リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "look for link or image"
-msgstr "リンクないし画像の探索"
+msgid "setext heading underline"
+msgstr "setext見出しの下線"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "thematic break"
-msgstr "主題分割"
+msgid "delimiter stack"
+msgstr "区切りスタック"
 
 #. type: heading3
 #: refs.translatable.yaml:1 spec.txt:9667
@@ -575,80 +602,75 @@ msgstr "主題分割"
 msgid "An algorithm for parsing nested emphasis and links"
 msgstr "入れ子の強調とリンクを構文解析するためのアルゴリズム"
 
-# any distinct time period in a sequence of events; "we are in a
-# transitional stage in which many former ideas must be revised or
-# rejected"
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:9494
+#. type: Hash Value: ja
+#: refs.translatable.yaml:1
 #, no-wrap
-msgid "Phase 1: block structure"
-msgstr "段階1：ブロックの構造"
+msgid "indented chunk"
+msgstr "字下げされた塊"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:9456
-#, no-wrap
-msgid "Overview"
-msgstr "概観"
-
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:9451
+#: refs.translatable.yaml:1 spec.txt:4111
 #, no-wrap
-msgid "Appendix: A parsing strategy"
-msgstr "補遺：構文解析の戦略"
+msgid "List items"
+msgstr "リスト項目"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:826
 #, no-wrap
-msgid "open tag"
-msgstr "開始タグ"
+msgid "Precedence"
+msgstr "優先順位"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "softbreak"
-msgstr "柔らかい分割"
+msgid "fenced code block"
+msgstr "有塀コードブロック"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:9386
+#: refs.translatable.yaml:1 spec.txt:3173
 #, no-wrap
-msgid "Soft line breaks"
-msgstr "柔らかい改行"
+msgid "Link reference definitions"
+msgstr "リンク参照定義について"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:3
+#: refs.translatable.yaml:1 spec.txt:9636
 #, no-wrap
-msgid "What is Markdown?"
-msgstr "マークダウンとは"
+msgid "Phase 2: inline structure"
+msgstr "段階2：行内の構造"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "link reference definition"
-msgstr "リンク参照定義"
+msgid "Hexadecimal numeric character references"
+msgstr "16進数の数値的な文字参照"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "URI autolink"
-msgstr "URIの自動リンク"
+msgid "HTML comment"
+msgstr "HTMLコメント"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "Hexadecimal numeric character references"
-msgstr "16進数の数値的な文字参照"
+msgid "tab"
+msgstr "タブ文字"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:9421
 #, no-wrap
-msgid "Decimal numeric character references"
-msgstr "10進数の数値的な文字参照"
+msgid "Textual content"
+msgstr "テキストの内容"
 
+# To fall together suddenly, as the sides of a hollow vessel; to close
+# by falling or shrinking together; to have the sides or parts of (a
+# thing) fall in together, or be crushed in together; as, “a flue in
+# the boiler of a steam engine sometimes collapses”.
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "attribute"
-msgstr "属性"
+msgid "collapsed reference link"
+msgstr "縮約参照リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
@@ -657,22 +679,22 @@ msgid "Unicode punctuation character"
 msgstr "ユニコードの約物文字"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:1310
+#: refs.translatable.yaml:1 spec.txt:9236
 #, no-wrap
-msgid "Setext headings"
-msgstr "Setext見出し"
+msgid "Hard line breaks"
+msgstr "固い改行について"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "closing tag"
-msgstr "閉止タグ"
+msgid "HTML tag"
+msgstr "HTMLタグ"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "declaration"
-msgstr "宣言"
+msgid "CDATA section"
+msgstr "CDATA節"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
@@ -683,168 +705,146 @@ msgstr "行末"
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "Autolink"
-msgstr "自動リンク"
+msgid "processing instruction"
+msgstr "処理命令"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "unquoted attribute value"
-msgstr "引用符のない属性値"
+msgid "line"
+msgstr "行"
+
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:6112
+#, no-wrap
+msgid "Emphasis and strong emphasis"
+msgstr "強調と強い強調"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "image description"
-msgstr "画像の説明"
+msgid "email address"
+msgstr "電子メールアドレス"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "indented code block"
-msgstr "字下げコードブロック"
+msgid "left-flanking delimiter run"
+msgstr "左側の区切り連"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:95
+#: refs.translatable.yaml:1 spec.txt:471
 #, no-wrap
-msgid "Why is a spec needed?"
-msgstr "なぜ仕様が必要とされているのか"
+msgid "Insecure characters"
+msgstr "安全でない文字"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "fenced code block"
-msgstr "有塀コードブロック"
+msgid "bullet list"
+msgstr "中黒リスト"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "ATX heading"
-msgstr "ATX見出し"
+msgid "tag name"
+msgstr "タグ名"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "Unicode whitespace character"
-msgstr "ユニコードの空白文字"
+msgid "shortcut reference link"
+msgstr "簡略参照リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "attribute value specification"
-msgstr "属性値の指定"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:6112
-#, no-wrap
-msgid "Emphasis and strong emphasis"
-msgstr "強調と強い強調"
+msgid "link title"
+msgstr "リンク題"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "CDATA section"
-msgstr "CDATA節"
+msgid "can close emphasis"
+msgstr "強調の閉止可能"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "link destination"
-msgstr "リンク先"
+msgid "ordered list marker"
+msgstr "順序付きリストの印"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "bullet list"
-msgstr "中黒リスト"
-
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:817
-#, no-wrap
-msgid "Blocks and inlines"
-msgstr "ブロックと行内"
+msgid "attribute value specification"
+msgstr "属性値の指定"
 
 #. type: heading2
-#: refs.translatable.yaml:1 spec.txt:284
+#: refs.translatable.yaml:1 spec.txt:5230
 #, no-wrap
-msgid "Characters and lines"
-msgstr "文字と行"
+msgid "Lists"
+msgstr "リストについて"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "start condition"
-msgstr "開始条件"
+msgid "end condition"
+msgstr "終了条件"
 
-#. type: heading3
-#: refs.translatable.yaml:1 spec.txt:5044
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:864
 #, no-wrap
-msgid "Motivation"
-msgstr "狙い"
+msgid "Thematic breaks"
+msgstr "主題分割について"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "delimiter run"
-msgstr "区切り連"
+msgid "scheme"
+msgstr "スキーム"
 
-#. type: Hash Value: ja
-#: refs.translatable.yaml:1
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:7476
 #, no-wrap
-msgid "tag name"
-msgstr "タグ名"
+msgid "Links"
+msgstr "リンク"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "lazy continuation line"
-msgstr "不精な継続行"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:1088
-#, no-wrap
-msgid "ATX headings"
-msgstr "ATX見出しについて"
+msgid "setext heading"
+msgstr "setext見出し"
 
-# To fall together suddenly, as the sides of a hollow vessel; to close
-# by falling or shrinking together; to have the sides or parts of (a
-# thing) fall in together, or be crushed in together; as, “a flue in
-# the boiler of a steam engine sometimes collapses”.
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "collapsed reference link"
-msgstr "縮約参照リンク"
-
-#. type: heading2
-#: refs.translatable.yaml:1 spec.txt:7476
-#, no-wrap
-msgid "Links"
-msgstr "リンク"
-
-#. type: heading1
-#: refs.translatable.yaml:1 spec.txt:1
-#, no-wrap
-msgid "Introduction"
-msgstr "はしがき"
+msgid "inline"
+msgstr "行内"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "can open strong emphasis"
-msgstr "強い強調の開始可能"
+msgid "process emphasis"
+msgstr "強調の処理"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "ASCII control character"
-msgstr "アスキーの制御文字"
+msgid "bullet list marker"
+msgstr "中黒リストの印"
 
 #. type: Hash Value: ja
 #: refs.translatable.yaml:1
 #, no-wrap
-msgid "tab"
-msgstr "タブ文字"
+msgid "principle of uniformity"
+msgstr "一律性の原則"
+
+#. type: heading2
+#: refs.translatable.yaml:1 spec.txt:477
+#, no-wrap
+msgid "Backslash escapes"
+msgstr "バックスラッシュのエスケープ"
 
 #. type: Yaml Front Matter Hash Value: author
 #: spec.txt:1