Hi Stefan, hi all, as many of the X2Go Client translators may know, X2Go Client contains some weird English text phrases. We are planning to clean that up before 4.0.3.0 release of X2Go Client. Stefan volunteered to help with that job. @Stefan: any chance we can pin down a date for that? Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Am 19.08.2014 um 17:46 schrieb Mike Gabriel:
Hi Stefan, hi all,
as many of the X2Go Client translators may know, X2Go Client contains some weird English text phrases. We are planning to clean that up before 4.0.3.0 release of X2Go Client. Stefan volunteered to help with that job.
@Stefan: any chance we can pin down a date for that?
Current estimate is either this weekend or the course of the following week. -Stefan
Hi Stefan, On Di 19 Aug 2014 17:49:42 CEST, Stefan Baur wrote:
Am 19.08.2014 um 17:46 schrieb Mike Gabriel:
Hi Stefan, hi all,
as many of the X2Go Client translators may know, X2Go Client contains some weird English text phrases. We are planning to clean that up before 4.0.3.0 release of X2Go Client. Stefan volunteered to help with that job.
@Stefan: any chance we can pin down a date for that?
Current estimate is either this weekend or the course of the following week.
-Stefan
Weekend won't work for me. The coming up week sounds good. Remember that we chat before you start working on that... Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Am 19.08.2014 um 17:56 schrieb Mike Gabriel:
Remember that we chat before you start working on that...
Hmm? I thought the plan was: - git clone the latest set of files - locate "odd" English messages - replace them in all language files using sed - report changed files to you as "ready to commit" Anything else we need to discuss before I start? -Stefan
Hi Stefan, On Mi 20 Aug 2014 00:47:24 CEST, Stefan Baur wrote:
Am 19.08.2014 um 17:56 schrieb Mike Gabriel:
Remember that we chat before you start working on that...
Hmm? I thought the plan was:
- git clone the latest set of files
- locate "odd" English messages
- replace them in all language files using sed
- report changed files to you as "ready to commit"
Anything else we need to discuss before I start?
Exactly! 1. The odd English phrase needs to be located in the source code, as well, and has to be changed there, as well. 2. You will want to commit portions of your work to Git on a separate branch. It case you f...-up on the way, you can reset your work to one of the last committed stages. best! Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Am 22.08.2014 um 14:28 schrieb Mike Gabriel:
- The odd English phrase needs to be located in the source code, as well, and has to be changed there, as well.
That should be easy with grep, sed, and diff.
- You will want to commit portions of your work to Git on a separate branch. It case you f...-up on the way, you can reset your work to one of the last committed stages.
I don't have commit rights (I think), and I doubt it would be a good idea to grant those to a non-dev like me. ;-) #DONOTWANT My plan was to change a copy of the files, send you the updated translation files (or work directly on fylgia, where you can easily copy them), and do the same + diffs for the source code, too (as I believe it is more likely that we'll have merge conflicts there due to ongoing dev work -> looking at the diff and applying the change manually to the current state might be easier than trying to merge). -Stefan
On Fri, Aug 22, 2014 at 9:23 AM, Stefan Baur <newsgroups.mail2@stefanbaur.de> wrote:
Am 22.08.2014 um 14:28 schrieb Mike Gabriel:
- The odd English phrase needs to be located in the source code, as well, and has to be changed there, as well.
That should be easy with grep, sed, and diff.
- You will want to commit portions of your work to Git on a separate branch. It case you f...-up on the way, you can reset your work to one of the last committed stages.
I don't have commit rights (I think), and I doubt it would be a good idea to grant those to a non-dev like me. ;-) #DONOTWANT
My plan was to change a copy of the files, send you the updated translation files (or work directly on fylgia, where you can easily copy them), and do the same + diffs for the source code, too (as I believe it is more likely that we'll have merge conflicts there due to ongoing dev work -> looking at the diff and applying the change manually to the current state might be easier than trying to merge).
-Stefan
Stefan, As we were discussing by IM, you can export a commit as a patch that you can email. You do not need rights to the code.x2go.org repo. Based on these instructions: https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/ Do this: git clone git://code.x2go.org/x2goclient.git cd x2goclient git checkout -b english_translation_fixes (I just made up "english_translation_fixes" as a branch name) <Make your changes to the files> git add <every file you modified> git diff --cached (This previews your changes) git commit -m "<Commit Message>" git format-patch master --stdout > <your patch name> <Then attach the patch to an email> The commit is only to a branch on your local repo. Even if you were to make a commit to the "master" branch on your local repo, you still wouldn't be able to push your commit to code.x2go.org. And you could still create a patch for it (git format-patch origin/master --stdout > <your patch name>). Your branch will not appear on code.x2go.org when we do import the patch. -Mike#2
Hi Stefan, On Fr 22 Aug 2014 15:49:51 CEST, Michael DePaulo wrote:
On Fri, Aug 22, 2014 at 9:23 AM, Stefan Baur <newsgroups.mail2@stefanbaur.de> wrote:
Am 22.08.2014 um 14:28 schrieb Mike Gabriel:
- The odd English phrase needs to be located in the source code, as well, and has to be changed there, as well.
That should be easy with grep, sed, and diff.
Yes and no... The code contains some fany line breaks in test phrases that appear in the .ts files. :-/
- You will want to commit portions of your work to Git on a separate branch. It case you f...-up on the way, you can reset your work to one of the last committed stages.
I don't have commit rights (I think), and I doubt it would be a good idea to grant those to a non-dev like me. ;-) #DONOTWANT
Agreeing here!
My plan was to change a copy of the files, send you the updated translation files (or work directly on fylgia, where you can easily copy them), and do the same + diffs for the source code, too (as I believe it is more likely that we'll have merge conflicts there due to ongoing dev work -> looking at the diff and applying the change manually to the current state might be easier than trying to merge).
-Stefan
Stefan,
As we were discussing by IM, you can export a commit as a patch that you can email. You do not need rights to the code.x2go.org repo.
Based on these instructions: https://ariejan.net/2009/10/26/how-to-create-and-apply-a-patch-with-git/ Do this:
git clone git://code.x2go.org/x2goclient.git cd x2goclient git checkout -b english_translation_fixes (I just made up "english_translation_fixes" as a branch name) <Make your changes to the files> git add <every file you modified> git diff --cached (This previews your changes) git commit -m "<Commit Message>" git format-patch master --stdout > <your patch name> <Then attach the patch to an email>
The commit is only to a branch on your local repo. Even if you were to make a commit to the "master" branch on your local repo, you still wouldn't be able to push your commit to code.x2go.org. And you could still create a patch for it (git format-patch origin/master --stdout > <your patch name>). Your branch will not appear on code.x2go.org when we do import the patch.
-Mike#2
Actually, I guess, there will be many stages of ### fix first eng orig phrases git commit -a -m "fix1" ### fix more eng orig phrases git commit -a -m "fix2" ### ... ### fix last eng orig phrase git commit -a -m "fix<last>" and at the end you rebase everything and squeaze it into one big patch. This patch then I want to have. Mike -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
-
Michael DePaulo -
Mike Gabriel -
Stefan Baur