Merge remote-tracking branch 'origin/master'

wiki/src/contribute/build.mdwn

@@ -101,7 +101,7 @@ Debian Wheezy and Jessie:
 Once all dependencies are installed, get the Tails sources and
 checkout the development branch:
 
-    git clone git://git.tails.boum.org/tails
+    git clone https://git-tails.immerda.ch/tails
     cd tails
     git checkout devel
 

wiki/src/contribute/design/Time_syncing.mdwn

@@ -127,7 +127,7 @@ custom version of the Perl HTP client into
 [[!tails_gitweb config/chroot_local-includes/usr/local/sbin/htpdate]].
 The repository we copied this script from can be found there:
 
-    git://git.tails.boum.org/htp
+    https://git-tails.immerda.ch/htp
 
 For reasons detailed bellow, this version of htpdate uses curl for all
 of its HTTP operations.

wiki/src/contribute/how/translate/with_Git.mdwn

@@ -176,7 +176,7 @@ ask on the [[mailing list for translators|translate#follow-up]], we will be glad
 Each [[language team|translate#language-teams]] keeps track of their contributors' repositories.
 To add one of these repositories as a `remote` in Git, use the following command line:
 
-       git remote add [name] git://git.tails.boum.org/[name].git
+       git remote add [name] https://git-tails.immerda.ch/[name].git
 
 For example:
 

wiki/src/doc.de.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Tails website\n"
-"POT-Creation-Date: 2015-02-09 16:00+0100\n"
+"POT-Creation-Date: 2015-02-09 16:04+0100\n"
 "PO-Revision-Date: 2014-07-18 23:32+0100\n"
 "Last-Translator: Tails translators <amnesia@boum.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,9 +27,20 @@ msgstr ""
 "Diese Dokumentation ist ständig in Bearbeitung und eine kollektive Aufgabe."
 
 #. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If this section doesn't answer your questions, you can also look at our "
-"[[FAQ|support/faq]]."
+"<p>If this section doesn't answer your questions, you can also look at our\n"
+"[[FAQ|support/faq]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text

wiki/src/doc.fr.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: SACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-09 16:00+0100\n"
+"POT-Creation-Date: 2015-02-09 16:04+0100\n"
 "PO-Revision-Date: 2014-04-25 06:01-0000\n"
 "Last-Translator: amnesia <amnesia@boum.org>\n"
 "Language-Team: SLANGUAGE <LL@li.org>\n"
@@ -28,9 +28,20 @@ msgstr ""
 "collectif."
 
 #. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If this section doesn't answer your questions, you can also look at our "
-"[[FAQ|support/faq]]."
+"<p>If this section doesn't answer your questions, you can also look at our\n"
+"[[FAQ|support/faq]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text

wiki/src/doc.pt.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-09 16:00+0100\n"
+"POT-Creation-Date: 2015-02-09 16:04+0100\n"
 "PO-Revision-Date: 2014-07-31 11:42-0300\n"
 "Last-Translator: Tails Developers <amnesia@boum.org>\n"
 "Language-Team: Portuguese <LL@li.org>\n"
@@ -28,9 +28,20 @@ msgid "This documentation is a work in progress and a collective task."
 msgstr "Esta documentação é um trabalho em progresso e uma tarefa coletiva."
 
 #. type: Plain text
+#, no-wrap
+msgid "<div class=\"tip\">\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If this section doesn't answer your questions, you can also look at our "
-"[[FAQ|support/faq]]."
+"<p>If this section doesn't answer your questions, you can also look at our\n"
+"[[FAQ|support/faq]].</p>\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "</div>\n"
 msgstr ""
 
 #. type: Plain text