Commit 96add6dd authored by sajolida's avatar sajolida
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	wiki/src/blueprint/report_2015_07.mdwn
parents 89cce848 9398e995
......@@ -147,69 +147,8 @@ Seeing that:
- Tails is running more or less on this devices.
- There are a limited number of different models.
We suggest to maintain a list of the state of Tails compatibility on
these computers. In the router of the web assistant, a potential user
could know if Tails works on her computer and on which media (DVD or
USB) before she tries to install it.
### Data type
The data could be stored in a YAML file, in the git repo.
### Data content
Something like:
model / part of the serial number
Tails version | working? | boot on USB? | boot on DVD? | comments
* In we want to keep history of compatibility (with older Tails
versions) in this file, maybe we will have to show to the user only
the last relevant informations.
* "Tails version" can be useful to:
- Have a better view of how the support Mac evolves.
- Let the user or frontdesk know when the compatibility got broken.
* "Comments" is raw information on Wi-Fi support, graphic support, etc.
### How to feed the list
- Call to heavily test sometimes
- Ask to people doing Tails trainings
- Update from frontdesk
- Maybe something editable by users
### Implementation
In the Mac page of the router, we could implement this in two ways, that
could be two iterations.
#### All information (without form)
- Raw data is transformed server-side into an HTML table with links to
the available scenarios for each model (maybe using
<https://ikiwiki.info/plugins/contrib/ymlfront/>).
- The full list is included in the HTML page sent to the user by hidden
in toggle by default.
- Some information is displayed to help the user identify his type of
Mac (maybe simplifying <https://fr.ifixit.com/Info/ID-your-Mac>).
- The user can toggle to display the sublist corresponding to her type
of Mac (iMac, Macbook, MacBook Air, etc.)
- If JavaScript is disabled, the full list is displayed.
#### Only relevant information (with form)
- Some information is displayed to know easily what kind of mac is
working
- The user types in a form the serial number of her Mac or clicks in a
dedicated tiny wizard like <https://fr.ifixit.com/Info/ID-your-Mac>.
- Some server-side code (Ruby?) or client-side code (JavaScript) gets
the relevant model and displays the possible scenarios.
- If implemented in JavaScript, it would fallback on the "without form"
version described earlier.
### Redmine
This tickets wants to fix the same problem : [[!tails_ticket 9150]]
We want to maintain a list of the state of Tails compatibility on
these computers. [[More details here.|mac]]
<a id="overview"></a>
......
List of compatibility with Mac
------------------------------
Seeing that:
- A lot of current and potential users are Mac users.
- Tails is running more or less on this devices.
- There are a limited number of different models.
We will maintain the state of Tails compatibility on these computers.
Roadmap
=======
1 Bootstrap
-----------
- Specifing the data type.
- Know the precise models. #9322
- Setup a git repo.
2 Start to fill it
------------------
- Frontdesk starts to fill it
3 Have it on the website
------------------------
- Full list in markdown thanks to a routine
- In the web installation assistant
- In/linked in the troubleshooting section
- Maybe later an interactive app in the assistant
### Data type
The data could be stored in a YAML file, in the git repo. See [[!tails_ticket 9892]] for work in progress.
### Data content
- Fields ("strings", boolean?):
"model id"
- "Tails version" | DVD? | dd ? | tails installer? | SD? | wifi? | gaphic card? | mac address?
- ... (an other user reports on this model)
Writing the report after the summit, I would add :
- Anonymised uniq identifier per users
- Timestemp
- Comments (if there is non anticipated things to keep)
- Explicit say if the device type and if it boot or not (I feel it's easiest to write and read)
Trying a yaml type (optional or not):
model_id: (required)
reports:
- date: (required)
user: (optional)
tails: (required)
media: (required)
boot: (required)
install: (required)
wifi: (optional)
mac_address (optional)
graphic_card (optional)
comments: (optional)
And some samples :
model_id: MacBookAir3.2
reports:
- date: 2012-08-06
user: Oothai1iu6iefaiy
tails: 1.5
media: usb
boot: true
install: tails_installer
comments:
Touchpad not working.
- date: 2012-07-26
user: seyuo4daiChei3Oo
tails: 1.4
media: sd
boot: true
install: tails_installer
wifi: true
mac_spoofing: false
- date: 2012-06-12
user: aif0ueveeb0Ahkii
tails: 1.2
media: dvd
boot: false
comments:
Tried to boot on external DVD. Tails is on not on the Mac boot menu.
* "model id" : #9322. For one model id, there is one or several reports. (note that there is not realy the "state" for one model : the is different reports who can help to guess the state.)
* "Tails version" : can be useful to:
- Have a better view of how the support Mac evolves.
- Let the user or frontdesk know when the compatibility got broken.
* We want to keep history of compatibility (with older Tails
versions) in this file, maybe we will have to show to the user only
the last relevant informations.
* "Comments" is raw information on harward issues (touchpad, bluetooth). The most common issues are fields (wifi, mac spoofing, graphic card)
### How to feed the list
- Call to heavily test sometimes
- Ask to people doing Tails trainings
- Update from frontdesk
- Maybe something editable by users
### Later implementation
In the Mac page of the router, we could implement this in two ways, that
could be two iterations.
#### All information (without form)
- Raw data is transformed server-side into an HTML table with links to
the available scenarios for each model (maybe using
<https://ikiwiki.info/plugins/contrib/ymlfront/>).
- The full list is included in the HTML page sent to the user by hidden
in toggle by default.
- Some information is displayed to help the user identify his type of
Mac (maybe simplifying <https://fr.ifixit.com/Info/ID-your-Mac>).
- The user can toggle to display the sublist corresponding to her type
of Mac (iMac, Macbook, MacBook Air, etc.)
- If JavaScript is disabled, the full list is displayed.
#### Only relevant information (with form)
- Some information is displayed to know easily what kind of mac is
working
- The user types in a form the serial number of her Mac or clicks in a
dedicated tiny wizard like <https://fr.ifixit.com/Info/ID-your-Mac>.
- Some server-side code (Ruby?) or client-side code (JavaScript) gets
the relevant model and displays the possible scenarios.
- If implemented in JavaScript, it would fallback on the "without form"
version described earlier.
### Redmine
This tickets wants to fix the same problem : [[!tails_ticket 9150]]
......@@ -4,6 +4,13 @@
<http://tp.linux.it/glossario.html>
# Info
Qualche informazione sui file po:
<http://tp.linux.it/guida-po/index.html>
# Repository GIT
Accesso: send {username, SSH pubkey} tuples to <intrigeri@boum.org>.
......@@ -16,106 +23,130 @@ to add it, run:
... in an existing clone of our Git repo.
# info
# Come configurare il workflow git sul vostro pc
qualche informazione sui file po:
NOTA:
tutte le righe che iniziano con $ sono da digitare nel terminale, a volte sotto c'è la risposta del terminale, oppure niente. In generale nei sistemi unix-like se il terminale dopo aver dato un comando non vi risponde niente, vuol dire che tutto è andato bene.
<http://tp.linux.it/guida-po/index.html>
1) Creata una cartella con TRADUZIONI:
$ mkdir TRADUZIONI
2) Entrata nella cartella:
$ cd TRADUZIONI
3) Clonato i file per il mio uso locale nella cartella mytails (indicata
in fondo al comando):
Come configurare il workflow sul vostro pc:
1) creata una cartella con TRADUZIONI:$ mkdir TRADUZIONI
2) entrata nella cartella:$ cd TRADUZIONI
3) clonato i file per il mio uso locale nella cartella mytails (indicata
in fondo):
$ git clone https://git-tails.immerda.ch/l10n-italian/tails/ mytails
Cloning into 'mytails'...
remote: Counting objects: 184366, done.
remote: Compressing objects: 100% (48007/48007), done.
remote: Total 184366 (delta 121678), reused 184279 (delta 121629)
Ricezione degli oggetti: 100% (184366/184366), 49.13 MiB | 892.00 KiB/s,
done.
Risoluzione dei delta: 100% (121678/121678), done.
Checking connectivity... fatto.
4)Entro nell cartella e controllo che mi dice git:
[cri@localhost mytails]$ git status
Sul branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git clone https://git-tails.immerda.ch/l10n-italian/tails/ mytails
Cloning into 'mytails'...
remote: Counting objects: 184366, done.
remote: Compressing objects: 100% (48007/48007), done.
remote: Total 184366 (delta 121678), reused 184279 (delta 121629)
Ricezione degli oggetti: 100% (184366/184366), 49.13 MiB | 892.00 KiB/s,
done.
Risoluzione dei delta: 100% (121678/121678), done.
Checking connectivity... fatto.
4)Entro nell cartella mytails e controllo che mi dice git:
$ git status
Sul branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
5)Aggiungo il repository remoto:
[cri@localhost mytails]$ git remote add l10n-italian tails@git.tails.boum.org:l10n-italian/tails
6)controllo che funzioni:
[cri@localhost mytails]$ git remote -v
l10n-italian tails@git.tails.boum.org:l10n-italian/tails (fetch)
l10n-italian tails@git.tails.boum.org:l10n-italian/tails (push)
tails https://git-tails.immerda.ch/l10n-italian/tails/ (fetch)
tails https://git-tails.immerda.ch/l10n-italian/tails/ (push)
$ git remote add l10n-italian tails@git.tails.boum.org:l10n-italian/tails
6)Controllo che funzioni:
7)modifico dei file, aggiungo traduzioni, etc..
$ git remote -v
l10n-italian tails@git.tails.boum.org:l10n-italian/tails (fetch)
l10n-italian tails@git.tails.boum.org:l10n-italian/tails (push)
tails https://git-tails.immerda.ch/l10n-italian/tails/ (fetch)
tails https://git-tails.immerda.ch/l10n-italian/tails/ (push)
7)Modifico dei file, aggiungo traduzioni, etc.. poi torno al terminale.
8)Aggiungo due file che ho creato e modificato:
[cri@localhost mytails]$ git add wiki/src/doc/about/license.it.po
[cri@localhost mytails]$ git add wiki/src/doc/about/requirements.it.po
[cri@localhost mytails]$ git status
Sul branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: wiki/src/doc/about/license.it.po
new file: wiki/src/doc/about/requirements.it.po
$ git add wiki/src/doc/about/license.it.po
$ git add wiki/src/doc/about/requirements.it.po
$ git status
Sul branch master
Your branch is up-to-date with 'origin/master'.
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: wiki/src/doc/about/license.it.po
new file: wiki/src/doc/about/requirements.it.po
9) Faccio il commit locale
$ git commit -m "primi file tradotti"
[master c149e1b] primi file tradotti
Committer: cri <cri@localhost.lan>
Il tuo nome e l'indirizzo email sono stati configurati automaticamente usando
il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.
È possibile eliminare questo messaggio impostandoli esplicitamente:
git config --global user.name "Tuo Nome"
git config --global user.email tu@esempio.com
Dopo questa operazione, puoi ripristinare l'identità usata in questo commit con:
git commit --amend --reset-author
2 files changed, 203 insertions(+)
create mode 100644 wiki/src/doc/about/license.it.po
create mode 100644 wiki/src/doc/about/requirements.it.po
10)Configuro la mia identità (opzionale):
$ git config --global user.name "Tails Developer"
$ git config --global user.email "developer@blablabla.net"
11)Genero la chiave ssh, la invio agli sviluppatori TAILS(il file.pub) e l'associo per essere autenticato sul server:
ssh-keygen -t rsa -b 4096 -C "ignifugo@blablabla.net"
$ eval "$(ssh-agent -s)"
Agent pid 12534
$ ssh-add /home/cri/ignissh
Enter passphrase for /home/cri/ignissh:
Identity added: /home/cri/ignissh (/home/cri/ignissh)
12) Metto i file sul server:
9) faccio il commit locale
$ git push l10n-italian master
The authenticity of host 'git.tails.boum.org (77.109.139.10)' can't be established.
RSA key fingerprint is ed:1b:5b:45:e4:9c:d6:8f:55:f3:5f:b7:44:30:42:17.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'git.tails.boum.org,77.109.139.10' (RSA) to the list of known hosts.
Counting objects: 8, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 4.04 KiB | 0 bytes/s, done.
Total 8 (delta 4), reused 0 (delta 0)
To tails@git.tails.boum.org:l10n-italian/tails
42f6936..c149e1b master -> master
[cri@localhost mytails]$ git commit -m "primi file tradotti"
[master c149e1b] primi file tradotti
Committer: cri <cri@localhost.lan>
Il tuo nome e l'indirizzo email sono stati configurati automaticamente
usando
il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.
È possibile eliminare questo messaggio impostandoli esplicitamente:
13) Controllo che ci sia, sul terminale:
git config --global user.name "Tuo Nome"
git config --global user.email tu@esempio.com
$git log
Dopo questa operazione, puoi ripristinare l'identità usata in questo
commit con:
Oppure in grafica dal browser:
git commit --amend --reset-author
<https://git-tails.immerda.ch/l10n-italian/tails/>
2 files changed, 203 insertions(+)
create mode 100644 wiki/src/doc/about/license.it.po
create mode 100644 wiki/src/doc/about/requirements.it.po
10)Configuro la mia identità:
[cri@localhost mytails]$ git config --global user.name "ignifugo"
[cri@localhost mytails]$ git config --global user.email
"ignifugo@blablabla.net"
# Lavoro da affrontare
11)Genero la chiave ssh, la invio agli sviluppatori TAILS(il file.pub) e l'associo per essere autenticato sul server:
ssh-keygen -t rsa -b 4096 -C "ignifugo@blablabla.net"
Attingere nuove pagine da tradurre dando precedenza a queste:
<https://tails.boum.org/contribute/l10n_tricks/core_po_files.txt>
[cri@localhost ITATAILS]$ eval "$(ssh-agent -s)"
Agent pid 12534
[cri@localhost mytails]$ ssh-add /home/cri/ignissh
Enter passphrase for /home/cri/ignissh:
Identity added: /home/cri/ignissh (/home/cri/ignissh)
12) metto i file sul server:
[cri@localhost mytails]$ git push l10n-italian master
The authenticity of host 'git.tails.boum.org (77.109.139.10)' can't be established.
RSA key fingerprint is ed:1b:5b:45:e4:9c:d6:8f:55:f3:5f:b7:44:30:42:17.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'git.tails.boum.org,77.109.139.10' (RSA) to the list of known hosts.
Counting objects: 8, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 4.04 KiB | 0 bytes/s, done.
Total 8 (delta 4), reused 0 (delta 0)
To tails@git.tails.boum.org:l10n-italian/tails
42f6936..c149e1b master -> master
# Lavoro svolto
......
......@@ -37,7 +37,7 @@ User experience
Infrastructure
==============
* Our test suite covers FIXME scenarios, FIXME more that in April.
* Our test suite covers 185 scenarios, 3 more that in April.
* We started a discussion about having a [[CRM to handle our user support requests|blueprint/CRM_for_frontdesk]].
......@@ -65,12 +65,36 @@ FIXME
Press and testimonials
======================
* 2015-07-29: [Gut geschützt im Internetcafé](http://www.zeit.de/digital/datenschutz/2015-07/urlaub-internetcafe-mail-facebook) by Johannes Wendt in Zeit (in German).
* 2015-07-27: [מדריך: כך תתגוננו מפני מעקב ברשת](http://mekomit.co.il/%D7%94%D7%AA%D7%92%D7%95%D7%A0%D7%A0%D7%95%D7%AA-%D7%9E%D7%A4%D7%A0%D7%99-%D7%9E%D7%A2%D7%A7%D7%91-%D7%A8%D7%A9%D7%AA%D7%95%D7%AA-%D7%97%D7%91%D7%A8%D7%AA%D7%99%D7%95%D7%AA/) (in Hebrew).
* 2015-07-25: ['Tails' Bantu Amankan Aktivis Daring](http://www.pikiran-rakyat.com/horison/2015/07/25/335754/tails-bantu-amankan-aktivis-daring) in Pikiran Rakyat (in Indonesian).
* 2015-07-23: [Digital Solution Helps Shield Online Activists](http://www.voanews.com/content/digital-solution-helps-shield-online-activists/2873529.html) by Doug Bernard in Voice of America.
* 2015-07-14: [Chatting in Secret While We're All Being Watched](https://firstlook.org/theintercept/2015/07/14/communicating-secret-watched/) by Micah Lee in The Intercept.
Translation
===========
FIXME
All website PO files
--------------------
- de: 19% (1274) strings translated, 0% strings fuzzy, 17% words translated
- fr: 46% (3120) strings translated, 2% strings fuzzy, 43% words translated
- pt: 27% (1863) strings translated, 3% strings fuzzy, 26% words translated
Total original words: 76959
[[Core PO files|contribute/l10n_tricks/core_po_files.txt]]
--------------------------------------
- de: 60% (803) strings translated, 0% strings fuzzy, 68% words translated
- fr: 92% (1214) strings translated, 3% strings fuzzy, 92% words translated
- pt: 84% (1119) strings translated, 8% strings fuzzy, 87% words translated
Total original words: 14258
Metrics
=======
......
......@@ -43,6 +43,10 @@ FIXME
Outreach
========
* [We have Tails stickers again](http://t.co/AgtuTN0XmJ)! We'll share them during upcoming events, you can also [[make your own|contribute/how/promote/material/stickers]]...
* A talk about Tails took place during DebConf15 in Heidelberg, Germany, on August 15th.
FIXME
Upcoming events
......
[[!meta title="Calendar"]]
* 2015-07-31:
* 2015-08-05: anonym becomes RM
* 2015-08-05:
- Freeze Tails 1.5: all features targeting Tails 1.5 must be merged
into the `devel` branch by noon CEST. This hopefully includes
into the `devel` branch by 5pm CEST. This hopefully includes
a Tor Browser candidate based on the latest Firefox 38 ESR.
- Build and upload Tails 1.5~rc1
- Automatically test Tails 1.5~rc1
* 2015-08-01: Test and release Tails 1.5~rc1
* 2015-08-06: Release Tails 1.5~rc1
* 2015-08-03: [[Monthly meeting|contribute/meetings]]
* 2015-08-05: anonym becomes RM
* 2015-08-06 and 2015-08-07: Manually test Tails 1.5~rc1
* 2015-08-10:
- All branches targeting Tails 1.5 must be merged into the `testing`
......@@ -49,3 +50,4 @@
* 2016-05-31 (?): Release 1.12
* 2016-07-12 (?): Release 1.13
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2015-08-04 13:36+0200\n"
"POT-Creation-Date: 2015-08-04 16:39+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -34,13 +34,14 @@ msgid "Releases\n"
msgstr ""
#. type: Bullet: '* '
msgid "The next release (1.5) is [[planned for August 11|contribute/calendar/]]."
msgid ""
"The next release (1.5) is [[planned for August 11|contribute/calendar/]]."
msgstr ""
#. type: Bullet: '* '
msgid ""
"We decided on a new [[version number "
"scheme|contribute/release_schedule#versioning]]."
"We decided on a new [[version number scheme|contribute/"
"release_schedule#versioning]]."
msgstr ""
#. type: Title =
......@@ -50,8 +51,8 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
"A small note about non-free firmware was added to our [[licence "
"page|doc/about/license]]."
"A small note about non-free firmware was added to our [[licence page|doc/"
"about/license]]."
msgstr ""
#. type: Bullet: '* '
......@@ -63,7 +64,8 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
"We warn that *Tails OpenPGP Applet* can lead to [[encoding problems for "
"emails|doc/encryption_and_privacy/gpgapplet/public-key_cryptography#encoding]]."
"emails|doc/encryption_and_privacy/gpgapplet/public-"
"key_cryptography#encoding]]."
msgstr ""
#. type: Title =
......@@ -77,17 +79,15 @@ msgid ""
"- On the [[Installation Assistant|blueprint/bootstrapping/assistant]]:\n"
" - We wrote a full synopsis of the [[installation process for\n"
" Windows|blueprint/bootstrapping/assistant/windows]], submitted it for\n"
" review, and started testing it ([[!tails_ticket 9202 "
"desc=\"#9202\"]]).\n"
" - We started writing an ikiwiki and Bootstrap prototype of the "
"Installation\n"
" review, and started testing it ([[!tails_ticket 9202 desc=\"#9202\"]]).\n"
" - We started writing an ikiwiki and Bootstrap prototype of the Installation\n"
" Assistant in [[!tails_gitweb_branch web/assistant]].\n"
msgstr ""
#. type: Bullet: '* '
msgid ""
"People are working on the [Greeter "
"mockups](https://mailman.boum.org/pipermail/tails-ux/2015-June/000437.html)."
"People are working on the [Greeter mockups](https://mailman.boum.org/"
"pipermail/tails-ux/2015-June/000437.html)."
msgstr ""
#. type: Title =
......@@ -97,11 +97,11 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
"Our test suite covers 185 scenarios, 3 more than in May. We removed outdated "
"scenarios again, so there are more than 3 new tests :) New tests add "
"coverage for the Tor Browser's _New Identity_ feature and confirm that the "
"hardware clock is not updated by Tails. Additionally, a huge amount of work "
"was put into making our test suite more robust."
"Our test suite covers 182 scenarios, just as in May. We removed outdated "
"scenarios again, so there are actually new tests :) New tests add coverage "
"for the Tor Browser's _New Identity_ feature and confirm that the hardware "
"clock is not updated by Tails. Additionally, a huge amount of work was put "
"into making our test suite more robust."
msgstr ""
#. type: Bullet: '* '
......@@ -112,9 +112,9 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
"Great progress was made towards automatically [[!tails_ticket 6196 "
"desc=\"building all active branches\"]] with Jenkins. Live deployment is now "
"a matter of days."
"Great progress was made towards automatically [[!tails_ticket 6196 desc="
"\"building all active branches\"]] with Jenkins. Live deployment is now a "
"matter of days."