summaryrefslogtreecommitdiff
path: root/inc/lang/id/lang.php
diff options
context:
space:
mode:
authorMichael Hamann <michael@content-space.de>2011-02-24 23:27:24 +0100
committerMichael Hamann <michael@content-space.de>2011-02-24 23:27:24 +0100
commitf77fc90de1e477b721442757cd7413f91cccc044 (patch)
tree2abb734dacf39419b96b6b70c65115de57228fc3 /inc/lang/id/lang.php
parentb8c040db1fdc0eee80963e57d95a15fd3813912d (diff)
parentbd07158f0f2569ae470f980dd49d69b7f1fd2c49 (diff)
downloadrpg-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/id/lang.php')
-rw-r--r--inc/lang/id/lang.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index 3ea1b394a..c1480f518 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -45,6 +45,7 @@ $lang['btn_reset'] = 'Reset';
$lang['btn_resendpwd'] = 'Kirim password baru';
$lang['btn_draft'] = 'Edit draft';
$lang['btn_draftdel'] = 'Hapus draft';
+$lang['btn_register'] = 'Daftar';
$lang['loggedinas'] = 'Login sebagai ';
$lang['user'] = 'Username';
$lang['pass'] = 'Password';
@@ -54,7 +55,6 @@ $lang['passchk'] = 'sekali lagi';
$lang['remember'] = 'Ingat saya';
$lang['fullname'] = 'Nama lengkap';
$lang['email'] = 'E-Mail';
-$lang['register'] = 'Daftar';
$lang['profile'] = 'Profil User';
$lang['badlogin'] = 'Maaf, username atau password salah.';
$lang['minoredit'] = 'Perubahan Minor';