path: root/wiki/src/
diff options
authorTails developers <>2014-05-26 10:10:39 +0000
committerTails developers <>2014-05-26 10:12:47 +0000
commita86249bf720e1e5b474f36906bedbf4ff6a6270e (patch)
tree5aeb777a03276d02d944fb4798a1029ff7be4710 /wiki/src/
parent5281f87ca5c372543826c1247440754dc61f9477 (diff)
parent755cdb1e3da35df10c4f14d33b901a023232c3a6 (diff)
Merge branch 'devel' into doc/wheezy
Conflicts: wiki/src/ wiki/src/doc/first_steps/ wiki/src/doc/get/ wiki/src/
Diffstat (limited to 'wiki/src/')
1 files changed, 9 insertions, 6 deletions
diff --git a/wiki/src/ b/wiki/src/
index b44f2cc..44f70a3 100644
--- a/wiki/src/
+++ b/wiki/src/
@@ -46,8 +46,8 @@ msgid ""
"all connections to the Internet are forced to go through [[the Tor network|"
msgstr ""
-"todas as conexões feitas à Internet são forçadas a passarem [[pela rede Tor|"
+"todas as conexões feitas à Internet são passam necessariamente [[pela rede "
#. type: Content of: <div><div><ul><li>
msgid ""
@@ -110,11 +110,11 @@ msgstr "[[!img lib/debian.png link=\"no\"]]"
#. type: Content of: <div><div><p>
msgid "Tails is built upon <a href=\"\">Debian</a>."
msgstr ""
-"Tails é construído a partir do <a href=\"\">Debian</a>."
+"Tails é desenvolvido a partir do <a href=\"\">Debian</a>."
-#. type: Content of: <div><div><p>
-msgid "Free Software"
-msgstr "Software Livre"
+#. type: Content of: <div><div>
+msgid "[[!img lib/free-software.png link=\"no\"]]"
+msgstr "[[!img lib/free-software.png link=\"no\"]]"
#. type: Content of: <div><div><p>
msgid "Tails is [[Free Software|doc/about/license]]."
@@ -130,6 +130,9 @@ msgid ""
msgstr ""
"Tails envia seu tráfego pelo <a href=\"\">Tor</a>."
+#~ msgid "Free Software"
+#~ msgstr "Software Livre"
#~ msgid "It helps you to:"
#~ msgstr "Ele ajuda você a:"