Merge remote-tracking branch 'origin/master' into userlink

Conflicts:
	inc/parser/renderer.php
	inc/template.php

1 files changed, 0 insertions, 32 deletions

diff --git a/lib/plugins/plugin/lang/id/lang.php b/lib/plugins/plugin/lang/id/lang.php
deleted file mode 100644
index 2653b075e..000000000
--- a/lib/plugins/plugin/lang/id/lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * 
- * @author Irwan Butar Butar <irwansah.putra@gmail.com>
- * @author Yustinus Waruwu <juswaruwu@gmail.com>
- */
-$lang['btn_info']              = 'Info';
-$lang['btn_update']            = 'Baharui';
-$lang['btn_delete']            = 'Hapus';
-$lang['btn_settings']          = 'Pengaturan';
-$lang['btn_download']          = 'Unduh';
-$lang['btn_enable']            = 'Simpan';
-$lang['url']                   = 'URL';
-$lang['installed']             = 'Instal';
-$lang['lastupdate']            = 'Pembaharuan terakhir:';
-$lang['source']                = 'Sumber:';
-$lang['unknown']               = 'Tidak kenal';
-$lang['updating']              = 'Terbaharui ...';
-$lang['update_none']           = 'Tidak ditemukan pembaharuan';
-$lang['deleting']              = 'Terhapus ...';
-$lang['deleted']               = 'Hapus Plugin %s.';
-$lang['downloading']           = 'Unduh ...';
-$lang['plugin']                = 'Plugin:';
-$lang['components']            = 'Komponen';
-$lang['name']                  = 'Nama:';
-$lang['date']                  = 'Tanggal:';
-$lang['type']                  = 'Tipe:';
-$lang['desc']                  = 'Penjelasan:';
-$lang['author']                = 'Autor:';
-$lang['www']                   = 'Web:';