Merge branch 'master' into htmlmail

* master: (382 commits)
  Romanian language update
  Marathi language update
  Arabic Language Update
  when there's not enough space for images, make sure they stay proportional (might be FS#2480)
  added minimal RTL print styles (part of FS#2185)
  moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
  removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
  removed comments from accidentally commented lines in tpl_includeFile()
  removed obsolete template file
  added tpl_includeFile() to core
  Make getTitle method in remote interface public
  Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
  BG: language update
  Korean language update
  fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
  deleted very old (and unused) images
  added accidentally removed '<?php' back in (was in 57fc5edd)
  wrapped X-UA-Compatible meta tag with conditional comments
  added explanation to todo in _forms.css
  removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
  ...

Conflicts:
	inc/auth.php
	inc/load.php

1 files changed, 0 insertions, 13 deletions

diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index e8026acee..2302d4f6f 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -42,7 +42,6 @@ $lang['btn_subscribe']         = 'Ikuti Perubahan';
 $lang['btn_unsubscribe']       = 'Berhenti Ikuti Perubahan';
 $lang['btn_profile']           = 'Ubah Profil';
 $lang['btn_reset']             = 'Reset';
-$lang['btn_resendpwd']         = 'Kirim password baru';
 $lang['btn_draft']             = 'Edit draft';
 $lang['btn_draftdel']          = 'Hapus draft';
 $lang['btn_register']          = 'Daftar';
@@ -74,7 +73,6 @@ $lang['profnoempty']           = 'Mohon mengisikan nama atau alamat email.';
 $lang['profchanged']           = 'Profil User berhasil diubah.';
 $lang['pwdforget']             = 'Lupa Password? Dapatkan yang baru';
 $lang['resendna']              = 'Wiki ini tidak mendukung pengiriman ulang password.';
-$lang['resendpwd']             = 'Kirim password baru untuk';
 $lang['resendpwdmissing']      = 'Maaf, Anda harus mengisikan semua field.';
 $lang['resendpwdnouser']       = 'Maaf, user ini tidak ditemukan.';
 $lang['resendpwdbadauth']      = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.';
@@ -197,14 +195,3 @@ $lang['i_pol0']                = 'Wiki Terbuka (baca, tulis, upload untuk semua
 $lang['i_pol1']                = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)';
 $lang['i_pol2']                = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)';
 $lang['i_retry']               = 'Coba Lagi';
-$lang['mu_gridname']           = 'Nama file';
-$lang['mu_gridsize']           = 'Ukuran';
-$lang['mu_gridstat']           = 'Status';
-$lang['mu_namespace']          = 'Namaspace';
-$lang['mu_browse']             = 'Jelajah';
-$lang['mu_ready']              = 'Siap untuk uplod';
-$lang['mu_done']               = 'Selesai';
-$lang['mu_fail']               = 'Gagal';
-$lang['mu_authfail']           = 'sesi habis';
-$lang['mu_progress']           = '@PCT@% uploaded';
-$lang['mu_filetypes']          = 'Izinkan tipe file';