Skip to content

Conversation

VAGurko
Copy link

@VAGurko VAGurko commented Jan 15, 2025

In the file "guacamole/src/main/frontend/src/translations/ru.json" the typo of "секуны" has been corrected to "секунды".

mike-jumper and others added 30 commits August 6, 2024 16:38
…s for later consumption by name-specific handlers.
…camole interface "секуны", it needs to be fixed to "секунды".

In the file "guacamole/src/main/frontend/src/translations/ru.json" the typo of "секуны" has been corrected to "секунды".
Copy link
Member

@corentin-soriano corentin-soriano left a comment

Choose a reason for hiding this comment

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

Could you do a rebase from the patch branch please?

@VAGurko
Copy link
Author

VAGurko commented Jan 21, 2025

Could you do a rebase from the patch branch please?

I did a rebase, please check

@corentin-soriano
Copy link
Member

The correct procedure would look like this:

git fetch upstream
git rebase upstream/patch
git push --force

This will remove all commits from the main branch that are not present in the patch branch.

If this is not done yet, you can add the apache/guacamole-server repository to your remote repositories: https://docs.github.com/en/get-started/getting-started-with-git/managing-remote-repositories

@necouchman
Copy link
Contributor

As mentioned on #1048, please:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants