diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-06 12:43:51 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-06 12:43:51 -0800 |
| commit | 9a42d63516553e8fcea3190c012ca1237e7cbf0a (patch) | |
| tree | a236a1fe58046cc95ee2d803d3e559e3c0365091 /util | |
| parent | 4620eb32d29e1dc4058db66a6caf9f51cf01397b (diff) | |
| parent | 1c8f63f1e50726c00220cfd98f259d2d35d37106 (diff) | |
| download | volse-hubzilla-9a42d63516553e8fcea3190c012ca1237e7cbf0a.tar.gz volse-hubzilla-9a42d63516553e8fcea3190c012ca1237e7cbf0a.tar.bz2 volse-hubzilla-9a42d63516553e8fcea3190c012ca1237e7cbf0a.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
boot.php
install/update.php
Diffstat (limited to 'util')
| -rw-r--r-- | util/messages.po | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/util/messages.po b/util/messages.po index 9693476e9..f3c9782f3 100644 --- a/util/messages.po +++ b/util/messages.po @@ -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 "" |