Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

l10n: Change "rain" to "rainfall" #30550

Merged
merged 1 commit into from
Apr 1, 2022
Merged

l10n: Change "rain" to "rainfall" #30550

merged 1 commit into from
Apr 1, 2022

Conversation

Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Jan 8, 2022

@Valdnet Valdnet self-assigned this Jan 8, 2022
CarlSchwan
CarlSchwan approved these changes Jan 14, 2022
View reviewed changes
Copy link
Member

@CarlSchwan CarlSchwan left a comment

Choose a reason for hiding this comment

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

I looked a bit on the internet and it seems like rainfall is used when describing the quantity of the rain, so this change looks correct.

Maybe we should change keep 'rain' for the simple 'rain' category and only use rainfall for light rainfall, heav rainfall, ... but I'm not sure :)

@CarlSchwan
Copy link
Member

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 14, 2022

@CarlSchwan A conflict occurred during compilation. Can you fix it?

@CarlSchwan
Copy link
Member

@CarlSchwan A conflict occurred during compilation. Can you fix it?

Sure, on it :)

@szaimen szaimen added this to the Nextcloud 24 milestone Jan 14, 2022
@skjnldsv skjnldsv mentioned this pull request Mar 24, 2022
Merged
@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 25, 2022

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 25, 2022

@CarlSchwan I am asking for help in resolving the conflict and merging 😉.

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

/rebase

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

I am asking for help in resolving the conflict and conducting tests. It looks like it is stuck.

@rakekniven Please check and approve 😉.

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

/compile amend /

@blizzz blizzz mentioned this pull request Mar 31, 2022
Merged
@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

/rebase

@Valdnet
Copy link
Contributor Author

Valdnet commented Mar 31, 2022

@artonge Can you help me with this PR? I am trying to resolve the conflict, but to no avail.

@Valdnet @artonge
l10n: Change "rain" to "rainfall"
e750b23 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
@artonge
Copy link
Contributor

artonge commented Mar 31, 2022

@artonge Can you help me with this PR? I am trying to resolve the conflict, but to no avail.

Done, in future case:

# From your branch:
git rebase origin/master
npm ci
npm run build
git add dist/
git rebase --continue
git push --force-with-lease

@Valdnet Valdnet merged commit 4b8b73e into master Apr 1, 2022
@Valdnet Valdnet deleted the Valdnet-patch-1 branch April 1, 2022 06:24
@Valdnet
Copy link
Contributor Author

Valdnet commented Apr 1, 2022

@artonge Thanks a lot 👍. Mostly I only use GitHub which has limited capabilities for commits.

@blizzz blizzz mentioned this pull request Apr 7, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artonge artonge artonge approved these changes

@CarlSchwan CarlSchwan CarlSchwan approved these changes

@rakekniven rakekniven Awaiting requested review from rakekniven

@julien-nc julien-nc Awaiting requested review from julien-nc

Assignees

@Valdnet Valdnet

Labels
enhancement feature: language l10n and translations
Projects
None yet
Milestone
Nextcloud 24
Development

Successfully merging this pull request may close these issues.
4 participants
@Valdnet @CarlSchwan @artonge @szaimen