diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
| commit | d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526 (patch) | |
| tree | 7c90009354601ab34473b4d6d376e4b73c45e3f7 /inc/lang/en/lang.php | |
| parent | 84a355b61e53b5d8969c030679612a7b456777e9 (diff) | |
| parent | 3240c7a0b3414f926ee76b2c4fff0a95ab33e916 (diff) | |
| download | rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.gz rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
inc/lang/bg/lang.php
Diffstat (limited to 'inc/lang/en/lang.php')
| -rw-r--r-- | inc/lang/en/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php index 8abd4314c..51fd8f645 100644 --- a/inc/lang/en/lang.php +++ b/inc/lang/en/lang.php @@ -46,7 +46,8 @@ $lang['btn_resendpwd'] = 'Send new password'; $lang['btn_draft'] = 'Edit draft'; $lang['btn_recover'] = 'Recover draft'; $lang['btn_draftdel'] = 'Delete draft'; -$lang['btn_revert'] = 'Restore'; +$lang['btn_revert'] = 'Restore'; +$lang['btn_register'] = 'Register'; $lang['loggedinas'] = 'Logged in as'; $lang['user'] = 'Username'; @@ -57,7 +58,6 @@ $lang['passchk'] = 'once again'; $lang['remember'] = 'Remember me'; $lang['fullname'] = 'Real name'; $lang['email'] = 'E-Mail'; -$lang['register'] = 'Register'; $lang['profile'] = 'User Profile'; $lang['badlogin'] = 'Sorry, username or password was wrong.'; $lang['minoredit'] = 'Minor Changes'; |