Merge branch 'master' into stable

Conflicts:
	doku.php

1 files changed, 1 insertions, 2 deletions

diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index bdfef88f4..8398f29f0 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'Incargar como (optional)';
 $lang['txt_overwrt']           = 'Reimplaciar le file existente';
 $lang['lockedby']              = 'Actualmente serrate per';
 $lang['lockexpire']            = 'Serratura expira le';
-$lang['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
+$lang['js']['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
 $lang['js']['notsavedyet']     = "Le modificationes non salveguardate essera perdite.\nRealmente continuar?";
 $lang['rssfailed']             = 'Un error occurreva durante le obtention de iste syndication:';
 $lang['nothingfound']          = 'Nihil ha essite trovate.';
@@ -143,7 +143,6 @@ Tu pote nonobstante copiar e collar le ligamine.';
 $lang['js']['linkwiz']         = 'Assistente pro ligamines';
 $lang['js']['linkto']          = 'Ligar verso:';
 $lang['js']['del_confirm']     = 'Realmente deler le entrata(s) seligite?';
-$lang['js']['mu_btn']          = 'Incargar plure files simultaneemente';
 $lang['mediausage']            = 'Usa le syntaxe sequente pro referer a iste file:';
 $lang['mediaview']             = 'Vider file original';
 $lang['mediaroot']             = 'radice';