almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-28 17:32:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wrongly commited conflicting files

Browse source
This commit is contained in:
Alexis Métaireau 2021-11-01 18:38:58 +01:00
parent 35a74100cb
commit 2ff1ba4ed1
6 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ihatemoney/translations/cs/LC_MESSAGES/messages.po
View file

@ -3,11 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"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"
"Last-Translator: Clonewayx <fillip1@seznam.cz>\n"
"Language: cs\n"

4
ihatemoney/translations/fa/LC_MESSAGES/messages.po
View file

@ -3,11 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"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"
"Last-Translator: Automatically generated\n"
"Language: fa\n"

4
ihatemoney/translations/kn/LC_MESSAGES/messages.po
View file

@ -3,11 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"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"
"Last-Translator: a-g-rao <athrigrao@gmail.com>\n"
"Language: kn\n"

4
ihatemoney/translations/ms/LC_MESSAGES/messages.po
View file

@ -3,11 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"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"
"Last-Translator: Kemystra <izzmin97@gmail.com>\n"
"Language: ms\n"

4
ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po
View file

@ -3,11 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"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"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language: nb_NO\n"

4
ihatemoney/translations/sr/LC_MESSAGES/messages.po
View file

@ -3,11 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"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"
"Last-Translator: Rastko Sarcevic <ralesarcevic@gmail.com>\n"
"Language: sr\n"