diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 728031a6b15f2..d34ecdb5cf0ae 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -13,7 +13,7 @@ jobs: - name: Pull submodule latest commit run: | git submodule update -i - cd data/ && git checkout development + cd data/ && git checkout master - name: Setup Node uses: actions/setup-node@v1 diff --git a/assets/locales/en.json b/assets/locales/en.json index 6a6b346b5921c..712c2b0731ae4 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -189,11 +189,11 @@ "合計": "Total", "{date}の全体累計": "Cumulative total as of %{date}", "{date}の合計": "Total of %{date}", - "入院患者数と残り病床数": "Number of Hospitalized Patients and Remaining Sickbeds", + "入院患者数と病床数": "Number of Hospitalized Patients and Sickbeds", "床": "beds", "総病床数": "Total Number of Sickbeds", "入院患者数": "Hospitalized Patients", - "残り病床数": "Remaining Sickbeds", + "病床数": "Sickbeds", "最新のお知らせ": "What's new", "都の備蓄マスク20万枚を都内全区市町村へ提供": "Oita Prefecture Government provides the stockpile of masks for all the wards: and the municipalities in Oita (in Japanese)", "都内医療機関及び保健所等へのマスクの配布について": "Regarding the distribution of masks to medical institutions: public health centers: etc.: in Oita", diff --git a/assets/locales/ja.json b/assets/locales/ja.json index 997de952ef099..8575e9d027f44 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -191,11 +191,11 @@ "合計": "合計", "{date}の全体累計": "%{date}の全体累計", "{date}の合計": "%{date}の合計", - "入院患者数と残り病床数": "入院患者数と残り病床数", + "入院患者数と病床数": "入院患者数と病床数", "床": "床", "総病床数": "総病床数", "入院患者数": "入院患者数", - "残り病床数": "残り病床数", + "病床数": "病床数", "最新のお知らせ": "最新のお知らせ", "都の備蓄マスク20万枚を都内全区市町村へ提供": "都の備蓄マスク20万枚を都内全区市町村へ提供", "都内医療機関及び保健所等へのマスクの配布について": "都内医療機関及び保健所等へのマスクの配布について", diff --git a/components/cards/SickbedsSummaryCard.vue b/components/cards/SickbedsSummaryCard.vue index 2cebc31e8bb9d..d94e08dfa0f78 100644 --- a/components/cards/SickbedsSummaryCard.vue +++ b/components/cards/SickbedsSummaryCard.vue @@ -1,7 +1,7 @@