Hi u,
I understand the confusion of upstream git repo now, and have re-upstreamed
my gitlab repo (and renamed).
Please take a look at my modified zh.mdwn (in which my git repo has been
changed).
Many thanks
On Thu, 8 Nov 2018 at 08:23, psychi <psychi2009@???> wrote:
> Hi again,
>
> I just realized that translating from Tails weblate and from git repo can
> not be co-existed, right?
>
> If so, please ignore what I suggested in the zh.mdwn. Using git to work
> would be better than those js-based web services in some poor internet
> connections (in most area of China).
>
> And help me re-assure which git repo we should use as upstream.
>
> Many thanks and sorry for the confusion.
>
> Cheers
>
> On Wed, 7 Nov 2018 at 21:38, psychi <psychi2009@???> wrote:
>
>> Hi u and geb,
>>
>> Thanks for the instruction.
>> I refined zh.mdwn, with the following suggestions: (also attached)
>>
>> 1. I set up a repo in Gitlab.com with upstream to
>> http://translate.tails.boum.org ( I know there is Tails' repo in Gitlab,
>> but I can't get the latest commits when I forked it....looks weird...)
>> 2. As you mentioned in zh.mdwn, is it primarily suggested to fork /
>> follow this git repo: https://git-tails.immerda.ch/tails/ ? or,
>> primarily follow http://translate.tails.boum.org ? (Please advise, since
>> the former one seems not to be used for translation...)
>>
>> So, the workflow is: *the contributors pull/fork the repo from
>> http://translate.tails.boum.org <http://translate.tails.boum.org>, then do
>> their translations, then push to their own repo (e.g. my Gitlab one), and
>> then send an email to the mailing list to ask for a merge*. Am I right?
>>
>> Many thanks
>> psychi
>>
>> On Wed, 7 Nov 2018 at 01:41, u <u@???> wrote:
>>
>>> Hi!
>>>
>>> > This is a great idea. I am honored.
>>>
>>> I am glad to make that happen :)
>>>
>>> > Currently, my translation is in my Github repo:
>>> > https://github.com/mdrights/tails-zh_CN
>>>
>>> This is fine, I will add it to the page and wait for jx to send us their
>>> repository address too.
>>>
>>> > While I think I should set up a new repository in the same place with
>>> Tails
>>> > main repo (being convenient for merging), on Gitlab or
>>> > https://git-tails.immerda.ch/ , right?
>>> > I will let you know when I set it up.
>>>
>>> Github works fine, if this is convenient for you.
>>>
>>> > I tend to use the Tor's glossary:
>>> > https://www.transifex.com/otf/torproject/glossary/zh_CN/ (it needs to
>>> fill
>>> > in.)
>>>
>>> Ok. I mentioned that on the page.
>>>
>>> > New contributors are required to subsribe the tails-l10n mailing list
>>> and
>>> > talk to the Chinese team in the first place.
>>>
>>> Ok.
>>>
>>> > Let me know if any other stuff that needs to be mentioned.
>>>
>>> If you want you can share your PGP key fingerprints, so that people can
>>> also write to you by email, but this is totally optional.
>>>
>>> > jx, you are welcome to have a say, e.g. to have this page joint with
>>> bot
>>> > Trad. and Simp. Chinese ?
>>>
>>> Yes, that should work.
>>>
>>> I'm attaching the file I've created, let me know if that works or if you
>>> want to change something in the text.
>>>
>>> Cheers!
>>> u.
>>> _______________________________________________
>>> Tails-l10n mailing list
>>> Tails-l10n@???
>>> https://mailman.boum.org/listinfo/tails-l10n
>>> To unsubscribe from this list, send an empty email to
>>> Tails-l10n-unsubscribe@???.
>>
>>
>>
>> --
>> --
>> This is my receive-only mail address. If I did not reply to you, please
>> find another email address of mine. Cheers.
>> --
>>
>>
>>
>
> --
> --
> This is my receive-only mail address. If I did not reply to you, please
> find another email address of mine. Cheers.
> --
>
>
>
--
--
This is my receive-only mail address. If I did not reply to you, please
find another email address of mine. Cheers.
--
