harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	boot.php
	install/update.php
This commit is contained in:
redmatrix
2015-11-06 12:43:51 -08:00
parent 4620eb32d2 1c8f63f1e5
commit 9a42d63516
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/messages.po
View File

@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 2015-10-30.1201\n"
"Project-Id-Version: 2015-11-06.1208\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-30 00:04-0700\n"
"POT-Creation-Date: 2015-11-06 00:04-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
#: ../../include/photo/photo_driver.php:694 ../../mod/profile_photo.php:143
#: ../../include/photo/photo_driver.php:703 ../../mod/profile_photo.php:143
#: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
#: ../../mod/photos.php:92 ../../mod/photos.php:637
msgid "Profile Photos"
@@ -2798,15 +2798,15 @@ msgstr ""
msgid "Connection not found."
msgstr ""
#: ../../include/zot.php:684
#: ../../include/zot.php:685
msgid "Invalid data packet"
msgstr ""
#: ../../include/zot.php:700
#: ../../include/zot.php:701
msgid "Unable to verify channel signature"
msgstr ""
#: ../../include/zot.php:2208
#: ../../include/zot.php:2209
#, php-format
msgid "Unable to verify site signature for %s"
msgstr ""