Component Approved Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
docs/psyco/guangdong/li-qirong/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangdong/shenzhen-kangning/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangdong/wang-xiaojing/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangdong/zhao-suhua/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangxi/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangxi/gxykdxdyfsyy CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangxi/nnswy/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/hubei/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/hubei/li-fu/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/hunan/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/hunan/cheng-ming/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/hunan/he-ying/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/introletter/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/jiangsu/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/jiangsu/cao-qiuyun/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/jiangsu/nbh/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/jiangxi/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/jiangxi/guo-ming/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/liaoning/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/liaoning/liu-hong/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/liaoning/zhang-liang/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/liaoning/zhang-ye/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/psyco-confirmable/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/psyco-friendly CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/psyco-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shandong/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shandong/gao-jin/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shandong/sdmhc/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shanghai/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shanghai/shmhc/index CC-BY-SA-4.0 100% 100% 0 0 0 0 1 0 0
docs/psyco/shanghai/shspdjw/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shanxi/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/shanxi/dongyan/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/sichuan/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/sichuan/chengdu/daijing/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/sichuan/chengdu/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/yunnan/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/yunnan/liu-ruixiang/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/zhejiang/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/zhejiang/hzsdqyy/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/zhejiang/sahzu/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/zhejiang/zheng-tiansheng/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/care CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/416/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/ayfy/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/jd120/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/notarization CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/pku3/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/psh/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/psh/psh-tracheal-shave/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/sh411/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/sh411/gonadectomy CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/sh411/sh411-tracheal-shave/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/sh9/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/srs-overview-china CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/szlh/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/china/xu-xuewen/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/finland/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/id-card CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/mexico/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/mexico/mtc CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/srs-compraise CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/srs-faq CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/srs-tech CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/terminology CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/chettawut CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/greechart CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/kamol CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/notice CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/preecha CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/saran CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/srs-overview-thailand CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/suporn CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/thailand-tips CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/thiti CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/thailand/yanhee CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/us/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/us/america CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/us/heidi-wittenberg CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/srs/us/min-jun CC-BY-SA-4.0 100% 100% 0 0 0 0 1 0 0
docs/srs/us/srs-overview-us CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/unconfirmed CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/abbreviation CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/colloquialism CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/css/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/css/css-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/document-updates/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/document-updates/finland CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/document-updates/germany CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/document-updates/name-change CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/document-updates/unitedstates CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/education CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/healthcare-quickguide CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/legal-faq CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/organizations CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/useful-info/real-name-info CC-BY-SA-4.0 0 0 0 0 0 0 0

Summary

Project website mtf.wiki
Project reviewers User avatar Felinya
an hour ago

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 5,126 268,026 481,184
Source 4,844 247,159 427,628
Approved 2% 127 3% 10,295 5% 26,869
Waiting for review 1% 15 0% 180 1% 515
Translated 97% 4,986 96% 257,634 94% 455,012
Needs editing 1% 3 1% 14 1% 281
Read-only 94% 4,844 92% 247,159 88% 427,628
Failing checks 1% 13 1% 1,112 1% 4,973
Strings with suggestions 0% 0 0% 0 0% 0
Untranslated strings 2% 137 3% 10,378 5% 25,891

Quick numbers

268 k
Hosted words
5,126
Hosted strings
97%
Translated
and previous 30 days

Trends of last 30 days

Hosted words
+100%
Hosted strings
+100%
Translated
+97%
Contributors
Language Approved Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
Chinese (Simplified Han script) 100% 100% 0 0 0 0 5 0 0
Japanese 45% 50% 140 10,392 26,172 137 8 0 0
User avatar webhook:github

Repository merge failed

error: Your local changes to the following files would be overwritten by merge:
	.github/workflows/deploy.yaml
	.github/workflows/preview-pr-build.yaml
	.gitmodules
	README-EN.md
	README-ES.md
	README-JA.md
	README-T.md
	README.md
	config/_default/config.toml
	config/_default/languages.toml
	config/_default/menus.en.toml
	config/_default/menus.es.toml
	config/_default/menus.zh-cn.toml
	config/_default/menus.zh-hant.toml
	config/_default/params.toml
	content/en/about/_index.md
	content/es/about/_index.md
	content/ja/about/_index.md
	content/zh-cn/about/_index.md
	content/zh-cn/docs/hrt/canada/uoft/index.md
	content/zh-cn/docs/hrt/duan-lian/_index.md
	content/zh-cn/docs/hrt/duan-lian/bingli1.jpg
	content/zh-cn/docs/hrt/duan-lian/bingli2.jpg
	content/zh-cn/docs/hrt/duan-lian/license1.jpg
	content/zh-cn/docs/hrt/duan-lian/license2.jpg
	content/zh-cn/docs/hrt/jnuh1/index.md
	content/zh-cn/docs/hrt/other-chinamainland-hrt-res-list.md
	content/zh-cn/docs/hrt/puth/_index.md
	content/zh-cn/docs/hrt/shanghai/sh9-hrt/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone-zh.pdf
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-cn/docs/medicine/estrogen/estradiol-valerate/index.md
	content/zh-cn/docs/medicine/hrt-overview.md
	content/zh-cn/docs/medicine/monitoring.md
	content/zh-cn/docs/outdated.md
	content/zh-cn/docs/psyco/beijing/bhlgh/di-xiaolan/no-crime.png
	content/zh-cn/docs/psyco/beijing/hao-shuwei/index.md
	content/zh-cn/docs/psyco/guangdong/li-qirong/index.md
	content/zh-cn/docs/psyco/hunan/cheng-ming/index.md
	content/zh-cn/docs/psyco/jiangsu/cao-qiuyun/index.md
	content/zh-cn/docs/psyco/shanghai/shmhc/index.md
	content/zh-cn/docs/srs/china/pku3/index.md
	content/zh-cn/docs/srs/id-card.md
	content/zh-cn/docs/srs/thailand/chettawut.md
	content/zh-cn/docs/srs/thailand/greechart.md
	content/zh-cn/docs/srs/thailand/kamol.md
	content/zh-cn/docs/srs/thailand/preecha.md
	content/zh-cn/docs/useful-info/document-updates/name-change.md
	content/zh-cn/docs/useful-info/legal-faq.md
	content/zh-cn/docs/vocal-therapy/hou-qian.md
	content/zh-cn/docs/vocal-therapy/vocal-therapy-confirmed.md
	content/zh-hant/about/_index.md
	content/zh-hant/docs/contributor-guide.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/aldactone.jpg
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-hant/docs/srs/hongkong/gov.md
	content/zh-hant/docs/srs/srs-faq.md
	package-lock.json
	package.json
	themes/mtfwiki-modified/archetypes/default.md
	themes/mtfwiki-modified/archetypes/post.md
	themes/mtfwiki-modified/archetypes/section.md
	themes/mtfwiki-modified/assets/baidu-hrt.scss
	themes/mtfwiki-modified/assets/cookies-eu-banner.css
	themes/mtfwiki-modified/assets/cookies-eu-banner.js
	themes/mtfwiki-modified/assets/customize.js
	themes/mtfwiki-modified/assets/customize.scss
	themes/mtfwiki-modified/assets/gtag.ts
	themes/mtfwiki-modified/assets/qrcode.min.js
	themes/mtfwiki-modified/assets/sass/abstracts/_variables.scss
	themes/mtfwiki-modified/assets/sass/base/_typography.scss
	themes/mtfwiki-modified/assets/sweetalert.min.js
	themes/mtfwiki-modified/data/.gitkeep
	themes/mtfwiki-modified/data/font.toml
	themes/mtfwiki-modified/i18n/zh-cn.toml
	themes/mtfwiki-modified/layouts/404.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-csv.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-qrcode.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-heading.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-image.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-link.html
	themes/mtfwiki-modified/layouts/_default/section.html
	themes/mtfwiki-modified/layouts/partials/head/services.html
	themes/mtfwiki-modified/layouts/robots.txt
	themes/mtfwiki-modified/layouts/shortcodes/currency.html
	themes/mtfwiki-modified/layouts/shortcodes/current-year.html
	the
Aborting
Merge with strategy ort failed.
 (2)
3 days ago
User avatar webhook:github

Repository notification received

GitHub: https://api.github.com/repos/project-trans/MtF-wiki, master 3 days ago
User avatar webhook:github

Repository merge failed

error: Your local changes to the following files would be overwritten by merge:
	.github/workflows/deploy.yaml
	.github/workflows/preview-pr-build.yaml
	.gitmodules
	README-EN.md
	README-ES.md
	README-JA.md
	README-T.md
	README.md
	config/_default/config.toml
	config/_default/languages.toml
	config/_default/menus.en.toml
	config/_default/menus.es.toml
	config/_default/menus.zh-cn.toml
	config/_default/menus.zh-hant.toml
	config/_default/params.toml
	content/en/about/_index.md
	content/es/about/_index.md
	content/ja/about/_index.md
	content/zh-cn/about/_index.md
	content/zh-cn/docs/hrt/canada/uoft/index.md
	content/zh-cn/docs/hrt/duan-lian/_index.md
	content/zh-cn/docs/hrt/duan-lian/bingli1.jpg
	content/zh-cn/docs/hrt/duan-lian/bingli2.jpg
	content/zh-cn/docs/hrt/duan-lian/license1.jpg
	content/zh-cn/docs/hrt/duan-lian/license2.jpg
	content/zh-cn/docs/hrt/jnuh1/index.md
	content/zh-cn/docs/hrt/other-chinamainland-hrt-res-list.md
	content/zh-cn/docs/hrt/puth/_index.md
	content/zh-cn/docs/hrt/shanghai/sh9-hrt/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone-zh.pdf
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-cn/docs/medicine/estrogen/estradiol-valerate/index.md
	content/zh-cn/docs/medicine/hrt-overview.md
	content/zh-cn/docs/medicine/monitoring.md
	content/zh-cn/docs/outdated.md
	content/zh-cn/docs/psyco/beijing/bhlgh/di-xiaolan/no-crime.png
	content/zh-cn/docs/psyco/beijing/hao-shuwei/index.md
	content/zh-cn/docs/psyco/hunan/cheng-ming/index.md
	content/zh-cn/docs/psyco/jiangsu/cao-qiuyun/index.md
	content/zh-cn/docs/psyco/shanghai/shmhc/index.md
	content/zh-cn/docs/srs/china/pku3/index.md
	content/zh-cn/docs/srs/id-card.md
	content/zh-cn/docs/srs/thailand/chettawut.md
	content/zh-cn/docs/srs/thailand/greechart.md
	content/zh-cn/docs/srs/thailand/kamol.md
	content/zh-cn/docs/srs/thailand/preecha.md
	content/zh-cn/docs/useful-info/document-updates/name-change.md
	content/zh-cn/docs/useful-info/legal-faq.md
	content/zh-cn/docs/vocal-therapy/hou-qian.md
	content/zh-cn/docs/vocal-therapy/vocal-therapy-confirmed.md
	content/zh-hant/about/_index.md
	content/zh-hant/docs/contributor-guide.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/aldactone.jpg
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-hant/docs/srs/hongkong/gov.md
	content/zh-hant/docs/srs/srs-faq.md
	package-lock.json
	package.json
	themes/mtfwiki-modified/archetypes/default.md
	themes/mtfwiki-modified/archetypes/post.md
	themes/mtfwiki-modified/archetypes/section.md
	themes/mtfwiki-modified/assets/baidu-hrt.scss
	themes/mtfwiki-modified/assets/cookies-eu-banner.css
	themes/mtfwiki-modified/assets/cookies-eu-banner.js
	themes/mtfwiki-modified/assets/customize.js
	themes/mtfwiki-modified/assets/customize.scss
	themes/mtfwiki-modified/assets/gtag.ts
	themes/mtfwiki-modified/assets/qrcode.min.js
	themes/mtfwiki-modified/assets/sass/abstracts/_variables.scss
	themes/mtfwiki-modified/assets/sass/base/_typography.scss
	themes/mtfwiki-modified/assets/sweetalert.min.js
	themes/mtfwiki-modified/data/.gitkeep
	themes/mtfwiki-modified/data/font.toml
	themes/mtfwiki-modified/i18n/zh-cn.toml
	themes/mtfwiki-modified/layouts/404.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-csv.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-qrcode.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-heading.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-image.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-link.html
	themes/mtfwiki-modified/layouts/_default/section.html
	themes/mtfwiki-modified/layouts/partials/head/services.html
	themes/mtfwiki-modified/layouts/robots.txt
	themes/mtfwiki-modified/layouts/shortcodes/currency.html
	themes/mtfwiki-modified/layouts/shortcodes/current-year.html
	themes/mtfwiki-modified/layouts/shortcodes/doctor-image.ht
Aborting
Merge with strategy ort failed.
 (2)
3 days ago
User avatar webhook:github

Repository notification received

GitHub: https://api.github.com/repos/project-trans/MtF-wiki, master 3 days ago
User avatar webhook:github

Repository merge failed

error: Your local changes to the following files would be overwritten by merge:
	.github/workflows/deploy.yaml
	.github/workflows/preview-pr-build.yaml
	.gitmodules
	README-EN.md
	README-ES.md
	README-JA.md
	README-T.md
	README.md
	config/_default/config.toml
	config/_default/languages.toml
	config/_default/menus.en.toml
	config/_default/menus.es.toml
	config/_default/menus.zh-cn.toml
	config/_default/menus.zh-hant.toml
	config/_default/params.toml
	content/en/about/_index.md
	content/es/about/_index.md
	content/ja/about/_index.md
	content/zh-cn/about/_index.md
	content/zh-cn/docs/hrt/canada/uoft/index.md
	content/zh-cn/docs/hrt/duan-lian/_index.md
	content/zh-cn/docs/hrt/duan-lian/bingli1.jpg
	content/zh-cn/docs/hrt/duan-lian/bingli2.jpg
	content/zh-cn/docs/hrt/duan-lian/license1.jpg
	content/zh-cn/docs/hrt/duan-lian/license2.jpg
	content/zh-cn/docs/hrt/jnuh1/index.md
	content/zh-cn/docs/hrt/other-chinamainland-hrt-res-list.md
	content/zh-cn/docs/hrt/puth/_index.md
	content/zh-cn/docs/hrt/shanghai/sh9-hrt/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone-zh.pdf
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-cn/docs/medicine/estrogen/estradiol-valerate/index.md
	content/zh-cn/docs/medicine/hrt-overview.md
	content/zh-cn/docs/medicine/monitoring.md
	content/zh-cn/docs/outdated.md
	content/zh-cn/docs/psyco/beijing/bhlgh/di-xiaolan/no-crime.png
	content/zh-cn/docs/psyco/beijing/hao-shuwei/index.md
	content/zh-cn/docs/psyco/hunan/cheng-ming/index.md
	content/zh-cn/docs/psyco/jiangsu/cao-qiuyun/index.md
	content/zh-cn/docs/psyco/shanghai/shmhc/index.md
	content/zh-cn/docs/srs/china/pku3/index.md
	content/zh-cn/docs/srs/id-card.md
	content/zh-cn/docs/srs/thailand/chettawut.md
	content/zh-cn/docs/srs/thailand/greechart.md
	content/zh-cn/docs/srs/thailand/kamol.md
	content/zh-cn/docs/srs/thailand/preecha.md
	content/zh-cn/docs/useful-info/document-updates/name-change.md
	content/zh-cn/docs/useful-info/legal-faq.md
	content/zh-cn/docs/vocal-therapy/hou-qian.md
	content/zh-cn/docs/vocal-therapy/vocal-therapy-confirmed.md
	content/zh-hant/about/_index.md
	content/zh-hant/docs/contributor-guide.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/aldactone.jpg
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-hant/docs/srs/hongkong/gov.md
	content/zh-hant/docs/srs/srs-faq.md
	package-lock.json
	package.json
	themes/mtfwiki-modified/archetypes/default.md
	themes/mtfwiki-modified/archetypes/post.md
	themes/mtfwiki-modified/archetypes/section.md
	themes/mtfwiki-modified/assets/baidu-hrt.scss
	themes/mtfwiki-modified/assets/cookies-eu-banner.css
	themes/mtfwiki-modified/assets/cookies-eu-banner.js
	themes/mtfwiki-modified/assets/customize.js
	themes/mtfwiki-modified/assets/customize.scss
	themes/mtfwiki-modified/assets/gtag.ts
	themes/mtfwiki-modified/assets/qrcode.min.js
	themes/mtfwiki-modified/assets/sass/abstracts/_variables.scss
	themes/mtfwiki-modified/assets/sass/base/_typography.scss
	themes/mtfwiki-modified/assets/sweetalert.min.js
	themes/mtfwiki-modified/data/.gitkeep
	themes/mtfwiki-modified/data/font.toml
	themes/mtfwiki-modified/i18n/zh-cn.toml
	themes/mtfwiki-modified/layouts/404.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-csv.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-qrcode.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-heading.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-image.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-link.html
	themes/mtfwiki-modified/layouts/_default/section.html
	themes/mtfwiki-modified/layouts/partials/head/services.html
	themes/mtfwiki-modified/layouts/robots.txt
	themes/mtfwiki-modified/layouts/shortcodes/currency.html
	themes/mtfwiki-modified/layouts/shortcodes/current-year.html
	themes/mtfwiki-modified/layouts/shortcodes/doctor-image.ht
Aborting
Merge with strategy ort failed.
 (2)
4 days ago
User avatar webhook:github

Repository notification received

GitHub: https://api.github.com/repos/project-trans/MtF-wiki, master 4 days ago
User avatar webhook:github

Repository merge failed

error: Your local changes to the following files would be overwritten by merge:
	.github/workflows/deploy.yaml
	.github/workflows/preview-pr-build.yaml
	.gitmodules
	README-EN.md
	README-ES.md
	README-JA.md
	README-T.md
	README.md
	config/_default/config.toml
	config/_default/languages.toml
	config/_default/menus.en.toml
	config/_default/menus.es.toml
	config/_default/menus.zh-cn.toml
	config/_default/menus.zh-hant.toml
	config/_default/params.toml
	content/en/about/_index.md
	content/es/about/_index.md
	content/ja/about/_index.md
	content/zh-cn/about/_index.md
	content/zh-cn/docs/hrt/canada/uoft/index.md
	content/zh-cn/docs/hrt/duan-lian/_index.md
	content/zh-cn/docs/hrt/duan-lian/bingli1.jpg
	content/zh-cn/docs/hrt/duan-lian/bingli2.jpg
	content/zh-cn/docs/hrt/duan-lian/license1.jpg
	content/zh-cn/docs/hrt/duan-lian/license2.jpg
	content/zh-cn/docs/hrt/jnuh1/index.md
	content/zh-cn/docs/hrt/other-chinamainland-hrt-res-list.md
	content/zh-cn/docs/hrt/puth/_index.md
	content/zh-cn/docs/hrt/shanghai/sh9-hrt/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone-zh.pdf
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-cn/docs/medicine/estrogen/estradiol-valerate/index.md
	content/zh-cn/docs/medicine/hrt-overview.md
	content/zh-cn/docs/medicine/monitoring.md
	content/zh-cn/docs/outdated.md
	content/zh-cn/docs/psyco/beijing/bhlgh/di-xiaolan/no-crime.png
	content/zh-cn/docs/psyco/beijing/hao-shuwei/index.md
	content/zh-cn/docs/psyco/hunan/cheng-ming/index.md
	content/zh-cn/docs/psyco/jiangsu/cao-qiuyun/index.md
	content/zh-cn/docs/psyco/shanghai/shmhc/index.md
	content/zh-cn/docs/srs/china/pku3/index.md
	content/zh-cn/docs/srs/id-card.md
	content/zh-cn/docs/srs/thailand/chettawut.md
	content/zh-cn/docs/srs/thailand/greechart.md
	content/zh-cn/docs/srs/thailand/kamol.md
	content/zh-cn/docs/srs/thailand/preecha.md
	content/zh-cn/docs/useful-info/document-updates/name-change.md
	content/zh-cn/docs/useful-info/legal-faq.md
	content/zh-cn/docs/vocal-therapy/hou-qian.md
	content/zh-cn/docs/vocal-therapy/vocal-therapy-confirmed.md
	content/zh-hant/about/_index.md
	content/zh-hant/docs/contributor-guide.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/aldactone.jpg
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-hant/docs/srs/hongkong/gov.md
	content/zh-hant/docs/srs/srs-faq.md
	package-lock.json
	package.json
	themes/mtfwiki-modified/archetypes/default.md
	themes/mtfwiki-modified/archetypes/post.md
	themes/mtfwiki-modified/archetypes/section.md
	themes/mtfwiki-modified/assets/baidu-hrt.scss
	themes/mtfwiki-modified/assets/cookies-eu-banner.css
	themes/mtfwiki-modified/assets/cookies-eu-banner.js
	themes/mtfwiki-modified/assets/customize.js
	themes/mtfwiki-modified/assets/customize.scss
	themes/mtfwiki-modified/assets/gtag.ts
	themes/mtfwiki-modified/assets/qrcode.min.js
	themes/mtfwiki-modified/assets/sass/abstracts/_variables.scss
	themes/mtfwiki-modified/assets/sass/base/_typography.scss
	themes/mtfwiki-modified/assets/sweetalert.min.js
	themes/mtfwiki-modified/data/.gitkeep
	themes/mtfwiki-modified/data/font.toml
	themes/mtfwiki-modified/i18n/zh-cn.toml
	themes/mtfwiki-modified/layouts/404.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-csv.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-qrcode.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-heading.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-image.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-link.html
	themes/mtfwiki-modified/layouts/_default/section.html
	themes/mtfwiki-modified/layouts/partials/head/services.html
	themes/mtfwiki-modified/layouts/robots.txt
	themes/mtfwiki-modified/layouts/shortcodes/currency.html
	themes/mtfwiki-modified/layouts/shortcodes/current-year.html
	themes/mtfwiki-modified/layouts/shortcodes/doctor-image.ht
Aborting
Merge with strategy ort failed.
 (2)
5 days ago
User avatar webhook:github

Repository notification received

GitHub: https://api.github.com/repos/project-trans/MtF-wiki, master 5 days ago
User avatar webhook:github

Repository merge failed

error: Your local changes to the following files would be overwritten by merge:
	.github/workflows/deploy.yaml
	.github/workflows/preview-pr-build.yaml
	.gitmodules
	README-EN.md
	README-ES.md
	README-JA.md
	README-T.md
	README.md
	config/_default/config.toml
	config/_default/languages.toml
	config/_default/menus.en.toml
	config/_default/menus.es.toml
	config/_default/menus.zh-cn.toml
	config/_default/menus.zh-hant.toml
	config/_default/params.toml
	content/en/about/_index.md
	content/es/about/_index.md
	content/ja/about/_index.md
	content/zh-cn/about/_index.md
	content/zh-cn/docs/hrt/canada/uoft/index.md
	content/zh-cn/docs/hrt/duan-lian/_index.md
	content/zh-cn/docs/hrt/duan-lian/bingli1.jpg
	content/zh-cn/docs/hrt/duan-lian/bingli2.jpg
	content/zh-cn/docs/hrt/duan-lian/license1.jpg
	content/zh-cn/docs/hrt/duan-lian/license2.jpg
	content/zh-cn/docs/hrt/jnuh1/index.md
	content/zh-cn/docs/hrt/other-chinamainland-hrt-res-list.md
	content/zh-cn/docs/hrt/puth/_index.md
	content/zh-cn/docs/hrt/shanghai/sh9-hrt/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone-zh.pdf
	content/zh-cn/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-cn/docs/medicine/estrogen/estradiol-valerate/index.md
	content/zh-cn/docs/medicine/hrt-overview.md
	content/zh-cn/docs/medicine/monitoring.md
	content/zh-cn/docs/outdated.md
	content/zh-cn/docs/psyco/beijing/bhlgh/di-xiaolan/no-crime.png
	content/zh-cn/docs/psyco/beijing/hao-shuwei/index.md
	content/zh-cn/docs/psyco/hunan/cheng-ming/index.md
	content/zh-cn/docs/psyco/jiangsu/cao-qiuyun/index.md
	content/zh-cn/docs/psyco/shanghai/shmhc/index.md
	content/zh-cn/docs/srs/china/pku3/index.md
	content/zh-cn/docs/srs/id-card.md
	content/zh-cn/docs/srs/thailand/chettawut.md
	content/zh-cn/docs/srs/thailand/greechart.md
	content/zh-cn/docs/srs/thailand/kamol.md
	content/zh-cn/docs/srs/thailand/preecha.md
	content/zh-cn/docs/useful-info/document-updates/name-change.md
	content/zh-cn/docs/useful-info/legal-faq.md
	content/zh-cn/docs/vocal-therapy/hou-qian.md
	content/zh-cn/docs/vocal-therapy/vocal-therapy-confirmed.md
	content/zh-hant/about/_index.md
	content/zh-hant/docs/contributor-guide.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/aldactone.jpg
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/index.md
	content/zh-hant/docs/medicine/antiandrogen/spironolactone/spironolactone.jpg
	content/zh-hant/docs/srs/hongkong/gov.md
	content/zh-hant/docs/srs/srs-faq.md
	package-lock.json
	package.json
	themes/mtfwiki-modified/archetypes/default.md
	themes/mtfwiki-modified/archetypes/post.md
	themes/mtfwiki-modified/archetypes/section.md
	themes/mtfwiki-modified/assets/baidu-hrt.scss
	themes/mtfwiki-modified/assets/cookies-eu-banner.css
	themes/mtfwiki-modified/assets/cookies-eu-banner.js
	themes/mtfwiki-modified/assets/customize.js
	themes/mtfwiki-modified/assets/customize.scss
	themes/mtfwiki-modified/assets/gtag.ts
	themes/mtfwiki-modified/assets/qrcode.min.js
	themes/mtfwiki-modified/assets/sass/abstracts/_variables.scss
	themes/mtfwiki-modified/assets/sass/base/_typography.scss
	themes/mtfwiki-modified/assets/sweetalert.min.js
	themes/mtfwiki-modified/data/.gitkeep
	themes/mtfwiki-modified/data/font.toml
	themes/mtfwiki-modified/i18n/zh-cn.toml
	themes/mtfwiki-modified/layouts/404.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-csv.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-codeblock-qrcode.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-heading.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-image.html
	themes/mtfwiki-modified/layouts/_default/_markup/render-link.html
	themes/mtfwiki-modified/layouts/_default/section.html
	themes/mtfwiki-modified/layouts/partials/head/services.html
	themes/mtfwiki-modified/layouts/robots.txt
	themes/mtfwiki-modified/layouts/shortcodes/currency.html
	themes/mtfwiki-modified/layouts/shortcodes/current-year.html
	themes/mtfwiki-modified/layouts/shortcodes/doctor-image.ht
Aborting
Merge with strategy ort failed.
 (2)
6 days ago
User avatar webhook:github

Repository notification received

GitHub: https://api.github.com/repos/project-trans/MtF-wiki, master 6 days ago
Browse all project changes