26 files changed, 33 insertions, 63 deletions
diff --git a/inc/lang/en/admin.txt b/inc/lang/en/admin.txt
index cfd21b217..8998ca9d8 100644
--- a/inc/lang/en/admin.txt
+++ b/inc/lang/en/admin.txt
@@ -1,4 +1,3 @@
 ====== Administration ======
 
 Below you can find a list of administrative tasks available in DokuWiki.
-
diff --git a/inc/lang/en/backlinks.txt b/inc/lang/en/backlinks.txt
index 5b40b84ea..55514bf35 100644
--- a/inc/lang/en/backlinks.txt
+++ b/inc/lang/en/backlinks.txt
@@ -1,4 +1,3 @@
 ====== Backlinks ======
 
 This is a list of pages that seem to link back to the current page.
-
diff --git a/inc/lang/en/conflict.txt b/inc/lang/en/conflict.txt
index 624f17b21..2586a2a44 100644
--- a/inc/lang/en/conflict.txt
+++ b/inc/lang/en/conflict.txt
@@ -3,4 +3,3 @@
 A newer version of the document you edited exists. This happens when another user changed the document while you were editing it.
 
 Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version.
-
diff --git a/inc/lang/en/denied.txt b/inc/lang/en/denied.txt
index 34cb8456a..e6fade4b9 100644
--- a/inc/lang/en/denied.txt
+++ b/inc/lang/en/denied.txt
@@ -1,4 +1,3 @@
 ====== Permission Denied ======
 
 Sorry, you don't have enough rights to continue.
-
diff --git a/inc/lang/en/diff.txt b/inc/lang/en/diff.txt
index 934534d42..46f0b34fe 100644
--- a/inc/lang/en/diff.txt
+++ b/inc/lang/en/diff.txt
@@ -1,4 +1,3 @@
 ====== Differences ======
 
 This shows you the differences between two versions of the page.
-
diff --git a/inc/lang/en/draft.txt b/inc/lang/en/draft.txt
index e84d34a5b..b6a930ac8 100644
--- a/inc/lang/en/draft.txt
+++ b/inc/lang/en/draft.txt
@@ -3,4 +3,3 @@
 Your last edit session on this page was not completed correctly. DokuWiki automatically saved a draft during your work which you may now use to continue your editing. Below you can see the data that was saved from your last session.
 
 Please decide if you want to //recover// your lost edit session, //delete// the autosaved draft or //cancel// the editing process.
-
diff --git a/inc/lang/en/edit.txt b/inc/lang/en/edit.txt
index 48c9c296d..0f395b574 100644
--- a/inc/lang/en/edit.txt
+++ b/inc/lang/en/edit.txt
@@ -1,2 +1 @@
 Edit the page and hit ''Save''. See [[wiki:syntax]] for Wiki syntax. Please edit the page only if you can **improve** it. If you want to test some things, learn to make your first steps on the [[playground:playground|playground]].
-
diff --git a/inc/lang/en/index.txt b/inc/lang/en/index.txt
index 152911bbb..dced64951 100644
--- a/inc/lang/en/index.txt
+++ b/inc/lang/en/index.txt
@@ -1,4 +1,3 @@
 ====== Sitemap ======
 
 This is a sitemap over all available pages ordered by [[doku>namespaces|namespaces]].
-
diff --git a/inc/lang/en/install.html b/inc/lang/en/install.html
index df2b69935..fa6b99ab7 100644
--- a/inc/lang/en/install.html
+++ b/inc/lang/en/install.html
@@ -1,24 +1,7 @@
-<p>This page assists in the first time installation and configuration of
-<a href="http://dokuwiki.org">Dokuwiki</a>. More info on this
-installer is available on it's own
-<a href="http://dokuwiki.org/installer">documentation page</a>.</p>
+<p>This page assists in the first time installation and configuration of <a href="http://dokuwiki.org">Dokuwiki</a>. More info on this installer is available on it's own <a href="http://dokuwiki.org/installer">documentation page</a>.</p>
 
-<p>DokuWiki uses ordinary files for the storage of wiki pages and other
-information associated with those pages (e.g. images, search indexes, old
-revisions, etc).  In order to operate successfully DokuWiki
-<strong>must</strong> have write access to the directories that hold those
-files.  This installer is not capable of setting up directory permissions. That
-normally needs to be done directly on a command shell or if you are using hosting,
-through FTP or your hosting control panel (e.g. cPanel).</p>
+<p>DokuWiki uses ordinary files for the storage of wiki pages and other information associated with those pages (e.g. images, search indexes, old revisions, etc).  In order to operate successfully DokuWiki <strong>must</strong> have write access to the directories that hold those files.  This installer is not capable of setting up directory permissions. That normally needs to be done directly on a command shell or if you are using hosting, through FTP or your hosting control panel (e.g. cPanel).</p>
 
-<p>This installer will setup your DokuWiki configuration for
-<abbr title="access control list">ACL</abbr>, which in turn allows administrator
-login and access to DokuWiki's admin menu for installing plugins, managing
-users, managing access to wiki pages and alteration of configuration settings.
-It isn't required for DokuWiki to operate, however it will make Dokuwiki easier
-to administer.</p>
+<p>This installer will setup your DokuWiki configuration for <abbr title="access control list">ACL</abbr>, which in turn allows administrator login and access to DokuWiki's admin menu for installing plugins, managing users, managing access to wiki pages and alteration of configuration settings. It isn't required for DokuWiki to operate, however it will make Dokuwiki easier to administer.</p>
 
-<p>Experienced users or users with special setup requirements should use these links
-for details concerning
-<a href="http://dokuwiki.org/install">installation instructions</a>
-and <a href="http://dokuwiki.org/config">configuration settings</a>.</p>
+<p>Experienced users or users with special setup requirements should use these links for details concerning <a href="http://dokuwiki.org/install">installation instructions</a> and <a href="http://dokuwiki.org/config">configuration settings</a>.</p>
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 4d11bac08..eb3ad1638 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -319,8 +319,12 @@ $lang['i_modified']            = 'For security reasons this script will only wor
                                   You should either re-extract the files from the downloaded package or consult the complete
                                   <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
 $lang['i_funcna']              = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
+$lang['i_disabled']            =  'It has been disabled by your provider.';
+$lang['i_funcnmail']           = '<b>Note:</b> The PHP mail function is not available. %s' .
+                                 ' If it remains unavailable, you may install the <a href="http://dokuwiki.org/plugins/smtp">smtp plugin</a>.';
 $lang['i_phpver']              = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
 $lang['i_mbfuncoverload']      = 'mbstring.func_overload must be disabled in php.ini to run DokuWiki.';
+$lang['i_urandom']             = 'DokuWiki cannot create cryptographically secure numbers for cookies. You may want to check your open_basedir settings in php.ini for proper <code>/dev/urandom</code> access.';
 $lang['i_permfail']            = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
 $lang['i_confexists']          = '<code>%s</code> already exists';
 $lang['i_writeerr']            = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
@@ -377,6 +381,7 @@ $lang['media_update']          = 'Upload new version';
 $lang['media_restore']         = 'Restore this version';
 $lang['media_acl_warning']     = 'This list might not be complete due to ACL restrictions and hidden pages.';
 
+$lang['email_fail']            = 'PHP mail() missing or disabled. The following email was not sent: ';
 $lang['currentns']             = 'Current namespace';
 $lang['searchresult']          = 'Search Result';
 $lang['plainhtml']             = 'Plain HTML';
diff --git a/inc/lang/en/login.txt b/inc/lang/en/login.txt
index 2004ea198..151bf7f4b 100644
--- a/inc/lang/en/login.txt
+++ b/inc/lang/en/login.txt
@@ -1,4 +1,3 @@
 ====== Login ======
 
 You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
-
diff --git a/inc/lang/en/mailtext.txt b/inc/lang/en/mailtext.txt
index aea14d459..eac40356d 100644
--- a/inc/lang/en/mailtext.txt
+++ b/inc/lang/en/mailtext.txt
@@ -1,12 +1,15 @@
 A page in your DokuWiki was added or changed. Here are the details:
 
-Date        : @DATE@
-Browser     : @BROWSER@
-IP-Address  : @IPADDRESS@
-Hostname    : @HOSTNAME@
-Old Revision: @OLDPAGE@
-New Revision: @NEWPAGE@
-Edit Summary: @SUMMARY@
-User        : @USER@
+Browser             : @BROWSER@
+IP Address          : @IPADDRESS@
+Hostname            : @HOSTNAME@
+Old Revision        : @OLDPAGE@
+New Revision        : @NEWPAGE@
+Date of New Revision: @DATE@
+Edit Summary        : @SUMMARY@
+User                : @USER@
+
+There may be newer changes after this revision. If this
+happens, a message will be shown on the top of the rev page.
 
 @DIFF@
diff --git a/inc/lang/en/newpage.txt b/inc/lang/en/newpage.txt
index e78b534a0..c9ae6e6fe 100644
--- a/inc/lang/en/newpage.txt
+++ b/inc/lang/en/newpage.txt
@@ -1,4 +1,3 @@
 ====== This topic does not exist yet ======
 
-You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by clicking on "Create this page".
-
+You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by clicking on **Create this page**.
diff --git a/inc/lang/en/norev.txt b/inc/lang/en/norev.txt
index 27c336be7..b24c7923c 100644
--- a/inc/lang/en/norev.txt
+++ b/inc/lang/en/norev.txt
@@ -1,4 +1,3 @@
 ====== No such revision ======
 
 The specified revision doesn't exist. Click on "Old revisions" for a list of old revisions of this document.
-
diff --git a/inc/lang/en/onceexisted.txt b/inc/lang/en/onceexisted.txt
new file mode 100644
index 000000000..87cc05750
--- /dev/null
+++ b/inc/lang/en/onceexisted.txt
@@ -0,0 +1,3 @@
+======= This page does not exist anymore ======
+
+You've followed a link to a page that no longer exists. You can check the list of [[?do=revisions|old revisions]] to see when and why it was deleted, access old revisions or restore it.
+\ No newline at end of file
diff --git a/inc/lang/en/preview.txt b/inc/lang/en/preview.txt
index 5ca69694d..672705683 100644
--- a/inc/lang/en/preview.txt
+++ b/inc/lang/en/preview.txt
@@ -1,4 +1,3 @@
 ====== Preview ======
 
-This is a preview of what your text will look like. Remember: It is **not saved** yet!
-
+This is a preview of what your text will look like. **Remember: It is not saved yet**!
diff --git a/inc/lang/en/pwconfirm.txt b/inc/lang/en/pwconfirm.txt
index 3732d8a03..44bdeb4a8 100644
--- a/inc/lang/en/pwconfirm.txt
+++ b/inc/lang/en/pwconfirm.txt
@@ -1,11 +1,9 @@
 Hi @FULLNAME@!
 
-Someone requested a new password for your @TITLE@
-login at @DOKUWIKIURL@
+Someone requested a new password for your @TITLE@ login at @DOKUWIKIURL@
 
 If you did not request a new password then just ignore this email.
 
-To confirm that the request was really sent by you please use the
-following link.
+To confirm that the request was really sent by you please use the following link.
 
 @CONFIRM@
diff --git a/inc/lang/en/read.txt b/inc/lang/en/read.txt
index 9f56d81ad..6e2af1335 100644
--- a/inc/lang/en/read.txt
+++ b/inc/lang/en/read.txt
@@ -1,2 +1 @@
 This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
-
diff --git a/inc/lang/en/recent.txt b/inc/lang/en/recent.txt
index 3f7b58c46..0f9a7f6b3 100644
--- a/inc/lang/en/recent.txt
+++ b/inc/lang/en/recent.txt
@@ -1,5 +1,3 @@
 ====== Recent Changes ======
 
-The following pages were changed recently.
-
-
+The following pages were changed recently:
diff --git a/inc/lang/en/register.txt b/inc/lang/en/register.txt
index db68d4f2f..777840261 100644
--- a/inc/lang/en/register.txt
+++ b/inc/lang/en/register.txt
@@ -1,4 +1,3 @@
 ====== Register as new user ======
 
 Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - if you are not asked to enter a password here, a new one will be sent to that address. The login name should be a valid [[doku>pagename|pagename]].
-
diff --git a/inc/lang/en/resendpwd.txt b/inc/lang/en/resendpwd.txt
index 98c8c756b..2696fe4f0 100644
--- a/inc/lang/en/resendpwd.txt
+++ b/inc/lang/en/resendpwd.txt
@@ -1,4 +1,3 @@
 ====== Send new password ======
 
 Please enter your user name in the form below to request a new password for your account in this wiki. A confirmation link will be sent to your registered email address.
-
diff --git a/inc/lang/en/resetpwd.txt b/inc/lang/en/resetpwd.txt
index 993b48765..5f59f0f68 100644
--- a/inc/lang/en/resetpwd.txt
+++ b/inc/lang/en/resetpwd.txt
@@ -1,4 +1,3 @@
 ====== Set new password ======
 
 Please enter a new password for your account in this wiki.
-
diff --git a/inc/lang/en/revisions.txt b/inc/lang/en/revisions.txt
index dd5f35b8e..90b036a0c 100644
--- a/inc/lang/en/revisions.txt
+++ b/inc/lang/en/revisions.txt
@@ -1,4 +1,3 @@
 ====== Old Revisions ======
 
 These are the older revisons of the current document. To revert to an old revision, select it from below, click ''Edit this page'' and save it.
-
diff --git a/inc/lang/en/searchpage.txt b/inc/lang/en/searchpage.txt
index 59cbec251..0cd016011 100644
--- a/inc/lang/en/searchpage.txt
+++ b/inc/lang/en/searchpage.txt
@@ -1,4 +1,3 @@
 ====== Search ======
 
 You can find the results of your search below. @CREATEPAGEINFO@
-
diff --git a/inc/lang/en/subscr_single.txt b/inc/lang/en/subscr_single.txt
index 8f097dc3e..046b9945d 100644
--- a/inc/lang/en/subscr_single.txt
+++ b/inc/lang/en/subscr_single.txt
@@ -7,11 +7,11 @@ Here are the changes:
 @DIFF@
 --------------------------------------------------------
 
-Date        : @DATE@
-User        : @USER@
-Edit Summary: @SUMMARY@
-Old Revision: @OLDPAGE@
-New Revision: @NEWPAGE@
+User                : @USER@
+Edit Summary        : @SUMMARY@
+Old Revision        : @OLDPAGE@
+New Revision        : @NEWPAGE@
+Date of New Revision: @DATE@
 
 To cancel the page notifications, log into the wiki at
 @DOKUWIKIURL@ then visit
diff --git a/inc/lang/en/updateprofile.txt b/inc/lang/en/updateprofile.txt
index b929fee83..73e53aaa7 100644
--- a/inc/lang/en/updateprofile.txt
+++ b/inc/lang/en/updateprofile.txt
@@ -1,5 +1,3 @@
 ====== Update your account profile ======
 
 You only need to complete those fields you wish to change.  You may not change your user name.
-
-