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

fix(i18n): Corrected grammar #40667

Merged
merged 2 commits into from
Feb 28, 2024
Merged

fix(i18n): Corrected grammar #40667

merged 2 commits into from
Feb 28, 2024

Conversation

rakekniven
Copy link
Member

Reported on Transifex

@szaimen szaimen added this to the Nextcloud 28 milestone Sep 28, 2023
@szaimen
Copy link
Contributor

szaimen commented Sep 28, 2023

/compile

@rakekniven
Copy link
Member Author

@szaimen How to solve this?

@nickvergessen
Copy link
Member

Conflicting files
dist/files-main.js
dist/files-main.js.map

@szaimen
Copy link
Contributor

szaimen commented Oct 4, 2023

@rakekniven this needs a manual rebase and then you can run the compile command again

@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
Merged
This was referenced Nov 6, 2023
Merged
Merged
@blizzz blizzz mentioned this pull request Nov 14, 2023
Merged
@rakekniven
Copy link
Member Author

Can someone help to get this merged?

@blizzz blizzz mentioned this pull request Nov 20, 2023
Merged
5 tasks
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
@rakekniven
Copy link
Member Author

Please merge it now.

@szaimen
Copy link
Contributor

szaimen commented Jan 30, 2024

@rakekniven can you rebase the pr and fix conflicts or recreate it from master?

@rakekniven
Copy link
Member Author

@rakekniven can you rebase the pr and fix conflicts or recreate it from master?

Hello,
my PR was working when I created it. I have no rebase button this time in the web UI here.
Why is it so difficult to apply such tiny changes?

@szaimen
Copy link
Contributor

szaimen commented Feb 5, 2024 •
edited
Loading

Why is it so difficult to apply such tiny changes?

Because of the compiled js

@rakekniven
Copy link
Member Author

Why is it so difficult to apply such tiny changes?

Because of the compiled js

Isn't this done by switch "compile amend"?

@szaimen
Copy link
Contributor

szaimen commented Feb 5, 2024

Isn't this done by switch "compile amend"?

No, because that command cannot resolve conflicts

@AndyScherzinger
Copy link
Member

/compile

@nextcloud-command
chore(assets): Recompile assets
214dead 
Signed-off-by: nextcloud-command <[email protected]>
@szaimen szaimen merged commit 0f9f244 into master Feb 28, 2024
98 checks passed
@szaimen szaimen deleted the rakekniven-patch-2 branch February 28, 2024 01:53
@blizzz blizzz mentioned this pull request Mar 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Valdnet Valdnet Valdnet approved these changes

@szaimen szaimen szaimen approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees
No one assigned
Labels
3. to review Waiting for reviews feature: language l10n and translations
Projects
None yet
Milestone
Nextcloud 29
Development

Successfully merging this pull request may close these issues.
8 participants
@rakekniven @szaimen @nickvergessen @AndyScherzinger @skjnldsv @Valdnet @blizzz @nextcloud-command