summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2014-07-14 22:08:25 +0200
committerTails developers <tails@boum.org>2014-07-14 22:08:25 +0200
commit8d875ffd51c4029027e00a0bf06588feb6f85e05 (patch)
treed9ae0adadd3034a5315e78ca33d63a3980c9546c
parented43c80b0c1a35cf1b4762e91cbbc3a09868c71b (diff)
parentdde45e9338c4511aaf483233eedd03aef4985852 (diff)
Merge branch 'master' of https://git-tails.immerda.ch/tails
-rw-r--r--wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn2
-rw-r--r--wiki/src/contribute/l10n_tricks.mdwn10
-rwxr-xr-xwiki/src/contribute/l10n_tricks/git-clean-po.sh10
-rw-r--r--wiki/src/contribute/working_together/roles/front_desk.mdwn1
-rw-r--r--wiki/src/press.de.po4
-rw-r--r--wiki/src/press.fr.po4
-rw-r--r--wiki/src/press.mdwn2
-rw-r--r--wiki/src/press.pt.po4
8 files changed, 33 insertions, 4 deletions
diff --git a/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn b/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
index e735a54..74e5b94 100644
--- a/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
+++ b/wiki/src/blueprint/tails-greeter:_revamp_UI.mdwn
@@ -30,7 +30,7 @@ They are thus exported as PNG. If you update the SVG please also update the PNGs
Flow
----
-[[!img greeter-flow.png align="right" size="" alt=""]]
+[[!img greeter-flow.png size="" alt=""]]
<a href="greeter-flow.svg">source</a>
diff --git a/wiki/src/contribute/l10n_tricks.mdwn b/wiki/src/contribute/l10n_tricks.mdwn
index 72d26d4..0ad994c 100644
--- a/wiki/src/contribute/l10n_tricks.mdwn
+++ b/wiki/src/contribute/l10n_tricks.mdwn
@@ -87,3 +87,13 @@ in a row with the following bash script:
This will basically check in all subfolders if there is an existing `.git` folder,
and run `git pull` if appropriate.
+
+Remove autogenerated PO files
+=============================
+
+When building the wiki, ikiwiki often generates many PO files that you don't
+need to take into account or commit if you are working on the documentation or
+only on one language. This [[script|git-clean-po.sh]] does a checkout on all of
+the modified PO files in your working tree. **Make sure to do `git add` on the
+files that you modified before running it**, otherwise your changes will be
+lost.
diff --git a/wiki/src/contribute/l10n_tricks/git-clean-po.sh b/wiki/src/contribute/l10n_tricks/git-clean-po.sh
new file mode 100755
index 0000000..e185083
--- /dev/null
+++ b/wiki/src/contribute/l10n_tricks/git-clean-po.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+LANG=C
+
+git status | \
+ grep -E "modified:\s.+.pot?$" | \
+ cut -d ' ' -f 4 | \
+ while read po ; do
+ git checkout "$po" ;
+ done
diff --git a/wiki/src/contribute/working_together/roles/front_desk.mdwn b/wiki/src/contribute/working_together/roles/front_desk.mdwn
index eb67f7a..ed3bc1b 100644
--- a/wiki/src/contribute/working_together/roles/front_desk.mdwn
+++ b/wiki/src/contribute/working_together/roles/front_desk.mdwn
@@ -23,3 +23,4 @@
- Publish the monthly report.
- Do user support on IRC if you feel like it.
- Try to do something about the [new tickets](https://labs.riseup.net/code/projects/tails/issues?query_id=148) in Redmine.
+ - Forward incoming emails from press to tails-press@boum.org.
diff --git a/wiki/src/press.de.po b/wiki/src/press.de.po
index 1fd830b..1a2fd85 100644
--- a/wiki/src/press.de.po
+++ b/wiki/src/press.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-13 11:08+0300\n"
+"POT-Creation-Date: 2014-07-14 09:47+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"
@@ -103,6 +103,8 @@ msgid ""
" by Lena Kampf, Jacob Appelbaum and John Goetz (in German).\n"
" - In [If you read Boing Boing, the NSA considers you a target for deep surveillance](http://boingboing.net/2014/07/03/if-you-read-boing-boing-the-n.html)\n"
" by Cory Doctorow.\n"
+" - In [TOR, logiciel-clé de protection de la vie privée, dans le viseur de la NSA](http://www.lemonde.fr/pixels/article/2014/07/03/un-logiciel-cle-de-protection-de-la-vie-privee-dans-le-viseur-de-la-nsa_4450718_4408996.html)\n"
+" by Martin Untersinger on LeMonde.fr (in French).\n"
"* 2014-06-25: [Dai segreti di Snowden ai social: il raduno italiano degli hacker](http://corrieredibologna.corriere.it/bologna/notizie/cronaca/2014/25-giugno-2014/dai-segreti-snowden-social-raduno-italiano-hacker-223459532934.shtml) by Andrea Rinaldi, in Corriere di Bologna (in Italian).\n"
"* 2014-06-30: [Tails, il sistema operativo incognito che frega l'NSA](http://www.wired.it/gadget/computer/2014/04/15/tails-sistema-operativo-incognito/) by Carola Frediani, in Wired.it (in Italian).\n"
"* 2014: late April and early May, many press articles covered the\n"
diff --git a/wiki/src/press.fr.po b/wiki/src/press.fr.po
index 79dc94d..4044bf0 100644
--- a/wiki/src/press.fr.po
+++ b/wiki/src/press.fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-13 11:08+0300\n"
+"POT-Creation-Date: 2014-07-14 09:47+0300\n"
"PO-Revision-Date: 2014-01-12 12:39+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,6 +135,8 @@ msgid ""
" by Lena Kampf, Jacob Appelbaum and John Goetz (in German).\n"
" - In [If you read Boing Boing, the NSA considers you a target for deep surveillance](http://boingboing.net/2014/07/03/if-you-read-boing-boing-the-n.html)\n"
" by Cory Doctorow.\n"
+" - In [TOR, logiciel-clé de protection de la vie privée, dans le viseur de la NSA](http://www.lemonde.fr/pixels/article/2014/07/03/un-logiciel-cle-de-protection-de-la-vie-privee-dans-le-viseur-de-la-nsa_4450718_4408996.html)\n"
+" by Martin Untersinger on LeMonde.fr (in French).\n"
"* 2014-06-25: [Dai segreti di Snowden ai social: il raduno italiano degli hacker](http://corrieredibologna.corriere.it/bologna/notizie/cronaca/2014/25-giugno-2014/dai-segreti-snowden-social-raduno-italiano-hacker-223459532934.shtml) by Andrea Rinaldi, in Corriere di Bologna (in Italian).\n"
"* 2014-06-30: [Tails, il sistema operativo incognito che frega l'NSA](http://www.wired.it/gadget/computer/2014/04/15/tails-sistema-operativo-incognito/) by Carola Frediani, in Wired.it (in Italian).\n"
"* 2014: late April and early May, many press articles covered the\n"
diff --git a/wiki/src/press.mdwn b/wiki/src/press.mdwn
index 18d9add..33104f7 100644
--- a/wiki/src/press.mdwn
+++ b/wiki/src/press.mdwn
@@ -41,6 +41,8 @@ that have been published about Tails.
by Lena Kampf, Jacob Appelbaum and John Goetz (in German).
- In [If you read Boing Boing, the NSA considers you a target for deep surveillance](http://boingboing.net/2014/07/03/if-you-read-boing-boing-the-n.html)
by Cory Doctorow.
+ - In [TOR, logiciel-clé de protection de la vie privée, dans le viseur de la NSA](http://www.lemonde.fr/pixels/article/2014/07/03/un-logiciel-cle-de-protection-de-la-vie-privee-dans-le-viseur-de-la-nsa_4450718_4408996.html)
+ by Martin Untersinger on LeMonde.fr (in French).
* 2014-06-25: [Dai segreti di Snowden ai social: il raduno italiano degli hacker](http://corrieredibologna.corriere.it/bologna/notizie/cronaca/2014/25-giugno-2014/dai-segreti-snowden-social-raduno-italiano-hacker-223459532934.shtml) by Andrea Rinaldi, in Corriere di Bologna (in Italian).
* 2014-06-30: [Tails, il sistema operativo incognito che frega l'NSA](http://www.wired.it/gadget/computer/2014/04/15/tails-sistema-operativo-incognito/) by Carola Frediani, in Wired.it (in Italian).
* 2014: late April and early May, many press articles covered the
diff --git a/wiki/src/press.pt.po b/wiki/src/press.pt.po
index 1fd830b..1a2fd85 100644
--- a/wiki/src/press.pt.po
+++ b/wiki/src/press.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-07-13 11:08+0300\n"
+"POT-Creation-Date: 2014-07-14 09:47+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"
@@ -103,6 +103,8 @@ msgid ""
" by Lena Kampf, Jacob Appelbaum and John Goetz (in German).\n"
" - In [If you read Boing Boing, the NSA considers you a target for deep surveillance](http://boingboing.net/2014/07/03/if-you-read-boing-boing-the-n.html)\n"
" by Cory Doctorow.\n"
+" - In [TOR, logiciel-clé de protection de la vie privée, dans le viseur de la NSA](http://www.lemonde.fr/pixels/article/2014/07/03/un-logiciel-cle-de-protection-de-la-vie-privee-dans-le-viseur-de-la-nsa_4450718_4408996.html)\n"
+" by Martin Untersinger on LeMonde.fr (in French).\n"
"* 2014-06-25: [Dai segreti di Snowden ai social: il raduno italiano degli hacker](http://corrieredibologna.corriere.it/bologna/notizie/cronaca/2014/25-giugno-2014/dai-segreti-snowden-social-raduno-italiano-hacker-223459532934.shtml) by Andrea Rinaldi, in Corriere di Bologna (in Italian).\n"
"* 2014-06-30: [Tails, il sistema operativo incognito che frega l'NSA](http://www.wired.it/gadget/computer/2014/04/15/tails-sistema-operativo-incognito/) by Carola Frediani, in Wired.it (in Italian).\n"
"* 2014: late April and early May, many press articles covered the\n"