moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merged master

Browse source
This commit is contained in:
Arvind Tiwari 2017-11-19 03:35:27 +05:30
commit 7ed0715f0d
20 changed files with 161 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ungleich_page/locale/de/LC_MESSAGES/django.po
View file

@ -8,7 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-10-26 03:32+0530\n"
=======
"POT-Creation-Date: 2017-11-06 00:24+0530\n"
>>>>>>> master
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -21,6 +25,12 @@ msgstr ""
msgid "Glasfaser menu"
msgstr ""
<<<<<<< HEAD
=======
msgid "\"Sorry, we could not find the page you are looking for!\""
msgstr ""
>>>>>>> master
msgid "Toggle navigation"
msgstr "Umschalten"