diff options
| author | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2011-02-24 23:27:24 +0100 |
| commit | f77fc90de1e477b721442757cd7413f91cccc044 (patch) | |
| tree | 2abb734dacf39419b96b6b70c65115de57228fc3 /inc/lang/es | |
| parent | b8c040db1fdc0eee80963e57d95a15fd3813912d (diff) | |
| parent | bd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff) | |
| download | rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.gz rpg-f77fc90de1e477b721442757cd7413f91cccc044.tar.bz2 | |
Merge branch 'master' into indexer_rewrite
Conflicts:
inc/fulltext.php
inc/indexer.php
lib/exe/indexer.php
Diffstat (limited to 'inc/lang/es')
| -rw-r--r-- | inc/lang/es/lang.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php index 04403c821..427f7e0a2 100644 --- a/inc/lang/es/lang.php +++ b/inc/lang/es/lang.php @@ -14,8 +14,7 @@ * @author oliver@samera.com.py * @author Enrico Nicoletto <liverig@gmail.com> * @author Manuel Meco <manuel.meco@gmail.com> - * @author VictorCastelan <victorcastelan@gmail.com> - * @author Jordan Mero hack.jord@gmail.com + * @author Jordan Mero <hack.jord@gmail.com> * @author Felipe Martinez <metalmartinez@gmail.com> * @author Javier Aranda <internet@javierav.com> * @author Zerial <fernando@zerial.org> @@ -64,6 +63,7 @@ $lang['btn_draft'] = 'Editar borrador'; $lang['btn_recover'] = 'Recuperar borrador'; $lang['btn_draftdel'] = 'Eliminar borrador'; $lang['btn_revert'] = 'Restaurar'; +$lang['btn_register'] = 'Registrarse'; $lang['loggedinas'] = 'Conectado como '; $lang['user'] = 'Usuario'; $lang['pass'] = 'Contraseña'; @@ -73,7 +73,6 @@ $lang['passchk'] = 'otra vez'; $lang['remember'] = 'Recordarme'; $lang['fullname'] = 'Nombre real'; $lang['email'] = 'E-Mail'; -$lang['register'] = 'Registrarse'; $lang['profile'] = 'Perfil del usuario'; $lang['badlogin'] = 'Lo siento, el usuario o la contraseña es incorrecto.'; $lang['minoredit'] = 'Cambios menores'; |