summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-01-13 14:17:52 +0100
committeranonym <anonym@riseup.net>2016-01-13 14:17:52 +0100
commit9164f959ee64dcd27b7cd9581f675bd49127a341 (patch)
treead0ba64e99526b09c5c57c4d7951cc82e0fa30e7
parent12a739654b668d7a42743e186b242a09965bab73 (diff)
parentfc0229c38fbe87406c382d556621e2018e6e012c (diff)
Merge remote-tracking branch 'origin/master' into testing
-rw-r--r--wiki/src/local.rtl.css4
-rw-r--r--wiki/src/news/test_2.0-rc1.de.po8
-rw-r--r--wiki/src/news/test_2.0-rc1.fa.po8
-rw-r--r--wiki/src/news/test_2.0-rc1.fr.po8
-rw-r--r--wiki/src/news/test_2.0-rc1.mdwn6
-rw-r--r--wiki/src/news/test_2.0-rc1.pt.po8
6 files changed, 21 insertions, 21 deletions
diff --git a/wiki/src/local.rtl.css b/wiki/src/local.rtl.css
index aaf312b..3c0384f 100644
--- a/wiki/src/local.rtl.css
+++ b/wiki/src/local.rtl.css
@@ -32,8 +32,8 @@ html[dir="rtl"] .sidebar .download a {
}
html[dir="rtl"] #tor_check {
- float: left;
- margin: 0 0 2em 0;
+ float: right;
+ margin: 0 0 0 2em;
}
html[dir="rtl"] .pageheader #otherlanguages {
diff --git a/wiki/src/news/test_2.0-rc1.de.po b/wiki/src/news/test_2.0-rc1.de.po
index 46825d3..322422e 100644
--- a/wiki/src/news/test_2.0-rc1.de.po
+++ b/wiki/src/news/test_2.0-rc1.de.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-12 18:14+0100\n"
+"POT-Creation-Date: 2016-01-13 12:37+0100\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"
@@ -211,7 +211,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Or try the <a href=\"#automatic_upgrade\">automatic upgrade</a> from\n"
+" Or try the automatic upgrade from\n"
" 2.0~beta1 even though it is very slow.\n"
" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
msgstr ""
@@ -274,7 +274,7 @@ msgid ""
"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
"icon that allows to change to another keyboard layout, may be hidden. Other "
"information, such as the clock, may not be visible. Restarting Tails often "
-"solves this problem. ()[[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
msgstr ""
#. type: Bullet: '* '
@@ -292,7 +292,7 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"It is not possible to add and configure printers ([[!tails_ticket #10893]])."
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/news/test_2.0-rc1.fa.po b/wiki/src/news/test_2.0-rc1.fa.po
index 46825d3..322422e 100644
--- a/wiki/src/news/test_2.0-rc1.fa.po
+++ b/wiki/src/news/test_2.0-rc1.fa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-12 18:14+0100\n"
+"POT-Creation-Date: 2016-01-13 12:37+0100\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"
@@ -211,7 +211,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Or try the <a href=\"#automatic_upgrade\">automatic upgrade</a> from\n"
+" Or try the automatic upgrade from\n"
" 2.0~beta1 even though it is very slow.\n"
" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
msgstr ""
@@ -274,7 +274,7 @@ msgid ""
"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
"icon that allows to change to another keyboard layout, may be hidden. Other "
"information, such as the clock, may not be visible. Restarting Tails often "
-"solves this problem. ()[[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
msgstr ""
#. type: Bullet: '* '
@@ -292,7 +292,7 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"It is not possible to add and configure printers ([[!tails_ticket #10893]])."
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/news/test_2.0-rc1.fr.po b/wiki/src/news/test_2.0-rc1.fr.po
index 46825d3..322422e 100644
--- a/wiki/src/news/test_2.0-rc1.fr.po
+++ b/wiki/src/news/test_2.0-rc1.fr.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-12 18:14+0100\n"
+"POT-Creation-Date: 2016-01-13 12:37+0100\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"
@@ -211,7 +211,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Or try the <a href=\"#automatic_upgrade\">automatic upgrade</a> from\n"
+" Or try the automatic upgrade from\n"
" 2.0~beta1 even though it is very slow.\n"
" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
msgstr ""
@@ -274,7 +274,7 @@ msgid ""
"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
"icon that allows to change to another keyboard layout, may be hidden. Other "
"information, such as the clock, may not be visible. Restarting Tails often "
-"solves this problem. ()[[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
msgstr ""
#. type: Bullet: '* '
@@ -292,7 +292,7 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"It is not possible to add and configure printers ([[!tails_ticket #10893]])."
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
msgstr ""
#. type: Bullet: '* '
diff --git a/wiki/src/news/test_2.0-rc1.mdwn b/wiki/src/news/test_2.0-rc1.mdwn
index 2057920..0a295fb 100644
--- a/wiki/src/news/test_2.0-rc1.mdwn
+++ b/wiki/src/news/test_2.0-rc1.mdwn
@@ -88,7 +88,7 @@ to port it to GNOME Shell (issued in January, 2015) was unsuccessful.
<a class="download-signature"
href="https://tails.boum.org/torrents/files/tails-i386-2.0~rc1.iso.sig">Tails 2.0~rc1 signature</a>
- Or try the <a href="#automatic_upgrade">automatic upgrade</a> from
+ Or try the automatic upgrade from
2.0~beta1 even though it is very slow.
Note that there is no automatic upgrade from 1.8.2 to this release.
@@ -125,7 +125,7 @@ Known issues in 2.0~rc1
icon, or the icon that allows to change to another keyboard layout,
may be hidden. Other information, such as the clock, may not
be visible. Restarting Tails often solves this problem.
- ()[[!tails_ticket 10576]] and [[!tails_ticket 10807]])
+ ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])
* Network interfaces sometimes remain turned off ([[!tails_ticket 9012]]).
If this happens to you, please [[report the error|doc/first_steps/bug_reporting]]
@@ -136,6 +136,6 @@ Known issues in 2.0~rc1
GeForce GTX 960.
* It is not possible to add and configure printers
- ([[!tails_ticket #10893]]).
+ ([[!tails_ticket 10893]]).
* [[Longstanding known issues|support/known_issues]]
diff --git a/wiki/src/news/test_2.0-rc1.pt.po b/wiki/src/news/test_2.0-rc1.pt.po
index 46825d3..322422e 100644
--- a/wiki/src/news/test_2.0-rc1.pt.po
+++ b/wiki/src/news/test_2.0-rc1.pt.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-01-12 18:14+0100\n"
+"POT-Creation-Date: 2016-01-13 12:37+0100\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"
@@ -211,7 +211,7 @@ msgstr ""
#. type: Plain text
#, no-wrap
msgid ""
-" Or try the <a href=\"#automatic_upgrade\">automatic upgrade</a> from\n"
+" Or try the automatic upgrade from\n"
" 2.0~beta1 even though it is very slow.\n"
" Note that there is no automatic upgrade from 1.8.2 to this release.\n"
msgstr ""
@@ -274,7 +274,7 @@ msgid ""
"are not displayed entirely, or at all. For example, the Vidalia icon, or the "
"icon that allows to change to another keyboard layout, may be hidden. Other "
"information, such as the clock, may not be visible. Restarting Tails often "
-"solves this problem. ()[[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
+"solves this problem. ([[!tails_ticket 10576]] and [[!tails_ticket 10807]])"
msgstr ""
#. type: Bullet: '* '
@@ -292,7 +292,7 @@ msgstr ""
#. type: Bullet: '* '
msgid ""
-"It is not possible to add and configure printers ([[!tails_ticket #10893]])."
+"It is not possible to add and configure printers ([[!tails_ticket 10893]])."
msgstr ""
#. type: Bullet: '* '