Skip to content

fix(i18n): Corrected grammar#40667

Merged
szaimen merged 2 commits intomasterfrom
rakekniven-patch-2
Feb 28, 2024
Merged

fix(i18n): Corrected grammar#40667
szaimen merged 2 commits intomasterfrom
rakekniven-patch-2

Conversation

@rakekniven
Copy link
Member

@rakekniven rakekniven commented Sep 27, 2023

Reported on Transifex

@rakekniven rakekniven requested a review from skjnldsv September 27, 2023 19:46
@szaimen szaimen added 3. to review Waiting for reviews feature: language/translations (l10n/i18n) Localization and translation matters labels Sep 28, 2023
@szaimen szaimen added this to the Nextcloud 28 milestone Sep 28, 2023
@szaimen
Copy link
Contributor

szaimen commented Sep 28, 2023

/compile

@szaimen szaimen enabled auto-merge September 28, 2023 09:21
@rakekniven
Copy link
Member Author

rakekniven commented Sep 28, 2023

@szaimen How to solve this?

@nickvergessen
Copy link
Member

nickvergessen commented Sep 28, 2023

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

rakekniven commented Nov 17, 2023

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

rakekniven commented Jan 30, 2024

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 commented Feb 4, 2024

@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

rakekniven commented Feb 5, 2024

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

@rakekniven @AndyScherzinger
fix(i18n): Corrected grammar
e9daa1c 
Signed-off-by: rakekniven <2069590+rakekniven@users.noreply.github.com>
@AndyScherzinger
Copy link
Member

AndyScherzinger commented Feb 27, 2024

/compile

@nextcloud-command
chore(assets): Recompile assets
214dead 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@szaimen szaimen merged commit 0f9f244 into master Feb 28, 2024
@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

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@szaimen szaimen szaimen approved these changes

@Valdnet Valdnet Valdnet approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees

No one assigned

Labels

3. to review Waiting for reviews feature: language/translations (l10n/i18n) Localization and translation matters

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