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

diff --git a/inc/lang/is/lang.php b/inc/lang/is/lang.php
index 0e281e58d..be20da6b3 100644
--- a/inc/lang/is/lang.php
+++ b/inc/lang/is/lang.php
@@ -47,7 +47,6 @@ $lang['btn_subscribe']         = 'Vakta';
 $lang['btn_unsubscribe']       = 'Afvakta';
 $lang['btn_profile']           = 'Uppfæra notanda';
 $lang['btn_reset']             = 'Endurstilla';
-$lang['btn_resendpwd']         = 'Senda nýtt aðgangsorð með tölvupósti';
 $lang['btn_draft']             = 'Breyta uppkasti';
 $lang['btn_recover']           = 'Endurheimta uppkast';
 $lang['btn_draftdel']          = 'Eyða uppkasti';
@@ -82,7 +81,6 @@ $lang['profnoempty']           = 'Það er ekki leyfilegt að skilja nafn og pó
 $lang['profchanged']           = 'Notendaupplýsingum breytt';
 $lang['pwdforget']             = 'Gleymt aðgangsorð? Fáðu nýtt';
 $lang['resendna']              = 'Þessi wiki styður ekki endursendingar aðgangsorðs';
-$lang['resendpwd']             = 'Senda nýtt aðgangsorð fyrir';
 $lang['resendpwdmissing']      = 'Afsakið, þú verður að út eyðublaðið allt';
 $lang['resendpwdnouser']       = 'Afsakið, notandi finnst ekki.';
 $lang['resendpwdbadauth']      = 'Afsakið, þessi sannvottunorð er ekki gild. Gakktu úr skugga um að þú notaðir að ljúka staðfesting hlekkur.';
@@ -185,10 +183,3 @@ $lang['img_format']            = 'Forsnið';
 $lang['img_camera']            = 'Myndavél';
 $lang['img_keywords']          = 'Lykilorðir';
 $lang['i_retry']               = 'Reyna aftur';
-$lang['mu_gridsize']           = 'Stærð';
-$lang['mu_toobig']             = 'of stór';
-$lang['mu_ready']              = 'tilbúin til upphleðslu';
-$lang['mu_done']               = 'lokið';
-$lang['mu_fail']               = 'mistókst';
-$lang['mu_info']               = 'Skrár innhlaðnar.';
-$lang['mu_lasterr']            = 'Síðasta villa:';