From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/id_users.lng |   64 +++++++++++++++++--------------
 1 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng
index bdaf72c..7264183 100644
--- a/interface/web/admin/lib/lang/id_users.lng
+++ b/interface/web/admin/lib/lang/id_users.lng
@@ -1,29 +1,35 @@
-<?php
-$wb['username_txt'] = 'Nama Pengguna';
-$wb['username_err'] = 'Nama pengguna terlalu panjang atau mengandung karakter yang tidak valid.';
-$wb['username_empty'] = 'Nama pengguna kosong.';
-$wb['username_unique'] = 'Sudah ada pengguna yang memakai nama ini.';
-$wb['passwort_txt'] = 'Kata Sandi';
-$wb['password_strength_txt'] = 'Kekuatan sandi';
-$wb['modules_txt'] = 'Modul';
-$wb['startmodule_txt'] = 'Modul awal';
-$wb['app_theme_txt'] = 'Desain';
-$wb['typ_txt'] = 'Tipe';
-$wb['active_txt'] = 'Aktif';
-$wb['language_txt'] = 'Bahasa';
-$wb['name_txt'] = 'Nama';
-$wb['vorname_txt'] = 'Nama kecil';
-$wb['unternehmen_txt'] = 'Perusahaan';
-$wb['strasse_txt'] = 'Jalan';
-$wb['ort_txt'] = 'Kota';
-$wb['plz_txt'] = 'Kode Pos';
-$wb['land_txt'] = 'Negara';
-$wb['email_txt'] = 'Email';
-$wb['url_txt'] = 'URL';
-$wb['telefon_txt'] = 'Telepon';
-$wb['fax_txt'] = 'Faks';
-$wb['groups_txt'] = 'Grup';
-$wb['default_group_txt'] = 'Grup Baku';
-$wb['startmodule_err'] = 'Modul awal tidak termasuk dalam modul.';
-?>
-
+<?php
+$wb['username_txt'] = 'Nama Pengguna';
+$wb['username_err'] = 'Nama pengguna terlalu panjang atau mengandung karakter yang tidak valid.';
+$wb['username_empty'] = 'Nama pengguna kosong.';
+$wb['username_unique'] = 'Sudah ada pengguna yang memakai nama ini.';
+$wb['passwort_txt'] = 'Kata Sandi';
+$wb['password_strength_txt'] = 'Kekuatan sandi';
+$wb['modules_txt'] = 'Modul';
+$wb['startmodule_txt'] = 'Modul awal';
+$wb['app_theme_txt'] = 'Desain';
+$wb['typ_txt'] = 'Tipe';
+$wb['active_txt'] = 'Aktif';
+$wb['language_txt'] = 'Bahasa';
+$wb['name_txt'] = 'Nama';
+$wb['vorname_txt'] = 'Nama kecil';
+$wb['unternehmen_txt'] = 'Perusahaan';
+$wb['strasse_txt'] = 'Jalan';
+$wb['ort_txt'] = 'Kota';
+$wb['plz_txt'] = 'Kode Pos';
+$wb['land_txt'] = 'Negara';
+$wb['email_txt'] = 'Email';
+$wb['url_txt'] = 'URL';
+$wb['telefon_txt'] = 'Telepon';
+$wb['fax_txt'] = 'Faks';
+$wb['groups_txt'] = 'Grup';
+$wb['default_group_txt'] = 'Grup Baku';
+$wb['startmodule_err'] = 'Modul awal tidak termasuk dalam modul.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
+$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
+?>

--
Gitblit v1.9.1