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
This commit is contained in:
redmatrix 2015-10-04 13:49:13 -07:00
commit 95d6d2644f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2015-09-25.1166\n" "Project-Id-Version: 2015-10-02.1173\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-25 00:05-0700\n" "POT-Creation-Date: 2015-10-02 00:04-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -3110,15 +3110,15 @@ msgstr ""
msgid "Connection not found." msgid "Connection not found."
msgstr "" msgstr ""
#: ../../include/zot.php:678 #: ../../include/zot.php:684
msgid "Invalid data packet" msgid "Invalid data packet"
msgstr "" msgstr ""
#: ../../include/zot.php:694 #: ../../include/zot.php:700
msgid "Unable to verify channel signature" msgid "Unable to verify channel signature"
msgstr "" msgstr ""
#: ../../include/zot.php:2184 #: ../../include/zot.php:2208
#, php-format #, php-format
msgid "Unable to verify site signature for %s" msgid "Unable to verify site signature for %s"
msgstr "" msgstr ""

2
version.inc
View File

@ -1 +1 @@
2015-10-01.1172 2015-10-04.1175