merge with main git using merge_canonical_changes.py.

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.ar.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.ca.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.id.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.pl.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.ru.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.sr_Latn.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.tr.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.zh.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.zh_TW.po: updating as wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po has changed.
wiki/src/news/version_4.12.ar.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.ca.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.id.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.pl.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.ru.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.sr_Latn.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.tr.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.zh.po: updating as wiki/src/news/version_4.12.de.po has changed.
wiki/src/news/version_4.12.zh_TW.po: updating as wiki/src/news/version_4.12.de.po has changed.

wiki/src/blueprint/user_survey.mdwn

@@ -568,6 +568,12 @@ F. I don't want my data to be gathered by corporations and governments
 
   [Single Ease Question](https://measuringu.com/seq10/)
 
+- **Tails' capabilities meet my requirements.**
+
+- **Tails is easy to use.**
+
+  [UMUX-Lite](https://measuringu.com/umux-lite/)
+
 - **What one things would you improve on our website?**
 
   Short text:

wiki/src/blueprint/wi-fi_adapters.mdwn

@@ -30,6 +30,7 @@ These adapters didn't work and are superseded or not manufactured anymore:
 Other USB Wi-Fi adapters that work in Tails but have no advantage
 =================================================================
 
+- [Edimax EW-7811Un](https://www.amazon.com/d/B003MTTJOY) (stopped working in version 2)
 - [CanaKit Raspberry Pi](https://www.amazon.com/d/B00GFAN498) (same size & price as Edimax)
 - [Panda Wireless Mini](https://www.amazon.com/d/B003283M6Q) (larger & more expensive)
 - [Panda Wireless N600](https://www.amazon.com/d/B00U2SIS0O) (larger & more expensive)

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.ar.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.ca.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\n"
 "PO-Revision-Date: 2020-04-24 09:35+0000\n"
 "Last-Translator: Benjamin Held <Benjamin.Held@protonmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -124,7 +124,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.es.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.fa.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\n"
 "PO-Revision-Date: 2020-01-12 13:29+0000\n"
 "Last-Translator: xin <xin@riseup.net>\n"
 "Language-Team: \n"
@@ -131,11 +131,17 @@ msgid "  <!--  <tr><td>D-Link</td><td>DWA-121</td><td>Nano</td><td>150 Mbit/s</t
 msgstr "<!--  <tr><td>D-Link</td><td>DWA-121</td><td>Nano</td><td>150 Mbit/s</td><td>6$</td><td>Non</td><td><a href=\"https://www.amazon.com/d/B004X8R7HY\">Amazon</a></td></tr>-->\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  <table>\n"
+#| "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
+#| "  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
+#| "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
+#| "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
+#| "  </table>\n"
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.id.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.it.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\n"
 "PO-Revision-Date: 2020-03-08 15:37+0000\n"
 "Last-Translator: gallium69 <gallium69@riseup.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -124,7 +124,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn

@@ -53,7 +53,6 @@ To connect to the Internet, you can try to:
 
   <table>
   <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>
-  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href="https://www.amazon.com/d/B003MTTJOY">Amazon</a></td></tr>
   <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href="https://www.amazon.com/d/B00762YNMG">Amazon</a></td></tr>
   <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href="https://www.amazon.com/d/B00EQT0YK2">Amazon</a></td></tr>
   </table>

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.pl.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.pt.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.ru.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.sr_Latn.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.tr.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.zh.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.zh_TW.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-08-24 11:56+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -122,7 +122,6 @@ msgstr ""
 msgid ""
 "  <table>\n"
 "  <tr><th>Vendor</th><th>Model</th><th>Size</th><th>Speed</th><th>Price</th><th>Buy offline</th><th>Buy online</th></tr>\n"
-"  <tr><td>Edimax</td><td>EW-7811Un</td><td>Nano</td><td>150 Mbit/s</td><td>$10</td><td>No</td><td><a href=\"https://www.amazon.com/d/B003MTTJOY\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>Ultra</td><td>Nano</td><td>150 Mbit/s</td><td>$12</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00762YNMG\">Amazon</a></td></tr>\n"
 "  <tr><td>Panda Wireless</td><td>PAU05</td><td>Small</td><td>300 Mbit/s</td><td>$14</td><td>No</td><td><a href=\"https://www.amazon.com/d/B00EQT0YK2\">Amazon</a></td></tr>\n"
 "  </table>\n"

wiki/src/install/inc/steps/pc_boot_menu.inline.html

@@ -48,6 +48,7 @@ to start on the USB stick:</p>
   <table>
     <tr><th>Manufacturer</th><th>Key</th></tr>
     <tr><td>Acer</td><td>Esc, F12, F9</td></tr>
+    <tr><td>Apple</td><td>Option</td></tr>
     <tr><td>Asus</td><td>Esc, F8</td></tr>
     <tr><td>Clevo</td><td>F7</td></tr>
     <tr><td>Dell</td><td>F12</td></tr>

wiki/src/news/version_4.12.ar.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-20 10:39+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta date=\"Tue, 20 Nov 2020 12:34:56 +0000\"]]\n"
+msgid "[[!meta date=\"Tue, 20 Oct 2020 12:34:56 +0000\"]]\n"
 msgstr ""
 
 #. type: Plain text

wiki/src/news/version_4.12.ca.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-20 10:39+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta date=\"Tue, 20 Nov 2020 12:34:56 +0000\"]]\n"
+msgid "[[!meta date=\"Tue, 20 Oct 2020 12:34:56 +0000\"]]\n"
 msgstr ""
 
 #. type: Plain text

wiki/src/news/version_4.12.de.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-20 10:39+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta date=\"Tue, 20 Nov 2020 12:34:56 +0000\"]]\n"
+msgid "[[!meta date=\"Tue, 20 Oct 2020 12:34:56 +0000\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -38,9 +38,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_4.11]]. You should "
-"upgrade as soon as possible."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_4.11]]. You should upgrade as soon as possible."
 msgstr ""
 
 #. type: Plain text
@@ -55,8 +54,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- Update *Tor Browser* to "
-"[10.0.2](https://blog.torproject.org/new-release-tor-browser-1002)."
+"- Update *Tor Browser* to [10.0.2](https://blog.torproject.org/new-release-"
+"tor-browser-1002)."
 msgstr ""
 
 #. type: Plain text
@@ -71,8 +70,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- Add a button to cancel an automated upgrade while "
-"downloading. ([[!tails_ticket 17310]])"
+"- Add a button to cancel an automated upgrade while downloading. ([[!"
+"tails_ticket 17310]])"
 msgstr ""
 
 #. type: Plain text
@@ -89,14 +88,14 @@ msgstr ""
 
 #. type: Bullet: '- '
 msgid ""
-"Anonymize URLs in the technical details provided by *WhisperBack*.  "
-"([[!tails_ticket 17147]])"
+"Anonymize URLs in the technical details provided by *WhisperBack*.  ([[!"
+"tails_ticket 17147]])"
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
 msgstr ""
 
 #. type: Plain text
@@ -150,8 +149,7 @@ msgstr ""
 #. type: Bullet: '- '
 msgid ""
 "If you cannot do an automatic upgrade or if Tails fails to start after an "
-"automatic upgrade, please try to do a [[manual "
-"upgrade|doc/upgrade/#manual]]."
+"automatic upgrade, please try to do a [[manual upgrade|doc/upgrade/#manual]]."
 msgstr ""
 
 #. type: Title ##
@@ -178,8 +176,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<div class=\"caution\"><p>The Persistent Storage on the USB stick will be "
-"lost if\n"
+"<div class=\"caution\"><p>The Persistent Storage on the USB stick will be lost if\n"
 "you install instead of upgrading.</p></div>\n"
 msgstr ""
 
@@ -219,7 +216,6 @@ msgstr ""
 #, no-wrap
 msgid ""
 "We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate/?r=4.12\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate/?r=4.12\">donating</a> is only one of\n"
 "them). Come [[talk to us|about/contact#tails-dev]]!\n"
 msgstr ""

wiki/src/news/version_4.12.es.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-20 10:39+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta date=\"Tue, 20 Nov 2020 12:34:56 +0000\"]]\n"
+msgid "[[!meta date=\"Tue, 20 Oct 2020 12:34:56 +0000\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -38,9 +38,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_4.11]]. You should "
-"upgrade as soon as possible."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_4.11]]. You should upgrade as soon as possible."
 msgstr ""
 
 #. type: Plain text
@@ -55,8 +54,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- Update *Tor Browser* to "
-"[10.0.2](https://blog.torproject.org/new-release-tor-browser-1002)."
+"- Update *Tor Browser* to [10.0.2](https://blog.torproject.org/new-release-"
+"tor-browser-1002)."
 msgstr ""
 
 #. type: Plain text
@@ -71,8 +70,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- Add a button to cancel an automated upgrade while "
-"downloading. ([[!tails_ticket 17310]])"
+"- Add a button to cancel an automated upgrade while downloading. ([[!"
+"tails_ticket 17310]])"
 msgstr ""
 
 #. type: Plain text
@@ -89,14 +88,14 @@ msgstr ""
 
 #. type: Bullet: '- '
 msgid ""
-"Anonymize URLs in the technical details provided by *WhisperBack*.  "
-"([[!tails_ticket 17147]])"
+"Anonymize URLs in the technical details provided by *WhisperBack*.  ([[!"
+"tails_ticket 17147]])"
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
 msgstr ""
 
 #. type: Plain text
@@ -150,8 +149,7 @@ msgstr ""
 #. type: Bullet: '- '
 msgid ""
 "If you cannot do an automatic upgrade or if Tails fails to start after an "
-"automatic upgrade, please try to do a [[manual "
-"upgrade|doc/upgrade/#manual]]."
+"automatic upgrade, please try to do a [[manual upgrade|doc/upgrade/#manual]]."
 msgstr ""
 
 #. type: Title ##
@@ -178,8 +176,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"<div class=\"caution\"><p>The Persistent Storage on the USB stick will be "
-"lost if\n"
+"<div class=\"caution\"><p>The Persistent Storage on the USB stick will be lost if\n"
 "you install instead of upgrading.</p></div>\n"
 msgstr ""
 
@@ -219,7 +216,6 @@ msgstr ""
 #, no-wrap
 msgid ""
 "We need your help and there are many ways to [[contribute to\n"
-"Tails|contribute]] (<a "
-"href=\"https://tails.boum.org/donate/?r=4.12\">donating</a> is only one of\n"
+"Tails|contribute]] (<a href=\"https://tails.boum.org/donate/?r=4.12\">donating</a> is only one of\n"
 "them). Come [[talk to us|about/contact#tails-dev]]!\n"
 msgstr ""

wiki/src/news/version_4.12.fa.po

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-20 10:39+0200\n"
+"POT-Creation-Date: 2020-10-20 17:21+0000\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"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!meta date=\"Tue, 20 Nov 2020 12:34:56 +0000\"]]\n"
+msgid "[[!meta date=\"Tue, 20 Oct 2020 12:34:56 +0000\"]]\n"
 msgstr ""
 
 #. type: Plain text
@@ -38,9 +38,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"This release fixes [[many security "
-"vulnerabilities|security/Numerous_security_holes_in_4.11]]. You should "
-"upgrade as soon as possible."
+"This release fixes [[many security vulnerabilities|security/"
+"Numerous_security_holes_in_4.11]]. You should upgrade as soon as possible."
 msgstr ""
 
 #. type: Plain text
@@ -55,8 +54,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- Update *Tor Browser* to "
-"[10.0.2](https://blog.torproject.org/new-release-tor-browser-1002)."
+"- Update *Tor Browser* to [10.0.2](https://blog.torproject.org/new-release-"
+"tor-browser-1002)."
 msgstr ""
 
 #. type: Plain text
@@ -71,8 +70,8 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"- Add a button to cancel an automated upgrade while "
-"downloading. ([[!tails_ticket 17310]])"
+"- Add a button to cancel an automated upgrade while downloading. ([[!"
+"tails_ticket 17310]])"
 msgstr ""
 
 #. type: Plain text
@@ -89,14 +88,14 @@ msgstr ""
 
 #. type: Bullet: '- '
 msgid ""
-"Anonymize URLs in the technical details provided by *WhisperBack*.  "
-"([[!tails_ticket 17147]])"
+"Anonymize URLs in the technical details provided by *WhisperBack*.  ([[!"
+"tails_ticket 17147]])"
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"For more details, read our [[!tails_gitweb debian/changelog "
-"desc=\"changelog\"]]."
+"For more details, read our [[!tails_gitweb debian/changelog desc=\"changelog"
+"\"]]."
 msgstr ""
 
 #. type: Plain text
@@ -150,8 +149,7 @@ msgstr ""
 #. type: Bullet: '- '
 msgid ""
 "If you cannot do an automatic upgrade or if Tails fails to start after an "
-"automatic upgrade, please try to do a [[manual "
-"upgrade|doc/upgrade/#manual]]."
+"automatic upgrade, please try to do a [[manual upgrade|doc/upgrade/#manual]]."
 msgstr ""
 
 #. type: Title ##
@@ -178,8 +176,7 @@ msgstr ""
 #. type: Plain text