summaryrefslogtreecommitdiff
path: root/lib/plugins/extension/lang/en
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-09-28 13:46:04 +0200
committerGerrit Uitslag <klapinklapin@gmail.com>2014-09-28 13:46:04 +0200
commitb79379f2e598abaa2febb299cdfcebe0a95d034c (patch)
tree7098c3a758f606394f4b38d679b5198f8973cffe /lib/plugins/extension/lang/en
parent73411587cb6d2c54aefebe90c87799c4aa1d31ec (diff)
parentda9572711f54d13ce3c5506971154b0bc359723f (diff)
downloadrpg-b79379f2e598abaa2febb299cdfcebe0a95d034c.tar.gz
rpg-b79379f2e598abaa2febb299cdfcebe0a95d034c.tar.bz2
Merge remote-tracking branch 'origin/master' into overridablelangstrings
Conflicts: inc/plugin.php
Diffstat (limited to 'lib/plugins/extension/lang/en')
-rw-r--r--lib/plugins/extension/lang/en/lang.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/plugins/extension/lang/en/lang.php b/lib/plugins/extension/lang/en/lang.php
index 5224f694a..72c9b9e2d 100644
--- a/lib/plugins/extension/lang/en/lang.php
+++ b/lib/plugins/extension/lang/en/lang.php
@@ -96,4 +96,6 @@ $lang['nopluginperms'] = 'Plugin directory is not writable';
$lang['git'] = 'This extension was installed via git, you may not want to update it here.';
$lang['install_url'] = 'Install from URL:';
-$lang['install_upload'] = 'Upload Extension:'; \ No newline at end of file
+$lang['install_upload'] = 'Upload Extension:';
+
+$lang['repo_error'] = 'The plugin repository could not be contacted. Make sure your server is allowed to contact www.dokuwiki.org and check your proxy settings.'; \ No newline at end of file