summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-04-19 20:17:31 +0200
committeranonym <anonym@riseup.net>2017-04-19 20:17:31 +0200
commit50f409fe63160adb003a4a5500e83f8fe35af7bc (patch)
treed4402f55fe4220cd8c36d90ba38ce7141d56c0fa
parentb79e13997c5a697d72ba8ad09c6dcc34f5c14c7d (diff)
parentfe917e7fd1bb18588f6428f79cecf16070736dd8 (diff)
Merge branch 'devel' into feature/stretch
-rw-r--r--debian/changelog6
-rw-r--r--wiki/src/blueprint/l10n_Italian.mdwn3
-rw-r--r--wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po4
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp16
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml5
-rw-r--r--wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp16
7 files changed, 9 insertions, 46 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b0fb1c..7eda84b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,12 @@ tails (3.0~beta4) unstable; urgency=medium
-- Tails developers <tails@boum.org> Tue, 18 Apr 2017 13:01:25 +0000
+tails (2.12.1) UNRELEASED; urgency=medium
+
+ * Dummy entry.
+
+ -- Tails developers <tails@boum.org> Wed, 19 Apr 2017 19:18:06 +0200
+
tails (2.12) unstable; urgency=medium
* Major changes
diff --git a/wiki/src/blueprint/l10n_Italian.mdwn b/wiki/src/blueprint/l10n_Italian.mdwn
index 940379c..0b36ba7 100644
--- a/wiki/src/blueprint/l10n_Italian.mdwn
+++ b/wiki/src/blueprint/l10n_Italian.mdwn
@@ -1,2 +1 @@
-Hello!
-<a href="http://onlinecialisrxd.com/">cialis super active</a> ,
+Im thankful for the post. Great.
diff --git a/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po b/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po
index 603df55..63017ba 100644
--- a/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po
+++ b/wiki/src/doc/anonymous_internet/why_tor_is_slow.de.po
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2017-02-25 15:24+0100\n"
+"POT-Creation-Date: 2017-04-19 19:29+0300\n"
"PO-Revision-Date: 2017-04-14 18:28+0200\n"
"Last-Translator: spriver <spriver@autistici.org>\n"
+"Language-Team: \n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.11\n"
-"Language-Team: \n"
#. type: Plain text
#, no-wrap
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml
deleted file mode 100644
index 938ffdd..0000000
--- a/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: i386
-channel: alpha
-product-name: Tails
-product-version: '2.11.1'
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp
deleted file mode 100644
index acbbe24..0000000
--- a/wiki/src/upgrade/v1/Tails/2.11.1/i386/alpha/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuiwiL0SsAO2YmTiTmP7GvHUqPbYFAljGgRoACgkQmP7GvHUq
-PbZslA//Ti/IRyR/nW2OyKivF9iHc8E5jQ492ufZIVOTpUo79DjQqaL3H96i3j8Z
-Vbk8RxNizA9BDFWB8EpuNR9d3wgpmJXAHAe91TAacRgGLDsqn4YQpAMabGQ4lsjj
-Q7hCKfLhmdiWFrkQwA8yGoPmw54vfUOeuYU6+J2xZTzsMycT0r37XxiDbCIDbLA8
-mWxd74P9/3hJ0loYeSkhd9HlR1k0q3RfX31gGKnI8FOpoUqtmin9WKE6i5W/B0N+
-UPYUYwve7yJ8u0vwzWxcg8cQNthcACG7vy9Q3R03eF7kTjsIvBdUarPSTR+m4wBk
-g34ORYpwTchbRkflyITJVnpC5EdNPLi+7AJsw5iItIizlxUNQQQ5/MLBQF1HMurf
-Syfa+SzqizJf0EHE3h3QiWMbITiGrx0YiBFMZZlR4VMhz47AHrHGAL7b/eJVzk2v
-zPok5hXlz/G1QFAAd7weL/cVnZAN/E7FQd0xb7sJfHId7bwV0PW6zWEE9cLIacvT
-u8+H23xjwCzy/Z8JFmuofbETtuzRGS0Wu0d6vDcDUBSnt1bGawnMGvCdUqGLeDch
-SxyCyXUDhhA4Q6c0wXQhUe+nxGlK1hf6QLGb8scMEJBwkZvSlUR6VFJojZmngsFH
-d3+jLEiith3IWzQWJ8x66RK3Z3/dwUEIHt9atRd0Zscply82AJo=
-=c9QW
------END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml
deleted file mode 100644
index 89e1f36..0000000
--- a/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-build-target: i386
-channel: stable
-product-name: Tails
-product-version: '2.11.1'
diff --git a/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp
deleted file mode 100644
index 1af8040..0000000
--- a/wiki/src/upgrade/v1/Tails/2.11.1/i386/stable/upgrades.yml.pgp
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEuiwiL0SsAO2YmTiTmP7GvHUqPbYFAljGgREACgkQmP7GvHUq
-PbbYwQ/8D/RUOiuLYaVHMOSMNI4GP5c5Nfnp1F/0JUO5YoHdojBLMPgxJ6O/R+0A
-7zt51ToVTTkPdBmrpr3LBFU70VGUaSIEc/dgj9zikoG9U0ebts33rzFGVO8lyiPl
-pbjKZRknQDCVveXp9J3MFVx1v0OO8YecN7vpD5sMuh0SyQSaFs2B7N6bcpfHvLSs
-yrVuR0085G3B2O14NwqLmrqv0aP8LN5M8CEEW8mMCICuyroZQEtoR4fseC1zQwDu
-T7Pf95CMN5Sx4cvlbPRvLyZFiDG6KaSiTQwX/1nRipnIeqWyptdaDWARZKPSzwNF
-aA+NH8VHMnoGF4Kslw/sqY9Q9qhHQqyVWQuvG0yk24oL5SADFwi7W0tEU47fgZOg
-3m/hvQaYOiwb21OZgyjPCVC6JqyNmfW6g423gAqdogYng986QBlOlamy8HySJMmr
-nsIj6Hm3RgNpJ5haYzxILz0UxzbMRccYWXfLyI5a9DqdkgYaybVSw5y/uiI/tv2E
-2eqfN+am5Grr48pqn4mqAOwA7tLCM5adfbgDRxFA25T9NzkwlXTSCQ4Yp8bp6W0E
-041UA4Bd144xRKfxrR0Wzi842fHk1onsmeFF0QNUgolHwkyR99ZClZIhfAZkYG4w
-hRGWqFzQ4DLnQdEBle9Nigko4bLCkqUgJ7J8afHfjgipCuYq2N8=
-=wXPr
------END PGP SIGNATURE-----