Fix bad merge

This commit is contained in:
Alexis Métaireau 2021-11-01 18:34:42 +01:00
parent 8d32f8e388
commit 5fdc056de0
6 changed files with 0 additions and 30 deletions

View file

@ -3,11 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2021-11-01 18:01+0100\n" "POT-Creation-Date: 2021-11-01 18:01+0100\n"
=======
"POT-Creation-Date: 2021-10-26 23:38+0200\n"
>>>>>>> master
"PO-Revision-Date: 2021-09-05 13:34+0000\n" "PO-Revision-Date: 2021-09-05 13:34+0000\n"
"Last-Translator: Clonewayx <fillip1@seznam.cz>\n" "Last-Translator: Clonewayx <fillip1@seznam.cz>\n"
"Language: cs\n" "Language: cs\n"
@ -1037,4 +1033,3 @@ msgstr ""
#~ msgid "Participants to notify" #~ msgid "Participants to notify"
#~ msgstr "" #~ msgstr ""

View file

@ -3,11 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2021-11-01 18:01+0100\n" "POT-Creation-Date: 2021-11-01 18:01+0100\n"
=======
"POT-Creation-Date: 2021-10-26 23:38+0200\n"
>>>>>>> master
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language: fa\n" "Language: fa\n"
@ -946,4 +942,3 @@ msgstr ""
#~ msgid "Participants to notify" #~ msgid "Participants to notify"
#~ msgstr "" #~ msgstr ""

View file

@ -3,11 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2021-11-01 18:01+0100\n" "POT-Creation-Date: 2021-11-01 18:01+0100\n"
=======
"POT-Creation-Date: 2021-10-26 23:38+0200\n"
>>>>>>> master
"PO-Revision-Date: 2021-10-17 04:56+0000\n" "PO-Revision-Date: 2021-10-17 04:56+0000\n"
"Last-Translator: a-g-rao <athrigrao@gmail.com>\n" "Last-Translator: a-g-rao <athrigrao@gmail.com>\n"
"Language: kn\n" "Language: kn\n"
@ -947,4 +943,3 @@ msgstr ""
#~ msgid "Participants to notify" #~ msgid "Participants to notify"
#~ msgstr "" #~ msgstr ""

View file

@ -3,11 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2021-11-01 18:01+0100\n" "POT-Creation-Date: 2021-11-01 18:01+0100\n"
=======
"POT-Creation-Date: 2021-10-26 23:38+0200\n"
>>>>>>> master
"PO-Revision-Date: 2021-07-18 12:32+0000\n" "PO-Revision-Date: 2021-07-18 12:32+0000\n"
"Last-Translator: Kemystra <izzmin97@gmail.com>\n" "Last-Translator: Kemystra <izzmin97@gmail.com>\n"
"Language: ms\n" "Language: ms\n"
@ -957,4 +953,3 @@ msgstr ""
#~ msgid "Participants to notify" #~ msgid "Participants to notify"
#~ msgstr "" #~ msgstr ""

View file

@ -3,11 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2021-11-01 18:01+0100\n" "POT-Creation-Date: 2021-11-01 18:01+0100\n"
=======
"POT-Creation-Date: 2021-10-26 23:38+0200\n"
>>>>>>> master
"PO-Revision-Date: 2021-07-18 20:48+0000\n" "PO-Revision-Date: 2021-07-18 20:48+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language: nb_NO\n" "Language: nb_NO\n"
@ -1229,4 +1225,3 @@ msgstr "Periode"
#~ msgid "Participants to notify" #~ msgid "Participants to notify"
#~ msgstr "legge til deltagere" #~ msgstr "legge til deltagere"

View file

@ -3,11 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2021-11-01 18:01+0100\n" "POT-Creation-Date: 2021-11-01 18:01+0100\n"
=======
"POT-Creation-Date: 2021-10-26 23:38+0200\n"
>>>>>>> master
"PO-Revision-Date: 2021-04-09 13:26+0000\n" "PO-Revision-Date: 2021-04-09 13:26+0000\n"
"Last-Translator: Rastko Sarcevic <ralesarcevic@gmail.com>\n" "Last-Translator: Rastko Sarcevic <ralesarcevic@gmail.com>\n"
"Language: sr\n" "Language: sr\n"
@ -1013,4 +1009,3 @@ msgstr "Period"
#~ msgid "Participants to notify" #~ msgid "Participants to notify"
#~ msgstr "" #~ msgstr ""