From: Daniel Jakots <vigdis@chown.me>
Date: Tue, 9 Dec 2014 17:09:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://bulbe/website
X-Git-Url: https://nos-oignons.net/gitweb/website.git/commitdiff_plain/50c3034ad3dcc6fbe1b2a6d000e6ee389fd0ec95?hp=-c

Merge branch 'master' of ssh://bulbe/website
---

50c3034ad3dcc6fbe1b2a6d000e6ee389fd0ec95
diff --combined Donnez.en.po
index 103d462,828bd40..b7d91e1
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@@ -2,7 -2,7 +2,7 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: Nos oignons website\n"
- "POT-Creation-Date: 2014-12-09 17:26+0100\n"
+ "POT-Creation-Date: 2014-12-09 18:01+0100\n"
  "PO-Revision-Date: 2014-07-11 10:42+0200\n"
  "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
  "Language-Team: English <webmaster@nos-oignons.net>\n"
@@@ -31,15 -31,15 +31,15 @@@ msgstr "
  
  #. type: Content of: <h3>
  msgid "État de la trésorerie"
 -msgstr ""
 +msgstr "Financial state"
  
  #. type: Content of: <div><p>
 -msgid "Un oignon correspond à 1 mois de fonctionnement."
 -msgstr ""
 +msgid "Un oignon correspond à un mois de fonctionnement."
 +msgstr "An oignon represents one month of operation"
  
  #. type: Content of: <div><p>
 -msgid "Au dela de 6 mois, nous essayons de mettre en place un nouveau relai."
 -msgstr ""
 +msgid "Au dela de 6 mois, nous essayons de mettre en place un nouveau noeud de sorti."
 +msgstr "When we have fund for more than 6 months we try to have a new exit node"
  
  #. type: Content of: <h3>
  msgid "Par carte bleue"
@@@ -91,11 -91,6 +91,6 @@@ msgstr "Other
  #.   </div>
  #.   
  #. type: Content of: <form>
- #, fuzzy
- #| msgid ""
- #| "<input type=\"hidden\" name=\"lang\" value=\"fr\" /> <input type=\"hidden"
- #| "\" name=\"dest\" value=\"oignon\" /> <input type=\"submit\" name=\"submit"
- #| "\" id=\"submit\" value=\"Soutenez le réseau Tor…\" />"
  msgid ""
  "</select> <input type=\"text\" name=\"custom-amount\" id=\"custom-amount\" /"
  "> <input type=\"hidden\" name=\"lang\" value=\"fr\" /> <input type=\"hidden"