diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-29 22:06:16 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-29 22:06:16 -0400 |
commit | 34eb843fb486b9487f02553c1b791892bb7615fc (patch) | |
tree | 0cc1e343310753e018c0fb36f9848f227d5eb35a /view/en/update_fail_eml.tpl | |
parent | ecd1dab373a1fccb1663023f6515ed148475079d (diff) | |
parent | def6f0b408680c4e5f209890bbf1ad6bf40b5add (diff) | |
download | volse-hubzilla-34eb843fb486b9487f02553c1b791892bb7615fc.tar.gz volse-hubzilla-34eb843fb486b9487f02553c1b791892bb7615fc.tar.bz2 volse-hubzilla-34eb843fb486b9487f02553c1b791892bb7615fc.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
the heart should really be red.
fix location change notification
enhanced profile reporting for single values
add db field for removed account, which will also be the first test of update error checking
toggle to archive unfriends, though render them useless
indicate successful updates
diabook-themes: small fix
diabook-themes: bug/css-fixes
some constants for the db update failure possibilities
bring back the email and logging of update failures, but without the transactions
* master:
Diffstat (limited to 'view/en/update_fail_eml.tpl')
-rw-r--r-- | view/en/update_fail_eml.tpl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl new file mode 100644 index 000000000..f68a3dece --- /dev/null +++ b/view/en/update_fail_eml.tpl @@ -0,0 +1,11 @@ +Hey,
+I'm $sitename.
+The friendica developers released update $update recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and I can't do it alone. Please contact a
+friendica developer if you can not help me on your own. My database might be invalid.
+
+The error message is '$error'.
+
+I'm sorry,
+your friendica server at $siteurl
\ No newline at end of file |