You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@guacamole.apache.org by GitBox <gi...@apache.org> on 2022/05/21 15:42:56 UTC
[GitHub] [guacamole-client] Niubbo75 opened a new pull request, #728: GUACAMOLE-1612: Fixed/Added italian translations
Niubbo75 opened a new pull request, #728:
URL: https://github.com/apache/guacamole-client/pull/728
Hello, I've fixed some typos in existent italian translations plus I've add new italian translations.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1208062792
Hello @necouchman I've try your suggested command but with no luck, so I've deleted my old fork and now I have create a new one, cloning it into my Debian 11, made my file, so:
```
alessandro@debian:~/GitHub/guacamole-client$ git add *
alessandro@debian:~/GitHub/guacamole-client$ git commit -m "GUACAMOLE-1612: Fix/Add italian translations"
[master a4713ca53] GUACAMOLE-1612: Fix/Add italian translations
6 files changed, 227 insertions(+)
create mode 100644 extensions/guacamole-auth-duo/src/main/resources/translations/it.json
create mode 100644 extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/it.json
create mode 100644 extensions/guacamole-auth-quickconnect/src/main/resources/translations/it.json
create mode 100644 extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/it.json
create mode 100644 extensions/guacamole-auth-totp/src/main/resources/translations/it.json
create mode 100644 extensions/guacamole-history-recording-storage/src/main/resources/translations/it.json
alessandro@debian:~/GitHub/guacamole-client$ git push -f
Warning: Permanently added the ECDSA host key for IP address '140.82.121.4' to the list of known hosts.
Enumerazione degli oggetti in corso: 69, fatto.
Conteggio degli oggetti in corso: 100% (69/69), fatto.
Compressione delta in corso, uso fino a 4 thread
Compressione oggetti in corso: 100% (40/40), fatto.
Scrittura degli oggetti in corso: 100% (43/43), 7.14 KiB | 2.38 MiB/s, fatto.
43 oggetti totali (16 delta), 0 riutilizzati (0 delta), 0 riutilizzati nel file pack
remote: Resolving deltas: 100% (16/16), completed with 16 local objects.
To github.com:Niubbo75/guacamole-client.git
6138a51e9..a4713ca53 master -> master
alessandro@debian:~/GitHub/guacamole-client$
```
now what I have to do?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
necouchman commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1198097792
@Niubbo75 There are still many conflicts. My guess is that your forked Master repository is out of sync with the Apache one - so you'll need to add the Apache repo to your local copy and "fast-forward" your git master with those changes. I know how to do that when the commits are on their own branch - I'm not exactly sure how to do it when you've committed to your master branch without wiping out your changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
necouchman commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1139588714
@Niubbo75:
That first error is indicating that something in your source code had been updated but not committed, so you should commit that file, first (git add, git commit), then re-try the rebase.
I don't do much editing/committing on the github.com web page - I do all of mine in a terminal - so I'm not sure how easy it is to squash things on the web UI.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1198206214
@necouchman this is strange.
What I'd done is star from a fresh Debian install (made just for that), git clone the official guacamole-client, made translations, git rebase -i; git push -f.
Am I done some wrong command? Maybe is better if I delete my personal fork done via github webpage?
Let me know, thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fixed/Added italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1134255476
Hello @necouchman I'm not a master of git, ATM I've done this via browser, do you know how to do that from Browser?
I've just use the same commit message I've seen on other translations, sorry for my mistake.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 closed pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 closed pull request #728: GUACAMOLE-1612: Fix/Add italian translations
URL: https://github.com/apache/guacamole-client/pull/728
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1139585759
Hello @necouchman:
```
D:\Github\guacamole-client>git rebase -i
error: Your local changes to the following files would be overwritten by checkout:
guacamole/src/main/frontend/src/translations/it.json
Please commit your changes or stash them before you switch branches.
error: The following untracked working tree files would be overwritten by checkout:
extensions/guacamole-auth-duo/src/main/resources/translations/it.json
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/it.json
extensions/guacamole-auth-quickconnect/src/main/resources/translations/it.json
extensions/guacamole-auth-radius/src/main/resources/translations/it.json
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/it.json
extensions/guacamole-auth-totp/src/main/resources/translations/it.json
extensions/guacamole-history-recording-storage/src/main/resources/translations/it.json
extensions/guacamole-vault/modules/guacamole-vault-base/src/main/resources/translations/it.json
Please move or remove them before you switch branches.
Aborting
error: could not detach HEAD
D:\Github\guacamole-client>git push -f
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To https://github.com/Niubbo75/guacamole-client.git
+ acaf9c776...7f707cdb0 master -> master (forced update)
D:\Github\guacamole-client>
```
I hope to have done it right
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1197010858
Hello @necouchman, sorry for the delay but I was very busy!
So, I have try again:
`alessandro@debian:~/Niubbo75/guacamole-client$ git rebase -i
Rebase e aggiornamento di refs/heads/master eseguiti con successo.
alessandro@debian:~/Niubbo75/guacamole-client$ git push -f
Username for 'https://github.com': Niubbo75
Password for 'https://Niubbo75@github.com':
Everything up-to-date
alessandro@debian:~/Niubbo75/guacamole-client$`
Can you please check if it works?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1157300557
@necouchman can you please let me know if it is ok or not?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
necouchman commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1207205575
@Niubbo75: I don't think you need to delete your personal fork, no, but you'll probably need to update it with the current Apace commits. Something like this should work:
* Add the Apache version as a new remote: `git remote add apache https://github.com/apache/guacamole-client`
* Rebase everything on top of the apache/master branch: `git rebase apache/master`
* At this point you may have to resolve conflicts in the rebase
* Verify that the rebase git log includes your changes: `git log`
* Push it to your fork: `git push -f`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #728: GUACAMOLE-1612: Fixed/Added italian translations
Posted by GitBox <gi...@apache.org>.
necouchman commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1133769242
Thanks, @Niubbo75! Overall it looks okay -the one issue I see is the commit messages. They're all the same, and not quite as descriptive as they could be. I would suggest, for this type of issue, that you just squash all of the commits together into a single commit (git rebase -i, then git push -f), and make the commit message a bit more descriptive. There's a good page that helps with pointers on commit messages, here: https://www.codelord.net/2015/03/16/bad-commit-messages-hall-of-shame/.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] Niubbo75 commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
Niubbo75 commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1139598320
Maybe now I've done:
`[GUACAMOLE-1612: Fix/Add italian translations](https://github.com/apache/guacamole-client/pull/728#)`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
necouchman commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1159241628
@Niubbo75: I don't quite think so - the PR is closed (you closed it 21 days ago), and there are 0 commits to it. So, something is still not quite right :-). git can be a little challenging to get used to.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [guacamole-client] necouchman commented on pull request #728: GUACAMOLE-1612: Fix/Add italian translations
Posted by GitBox <gi...@apache.org>.
necouchman commented on PR #728:
URL: https://github.com/apache/guacamole-client/pull/728#issuecomment-1208066630
@Niubbo75 Since you deleted your old fork, this PR has closed, and you'll have to open a new PR from the new fork.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@guacamole.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org