[X2Go-i18n] x2go-i18n Digest, Vol 23, Issue 1

[martti pitkanen]

Hi,

I am using git only in connection in connection with x2go translation.
Can anybody tell my the git command by which I can merge repository with 
my local files,
on which I have been working for previous release.


On 10/01/2017 01:00 PM, x2go-i18n-request at lists.x2go.org wrote:
> Send x2go-i18n mailing list submissions to
> 	x2go-i18n at lists.x2go.org
>
> To subscribe or unsubscribe via the World Wide Web, visit
> 	https://lists.x2go.org/listinfo/x2go-i18n
> or, via email, send a message with subject or body 'help' to
> 	x2go-i18n-request at lists.x2go.org
>
> You can reach the person managing the list at
> 	x2go-i18n-owner at lists.x2go.org
>
> When replying, please edit your Subject line so it is more specific
> than "Re: Contents of x2go-i18n digest..."
>
>
> Today's Topics:
>
>     1.  Call for Translations for X2Go Client (Mihai Moldovan)
>
>
> ----------------------------------------------------------------------
>
> Message: 1
> Date: Sat, 30 Sep 2017 20:37:24 +0200
> From: Mihai Moldovan <ionic at ionic.de>
> To: "x2go-i18n at lists.x2go.org" <x2go-i18n at lists.x2go.org>
> Subject: [X2Go-i18n]  Call for Translations for X2Go Client
> Message-ID: <f037e83b-98d8-fe63-7d22-82cf6f20a955 at ionic.de>
> Content-Type: text/plain; charset="utf-8"
>
> Hi
>
> I plan to release new versions of X2Go Client soon.
>
> The deadline for translations is October 8, 2017.
>
> Current status in X2Go Client:
>
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_de.qm'...
>      Generated 675 translation(s) (672 finished and 3 unfinished)
>      Ignored 24 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_da.qm'...
>      Generated 441 translation(s) (439 finished and 2 unfinished)
>      Ignored 258 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_es.qm'...
>      Generated 675 translation(s) (670 finished and 5 unfinished)
>      Ignored 24 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_et.qm'...
>      Generated 670 translation(s) (661 finished and 9 unfinished)
>      Ignored 29 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_fi.qm'...
>      Generated 675 translation(s) (673 finished and 2 unfinished)
>      Ignored 24 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_fr.qm'...
>      Generated 675 translation(s) (672 finished and 3 unfinished)
>      Ignored 24 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_nb_no.qm'...
>      Generated 582 translation(s) (575 finished and 7 unfinished)
>      Ignored 117 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_nl.qm'...
>      Generated 584 translation(s) (577 finished and 7 unfinished)
>      Ignored 115 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_pt.qm'...
>      Generated 0 translation(s) (0 finished and 0 unfinished)
>      Ignored 699 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_ru.qm'...
>      Generated 431 translation(s) (421 finished and 10 unfinished)
>      Ignored 268 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_sv.qm'...
>      Generated 675 translation(s) (672 finished and 3 unfinished)
>      Ignored 24 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_tr.qm'...
>      Generated 430 translation(s) (419 finished and 11 unfinished)
>      Ignored 269 untranslated source text(s)
> Updating '/home/ionic/src/x2go/x2goclient-git/res/i18n/x2goclient_zh_tw.qm'...
>      Generated 314 translation(s) (293 finished and 21 unfinished)
>      Ignored 385 untranslated source text(s)
>
>
>
> The translation files in the repository are already updated, no need for any
> manual work prior to translating.
>
>
> For a description of the translation process, please refer to
> http://wiki.x2go.org/doku.php/wiki:development:i18n and the corresponding
> README.i18n files in the component repository:
>    - http://code.x2go.org/gitweb?p=x2goclient.git;a=blob;f=README.i18n;hb=master
>
>
>
> Mihai
>
> -------------- next part --------------
> A non-text attachment was scrubbed...
> Name: signature.asc
> Type: application/pgp-signature
> Size: 898 bytes
> Desc: OpenPGP digital signature
> URL: <http://lists.x2go.org/pipermail/x2go-i18n/attachments/20170930/2c20bbd5/attachment-0001.sig>
>
> ------------------------------
>
> Subject: Digest Footer
>
> _______________________________________________
> x2go-i18n mailing list
> x2go-i18n at lists.x2go.org
> https://lists.x2go.org/listinfo/x2go-i18n
>
> ------------------------------
>
> End of x2go-i18n Digest, Vol 23, Issue 1
> ****************************************

-- 
--- Martti Pitkänen APLcomp Oy Mariankatu 17 00170 Helsinki Finland Tel 
+358 9 1357266 Mob +358 40 0602157 www.aplcomp.com Mail: P.O.BOX 126 
00171 Helsinki Finland
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x2go.org/pipermail/x2go-i18n/attachments/20171003/48fa1698/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: martti_pitkanen.vcf
Type: text/x-vcard
Size: 325 bytes
Desc: not available
URL: <http://lists.x2go.org/pipermail/x2go-i18n/attachments/20171003/48fa1698/attachment.vcf>