aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2015-10-05 16:51:51 +0200
committerjeroenpraat <jeroenpraat@xs4all.nl>2015-10-05 16:51:51 +0200
commit08813f1650cd2f896bd99a940b4ab141b262599b (patch)
treee41d6d9419cab240a6fa98fe7cede7fbd677cb5a
parent8f7dd2f858d299a3004cfb7862ca4e4e96379b37 (diff)
parentdbd981939c464fc2f13d106e663f29009c4bbea4 (diff)
downloadvolse-hubzilla-08813f1650cd2f896bd99a940b4ab141b262599b.tar.gz
volse-hubzilla-08813f1650cd2f896bd99a940b4ab141b262599b.tar.bz2
volse-hubzilla-08813f1650cd2f896bd99a940b4ab141b262599b.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
-rw-r--r--util/messages.po10
-rw-r--r--version.inc2
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