Component Approved Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
converter/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
cup-calculator CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/hrt-overview CC-BY-SA-4.0 50% 50% 108 9,203 23,927 108 0 0 0
docs/medicine/monitoring CC-BY-SA-4.0 86% 86% 16 358 763 16 0 0 0
docs/medicine/risk CC-BY-SA-4.0 89% 89% 10 770 916 10 0 0 0
about/_index CC-BY-SA-4.0 50% 87% 5 33 504 2 8 0 0
about/disclaimer CC-BY-SA-4.0 0 0 0 0 0 0 0
about/licence-pic CC-BY-SA-4.0 0 0 0 0 0 0 0
blog/statement-2022-3 CC-BY-SA-4.0 0 0 0 0 0 0 0
blog/travel-under-pandemia CC-BY-SA-4.0 0 0 0 0 0 0 0
converter/science-literacy CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/_index CC-BY-SA-4.0 96% 96% 1 28 62 1 0 0 0
docs/breast-augmentation/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/breast-augmentation/breast-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/campus CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/contributor-guide CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/ffs/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/ffs/ffs-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/ffs/hair-loss-med CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/ffs/tracheal-shave CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/friendship CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/australia/Sydney/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/australia/UWA/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/australia/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/australia/au-hrt-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/Kingston/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/UWaterloo/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/human-rights/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/notice/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/uOttawa/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/canada/uoft/index CC-BY-SA-4.0 100% 100% 0 0 0 0 2 0 0
docs/hrt/duan-lian/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/espana CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/finland/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/hongkong/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/hongkong/gov CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/hongkong/list CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/hrt-res-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/italia CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/japan CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/jnuh1/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/liaoning/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/liaoning/zhang-xia/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/other-chinamainland-hrt-res-list CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/puth/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/puth/chang-xu/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/puth/liu-ye/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/puth/pan-bailin/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/sduqlqd/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/fudan-ch/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/li-xiaoying CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/other-shanghai-hrt-res-list CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/qiu-wenjuan CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/sh9-hrt/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/shanghai/shang-hai-rui-jing CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/singapore/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/singapore/mount CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/suzhou/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/suzhou/luting/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/suzhou/zhou-jianying/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/us/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/us/powers CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/us/us-hrt-overview CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/wang-xiaohong/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/xiangya3/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/hrt/zhejiang2 CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/SERMs/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/SERMs/raloxifene/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/antiandrogen/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/antiandrogen/bicalutamide/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/antiandrogen/cyproterone/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/antiandrogen/gnrha CC-BY-SA-4.0 100% 100% 0 0 0 0 1 0 0
docs/medicine/antiandrogen/medroxyprogesterone/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/antiandrogen/spironolactone/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/estrogen/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/estrogen/estradiol-patch/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/estrogen/estradiol-valerate/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/estrogen/estradiol/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/estrogen/gel/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/medicine/estrogen/injection/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/outdated CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/projects CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/ICD11 CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/bhlgh/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/bhlgh/di-xiaolan/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/bhlgh/guo-bin/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/bhlgh/niu-yajuan/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/hao-shuwei/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/hu-peicheng/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/beijing/tang-hongyu/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/chongqing/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/chongqing/ren-zhengjia/index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangdong/_index CC-BY-SA-4.0 0 0 0 0 0 0 0
docs/psyco/guangdong/jia-yanbin/index CC-BY-SA-4.0 0 0 0 0 0 0 0

Summary

Project website mtf.wiki
Project reviewers User avatar Felinya
5 hours 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)
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)
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