Re: [Tails-l10n] translation-de / translation to review

Delete this message

Reply to this message
Author: u
Date:  
To: tails-l10n
Subject: Re: [Tails-l10n] translation-de / translation to review
Hi Nivatius,

Nivatius:
> Hello everyone I'm still new to this,
> I somehow managed to get this up on github.
> How to I get the file into the tails wiki/website?


(please correct me if i'm wrong, people on this list.)

You should ask for review of your modifications here on the mailing
list. Indicate where your repo is located, which files you modified,
which commit you want reviewed.

Once reviewed, one (you or seombody else from the german team) might ask
for a pull, putting [pull] in the email subject.

> https://github.com/Nivatius/tailstransWebDE/blob/master/wiki/src/download.de.po
>
> stay save,
> N.


Just to get the set-up of the repo clear. From what i understood, a
correct setup works something like this:

Create an empty git repository somewhere.
Clone this repo on your computer, somehow like this (this is an example
with a git repo @git.tails.boum.org, you would clone your guthub repo
for example)

    git clone tails@???:xxxx/tails


Go to the folder you justed checked out, it should be empty:
    cd tails


You should configure git now (as detailed on the website).

There you would then pull the files from the main repository:
    git remote add tails https://git-tails.immerda.ch/tails


Now, typing
    git remote
should give you two remote branches, one of which is called "origin",
the other one "tails".


Now you can get the files from the master at immerda.ch:
    git fetch tails master
    git pull tails master


(i don't remember if you have to do fetch and pull or just fetch or just
pull).

Then you can modify files, preferably using poedit 1.5.4 at least.
Then you can
    git add [files]
    git commit [files]
then push them to your repository at github.
    git push -u origin master


Better than pushing to master would be to create a branch for the
translations though. Like so (example with a branch called "de"):
    git branch de


type
    git branch
to see which branches you have and which one is the active branch right now.


then you can
    git checkout de
(or git checkout master, to get back to the master branch)
this will activate the branch "de" where you can then modify files.


Then you can
    git add [files]
    git commit [files]
and push these files to your repo at github or whereever:
    git push origin de


If needed you can delete a remote and local branch like so:
    git branch -D de
    git push origin :de



Regularly, you should
    git pull tails master
to update the files in your repo with newer ones which have already been
reviewed and pushed to the master branch.


Maybe somebody can correct me if i'm wrong, or add more information to
this little howto (which could then maybe become part of the
documentation for translators).

no need for being harsh, Nivatius. You could be the one improving the
documentation! :)

cheers,
u.

PS : oh, and you might want to use git over Tor ("usewithtor git" if
you have a local running install of the Tor daemon.) Also don't forget
to configure poedit as it will add a header with the name and email of
the last translator. I believe you can use "Tails developers" /
amnesia@??? here too. I don't think this is a requirement, but
somebody might correct me here.