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/fo | |
| 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/fo')
| -rw-r--r-- | inc/lang/fo/lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php index 2bc5c3d53..3d4d0455b 100644 --- a/inc/lang/fo/lang.php +++ b/inc/lang/fo/lang.php @@ -4,7 +4,7 @@ * * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) * @author Poul J. Clementsen <poul@diku.dk> - * @author Einar Petersen einar.petersen@gmail.com + * @author Einar Petersen <einar.petersen@gmail.com> */ $lang['encoding'] = 'utf-8'; $lang['direction'] = 'ltr'; @@ -45,6 +45,7 @@ $lang['btn_draft'] = 'Broyt kladdu'; $lang['btn_recover'] = 'Endurbygg kladdu'; $lang['btn_draftdel'] = 'Sletta'; $lang['btn_revert'] = 'Endurbygg'; +$lang['btn_register'] = 'Melda til'; $lang['loggedinas'] = 'Ritavur inn sum'; $lang['user'] = 'Brúkaranavn'; $lang['pass'] = 'Loyniorð'; @@ -54,7 +55,6 @@ $lang['passchk'] = 'Endurtak nýtt loyniorð'; $lang['remember'] = 'Minst til loyniorðið hjá mær'; $lang['fullname'] = 'Navn'; $lang['email'] = 'T-postur'; -$lang['register'] = 'Melda til'; $lang['profile'] = 'Brúkara vangamynd'; $lang['badlogin'] = 'Skeivt brúkaranavn ella loyniorð.'; $lang['minoredit'] = 'Smærri broytingar'; |