Skip to content

fix(i18n): Corrected grammar - #40667

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

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

Conversation

@rakekniven

@rakeknivenrakekniven commented Sep 27, 2023

Copy link
Copy Markdown
Member

Reported on Transifex

@szaimenszaimen added 3. to review Waiting for reviews feature: language/translations (l10n/i18n) Localization and translation matters labels Sep 28, 2023
@szaimenszaimen added this to the Nextcloud 28 milestone Sep 28, 2023
@szaimen

szaimen commented Sep 28, 2023

Copy link
Copy Markdown
Contributor

/compile

@rakekniven

rakekniven commented Sep 28, 2023

Copy link
Copy Markdown
MemberAuthor

@szaimen How to solve this?

@nickvergessen

nickvergessen commented Sep 28, 2023

Copy link
Copy Markdown
Member

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

@szaimen

szaimen commented Oct 4, 2023

Copy link
Copy Markdown
Contributor

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

@skjnldsvskjnldsv mentioned this pull request Nov 1, 2023
Merged
This was referenced Nov 6, 2023
Merged
Merged
@blizzzblizzz mentioned this pull request Nov 14, 2023
Merged
@rakekniven

rakekniven commented Nov 17, 2023

Copy link
Copy Markdown
MemberAuthor

Can someone help to get this merged?

@blizzzblizzz mentioned this pull request Nov 20, 2023
Merged
5 tasks
@blizzzblizzz modified the milestones: Nextcloud 28, Nextcloud 29Nov 23, 2023
@rakekniven

rakekniven commented Jan 30, 2024

Copy link
Copy Markdown
MemberAuthor

Please merge it now.

@szaimen

szaimen commented Jan 30, 2024

Copy link
Copy Markdown
Contributor

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

@rakekniven

rakekniven commented Feb 4, 2024

Copy link
Copy Markdown
MemberAuthor

@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

szaimen commented Feb 5, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

Why is it so difficult to apply such tiny changes?

Because of the compiled js

@rakekniven

rakekniven commented Feb 5, 2024

Copy link
Copy Markdown
MemberAuthor

Why is it so difficult to apply such tiny changes?

Because of the compiled js

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

@szaimen

szaimen commented Feb 5, 2024

Copy link
Copy Markdown
Contributor

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

AndyScherzinger commented Feb 27, 2024

Copy link
Copy Markdown
Member

/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 masterFeb 28, 2024
@szaimen
szaimen deleted the rakekniven-patch-2 branch February 28, 2024 01:53
@blizzzblizzz mentioned this pull request Mar 5, 2024
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzingerAndyScherzingerAndyScherzinger approved these changes
@skjnldsvskjnldsvskjnldsv approved these changes
@szaimenszaimenszaimen approved these changes
@ValdnetValdnetValdnet approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsfeature: 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