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: Spelling unification #29846

Merged
merged 2 commits into from
Jan 20, 2022
Merged

l10n: Spelling unification #29846

merged 2 commits into from
Jan 20, 2022

Conversation

Valdnet
Copy link
Contributor

@Valdnet Valdnet commented Nov 23, 2021 •
edited
Loading

Spelling unification in Transifex.

Signed-off-by: Valdnet 47037905+Valdnet@users.noreply.github.com

@Valdnet Valdnet changed the title l10n: Spelling unification in Transifex. l10n: Spelling unification Nov 23, 2021
@szaimen
Copy link
Contributor

szaimen commented Nov 23, 2021

/compile amend /

szaimen
szaimen approved these changes Nov 23, 2021
View reviewed changes
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

lgtm

@szaimen szaimen added the 4. to release Ready to be released and/or waiting for tests to finish label Nov 23, 2021
@szaimen szaimen added this to the Nextcloud 24 milestone Nov 23, 2021
@rakekniven
Copy link
Member

rakekniven commented Nov 23, 2021 •
edited
Loading

String freeze is active. Please make no changes to code which causes changes at Transifex until final of v23 is out.

@szaimen
Copy link
Contributor

szaimen commented Nov 23, 2021 •
edited by rakekniven
Loading

String freeze is active. Please make no changes to code which causes changes at Transifex until final of v23 is out.

cc @Pytal

@szaimen
Copy link
Contributor

szaimen commented Nov 23, 2021

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 19, 2022

There is a file conflict. How can this be fixed?

@szaimen
Copy link
Contributor

szaimen commented Jan 19, 2022

There is a file conflict. How can this be fixed?

git pull --rebase origin master
and then
git push --force-with-lease

@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 19, 2022

@szaimen And from GitHub? Is /rebase enough?

@szaimen
Copy link
Contributor

szaimen commented Jan 19, 2022

@szaimen And from GitHub? Is /rebase enough?

No that won't work unfortunately because there are conflicts...

@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 19, 2022

I am asking for help in removing the conflict from within Git. I do not have it installed on my machines.

It would be good to merge this PR 😉.

@szaimen
Copy link
Contributor

szaimen commented Jan 19, 2022

/compile amend /

@szaimen szaimen force-pushed the Valdnet-patch-2 branch 2 times, most recently from 49979e1 to 2fa1260 Compare January 19, 2022 17:14
@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 20, 2022

@szaimen Thank you for doing the rebase 😉. There are two more conflicts that I cannot deal with. Can I ask for tips or solve them?

@szaimen
Copy link
Contributor

szaimen commented Jan 20, 2022

@szaimen Thank you for doing the rebase 😉. There are two more conflicts that I cannot deal with. Can I ask for tips or solve them?

I fear it needs another rebase

@szaimen
Copy link
Contributor

szaimen commented Jan 20, 2022

/compile amend /

@szaimen
Copy link
Contributor

szaimen commented Jan 20, 2022

And another rebase. Its getting exhausting

@Valdnet @szaimen
l10n: Spelling unification in Transifex.
7c6f41b 
There should be no abbreviations in official sentences.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
@szaimen
Copy link
Contributor

szaimen commented Jan 20, 2022

/compile amend /

@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 20, 2022

And another rebase. Its getting exhausting

Would it be better to close this PR and open a new one?

@szaimen
Copy link
Contributor

szaimen commented Jan 20, 2022

And another rebase. Its getting exhausting

Would it be better to close this PR and open a new one?

Nope the same would hapen to that as well...

@Valdnet @nextcloud-command
l10n: Spelling unification in Transifex.
0fb15e3 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@Valdnet
Copy link
Contributor Author

Valdnet commented Jan 20, 2022

Thank you @szaimen for your help 👍.

Please merge 😉.

@szaimen szaimen merged commit 31af141 into master Jan 20, 2022
@szaimen szaimen deleted the Valdnet-patch-2 branch January 20, 2022 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rakekniven rakekniven rakekniven approved these changes

@Pytal Pytal Pytal approved these changes

@szaimen szaimen szaimen approved these changes

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: language l10n and translations
Projects
None yet
Milestone
Nextcloud 24
Development

Successfully merging this pull request may close these issues.
4 participants
@Valdnet @szaimen @rakekniven @Pytal