[X2Go-i18n] English language clean-up of X2Go Client

[Mike Gabriel]

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 at stefanbaur.de> wrote:
>> Am 22.08.2014 um 14:28 schrieb Mike Gabriel:
>>
>>> 1. 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. :-/

>>
>>> 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.
>>
>> 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 at das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digitale PGP-Signatur
URL: <http://lists.x2go.org/pipermail/x2go-i18n/attachments/20140822/f7c3af24/attachment.pgp>