Private GIT

Skip to content
Snippets Groups Projects
Commit ab16b726 authored by miigotu's avatar miigotu
Browse files

Update pot, po, mo

parent 7f693873
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
locale/en_US.UTF-8/LC_MESSAGES/messages.po
+ 7
− 0
View file @ ab16b726
......@@ -7,7 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: sickrage 0.0.1\n"
"Report-Msgid-Bugs-To: miigotu@gmail.com\n"
<<<<<<< 6b9e54c0cf605a372fe8145e75dbbad883ad8bc0
"POT-Creation-Date: 2016-04-02 20:47-0700\n"
=======
"POT-Creation-Date: 2016-04-02 17:04-0700\n"
>>>>>>> Update pot, po, mo
"PO-Revision-Date: 2016-04-02 15:01-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: en_US <LL@li.org>\n"
......@@ -290,6 +294,7 @@ msgstr ""
msgid "IRC Chat:"
msgstr ""
<<<<<<< 6b9e54c0cf605a372fe8145e75dbbad883ad8bc0
#: gui/slick/views/layouts/main.mako:112
msgid "Show List"
msgstr ""
......@@ -484,3 +489,5 @@ msgstr ""
msgid "Now:"
msgstr ""
=======
>>>>>>> Update pot, po, mo
locale/messages.pot
+ 7
− 0
View file @ ab16b726
......@@ -8,7 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: sickrage 0.0.1\n"
"Report-Msgid-Bugs-To: miigotu@gmail.com\n"
<<<<<<< 6b9e54c0cf605a372fe8145e75dbbad883ad8bc0
"POT-Creation-Date: 2016-04-02 20:47-0700\n"
=======
"POT-Creation-Date: 2016-04-02 17:04-0700\n"
>>>>>>> Update pot, po, mo
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -289,6 +293,7 @@ msgstr ""
msgid "IRC Chat:"
msgstr ""
<<<<<<< 6b9e54c0cf605a372fe8145e75dbbad883ad8bc0
#: gui/slick/views/layouts/main.mako:112
msgid "Show List"
msgstr ""
......@@ -483,3 +488,5 @@ msgstr ""
msgid "Now:"
msgstr ""
=======
>>>>>>> Update pot, po, mo
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Another place to be (or not)