diff options
Diffstat (limited to 'translations/fr/archaeological_warehouse.po')
| -rw-r--r-- | translations/fr/archaeological_warehouse.po | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index c2b34139a..b0ec89e0e 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -5,14 +5,18 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2018. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" +<<<<<<< HEAD "PO-Revision-Date: 2018-05-31 06:38+0000\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" +======= +"PO-Revision-Date: 2018-06-04 03:34+0000\n" +"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +>>>>>>> Update translations "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" |