diff options
| author | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2013-11-02 13:10:14 +0000 |
| commit | c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (patch) | |
| tree | 96e8dc34468a325596a5f94c85e38374fbc4b9ba /inc/lang/hr | |
| parent | 71c1143e8785954ea00a62aeb755ca7d8fa47e56 (diff) | |
| parent | 38d74b12176722ce52dc1905c13816a78a2551ee (diff) | |
| download | rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.gz rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into video-audio
Conflicts:
inc/parser/xhtml.php
Diffstat (limited to 'inc/lang/hr')
| -rw-r--r-- | inc/lang/hr/lang.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php index a607210d7..f19610827 100644 --- a/inc/lang/hr/lang.php +++ b/inc/lang/hr/lang.php @@ -231,7 +231,6 @@ $lang['subscr_m_receive'] = 'Primaj'; $lang['subscr_style_every'] = 'email za svaku promjenu'; $lang['subscr_style_digest'] = 'email s kratakim prikazom promjena za svaku stranicu (svaka %.2f dana)'; $lang['subscr_style_list'] = 'listu promijenjenih stranica od zadnjeg primljenog email-a (svaka %.2f dana)'; -$lang['authmodfailed'] = 'Greška u konfiguraciji korisničke autentifikacije. Molimo Vas da kontaktirate administratora.'; $lang['authtempfail'] = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.'; $lang['i_chooselang'] = 'Izaberite vaš jezik'; $lang['i_installer'] = 'DokuWiki instalacija'; |