diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-10-04 13:49:13 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-04 13:49:13 -0700 |
commit | 95d6d2644f25b208ce087ed48578be580973745e (patch) | |
tree | 5acd63eb4d78396b07d414f7f4da6fc43454cf3f | |
parent | 2e45b41902cbf3d55995c3a2d4cc5547663f04ed (diff) | |
parent | dbd981939c464fc2f13d106e663f29009c4bbea4 (diff) | |
download | volse-hubzilla-95d6d2644f25b208ce087ed48578be580973745e.tar.gz volse-hubzilla-95d6d2644f25b208ce087ed48578be580973745e.tar.bz2 volse-hubzilla-95d6d2644f25b208ce087ed48578be580973745e.zip |
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r-- | util/messages.po | 10 | ||||
-rw-r--r-- | version.inc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/util/messages.po b/util/messages.po index 341c042bb..07c6e08fa 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-09-25.1166\n" +"Project-Id-Version: 2015-10-02.1173\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" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3110,15 +3110,15 @@ msgstr "" msgid "Connection not found." msgstr "" -#: ../../include/zot.php:678 +#: ../../include/zot.php:684 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:694 +#: ../../include/zot.php:700 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2184 +#: ../../include/zot.php:2208 #, php-format msgid "Unable to verify site signature for %s" msgstr "" diff --git a/version.inc b/version.inc index e3915d929..4fcea74b5 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-10-01.1172 +2015-10-04.1175 |