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

GUACAMOLE-1692: Updated german translation #767

Merged
merged 2 commits into from
Oct 16, 2023
Merged

GUACAMOLE-1692: Updated german translation #767

merged 2 commits into from
Oct 16, 2023

Conversation

sirux88
Copy link
Contributor

@sirux88 sirux88 commented Oct 2, 2022

some improvements to german translation

@IT-Experte
Copy link
Contributor

Unfortunately I haven't had time for the translation in the last few months. Very good work.

IT-Experte
IT-Experte suggested changes Jan 21, 2023
View reviewed changes
Copy link
Contributor

@IT-Experte IT-Experte left a comment

Choose a reason for hiding this comment

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

Maybe some change should be made.

guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
@sirux88 sirux88 force-pushed the german-translation-improvements branch from 29d0a25 to d342702 Compare January 21, 2023 16:39
@sirux88
Copy link
Contributor Author

sirux88 commented Jan 21, 2023

@IT-Experte:
I oriented myself for all these FIELD_HEADER_DISABLE_COPY strings at the existing one within RDP block.
But I wasn't satisfied with the translation with RDP aswell but wanted to maintain the same kind of "speech".

I liked you're proposal so I inserted it everywhere you suggested and aswell within the RDP block

@sirux88
Copy link
Contributor Author

sirux88 commented Jan 21, 2023

I rebased to current master. So maybe it will get merged soon.

IT-Experte
IT-Experte approved these changes Jan 26, 2023
View reviewed changes
Copy link
Contributor

@IT-Experte IT-Experte left a comment

Choose a reason for hiding this comment

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

Everything looks good. I have one more suggestion, but it is not important.

@necouchman
Copy link
Contributor

@sirux88 and @IT-Experte Is this translation ready? Or do any of @IT-Experte changes need to be addressed, first? I'm sorry, I don't know German, so I cannot make any determination between the suggestions and the original.

@sirux88 sirux88 force-pushed the german-translation-improvements branch 2 times, most recently from 32d212b to 106a749 Compare October 14, 2023 09:08
@sirux88
Copy link
Contributor Author

sirux88 commented Oct 14, 2023 •
edited
Loading

I rebased to current master and updated the translation for the main application and TOTP extension to fit the latest language strings @necouchman

It should be fine to merge.

necouchman
necouchman requested changes Oct 14, 2023
View reviewed changes
Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Overall looks very good - just a few minor nitpicks on style and I think it'll be good to merge.

guacamole/src/main/frontend/src/translations/de.json Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Outdated Show resolved Hide resolved
guacamole/src/main/frontend/src/translations/de.json Show resolved Hide resolved
@sirux88 sirux88 force-pushed the german-translation-improvements branch from 106a749 to b4fef17 Compare October 15, 2023 10:34
@sirux88
Copy link
Contributor Author

sirux88 commented Oct 15, 2023

I reworked according to your comments @necouchman.
Additionally I added some more translation strings

@sirux88
Copy link
Contributor Author

sirux88 commented Oct 15, 2023

Let me know if I shall smash it into a single commit @necouchman

necouchman
necouchman approved these changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Looks good - I also did a manual build and load of the code just to make sure everything was good, since the Github automated builds are failing.

@necouchman necouchman merged commit b8cc74c into apache:master Oct 16, 2023
1 check failed
@sirux88
Copy link
Contributor Author

sirux88 commented Oct 16, 2023 •
edited
Loading

I made a copy/paste error here @necouchman

guacamole-client/guacamole/src/main/frontend/src/translations/en.json

Line 671 in b8cc74c

"FIELD_OPTION_SERVER_LAYOUT_DA_DK_QWERTY" : "Dänisch (Qwerty)",

This should be Danish not Dänisch (what is Danish in German)
Sorry for that...

How shall we fix this? Any chance to do it without opening an JIRA issue?

@necouchman
Copy link
Contributor

@sirux88 No need for a new Jira issue, just open a new PR with the same Jira tags (GUACAMOLE-1692). I'll re-open that Jira issue.

@sirux88 sirux88 mentioned this pull request Oct 16, 2023
Merged
@sirux88 sirux88 deleted the german-translation-improvements branch October 16, 2023 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IT-Experte IT-Experte IT-Experte approved these changes

@necouchman necouchman necouchman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sirux88 @IT-Experte @necouchman