Handle automatic reassignment of edits from duplicate accounts to the main

[lhc/web/wiklou.git] / languages / Language.php

diff --git a/languages/Language.php b/languages/Language.php
index cd5cfd3..541bc38 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -520,6 +520,7 @@ page that has been deleted.
 
 <p>If this is not the case, you may have found a bug in the software.
 Please report this to an administrator, making note of the URL.",
+'readonly_lag' => "The database has been automatically locked while the slave database servers catch up to the master",
 'internalerror' => 'Internal error',
 'filecopyerror' => "Could not copy file \"$1\" to \"$2\".",
 'filerenameerror' => "Could not rename file \"$1\" to \"$2\".",
@@ -569,6 +570,8 @@ Your account has been created. Don't forget to change your {{SITENAME}} preferen
 'yourpasswordagain' => 'Retype password',
 'newusersonly' => ' (new users only)',
 'remembermypassword' => 'Remember my password across sessions.',
+'yourdomainname'       => 'Your domain',
+'externaldberror'      => 'There was either an external authentication database error or you are not allowed to update your external account.',
 'loginproblem' => '<b>There has been a problem with your login.</b><br />Try again!',
 'alreadyloggedin' => "<font color=red><b>User $1, you are already logged in!</b></font><br />\n",
 
@@ -1025,7 +1028,7 @@ created and by whom, and anything else you may know about it. If this is an imag
 'savefile'             => 'Save file',
 'uploadedimage' => "uploaded \"[[$1]]\"",
 'uploaddisabled' => 'Sorry, uploading is disabled.',
-'uploadscripted' => 'This file contains HTML or script code that my be erronously be interpretet by a web browser.',
+'uploadscripted' => 'This file contains HTML or script code that my be erroneously be interpreted by a web browser.',
 'uploadcorrupt' => 'The file is corrupt or has an incorrect extension. Please check the file and upload again.',
 'uploadvirus' => 'The file contains a virus! Details: $1',
 'sourcefilename' => 'Source filename',