Commit a3f66357 authored by bertagaz's avatar bertagaz
Browse files

Merge branch 'master' into devel

parents d92cb4b9 c2e042f1
[[!meta title="About possible derivatives"]]
What for:
- Include additional features that we are not ready to add to Tails (for example
to include GNUnet or Namecoin).
- Have custom branding or configuration.
- Provide ISO images with less or different features (for example to
have VPN instead of Tor).
Why is it complicated:
- Release every 6 weeks and maybe emergency security releases
- Heavy quality assurance process (automated builds and tests)
- Complex infrastructure (upgrades)
- User trust (authenticated downloads, OpenPGP Web-of-Trust)
- Fingerprinting & partitioning users into a anonymity subset
- For features that are not in Tails because there has been no time or
solution for doing them correctly, the temptation to just shove them
in hastily and call it done
Good ways of doing it:
- Don't build your own ISO images.
- Package your specific applications in Debian to make them easier to
use in Tails.
- Document how to use your specific applications in Tails.
- Rely on the mechanisms already available in Tails to adapt it to your
needs (additional software packages, persistent storage).
- Help us build in Tails other mechanisms that you might need to adapt
it to your needs (for example to have persistent DConf settings or APT
sources).
- Talk with us to see how we can adapt our ISO images to make them
easier for your to reuse.
- If you want to include a piece of software into Tails, talk to us as
early as possible so we can provide feedback on how to integrate it.
Open questions:
- Trademark aspects. Will derivatives appear as being "Tails" to their
users while having different security features than Tails? Shall we
review ourselves the work of derivatives and "endorse" them? How could
crappy derivatives impact negatively the name and reputation of Tails?
...@@ -75,93 +75,109 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad ...@@ -75,93 +75,109 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
the Tails system administrators (<tails-sysadmins@boum.org>) to host the Tails system administrators (<tails-sysadmins@boum.org>) to host
your repository. your repository.
2. **Copy the source code from the main repository**
You first need to setup a [[persistent volume|doc/first_steps/persistence]] You first need to setup a [[persistent volume|doc/first_steps/persistence]]
to save the source code. Then navigate to the persistent folder, using the terminal: to save the source code. Then navigate to the persistent folder, using the terminal:
cd ~/Persistent cd ~/Persistent
This example clones an empty repository into the "tails" folder: Get the source code:
git clone git@gitlab.com:Tails/tails.git tails git clone https://git-tails.immerda.ch/tails
2. **Copy the source code from the main repository** This operation requires some time at setup, as it requires to pull the whole repository.
Then setup the remote Tails main repository: 3. **Add your repository**
Navigate to the folder containg the source code, using the terminal:
cd tails cd tails
git remote add tails https://git-tails.immerda.ch/tails
To publish your translations, you need to add the repository set up previously.
The URL of your repository should look like `tails@git.tails.boum.org:elouann/tails`.
If you cannot find the URL of your repository, get in touch with the sysadmins or send an email on the [[mailing list|translate#follow-up]]. Once you got it, add it to the repositories:
git remote add myrepo tails@git.tails.boum.org:elouann/tails
Typing `git remote` should now show two entries: Typing `git remote` should now show two entries:
origin origin
tails myrepo
More specifically, if you type `git remote -v` and you'll see something like this: More specifically, if you type `git remote -v`, you'll see something like this:
origin git@gitlab.com:Tails/tails.git (fetch) myrepo tails@git.tails.boum.org:elouann/tails (fetch)
origin git@gitlab.com:Tails/tails.git (push) myrepo tails@git.tails.boum.org:elouann/tails (push)
tails https://git-tails.immerda.ch/tails (fetch) origin https://git-tails.immerda.ch/tails (fetch)
tails https://git-tails.immerda.ch/tails (push) origin https://git-tails.immerda.ch/tails (push)
"origin" is your own repository, "tails" contains the files of the To check if the repository are correctly configured, run the following command:
main repository once we fetch them. This operation requires some time
at setup, as it requires to pull the whole repository.
git fetch tails master git fetch --all
If you have problem with SSH keys or with the URL of your repository, get in touch with the sysadmins or send an email on the [[mailing list|translate#follow-up]].
3. **Configure your credentials** 3. **Configure your credentials**
Now to setup Git, type: Now to setup Git, type:
git config user.name "Tails developers" git config user.name "Your nickname"
git config user.email "tails@boum.org" git config user.email "Your email adress"
Verify this configuration by typing: Verify this configuration by typing:
git config --list git config --list
4. **Translate!** 4. **Create a branch**
Create a branch for every translation you make, for example, if you want to Create a branch for every translation you make, for example, if you want to
translate the "contribute" page, create a branch named "translation-contribute": translate the "contribute" page, create a branch named `translate/contribute`:
git branch translate/contribute
git checkout translate/contribute
Now typing `git branch` should show a star in front of the active branch:
git branch translation-contribute master
git checkout translation-contribute * translate/contribute
Now typing `git branch` should show a star in front of the active branch. 5. **Translate!**
5. Translate whatever you can in your preferred PO file editor, possibly Poedit. You can use your preferred PO file editor, possibly *Poedit* which is included in Tails.
6. **Save your translations** 6. **Save your translations**
Commit the changes you made to `.po` files: Add your changes, then commit
git add <files> git add -p
git commit <files> git commit
7. **Test your work** 7. **Test your work**
[[Build the wiki locally|contribute/build/website/]] in order to verify [[Build the website locally|contribute/build/website/]] in order to verify
your modifications or to review the translations of somebody else. your modifications or to review the translations of somebody else.
If you need to rework something, go back to point 5, translate and test again. If you need to rework something, go back to step 5, translate, and test again.
8. Merge our main repository into yours. 8. **Merge our main repository into yours**.
Regularly, pull from the master branch of the main repository to update
Regularly, pull from the `master` branch of the main repository to update
your local files. your local files.
`git fetch tails master` only fetches new files, while `git fetch origin master` only fetches new files, while
`git pull tails master` fetches and merges the files.
`git pull origin master` fetches and merges the files.
9. **Publish your modifications** 9. **Publish your modifications**
Push your changes to your online Git repository. Push your changes to your online Git repository:
git push origin <name of branch> git push myrepo <name of branch>
For example, For example,
git push origin translation-contribute git push myrepo translate/contribute
10. Ask other members of your translation team to review your work by writing 10. Ask other members of your translation team to review your work by writing
an email to [[the mailing list for an email to [[the mailing list for
...@@ -171,16 +187,16 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad ...@@ -171,16 +187,16 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
11. The reviewer, once happy with the result, should ask on the 11. The reviewer, once happy with the result, should ask on the
[[mailing list for translators|translate#follow-up]] to pull from [[mailing list for translators|translate#follow-up]] to pull from
the branch that was worked on, writing an email with "(pull)" and the language the branch that was worked on, writing an email with "(pull)" and the language
short code in the subject. Ideally, such email would be OpenPGP-signed. short code in the subject. Ideally, such email would be signed with OpenPGP.
Each [[language team|translate#language-teams]] keeps track of their contributors' repositories. Each [[language team|translate#language-teams]] keeps track of the repositories of its contributors.
To add one of these repositories as a `remote` in Git, use the following command line: To add one of these repositories as a `remote` in Git, use the following command line:
git remote add [name] https://git-tails.immerda.ch/[name]/tails.git git remote add [name] https://git-tails.immerda.ch/[name]/tails.git
For example: For example:
git remote add https://git-tails.immerda.ch/mercedes508/tails.git git remote add mercedes508 https://git-tails.immerda.ch/mercedes508/tails.git
# More informations and resources # More informations and resources
......
...@@ -3,3 +3,18 @@ build-target: i386 ...@@ -3,3 +3,18 @@ build-target: i386
channel: alpha channel: alpha
product-name: Tails product-name: Tails
product-version: 1.5.1 product-version: 1.5.1
upgrades:
- details-url: https://tails.boum.org/news/version_1.6/
type: major
upgrade-paths:
- target-files:
- sha256: 6daba429ec9372af0822d8dd4c3e96407240a31c9373173a5985d8d669ea1d00
size: 987033600
url: http://dl.amnesia.boum.org/tails/stable/tails-i386-1.6/tails-i386-1.6.iso
type: full
- target-files:
- sha256: 87fe746e1856713dc4df5ca49d4131f30fb67f6402c80373148315444f5da1c8
size: 110510080
url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_1.5.1_to_1.6.iuk
type: incremental
version: '1.6'
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iQIcBAABCgAGBQJV38gLAAoJEJj+xrx1Kj22nwUP+gLHsaEN05N8rL7aQPM6soLn iQIcBAABCgAGBQJV/ytVAAoJEJj+xrx1Kj22bD0QAJ2lLPcBF4PB0F1naTbuI4Lr
eAw6ghc/QXctftcFDluiEEDwtEMo0a/dNL8o2iK00dArtOzc1IO5W+lFYEppPbRH K6vzOZ5w6wwzBhQRmJYPgUvGhY8oRdtWL/mfBE3YUsnD7Bqf0P/GIriaaaNT0UZu
Pdaci3smXVNjYpx42/eAuGk0qr6/HQi+2e6R3jm9f8jOeZKAlB9Es2oogV8qBZC7 HDCt1BpnWvAR1LXaJ815OmaVlfzcRtRv9PBL+R9SOa753cOkMu7M9CeW/tnpb0jP
H7E+NZzPhpdwPKkwtgPofZtdbp/CPtlULIJGfOn+D4kbTCPuFZkwMlPIYTsQeZJj sINx0+i3UhylcrttlwPC9N/YWQK7TmSiBx9tILPAo3mObHMCPLCCBGiSVPiVUe0j
FG8aL08a9f4geIY/jXCMUSpuo3rS4RWwkHCaGNqvktMrYrHhIGPMPWBOCU6O2b9R ZZLbR/RoBWaM+odziMHG2rqH58RbECL0h7f+cmipvNYHiTedmNR0JW7GuLDyR92u
6cZyuPXiqcA0aYo3H7K7PHf0/hh5PLnh29MNva7tTUTu6NZPxgVQlAYAEb2c30Vj KoTWaR0IjqMvCD4D/7gy3pprVzDbhowgjafqo2ukhXX3/LIvrdXnZbKjA4x31DXs
+SA21FsGIJMnkCYNlT5IAC2LXg/ASUprDWYr+vjh+sANJcZ+KJDw/eaaSYare+C2 cAVmohW5nA6Lh9DGKctAhOvDWRdpFG4DWF1N6VGFsirREhQVN4c5L5B0OgjhVZNU
GBBd+bwNk017/02Xo0IAAtgQ1p/NDRflIiqtaysScWiV8cJvegEcXBX9IFc+YEqG ssYs0m8UbpV/QcHXXg2/X/Vohi80OJ6q0f+tm5q8y2RdNqmd4XTqyOZ4hhJ8VAnL
k/8WsR/OdI+/VUscLbS7N8lpuvAWw5yE8PWV29owstEHLTJgyKkUGolBuaJDLr2L kbZcw8vhmGgDO310Fp+ilvsUwwFS0vcZgfEpYmIiAdBGhRKr4vpkbv8ufnouFLdH
sswfwBCEGTwlSSGJsU8RYRf3RzR2E6YlEE0uFTXGnosv2osCk6+Qm8my+saYU8Q8 iFst+Cl98IaZeR9qNaWG4wMVQDhYIgc2edYc9WL7kybCmJURuFhOnv1sKJSUo+9j
ZFFA8Ui7VWW62ptlW3PnOhGuuToJPbL4U0fasA8OIMMK24GVmEmiKmwSe045i69C 8QQdcEiRoLAJz53xfdp667VfVXAc+gSQcQDZGhDSPy8Lt/QA6drTa5BqQJw84C/a
XAShHcORTesAi7DFKDxn uJoaKmUmNIqHbOiFgsgH
=OJR1 =tQWq
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment