Skip to content
This repository has been archived by the owner on May 31, 2022. It is now read-only.

Revive clobbered translations 2 #57

Merged
merged 12 commits into from Jun 25, 2021
Merged

Conversation

ann-kilzer
Copy link
Contributor

@ann-kilzer ann-kilzer commented Jun 25, 2021

Attempt to revive the clobbered translations. 🙇🏻‍♀️

Resolves #56

This is delicate because I can't understand all the other languages. However, I am prioritizing files that have been edited and will carefully link prior PRs to check this work.

Manually checked all the PRs prior to the machine translation commit in #23 and ensured we've kept those authors' changes.

This reverts commit 7099d87.

 Conflicts:
	locales/ar.json
	locales/de.json
	locales/en.json
	locales/es.json
	locales/fil.json
	locales/fr.json
	locales/id.json
	locales/it.json
	locales/ja.json
	locales/ko.json
	locales/ms.json
	locales/ne.json
	locales/nl.json
	locales/pt.json
	locales/th.json
	locales/vi.json
	locales/zh_CN.json
@ann-kilzer ann-kilzer self-assigned this Jun 25, 2021
@@ -1,24 +1,24 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -1,29 +1,29 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

confirmed updates here: 87c42fd

@@ -42,7 +42,6 @@
"header": {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this file was first made outside lokalize, it wasn’t clobbered

@@ -2,34 +2,34 @@
"about": {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

locales/ms.json Outdated
@@ -40,24 +40,23 @@
},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -1,12 +1,12 @@
{
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ann-kilzer ann-kilzer marked this pull request as ready for review June 25, 2021 04:33
@ann-kilzer
Copy link
Contributor Author

@richoux Let me know your thoughts!

locales/id.json Outdated
@@ -80,8 +79,8 @@
"delete": "Delete"
},
"index": {
"massSite": "Siapa pun yang berusia 18 tahun ke atas yang memiliki voucher sekarang dapat divaksinasi di situs vaksinasi massal Tokyo atau Osaka.",
"register": "Pergi ke Situs Pendaftaran",
"massSite": "Anyone 18 years or older that has a voucher can now get vaccinated at the Tokyo or Osaka mass vaccination sites.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this one is right

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Will fix tonight, or feel free to push to this branch

locales/ko.json Outdated
"massSite": "바우처가있는 18 세 이상이면 누구나 도쿄 또는 오사카 대량 예방 접종 장소에서 예방 접종을받을 수 있습니다.",
"register": "등록 사이트로 이동",
"title": "일본의 COVID-19 예방 접종 취소 대기자 명단"
"massSite": "Anyone 18 years or older that has a voucher can now get vaccinated at the Tokyo or Osaka mass vaccination sites.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this one is right

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

locales/ne.json Outdated
"massSite": "१ 18 बर्ष वा माथिका जोसँग भाउचर छ अब टोकियो वा ओसाका मास खोप साइटहरूमा खोप लिन सकिन्छ।",
"register": "पञ्जीकरण साइटमा जानुहोस्",
"title": "COVID-19 जापानमा खोप रद्द गर्ने प्रतीक्षा सूचीहरू"
"massSite": "Anyone 18 years or older that has a voucher can now get vaccinated at the Tokyo or Osaka mass vaccination sites.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Contributor

@ermish ermish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM if that one section is correct.

Copy link
Contributor

@theyokohamalife theyokohamalife left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@richoux
Copy link
Contributor

richoux commented Jun 25, 2021

@ann-kilzer I don't have an opinion about other languages, I can just tell you that the French version need some modifications. I can handle them once this PR is accepted.
(EDIT: by "need some modifications", I mean for a better language level, otherwise it is currently fairly understandable).

@ann-kilzer
Copy link
Contributor Author

@richoux many thanks for your help! that sounds good

@ann-kilzer ann-kilzer merged commit 4bca8f7 into main Jun 25, 2021
@ann-kilzer ann-kilzer deleted the revive-clobbered-translations-2 branch June 25, 2021 08:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Warning: commit #23 has rolled back some translations
4 participants