summaryrefslogtreecommitdiff
path: root/lib/plugins/authmysql/lang/hu
diff options
context:
space:
mode:
authorGerrit Uitslag <klapinklapin@gmail.com>2014-03-10 23:57:01 +0100
committerGerrit Uitslag <klapinklapin@gmail.com>2014-03-10 23:57:01 +0100
commitf97db66038968542deefbf9817a3dd49b67b1904 (patch)
tree6995f5bfd7017999a743c327474afc7b9514d94f /lib/plugins/authmysql/lang/hu
parent6384941886832589f7bb3c13bc18115499cf9369 (diff)
parent9f12fc1cc9e916c3172a0cf8953ed70fd18f2ec1 (diff)
downloadrpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.gz
rpg-f97db66038968542deefbf9817a3dd49b67b1904.tar.bz2
Merge remote-tracking branch 'origin/master' into userlink
Conflicts: inc/parser/renderer.php inc/template.php
Diffstat (limited to 'lib/plugins/authmysql/lang/hu')
-rw-r--r--lib/plugins/authmysql/lang/hu/settings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/plugins/authmysql/lang/hu/settings.php b/lib/plugins/authmysql/lang/hu/settings.php
index 5936203fa..cf7b26bb9 100644
--- a/lib/plugins/authmysql/lang/hu/settings.php
+++ b/lib/plugins/authmysql/lang/hu/settings.php
@@ -6,8 +6,8 @@
* @author Marton Sebok <sebokmarton@gmail.com>
* @author Marina Vladi <deldadam@gmail.com>
*/
-$lang['server'] = 'MySQL-szerver';
-$lang['user'] = 'MySQL felhasználónév';
+$lang['server'] = 'MySQL-kiszolgáló';
+$lang['user'] = 'MySQL-felhasználónév';
$lang['password'] = 'Fenti felhasználó jelszava';
$lang['database'] = 'Adatbázis';
$lang['charset'] = 'Az adatbázisban használt karakterkészlet';