server icon indicating copy to clipboard operation
server copied to clipboard

fix(i18n): Corrected grammar

Open rakekniven opened this issue 2 years ago • 7 comments

Reported on Transifex

rakekniven avatar Sep 27 '23 19:09 rakekniven

/compile

szaimen avatar Sep 28 '23 09:09 szaimen

@szaimen How to solve this?

rakekniven avatar Sep 28 '23 10:09 rakekniven

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

nickvergessen avatar Sep 28 '23 11:09 nickvergessen

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

szaimen avatar Oct 04 '23 10:10 szaimen

Can someone help to get this merged?

rakekniven avatar Nov 17 '23 22:11 rakekniven

Please merge it now.

rakekniven avatar Jan 30 '24 16:01 rakekniven

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

szaimen avatar Jan 30 '24 16:01 szaimen

@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?

rakekniven avatar Feb 04 '24 15:02 rakekniven

Why is it so difficult to apply such tiny changes?

Because of the compiled js

szaimen avatar Feb 05 '24 08:02 szaimen

Why is it so difficult to apply such tiny changes?

Because of the compiled js

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

rakekniven avatar Feb 05 '24 08:02 rakekniven

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

No, because that command cannot resolve conflicts

szaimen avatar Feb 05 '24 09:02 szaimen

/compile

AndyScherzinger avatar Feb 27 '24 16:02 AndyScherzinger