diff options
author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
---|---|---|
committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-23 22:07:26 +0100 |
commit | 8fcb305db0081dacd8e8ad0583da5ecc6c6837dc (patch) | |
tree | 928fc44fde692835bca9dd304ebcb17cdd710ac8 /inc/lang/hu | |
parent | 4d5954c8d1f8bcc5450f8cf70d8139cf5a1e697d (diff) | |
parent | 5d873dd4ce31c79403a01ac0e40ff148be282592 (diff) | |
download | rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.gz rpg-8fcb305db0081dacd8e8ad0583da5ecc6c6837dc.tar.bz2 |
Merge remote-tracking branch 'origin/master' into diff_navigation
Conflicts:
inc/html.php
Diffstat (limited to 'inc/lang/hu')
-rw-r--r-- | inc/lang/hu/lang.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php index 5113e1cc8..a0aef9447 100644 --- a/inc/lang/hu/lang.php +++ b/inc/lang/hu/lang.php @@ -337,4 +337,4 @@ $lang['media_restore'] = 'Ezen verzió visszaállítása'; $lang['currentns'] = 'Aktuális névtér'; $lang['searchresult'] = 'Keresés eredménye'; $lang['plainhtml'] = 'Sima HTML'; -$lang['wikimarkup'] = 'Wiki-jelölő nyelv'; +$lang['wikimarkup'] = 'Wiki-jelölőnyelv'; |