diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-11-10 15:43:15 +0100 |
| commit | 16a774a8a61756df2d8fb813bfbaed98b42e3e65 (patch) | |
| tree | 3a48d311e74ccbf4017330cef8af00003b0ddb34 /inc/lang/is | |
| parent | 662a7b3fcc22d8327026bc1ef161a096683f1580 (diff) | |
| parent | a5a71ecfcc1ed6bfca1995b39cd0abe4b8dd9eeb (diff) | |
| download | rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.gz rpg-16a774a8a61756df2d8fb813bfbaed98b42e3e65.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'inc/lang/is')
| -rw-r--r-- | inc/lang/is/lang.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php index 7388e6908..0e281e58d 100644 --- a/inc/lang/is/lang.php +++ b/inc/lang/is/lang.php @@ -45,8 +45,6 @@ $lang['btn_backlink'] = 'Hvað tengist hingað'; $lang['btn_backtomedia'] = 'Aftur til miðlaskrá'; $lang['btn_subscribe'] = 'Vakta'; $lang['btn_unsubscribe'] = 'Afvakta'; -$lang['btn_subscribens'] = 'Vakta breytingar á nafnrými'; -$lang['btn_unsubscribens'] = 'Afvakta breytingar á nafnrými'; $lang['btn_profile'] = 'Uppfæra notanda'; $lang['btn_reset'] = 'Endurstilla'; $lang['btn_resendpwd'] = 'Senda nýtt aðgangsorð með tölvupósti'; |