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/sl | |
| 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/sl')
| -rw-r--r-- | inc/lang/sl/lang.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php index ed6b6db81..41723f0ba 100644 --- a/inc/lang/sl/lang.php +++ b/inc/lang/sl/lang.php @@ -48,6 +48,7 @@ $lang['btn_draft'] = 'Uredi osnutek'; $lang['btn_recover'] = 'Obnovi osnutek'; $lang['btn_draftdel'] = 'Izbriši osnutek'; $lang['btn_revert'] = 'Povrni'; +$lang['btn_register'] = 'Vpis računa'; $lang['loggedinas'] = 'Prijava kot'; $lang['user'] = 'Uporabniško ime'; $lang['pass'] = 'Geslo'; @@ -57,7 +58,6 @@ $lang['passchk'] = 'znova'; $lang['remember'] = 'Zapomni si me'; $lang['fullname'] = 'Pravo ime'; $lang['email'] = 'Elektronski naslov'; -$lang['register'] = 'Vpis računa'; $lang['profile'] = 'Uporabniški profil'; $lang['badlogin'] = 'Uporabniško ime ali geslo je napačno.'; $lang['minoredit'] = 'Manjše spremembe'; |