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, 8 deletions

diff --git a/inc/lang/hi/lang.php b/inc/lang/hi/lang.php
index 00e5589d8..893457066 100644
--- a/inc/lang/hi/lang.php
+++ b/inc/lang/hi/lang.php
@@ -59,7 +59,6 @@ $lang['regpwmail']             = 'आपकी डोकुविकी का �
 $lang['reghere']               = 'आपके पास अभी तक कोई खाता नहीं है? बस एक लें |';
 $lang['profna']                = 'यह विकी प्रोफ़ाइल संशोधन का समर्थन नहीं करता |';
 $lang['profnochange']          = 'कोई परिवर्तन नहीं, कुछ नहीं करना |';
-$lang['resendpwd']             = 'नवगुप्तशब्द भेजें';
 $lang['resendpwdmissing']      = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |';
 $lang['resendpwdsuccess']      = 'आपका नवगुप्तशब्द ईमेल द्वारा सम्प्रेषित कर दिया गया है |';
 $lang['txt_upload']            = 'अपलोड करने के लिए फ़ाइल चुनें';
@@ -116,10 +115,3 @@ $lang['i_installer']           = 'डोकुविकी इंस्टॉल
 $lang['i_wikiname']            = 'विकी का नाम';
 $lang['i_superuser']           = 'महाउपयोगकर्ता';
 $lang['i_retry']               = 'पुनःप्रयास';
-$lang['mu_gridsize']           = 'आकार';
-$lang['mu_gridstat']           = 'स्थिति';
-$lang['mu_browse']             = 'ब्राउज़';
-$lang['mu_toobig']             = 'बहुत बड़ा';
-$lang['mu_ready']              = 'अपलोड करने के लिए तैयार';
-$lang['mu_done']               = 'पूर्ण';
-$lang['mu_fail']               = 'असफल';