Correction suite à un conflit git mal géré

[website.git] / 404.en.po

diff --git a/404.en.po b/404.en.po
index 74fd113d170155378319c1eaea41637a15762e68..f99c5835db78badaa2932af6d64d31bd296adc86 100644 (file)
--- a/404.en.po
+++ b/404.en.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Nos oignons website\n"
-"POT-Creation-Date: 2015-05-27 15:11+0300\n"
+"POT-Creation-Date: 2020-07-06 11:56+0200\n"
 "PO-Revision-Date: 2013-05-26 16:32+0300\n"
 "Last-Translator: Nos oignons <webmaster@nos-oignons.net>\n"
 "Language-Team: English <webmaster@nos-oignons.net>\n"
@@ -10,11 +10,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!pagetemplate template=\"404.tmpl\"]]\n"
-msgstr "[[!pagetemplate template=\"404.tmpl\"]]\n"
-
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta title=\"Erreur quatre cent quatre\"]]\n"
@@ -25,8 +20,9 @@ msgid "Le fichier ou la page demandée n'existe pas."
 msgstr "The requested file or page can not be found."
 
 #. type: Title =
-#, no-wrap
-msgid "Plan du site\n"
+#, fuzzy, no-wrap
+#| msgid "Plan du site\n"
+msgid "Plan du site"
 msgstr "Site map\n"
 
 # Add Présentations to the english set, as it might still be of some interest
@@ -70,3 +66,6 @@ msgid ""
 "[Annuaire des listes de diffusions et de discussions](https://nos-oignons."
 "net/mailman/listinfo)"
 msgstr "[Index of mailling lists](https://nos-oignons.net/mailman/listinfo)"
+
+#~ msgid "[[!pagetemplate template=\"404.tmpl\"]]\n"
+#~ msgstr "[[!pagetemplate template=\"404.tmpl\"]]\n"