Skip to content

Backport Locales [2020-01-14]#9773

Merged
zeripath merged 5 commits into
go-gitea:release/v1.11from
6543-forks:backport_locale
Jan 15, 2020
Merged

Backport Locales [2020-01-14]#9773
zeripath merged 5 commits into
go-gitea:release/v1.11from
6543-forks:backport_locale

Conversation

@6543
Copy link
Copy Markdown
Member

@6543 6543 commented Jan 14, 2020

as title

6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_cs-CZ.ini
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 14, 2020
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_de-DE.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_en-US.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_es-ES.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_fa-IR.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_fr-FR.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_ja-JP.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_lv-LV.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_pl-PL.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_pt-BR.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_tr-TR.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_uk-UA.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Comment thread options/locale/locale_zh-CN.ini
6543
6543 commented Jan 14, 2020
View reviewed changes
Copy link
Copy Markdown
Member Author

@6543 6543 left a comment

Choose a reason for hiding this comment

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

comment

@zeripath @6543
Apply suggestions from code review
a63bf9e 
Co-Authored-By: 6543 <6543@obermui.de>
zeripath
zeripath approved these changes Jan 14, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@zeripath zeripath left a comment

Choose a reason for hiding this comment

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

They've all lost the newline at the end ... Is that deliberate?

Hopefully locale won't disagree with that?

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 14, 2020
@6543
Copy link
Copy Markdown
Member Author

6543 commented Jan 14, 2020 •
edited
Loading

about newline: this is the current locale file and gite dont look like as it has porblems with this

the only difference is that pulls.no_merge_status_check is not removed as in master ...

@6543 6543 changed the title backport locales state of 2020-01-14 Backport Locales [2020-01-14] Jan 14, 2020
@sapk sapk added this to the 1.11.0 milestone Jan 14, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 15, 2020
@6543
Copy link
Copy Markdown
Member Author

6543 commented Jan 15, 2020

ready to merge 🚀

@zeripath zeripath merged commit 73c90c2 into go-gitea:release/v1.11 Jan 15, 2020
@6543 6543 deleted the backport_locale branch January 15, 2020 09:09
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

+1 more reviewer

@zeripath zeripath zeripath approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/miscellaneous

Projects

None yet

Milestone

1.11.0

Development

Successfully merging this pull request may close these issues.

5 participants

@6543 @techknowlogick @zeripath @sapk @GiteaBot