diff options
| author | Tim Roes <mail@timroes.de> | 2012-05-07 17:08:35 +0200 |
|---|---|---|
| committer | Tim Roes <mail@timroes.de> | 2012-05-07 17:08:35 +0200 |
| commit | efa78c8638547cab77a37006e7f86aed792a1609 (patch) | |
| tree | 492804d80b28f8e32785b3648d9e03e77804b50f /inc/lang/en | |
| parent | ae992f53831c105d6deacfef79d7723b22a00033 (diff) | |
| parent | f774b92a94947b3eabd64919b6b4ba74f9c4b5fd (diff) | |
| download | rpg-efa78c8638547cab77a37006e7f86aed792a1609.tar.gz rpg-efa78c8638547cab77a37006e7f86aed792a1609.tar.bz2 | |
Merge branch 'master' of https://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/lang/en')
| -rw-r--r-- | inc/lang/en/lang.php | 1 | ||||
| -rw-r--r-- | inc/lang/en/mailwrap.html | 13 | ||||
| -rw-r--r-- | inc/lang/en/subscr_digest.txt | 2 | ||||
| -rw-r--r-- | inc/lang/en/subscr_list.txt | 2 | ||||
| -rw-r--r-- | inc/lang/en/subscr_single.txt | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 2ba220e64..c1fc543fb 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -99,6 +99,7 @@ $lang['searchmedia_in'] = 'Search in %s'; $lang['txt_upload'] = 'Select file to upload'; $lang['txt_filename'] = 'Upload as (optional)'; $lang['txt_overwrt'] = 'Overwrite existing file'; +$lang['maxuploadsize'] = 'Upload max. %s per file.'; $lang['lockedby'] = 'Currently locked by'; $lang['lockexpire'] = 'Lock expires at'; diff --git a/inc/lang/en/mailwrap.html b/inc/lang/en/mailwrap.html new file mode 100644 index 000000000..f9f80fd80 --- /dev/null +++ b/inc/lang/en/mailwrap.html @@ -0,0 +1,13 @@ +<html> +<head> + <title>@TITLE@</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> +<body> + +@HTMLBODY@ + +<br /><hr /> +<small>This mail was generated by DokuWiki at @DOKUWIKIURL@.</small> +</body> +</html> diff --git a/inc/lang/en/subscr_digest.txt b/inc/lang/en/subscr_digest.txt index fac8564bd..35011b6e6 100644 --- a/inc/lang/en/subscr_digest.txt +++ b/inc/lang/en/subscr_digest.txt @@ -15,6 +15,6 @@ To cancel the page notifications, log into the wiki at @SUBSCRIBE@ and unsubscribe page and/or namespace changes. --- +-- This mail was generated by DokuWiki at @DOKUWIKIURL@ diff --git a/inc/lang/en/subscr_list.txt b/inc/lang/en/subscr_list.txt index efe27d866..4c38b9326 100644 --- a/inc/lang/en/subscr_list.txt +++ b/inc/lang/en/subscr_list.txt @@ -12,6 +12,6 @@ To cancel the page notifications, log into the wiki at @SUBSCRIBE@ and unsubscribe page and/or namespace changes. --- +-- This mail was generated by DokuWiki at @DOKUWIKIURL@ diff --git a/inc/lang/en/subscr_single.txt b/inc/lang/en/subscr_single.txt index f2abe6d77..673c4c32a 100644 --- a/inc/lang/en/subscr_single.txt +++ b/inc/lang/en/subscr_single.txt @@ -18,6 +18,6 @@ To cancel the page notifications, log into the wiki at @NEWPAGE@ and unsubscribe page and/or namespace changes. --- +-- This mail was generated by DokuWiki at @DOKUWIKIURL@ |