diff --git a/inc/lang/ar/lang.php b/inc/lang/ar/lang.php
index e5606c456ed606bff3c25feebcf035a2937ed5e1..ee330099b6b055deebbc624f1b9c29d9d36043c4 100644
--- a/inc/lang/ar/lang.php
+++ b/inc/lang/ar/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'رفع كـ (اختياري)';
 $lang['txt_overwrt']           = 'اكتب على ملف موجود';
 $lang['lockedby']              = 'مقفلة حاليا لـ';
 $lang['lockexpire']            = 'ينتهي القفل في';
-$lang['willexpire']            = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
+$lang['js']['willexpire']            = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
 $lang['js']['notsavedyet']     = 'التعديلات غير المحفوظة ستفقد.';
 $lang['js']['searchmedia']     = 'ابحث عن ملفات';
 $lang['js']['keepopen']        = 'أبقي النافذة مفتوحة أثناء الاختيار';
diff --git a/inc/lang/az/lang.php b/inc/lang/az/lang.php
index 35b18d3a76d62ed6a0ceebcd1d4a9f1230548ecd..302f24c166fb9326fc3385276cc42bc83a0792a9 100644
--- a/inc/lang/az/lang.php
+++ b/inc/lang/az/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Faylın wiki-də olan adını daxil edin (müt
 $lang['txt_overwrt']           = 'Mövcud olan faylın üstündən yaz';
 $lang['lockedby']              = 'В данный момент заблокирован Bu an blokdadır';
 $lang['lockexpire']            = 'Blok bitir:';
-$lang['willexpire']            = 'Sizin bu səhifədə dəyişik etmək üçün blokunuz bir dəqiqə ərzində bitəcək.\nMünaqişələrdən yayınmaq və blokun taymerini sıfırlamaq üçün, baxış düyməsini sıxın.';
+$lang['js']['willexpire']            = 'Sizin bu səhifədə dəyişik etmək üçün blokunuz bir dəqiqə ərzində bitəcək.\nMünaqişələrdən yayınmaq və blokun taymerini sıfırlamaq üçün, baxış düyməsini sıxın.';
 $lang['notsavedyet']           = 'Yaddaşa yazılmamış dəyişiklər itəcəklər.\nSiz davam etmək istəyirsiz?';
 $lang['rssfailed']             = 'Aşağıda göstərilmiş xəbər lentini əldə edən zaman xəta baş verdi: ';
 $lang['nothingfound']          = 'Heçnə tapılmadı.';
diff --git a/inc/lang/bg/lang.php b/inc/lang/bg/lang.php
index 3f846028611016aff8abbd2fe93d9a7781a1ed0d..580f6d963bae1aeef3d903d804d52531ef36b809 100644
--- a/inc/lang/bg/lang.php
+++ b/inc/lang/bg/lang.php
@@ -91,7 +91,7 @@ $lang['txt_filename']          = 'Качи като (незадължителн
 $lang['txt_overwrt']           = 'Презапиши съществуващите файлове';
 $lang['lockedby']              = 'В момента е заключена от';
 $lang['lockexpire']            = 'Ще бъде отключена на';
-$lang['willexpire']            = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
+$lang['js']['willexpire']            = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
 $lang['js']['notsavedyet']     = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?';
 $lang['js']['searchmedia']     = 'Търсене на файлове';
 $lang['js']['keepopen']        = 'Без затваряне на прозореца след избор';
diff --git a/inc/lang/ca-valencia/lang.php b/inc/lang/ca-valencia/lang.php
index c6a7dc27e28b7ba222a07f34e3723e61da3dae6c..c9c15b12d55a38a691ce6247d9cb6125dba016ea 100644
--- a/inc/lang/ca-valencia/lang.php
+++ b/inc/lang/ca-valencia/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Enviar com (opcional)';
 $lang['txt_overwrt']           = 'Sobreescriure archius existents';
 $lang['lockedby']              = 'Actualment bloquejat per';
 $lang['lockexpire']            = 'El bloqueig venç a les';
-$lang['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
+$lang['js']['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
 $lang['js']['notsavedyet']     = "Els canvis no guardats es perdran.\n¿Segur que vol continuar?";
 $lang['rssfailed']             = 'Ha ocorregut un erro al solicitar este canal: ';
 $lang['nothingfound']          = 'No s\'ha trobat res.';
diff --git a/inc/lang/ca/lang.php b/inc/lang/ca/lang.php
index 342257d1187d1bd86c2f36b85cda6174cad11a2a..fbd1cb18a80ac6072430a91f4cc2e527e8308c85 100644
--- a/inc/lang/ca/lang.php
+++ b/inc/lang/ca/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Introduïu el nom wiki (opcional)';
 $lang['txt_overwrt']           = 'Sobreescriu el fitxer actual';
 $lang['lockedby']              = 'Actualment blocat per:';
 $lang['lockexpire']            = 'Venciment del blocatge:';
-$lang['willexpire']            = 'El blocatge per a editar aquesta pàgina venç d\'aquí a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
+$lang['js']['willexpire']            = 'El blocatge per a editar aquesta pàgina venç d\'aquí a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
 $lang['js']['notsavedyet']     = "Heu fet canvis que es perdran si no els deseu.\nVoleu continuar?";
 $lang['rssfailed']             = 'S\'ha produït un error en recollir aquesta alimentació: ';
 $lang['nothingfound']          = 'No s\'ha trobat res.';
diff --git a/inc/lang/cs/lang.php b/inc/lang/cs/lang.php
index e1c45e0c90b16cb893c3ddad56755e5678ca8894..eaefaadb5d76f99a3c436b4f8dbd807b8c9de7fa 100644
--- a/inc/lang/cs/lang.php
+++ b/inc/lang/cs/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'Wiki jméno (volitelné)';
 $lang['txt_overwrt']           = 'Přepsat existující soubor';
 $lang['lockedby']              = 'Právě zamknuto:';
 $lang['lockexpire']            = 'Zámek vyprší:';
-$lang['willexpire']            = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
+$lang['js']['willexpire']            = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
 $lang['js']['notsavedyet']     = 'Jsou tu neuložené změny, které budou ztraceny.
 Chcete opravdu pokračovat?';
 $lang['js']['searchmedia']     = 'Hledat soubory';
diff --git a/inc/lang/da/lang.php b/inc/lang/da/lang.php
index 80d55d6f52fb584317295e61e214b1d5fde1ee59..614f2bdf2ef75a851b812842aaea98a603f2b033 100644
--- a/inc/lang/da/lang.php
+++ b/inc/lang/da/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename']          = 'Indtast wikinavn (valgfrit)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Midlertidig låst af';
 $lang['lockexpire']            = 'Lås udløber kl.';
-$lang['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
+$lang['js']['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
 $lang['js']['notsavedyet']     = 'Ugemte ændringer vil blive mistet
 Fortsæt alligevel?';
 $lang['js']['searchmedia']     = 'Søg efter filer';
diff --git a/inc/lang/de-informal/lang.php b/inc/lang/de-informal/lang.php
index d39bf8152e907dab51ce80ffbb95eac7dbe07228..16686bc4cd2cb45a7f5adb71334f380363f3fa8c 100644
--- a/inc/lang/de-informal/lang.php
+++ b/inc/lang/de-informal/lang.php
@@ -103,7 +103,7 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche nach Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index f9f2509942f8502f14f626f8d14b626b4663ace8..3ae06dc7129a2f29bbcf80adfbaa08a65ab0ab6b 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -103,7 +103,7 @@ $lang['txt_filename']          = 'Hochladen als (optional)';
 $lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
 $lang['lockedby']              = 'Momentan gesperrt von';
 $lang['lockexpire']            = 'Sperre läuft ab am';
-$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
 $lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
 $lang['js']['searchmedia']     = 'Suche Dateien';
 $lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
diff --git a/inc/lang/el/lang.php b/inc/lang/el/lang.php
index 11c64285eacce8ef3aea920d159358aacfacc778..373dc5463e72d1345de5c6460cfa29d06a82b7ee 100644
--- a/inc/lang/el/lang.php
+++ b/inc/lang/el/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχεί
 $lang['txt_overwrt']           = 'Αντικατάσταση υπάρχοντος αρχείου';
 $lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
 $lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
-$lang['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
+$lang['js']['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
 $lang['js']['notsavedyet']     = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.
 Θέλετε να συνεχίσετε;';
 $lang['js']['searchmedia']     = 'Αναζήτηση για αρχεία';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index 51fd8f64566496adc0af75490782fc1d5d29202c..95356f7b4cf6a0e9f72f18ee52041f29a26e0d76 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename'] = 'Upload as (optional)';
 $lang['txt_overwrt']  = 'Overwrite existing file';
 $lang['lockedby']     = 'Currently locked by';
 $lang['lockexpire']   = 'Lock expires at';
-$lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
 
 $lang['js']['notsavedyet'] = "Unsaved changes will be lost.";
 $lang['rssfailed']   = 'An error occurred while fetching this feed: ';
diff --git a/inc/lang/eo/lang.php b/inc/lang/eo/lang.php
index 4bb1c005d3b2eb4378855a480c90d20dc93b0ed4..14bc56405799d5cdd677860b9a492047579d0bda 100644
--- a/inc/lang/eo/lang.php
+++ b/inc/lang/eo/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
 $lang['txt_overwrt']           = 'AnstataÅ­igi ekzistantan dosieron';
 $lang['lockedby']              = 'Nune ŝlosita de';
 $lang['lockexpire']            = 'Ŝlosado ĉesos en';
-$lang['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
+$lang['js']['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
 $lang['js']['notsavedyet']     = 'Ne konservitaj modifoj perdiĝos.
 Ĉu vi certe volas daŭrigi la procezon?';
 $lang['js']['searchmedia']     = 'Serĉi dosierojn';
diff --git a/inc/lang/es/lang.php b/inc/lang/es/lang.php
index aad93c075b87af9479033545acb9ed7b20154397..5dc6834e6a5bc6cadd1d9afb378da80ae4877c55 100644
--- a/inc/lang/es/lang.php
+++ b/inc/lang/es/lang.php
@@ -109,7 +109,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobreescribir archivo existente';
 $lang['lockedby']              = 'Actualmente bloqueado por';
 $lang['lockexpire']            = 'El bloqueo expira en';
-$lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
+$lang['js']['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
 $lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
 ¿Realmente quieres continuar?';
 $lang['js']['searchmedia']     = 'Buscar archivos';
diff --git a/inc/lang/et/lang.php b/inc/lang/et/lang.php
index 180a50c0912be7a5a3604bf4a92c5d3bff6788aa..66fab3f9ab9290eac650fbf70be08b41415a866b 100644
--- a/inc/lang/et/lang.php
+++ b/inc/lang/et/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Siseta oma Wikinimi (soovituslik)';
 $lang['txt_overwrt']           = 'Kirjutan olemasoleva faili üle';
 $lang['lockedby']              = 'Praegu on selle lukustanud';
 $lang['lockexpire']            = 'Lukustus aegub';
-$lang['willexpire']            = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
+$lang['js']['willexpire']            = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
 $lang['js']['notsavedyet']     = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.
 Kas Sa ikka tahad edasi liikuda?';
 $lang['js']['searchmedia']     = 'Otsi faile';
diff --git a/inc/lang/eu/lang.php b/inc/lang/eu/lang.php
index e49290e5e825bfe67d6e853c5a53297ed1e340aa..30dfe9e5b86a280d1d721ff4835f52f3f16ffe21 100644
--- a/inc/lang/eu/lang.php
+++ b/inc/lang/eu/lang.php
@@ -90,7 +90,7 @@ $lang['txt_filename']          = 'Idatzi wikiname-a (aukerazkoa)';
 $lang['txt_overwrt']           = 'Oraingo fitxategiaren gainean idatzi';
 $lang['lockedby']              = 'Momentu honetan blokeatzen:';
 $lang['lockexpire']            = 'Blokeaketa iraungitzen da:';
-$lang['willexpire']            = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
+$lang['js']['willexpire']            = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
 $lang['js']['notsavedyet']     = 'Gorde gabeko aldaketak galdu egingo dira.
 Benetan jarraitu nahi duzu?';
 $lang['js']['searchmedia']     = 'Bilatu fitxategiak';
diff --git a/inc/lang/fa/lang.php b/inc/lang/fa/lang.php
index 96374b409e0c0794718bbd2c964069898812e685..1a7467431f66a1e9d78750a4b635cdbdde825071 100644
--- a/inc/lang/fa/lang.php
+++ b/inc/lang/fa/lang.php
@@ -97,7 +97,7 @@ $lang['txt_filename']          = 'ارسال به صورت (اختیاری)';
 $lang['txt_overwrt']           = 'بر روی فایل موجود بنویس';
 $lang['lockedby']              = 'در حال حاضر قفل شده است';
 $lang['lockexpire']            = 'قفل منقضی شده است';
-$lang['willexpire']            = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
+$lang['js']['willexpire']            = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
 $lang['js']['notsavedyet']     = 'تغییرات ذخیره شده از بین خواهد رفت. 
  می‌خواهید ادامه دهید؟';
 $lang['js']['searchmedia']     = 'جستجو برای فایل';
diff --git a/inc/lang/fi/lang.php b/inc/lang/fi/lang.php
index cce597fe78b555fc54182e53e80ded86ce0f56ef..a2f2e2027fbbfed4f0563d338468af72b03d5dfb 100644
--- a/inc/lang/fi/lang.php
+++ b/inc/lang/fi/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
 $lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
 $lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
 $lang['lockexpire']            = 'Lukitus päättyy';
-$lang['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
+$lang['js']['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
 $lang['js']['notsavedyet']     = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.
  Haluatko varmasti jatkaa?';
 $lang['js']['searchmedia']     = 'Etsi tiedostoja';
diff --git a/inc/lang/fo/lang.php b/inc/lang/fo/lang.php
index 3d4d0455b5c473ed7126797fc1f53b6cd4448d6e..4cb895f72a6376d733a4cce6f28fafa2e43d419d 100644
--- a/inc/lang/fo/lang.php
+++ b/inc/lang/fo/lang.php
@@ -90,7 +90,7 @@ $lang['txt_filename']          = 'Sláa inn wikinavn (valfrítt)';
 $lang['txt_overwrt']           = 'Yvurskriva verandi fílu';
 $lang['lockedby']              = 'Fyribils læst av';
 $lang['lockexpire']            = 'Lásið ferð úr gildi kl.';
-$lang['willexpire']            = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
+$lang['js']['willexpire']            = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
 $lang['js']['notsavedyet']     = 'Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.
 Ynskir tú at halda fram?';
 $lang['js']['searchmedia']     = 'Leita eftir dátufílum';
diff --git a/inc/lang/fr/lang.php b/inc/lang/fr/lang.php
index 047019baf00cc65a258bea6de7388f96a3d1d8d8..ae082e9e73c64f6d9af1793b1594c8f57a1e414c 100644
--- a/inc/lang/fr/lang.php
+++ b/inc/lang/fr/lang.php
@@ -107,7 +107,7 @@ $lang['txt_filename']          = 'Donnez un « wikiname » (optionnel) ';
 $lang['txt_overwrt']           = 'Écraser le fichier cible';
 $lang['lockedby']              = 'Actuellement bloqué par';
 $lang['lockexpire']            = 'Le blocage expire à';
-$lang['willexpire']            = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['js']['willexpire']            = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton « Aperçu » pour réinitialiser le minuteur.';
 $lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues.
 Voulez-vous vraiment continuer ?';
 $lang['js']['searchmedia']     = 'Chercher des fichiers';
diff --git a/inc/lang/gl/lang.php b/inc/lang/gl/lang.php
index 37cf55d226278b55f916a692b387e87951657365..a3caeff6dfd0ff238851bf0b576e7007fbaab0cb 100644
--- a/inc/lang/gl/lang.php
+++ b/inc/lang/gl/lang.php
@@ -89,7 +89,7 @@ $lang['txt_filename']          = 'Subir como (opcional)';
 $lang['txt_overwrt']           = 'Sobrescribir arquivo existente';
 $lang['lockedby']              = 'Bloqueado actualmente por';
 $lang['lockexpire']            = 'O bloqueo remata o';
-$lang['willexpire']            = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
+$lang['js']['willexpire']            = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
 $lang['js']['notsavedyet']     = "Perderanse os trocos non gardados.\nEstá certo de quereres continuar?";
 $lang['rssfailed']             = 'Houbo un erro ao tentar obter esta corrente RSS: ';
 $lang['nothingfound']          = 'Non se atopou nada.';
diff --git a/inc/lang/he/lang.php b/inc/lang/he/lang.php
index 1a47ebcb8dd2b5e41542772bd80fac3adc70dea3..589088320cafd4167974682cb971517d181d3361 100644
--- a/inc/lang/he/lang.php
+++ b/inc/lang/he/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'העלאה בשם (נתון לבחירה)';
 $lang['txt_overwrt']           = 'שכתוב על קובץ קיים';
 $lang['lockedby']              = 'נעול על ידי';
 $lang['lockexpire']            = 'הנעילה פגה';
-$lang['willexpire']            = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
+$lang['js']['willexpire']            = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
 $lang['js']['notsavedyet']     = 'שינויים שלא נשמרו ילכו לאיבוד.';
 $lang['js']['searchmedia']     = 'חיפוש אחר קבצים';
 $lang['js']['keepopen']        = 'השארת חלון פתוח על הבחירה';
diff --git a/inc/lang/hr/lang.php b/inc/lang/hr/lang.php
index a76bde2e85be047861f5b2b033be8d654c686560..a85214cf72519abd534e0949c1911eef38e1593c 100644
--- a/inc/lang/hr/lang.php
+++ b/inc/lang/hr/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Postaviti kao (nije obavezno)';
 $lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
 $lang['lockedby']              = 'Zaključao';
 $lang['lockexpire']            = 'Zaključano do';
-$lang['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
+$lang['js']['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
 $lang['js']['notsavedyet']     = 'Vaše izmjene će se izgubiti.
 Želite li nastaviti?';
 $lang['js']['searchmedia']     = 'Traži datoteke';
diff --git a/inc/lang/hu/lang.php b/inc/lang/hu/lang.php
index 35e810ff061a0aebef102fcec49ca29012e9a23c..89ad779488fca245aafecc1f17d11e27529c8e2d 100644
--- a/inc/lang/hu/lang.php
+++ b/inc/lang/hu/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = 'feltöltési név (elhagyható)';
 $lang['txt_overwrt']           = 'Létező fájl felülírása';
 $lang['lockedby']              = 'Jelenleg zárolta:';
 $lang['lockexpire']            = 'A zárolás lejár:';
-$lang['willexpire']            = 'Az oldalszerkesztési zárolásod körülbelül egy percen belül lejár.\nAz ütközések elkerülése végett használd az előnézet gombot a zárolási időzítés frissítéséhez.';
+$lang['js']['willexpire']            = 'Az oldalszerkesztési zárolásod körülbelül egy percen belül lejár.\nAz ütközések elkerülése végett használd az előnézet gombot a zárolási időzítés frissítéséhez.';
 $lang['js']['notsavedyet']     = 'Elmentetlen változások vannak, amelyek el fognak veszni.
 Tényleg ezt akarod?';
 $lang['js']['searchmedia']     = 'Fájlok keresése';
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index bdfef88f4635f7b89bcf4bf0451f5883913f4994..abf1e67869afdc9377a8796a609e7f6b916ef2c2 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.';
diff --git a/inc/lang/id/lang.php b/inc/lang/id/lang.php
index c1480f51869521ff02f872f40214ae7d182e6f60..e8026aceec9005ab3cefccc556824a52b53bafcd 100644
--- a/inc/lang/id/lang.php
+++ b/inc/lang/id/lang.php
@@ -85,7 +85,7 @@ $lang['txt_filename']          = 'Masukkan nama wiki (opsional)';
 $lang['txt_overwrt']           = 'File yang telah ada akan ditindih';
 $lang['lockedby']              = 'Sedang dikunci oleh';
 $lang['lockexpire']            = 'Penguncian artikel sampai dengan';
-$lang['willexpire']            = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
+$lang['js']['willexpire']            = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
 $lang['js']['notsavedyet']     = "Perubahan yang belum disimpan akan hilang.\nYakin akan dilanjutkan?";
 $lang['rssfailed']             = 'Error terjadi saat mengambil feed: ';
 $lang['nothingfound']          = 'Tidak menemukan samasekali.';
diff --git a/inc/lang/it/lang.php b/inc/lang/it/lang.php
index 682f5b8c2f77b795718b7869add882919f1ceeec..8812b148db934c90cfb59d07fbc9a90c99ca72ad 100644
--- a/inc/lang/it/lang.php
+++ b/inc/lang/it/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename']          = 'Carica come (opzionale)';
 $lang['txt_overwrt']           = 'Sovrascrivi file esistente';
 $lang['lockedby']              = 'Attualmente bloccato da';
 $lang['lockexpire']            = 'Il blocco scade alle';
-$lang['willexpire']            = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
+$lang['js']['willexpire']            = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
 $lang['js']['notsavedyet']     = 'Le modifiche non salvate andranno perse.';
 $lang['js']['searchmedia']     = 'Cerca file';
 $lang['js']['keepopen']        = 'Tieni la finestra aperta durante la selezione';
diff --git a/inc/lang/ja/lang.php b/inc/lang/ja/lang.php
index e8999e05bca51918c09788c22c50a6d83891db43..b0b93450eebe3bf6a5eed9403524ee6fe0a24857 100644
--- a/inc/lang/ja/lang.php
+++ b/inc/lang/ja/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = '名前を変更してアップロード（オ
 $lang['txt_overwrt']           = '既存のファイルを上書き';
 $lang['lockedby']              = 'この文書は次のユーザによってロックされています';
 $lang['lockexpire']            = 'ロック期限：';
-$lang['willexpire']            = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
+$lang['js']['willexpire']            = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
 $lang['js']['notsavedyet']     = '変更は保存されません。このまま処理を続けてよろしいですか？';
 $lang['js']['searchmedia']     = 'ファイル検索';
 $lang['js']['keepopen']        = '選択中はウィンドウを閉じない';
diff --git a/inc/lang/kk/lang.php b/inc/lang/kk/lang.php
index 2b492ed1cb611ff629dfcc640e42568f75eb155c..f9ea0bced86ca910cf361c58b11e2bd793f7409c 100644
--- a/inc/lang/kk/lang.php
+++ b/inc/lang/kk/lang.php
@@ -88,7 +88,7 @@ $lang['txt_filename']          = 'Келесідей еңгізу (қалауы
 $lang['txt_overwrt']           = 'Бар файлды қайта жазу';
 $lang['lockedby']              = 'Осы уақытта тойтарылған';
 $lang['lockexpire']            = 'Тойтару келесі уақытта бітеді';
-$lang['willexpire']            = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
+$lang['js']['willexpire']            = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
 $lang['js']['notsavedyet']     = 'Сақталмаған өзгерістер жоғалатын болады.';
 $lang['js']['searchmedia']     = 'Файлдарды іздеу';
 $lang['js']['keepopen']        = 'Таңдаған соң терезе жаппаңыз';
diff --git a/inc/lang/km/lang.php b/inc/lang/km/lang.php
index 90cad3133c61b979f8c4c2513249e30add51f85f..68587e90f27052d5002053d882ee7cf91bdb0577 100644
--- a/inc/lang/km/lang.php
+++ b/inc/lang/km/lang.php
@@ -88,7 +88,7 @@ $lang['txt_filename'] = 'រុញឡើងជា (ស្រេច​ចិត
 $lang['txt_overwrt']  = 'កត់ពីលើ';//'Overwrite existing file';
 $lang['lockedby']     = 'ឥឡូវនេះចកជាប់​';
 $lang['lockexpire']   = 'សោជាប់ផុត​កំណត់ម៉ោង';
-$lang['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណត់​ឡើង​វិញ។';
+$lang['js']['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណត់​ឡើង​វិញ។';
 
 $lang['js']['notsavedyet'] = "កម្រែមិនទានរុក្សាទកត្រូវបោះបង់។\nបន្តទៅទាឬទេ?";
 $lang['rssfailed']   = 'មានកំហុសពេលទៅ​ប្រមូល​យកមតិ​ព័ត៌មាន៖ ';
diff --git a/inc/lang/ko/lang.php b/inc/lang/ko/lang.php
index c85a66d38713927a7014a83463a3470057de550d..7b55ebe7144ff69c3528b432add9eabf870293fe 100644
--- a/inc/lang/ko/lang.php
+++ b/inc/lang/ko/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = '업로드 파일 이름을 입력합니다.(
 $lang['txt_overwrt']           = '새로운 파일로 이전 파일을 교체합니다.';
 $lang['lockedby']              = '현재 잠금 사용자';
 $lang['lockexpire']            = '잠금 해제 시간';
-$lang['willexpire']            = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
+$lang['js']['willexpire']            = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
 $lang['js']['notsavedyet']     = '저장하지 않은 변경은 지워집니다.
 계속하시겠습니까?';
 $lang['js']['searchmedia']     = '파일 찾기';
diff --git a/inc/lang/ku/lang.php b/inc/lang/ku/lang.php
index 9bed43cd101d06e5400bf4c98f44bcf5765137d6..63ccafa3502b454529ca0b687745efc349d2e017 100644
--- a/inc/lang/ku/lang.php
+++ b/inc/lang/ku/lang.php
@@ -60,7 +60,7 @@ $lang['txt_filename'] = 'Enter wikiname (optional)';
 $lang['txt_overwrt']  = 'Overwrite existing file';
 $lang['lockedby']     = 'Currently locked by';
 $lang['lockexpire']   = 'Lock expires at';
-$lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
 
 $lang['js']['notsavedyet'] = "Unsaved changes will be lost.\nReally continue?";
 
diff --git a/inc/lang/la/lang.php b/inc/lang/la/lang.php
index d10c094f8dc9d642081ca794ab2ecc73b4822d08..00312f7a104364b1839059ce02630dc85cce523d 100644
--- a/inc/lang/la/lang.php
+++ b/inc/lang/la/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Onerare (optio):';
 $lang['txt_overwrt']           = 'Documento ueteri imponere:';
 $lang['lockedby']              = 'Nunc hoc intercludit';
 $lang['lockexpire']            = 'Hoc apertum';
-$lang['willexpire']            = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
+$lang['js']['willexpire']            = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
 $lang['js']['notsavedyet']     = 'Res non seruatae amissurae sunt.';
 $lang['js']['searchmedia']     = 'Quaere inter documenta';
 $lang['js']['keepopen']        = 'Fenestram apertam tene';
diff --git a/inc/lang/lb/lang.php b/inc/lang/lb/lang.php
index 09fc41f0897d32e6f4843a6392881e30942875c9..191a9bab5be0d3ae30a58416234a3a3ca71b55cf 100644
--- a/inc/lang/lb/lang.php
+++ b/inc/lang/lb/lang.php
@@ -84,7 +84,7 @@ $lang['txt_filename']          = 'Eroplueden als (optional)';
 $lang['txt_overwrt']           = 'Bestehend Datei iwwerschreiwen';
 $lang['lockedby']              = 'Am Moment gespaart vun';
 $lang['lockexpire']            = 'D\'Spär leeft of ëm';
-$lang['willexpire']            = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
+$lang['js']['willexpire']            = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
 $lang['js']['notsavedyet']     = "Net gespäicher Ännerunge gi verluer.\nWierklech weiderfueren?";
 $lang['rssfailed']             = 'Et ass e Feeler virkomm beim erofluede vun dësem Feed: ';
 $lang['nothingfound']          = 'Näischt fond.';
diff --git a/inc/lang/lt/lang.php b/inc/lang/lt/lang.php
index 6ae5f6c7309ad33b2b8300d91832ccf46cc8da73..121e2530811679b016e60d5e1d890c242644a573 100644
--- a/inc/lang/lt/lang.php
+++ b/inc/lang/lt/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Įveskite wikivardą (nebūtina)';
 $lang['txt_overwrt']           = 'Perrašyti egzistuojančią bylą';
 $lang['lockedby']              = 'Užrakintas vartotojo';
 $lang['lockexpire']            = 'Užraktas bus nuimtas';
-$lang['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
+$lang['js']['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
 $lang['js']['notsavedyet']     = "Pakeitimai nebus išsaugoti.\nTikrai tęsti?";
 $lang['rssfailed']             = 'Siunčiant šį feed\'ą įvyko klaida: ';
 $lang['nothingfound']          = 'Paieškos rezultatų nėra.';
diff --git a/inc/lang/lv/lang.php b/inc/lang/lv/lang.php
index 519ca231a55725a6e635fc018805a6eddc17b0cc..64e22c56a36d0e7438111acef8873a3dc4862b06 100644
--- a/inc/lang/lv/lang.php
+++ b/inc/lang/lv/lang.php
@@ -89,7 +89,7 @@ $lang['txt_filename']          = 'Ievadi vikivārdu (nav obligāts)';
 $lang['txt_overwrt']           = 'Aizstāt esošo failu';
 $lang['lockedby']              = 'Patlaban bloÄ·Ä“jis ';
 $lang['lockexpire']            = 'BloÄ·Ä“jums beigsies ';
-$lang['willexpire']            = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
+$lang['js']['willexpire']            = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
 $lang['js']['notsavedyet']     = 'Veiktas bet nav saglabātas izmaiņas.
 Vai tiešām tās nevajag?';
 $lang['js']['searchmedia']     = 'Meklēt failus';
diff --git a/inc/lang/mg/lang.php b/inc/lang/mg/lang.php
index 8c95a9e02517115ca73d9d2fd1cd16f9f25f023d..4142f00d0391577ab36d4952fdd5cfc5daa81a3c 100644
--- a/inc/lang/mg/lang.php
+++ b/inc/lang/mg/lang.php
@@ -54,7 +54,7 @@ $lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
 $lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
 $lang['lockedby']     = 'Mbola voahidin\'i';
 $lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
-$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
+$lang['js']['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
 
 $lang['js']['notsavedyet'] = "Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?";
 $lang['rssfailed']   = 'An error occured while fetching this feed: ';
diff --git a/inc/lang/mk/lang.php b/inc/lang/mk/lang.php
index 456a5a3d49c82ea619a61dd174e0404251f3dc8e..b7d43309201db6454d1842378a9da7de812af7c6 100644
--- a/inc/lang/mk/lang.php
+++ b/inc/lang/mk/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Качи како (неморално)';
 $lang['txt_overwrt']           = 'Пребриши ја веќе постоечката датотека';
 $lang['lockedby']              = 'Моментално заклучена од';
 $lang['lockexpire']            = 'Клучот истекува на';
-$lang['willexpire']            = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
+$lang['js']['willexpire']            = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
 $lang['js']['notsavedyet']     = "Незачуваните промени ќе бидат изгубени.\nСакате да продолжите?";
 $lang['rssfailed']             = 'Се појави грешка при повлекувањето на овој канал:';
 $lang['nothingfound']          = 'Ништо не е пронајдено.';
diff --git a/inc/lang/mr/lang.php b/inc/lang/mr/lang.php
index d991d46cf930f89a27bb82a6b343a6d8055aac5b..ae9d05bfd82bf22170074f3050e7abeeb7217a99 100644
--- a/inc/lang/mr/lang.php
+++ b/inc/lang/mr/lang.php
@@ -96,7 +96,7 @@ $lang['txt_filename']          = 'अपलोड उर्फ़ ( वैकल्
 $lang['txt_overwrt']           = 'अस्तित्वात असलेल्या फाइलवरच सुरक्षित करा.';
 $lang['lockedby']              = 'सध्या लॉक करणारा :';
 $lang['lockexpire']            = 'सध्या लॉक करणारा :';
-$lang['willexpire']            = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
+$lang['js']['willexpire']            = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
 $lang['js']['notsavedyet']     = "सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?";
 $lang['rssfailed']             = 'ही पुरवणी आणण्यात काही चूक झाली:';
 $lang['nothingfound']          = 'काही सापडला नाही.';
diff --git a/inc/lang/ne/lang.php b/inc/lang/ne/lang.php
index e5b30ceafd45c75c1c3f6d6fe9a181e65998c2b2..53c701b23b39ae6e6e6bc5b68b1d99aa82b71719 100644
--- a/inc/lang/ne/lang.php
+++ b/inc/lang/ne/lang.php
@@ -89,7 +89,7 @@ $lang['txt_filename']          = 'अर्को रुपमा अपलो
 $lang['txt_overwrt']           = 'रहेको उहि नामको फाइललाई मेटाउने';
 $lang['lockedby']              = 'अहिले ताल्चा लगाइएको';
 $lang['lockexpire']            = 'ताल्चा अवधि सकिने :';
-$lang['willexpire']            = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
+$lang['js']['willexpire']            = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
 $lang['js']['notsavedyet']     = "तपाईले वचन गर्नु नभएको परिवर्रन हराउने छ। \n साच्चै जारी गर्नुहुन्छ ।";
 $lang['rssfailed']             = 'यो फिड लिइ आउदा गल्ति भयो ।';
 $lang['nothingfound']          = 'केहि पनि भेटिएन ।';
diff --git a/inc/lang/nl/lang.php b/inc/lang/nl/lang.php
index 7dbde5ac83ae7e116a4161a3589a4884d18fedf3..6090babd9ea39eb0bfbb38380fe9af9575582f25 100644
--- a/inc/lang/nl/lang.php
+++ b/inc/lang/nl/lang.php
@@ -99,7 +99,7 @@ $lang['txt_filename']          = 'Vul nieuwe naam in (optioneel)';
 $lang['txt_overwrt']           = 'Overschrijf bestaand bestand';
 $lang['lockedby']              = 'Momenteel in gebruik door';
 $lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op';
-$lang['willexpire']            = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
+$lang['js']['willexpire']            = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
 $lang['js']['notsavedyet']     = 'Nog niet bewaarde wijzigingen zullen verloren gaan.
 Weet je zeker dat je wilt doorgaan?';
 $lang['js']['searchmedia']     = 'Zoek naar bestanden';
diff --git a/inc/lang/no/lang.php b/inc/lang/no/lang.php
index e610db6bda472c000def03caede4d7df5c47a946..fa946ca02f3a78aff98f385f19c63c5b827a5292 100644
--- a/inc/lang/no/lang.php
+++ b/inc/lang/no/lang.php
@@ -101,7 +101,7 @@ $lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
 $lang['txt_overwrt']           = 'Overskriv eksisterende fil';
 $lang['lockedby']              = 'Stengt av';
 $lang['lockexpire']            = 'Avstengningen opphører';
-$lang['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['js']['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
 $lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt.
 Vil du fortsette?';
 $lang['js']['searchmedia']     = 'Søk for filer';
diff --git a/inc/lang/pl/lang.php b/inc/lang/pl/lang.php
index bc0509df31921e16fcbe96502751be1c8945efca..32e5bf80c7a2c90a1ab0d8995e3b441e5619d46b 100644
--- a/inc/lang/pl/lang.php
+++ b/inc/lang/pl/lang.php
@@ -96,7 +96,7 @@ $lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
 $lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
 $lang['lockedby']              = 'Aktualnie zablokowane przez';
 $lang['lockexpire']            = 'Blokada wygasa';
-$lang['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
+$lang['js']['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
 $lang['js']['notsavedyet']     = 'Nie zapisane zmiany zostanÄ… utracone.
 Czy na pewno kontynuować?';
 $lang['js']['searchmedia']     = 'Szukaj plików';
diff --git a/inc/lang/pt-br/lang.php b/inc/lang/pt-br/lang.php
index f3b012521533a493883215703b4b6f6b85e6818b..0abe8a6b61d79fd49c41c689c6ace703f8e00cfa 100644
--- a/inc/lang/pt-br/lang.php
+++ b/inc/lang/pt-br/lang.php
@@ -103,7 +103,7 @@ $lang['txt_filename']          = 'Enviar como (opcional)';
 $lang['txt_overwrt']           = 'Substituir o arquivo existente';
 $lang['lockedby']              = 'Atualmente bloqueada por';
 $lang['lockexpire']            = 'O bloqueio expira em';
-$lang['willexpire']            = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
+$lang['js']['willexpire']            = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'As alterações não salvas serão perdidas.
 Deseja realmente continuar?';
 $lang['js']['searchmedia']     = 'Buscar por arquivos';
diff --git a/inc/lang/pt/lang.php b/inc/lang/pt/lang.php
index 41406ee60147d1c616c183b9f0bd31d1e0c187aa..dba379df5bf224a3e6a0db9b4a769d44f3ed03ec 100644
--- a/inc/lang/pt/lang.php
+++ b/inc/lang/pt/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Carregar como (opcional)';
 $lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
 $lang['lockedby']              = 'Bloqueado por';
 $lang['lockexpire']            = 'Expira em';
-$lang['willexpire']            = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
+$lang['js']['willexpire']            = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
 $lang['js']['notsavedyet']     = 'Existem alterações não gravadas, que serão perdidas se continuar.
 Deseja realmente continuar?';
 $lang['js']['searchmedia']     = 'Procurar por ficheiros';
diff --git a/inc/lang/ro/lang.php b/inc/lang/ro/lang.php
index cbecf6f6c323255b132ac8924f47e83213c2a8e3..b8d7520e6b75d54fb969ecd518da00461895b933 100644
--- a/inc/lang/ro/lang.php
+++ b/inc/lang/ro/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Încarcă fişierul ca (opţional)';
 $lang['txt_overwrt']           = 'Suprascrie fiÅŸierul existent';
 $lang['lockedby']              = 'Momentan blocat de';
 $lang['lockexpire']            = 'Blocarea expiră la';
-$lang['willexpire']            = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
+$lang['js']['willexpire']            = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
 $lang['js']['notsavedyet']     = 'Există modificări nesalvate, care se vor pierde.
 Doreşti să continui?';
 $lang['js']['searchmedia']     = 'Caută fişiere';
diff --git a/inc/lang/ru/lang.php b/inc/lang/ru/lang.php
index 1eaa488ec9ef0a5947db1dcc6aa7f1fda75f6da4..ce9e54819fde59cbaf9ebb8829ba04c854c60ce5 100644
--- a/inc/lang/ru/lang.php
+++ b/inc/lang/ru/lang.php
@@ -104,7 +104,7 @@ $lang['txt_filename']          = 'Введите имя файла в вики (
 $lang['txt_overwrt']           = 'Перезаписать существующий файл';
 $lang['lockedby']              = 'В данный момент заблокирован';
 $lang['lockexpire']            = 'Блокировка истекает в';
-$lang['willexpire']            = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
+$lang['js']['willexpire']            = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
 $lang['js']['notsavedyet']     = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?';
 $lang['js']['searchmedia']     = 'Поиск файлов';
 $lang['js']['keepopen']        = 'Не закрывать окно после выбора';
diff --git a/inc/lang/sk/lang.php b/inc/lang/sk/lang.php
index 4a2520abd2d96bbef69b51b40198f25d56acbde2..4dab977b98a2223b66b65b0abaaf4f39f1d20a01 100644
--- a/inc/lang/sk/lang.php
+++ b/inc/lang/sk/lang.php
@@ -92,7 +92,7 @@ $lang['txt_filename']          = 'Uložiť ako (voliteľné)';
 $lang['txt_overwrt']           = 'Prepísať existujúci súbor';
 $lang['lockedby']              = 'Práve zamknuté:';
 $lang['lockexpire']            = 'Zámok stratí platnosť:';
-$lang['willexpire']            = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
+$lang['js']['willexpire']            = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
 $lang['js']['notsavedyet']     = 'Neuložené zmeny budú stratené.
 Chcete naozaj pokračovať?';
 $lang['js']['searchmedia']     = 'Hľadať súbory';
diff --git a/inc/lang/sl/lang.php b/inc/lang/sl/lang.php
index 0e6c0a706b042c3cb3ae784dcf87219365eff3ed..55c895b2d2704f791b2467ad70b49dabfd4be58d 100644
--- a/inc/lang/sl/lang.php
+++ b/inc/lang/sl/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Pošlji z imenom (izborno)';
 $lang['txt_overwrt']           = 'Prepiši obstoječo datoteko';
 $lang['lockedby']              = 'Trenutno je zaklenjeno s strani';
 $lang['lockexpire']            = 'Zaklep preteče ob';
-$lang['willexpire']            = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
+$lang['js']['willexpire']            = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
 $lang['js']['notsavedyet']     = 'Neshranjene spremembe bodo izgubljene.';
 $lang['js']['searchmedia']     = 'Poišči datoteke';
 $lang['js']['keepopen']        = 'Od izbiri ohrani okno odprto';
diff --git a/inc/lang/sq/lang.php b/inc/lang/sq/lang.php
index 47a54d2eaed67b199cf7c9a0f523908a7bfdf86f..ea2f018b314e3161222faeb2cc118eecc5ecc632 100644
--- a/inc/lang/sq/lang.php
+++ b/inc/lang/sq/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Ngarko si (alternative)';
 $lang['txt_overwrt']           = 'Zëvendëso skedarin ekzistues';
 $lang['lockedby']              = 'Kyçur momentalisht nga';
 $lang['lockexpire']            = 'Kyçi skadon në';
-$lang['willexpire']            = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
+$lang['js']['willexpire']            = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
 $lang['js']['notsavedyet']     = "Ndryshimet e paruajtura do të humbasin.\nVazhdo me të vërtetë?";
 $lang['rssfailed']             = 'Ndoshi një gabim gjatë kapjes së këtij lajmi:';
 $lang['nothingfound']          = 'Nuk u gjet asgjë.';
diff --git a/inc/lang/sr/lang.php b/inc/lang/sr/lang.php
index b35956f03326987a96b177b37eef3bbe80629b40..a868f1d815ab2f83f31b623fcea9d4faf3c978f3 100644
--- a/inc/lang/sr/lang.php
+++ b/inc/lang/sr/lang.php
@@ -91,7 +91,7 @@ $lang['txt_filename']          = 'Унесите вики-име (опционо
 $lang['txt_overwrt']           = 'Препишите тренутни фајл';
 $lang['lockedby']              = 'Тренутно закључано од стране';
 $lang['lockexpire']            = 'Закључавање истиче';
-$lang['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
+$lang['js']['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
 $lang['js']['notsavedyet']     = 'Несачуване измене ће бити изгубљене.
 Да ли стварно желите да наставите?';
 $lang['js']['searchmedia']     = 'Потражи фајлове';
diff --git a/inc/lang/sv/lang.php b/inc/lang/sv/lang.php
index 06b21afe8898c88c6874e5ac59b3dc42cbc2db75..d6f90a5f4a2c529865f548163bfd382b2c9b3860 100644
--- a/inc/lang/sv/lang.php
+++ b/inc/lang/sv/lang.php
@@ -102,7 +102,7 @@ $lang['txt_filename']          = 'Ladda upp som (ej obligatoriskt)';
 $lang['txt_overwrt']           = 'Skriv över befintlig fil';
 $lang['lockedby']              = 'LÃ¥st av';
 $lang['lockexpire']            = 'Lås upphör att gälla';
-$lang['willexpire']            = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
+$lang['js']['willexpire']            = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
 $lang['js']['notsavedyet']     = 'Det finns ändringar som inte är sparade.
 Är du säker på att du vill fortsätta?';
 $lang['js']['searchmedia']     = 'Sök efter filer';
diff --git a/inc/lang/th/lang.php b/inc/lang/th/lang.php
index d40f30f4abae27c4dbbf181b9380dce860e112a4..e9dffa2c1f012b3d1cf52f03cd51812c980cb003 100644
--- a/inc/lang/th/lang.php
+++ b/inc/lang/th/lang.php
@@ -100,7 +100,7 @@ $lang['txt_filename']          = 'อัพโหลดเป็น(ตัวเ
 $lang['txt_overwrt']           = 'เขียนทับไฟล์ที่มีอยู่แล้ว';
 $lang['lockedby']              = 'ตอนนี้ถูกล๊อคโดย';
 $lang['lockexpire']            = 'การล๊อคจะหมดอายุเมื่อ';
-$lang['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
+$lang['js']['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
 $lang['js']['notsavedyet']     = "การแก้ไขที่ไม่ได้บันทึกจะสูญหาย \n ต้องการทำต่อจริงๆหรือ?";
 $lang['rssfailed']             = 'มีข้อผิดพลาดขณะดูดฟีดนี้';
 $lang['nothingfound']          = 'ไม่พบสิ่งใด';
diff --git a/inc/lang/tr/lang.php b/inc/lang/tr/lang.php
index 0509113b0f934e6552de17111624aca105c27707..0b76a6e8123b3848f0503db1d8105c0352c5d13b 100644
--- a/inc/lang/tr/lang.php
+++ b/inc/lang/tr/lang.php
@@ -93,7 +93,7 @@ $lang['txt_filename']          = 'Dosya adı (zorunlu değil)';
 $lang['txt_overwrt']           = 'Mevcut dosyanın üstüne yaz';
 $lang['lockedby']              = 'Şu an şunun tarafından kilitli:';
 $lang['lockexpire']            = 'Kilitin açılma tarihi:';
-$lang['willexpire']            = 'Bu sayfayı değiştirme kilidinin süresi yaklaşık bir dakika içinde geçecek.\nÇakışmaları önlemek için önizleme tuşunu kullanarak kilit sayacını sıfırla.';
+$lang['js']['willexpire']            = 'Bu sayfayı değiştirme kilidinin süresi yaklaşık bir dakika içinde geçecek.\nÇakışmaları önlemek için önizleme tuşunu kullanarak kilit sayacını sıfırla.';
 $lang['js']['notsavedyet']     = 'KaydedilmemiÅŸ deÄŸiÅŸiklikler kaybolacak.
 Devam etmek istiyor musunuz?';
 $lang['js']['searchmedia']     = 'Dosyalar için Ara';
diff --git a/inc/lang/uk/lang.php b/inc/lang/uk/lang.php
index 7bda0250195d7f3de121ffd677bf49a130e0c05f..6b80bc75c78e17f87b1a5a1086cf3c21ccde2243 100644
--- a/inc/lang/uk/lang.php
+++ b/inc/lang/uk/lang.php
@@ -94,7 +94,7 @@ $lang['txt_filename']          = 'Завантажити як (не обов\'я
 $lang['txt_overwrt']           = 'Перезаписати існуючий файл';
 $lang['lockedby']              = 'Заблоковано';
 $lang['lockexpire']            = 'Блокування завершується в';
-$lang['willexpire']            = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
+$lang['js']['willexpire']            = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
 $lang['js']['notsavedyet']     = 'Незбережені зміни будуть втрачені.
  Дійсно продовжити?';
 $lang['js']['searchmedia']     = 'Шукати файли';
diff --git a/inc/lang/vi/lang.php b/inc/lang/vi/lang.php
index 89c9e9cfcb1a56132a9ab7bae2b814efc1f44f10..361e51e84cde00bca9b46de33aebbd6e17f82cb5 100644
--- a/inc/lang/vi/lang.php
+++ b/inc/lang/vi/lang.php
@@ -49,7 +49,7 @@ $lang['txt_upload']   = 'Chọn tệp để tải lên';
 $lang['txt_filename'] = 'Điền wikiname (tuỳ ý)';
 $lang['lockedby']     = 'Đang khoá bởi';
 $lang['lockexpire']   = 'Khoá sẽ hết hạn vào lúc';
-$lang['willexpire']   = 'Khoá của bạn để biên soạn trang này sẽ hết hạn trong vòng 1 phút.\nĐể tránh xung đột, bạn nên bấm nút xem trước để lập lại thời gian khoá';
+$lang['js']['willexpire']   = 'Khoá của bạn để biên soạn trang này sẽ hết hạn trong vòng 1 phút.\nĐể tránh xung đột, bạn nên bấm nút xem trước để lập lại thời gian khoá';
 
 $lang['js']['notsavedyet'] = "Hiện có những thay đổi chưa được bảo lưu, và sẽ mất.\nBạn thật sự muốn tiếp tục?";
 $lang['rssfailed']   = 'Rút nguồn này gặp phải lỗi';
diff --git a/inc/lang/zh-tw/lang.php b/inc/lang/zh-tw/lang.php
index 074c510e9061adb15a87621183b06720acf6b688..2222125f536080f459d4b9711f89da07b53987ec 100644
--- a/inc/lang/zh-tw/lang.php
+++ b/inc/lang/zh-tw/lang.php
@@ -95,7 +95,7 @@ $lang['txt_filename']          = '請輸入要存在維基內的檔案名稱 (
 $lang['txt_overwrt']           = '是否要覆蓋原有檔案';
 $lang['lockedby']              = '目前已被下列人員鎖定';
 $lang['lockexpire']            = '預計解除鎖定於';
-$lang['willexpire']            = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
+$lang['js']['willexpire']            = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
 $lang['js']['notsavedyet']     = '未儲存的變更將會遺失，繼續嗎？';
 $lang['js']['searchmedia']     = '搜尋檔案';
 $lang['js']['keepopen']        = '選擇時保持視窗開啟';
diff --git a/inc/lang/zh/lang.php b/inc/lang/zh/lang.php
index 14c92c4b3699acc2395ef4b46a148254ee275563..31e6dc238122ed37ea31dd59c97fdccd063cd681 100644
--- a/inc/lang/zh/lang.php
+++ b/inc/lang/zh/lang.php
@@ -98,7 +98,7 @@ $lang['txt_filename']          = '上传并重命名为（可选）';
 $lang['txt_overwrt']           = '覆盖已存在的同名文件';
 $lang['lockedby']              = '目前已被下列人员锁定';
 $lang['lockexpire']            = '预计锁定解除于';
-$lang['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
+$lang['js']['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
 $lang['js']['notsavedyet']     = '未保存的更改将丢失。
 真的要继续？';
 $lang['js']['searchmedia']     = '查找文件';
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 0e0a22d423553f51b9711f21f4fe70fb075d172a..e96d45ee6607e56084f3558fa75ce590924cb2dd 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -109,7 +109,7 @@ function js_out(){
     js_runonstart("addEvent(document,'click',closePopups)");
     js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
     if($conf['locktime'] != 0){
-        js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].", 'wiki__text')");
+        js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")");
     }
     // init hotkeys - must have been done after init of toolbar
 # disabled for FS#1958    js_runonstart('initializeHotkeys()');
diff --git a/lib/scripts/locktimer.js b/lib/scripts/locktimer.js
index 60508a8e718e6b94128b5f64cc8a080eba1401d1..b83840557792ef6eefc4ac7a91e0eaa7edb2a80f 100644
--- a/lib/scripts/locktimer.js
+++ b/lib/scripts/locktimer.js
@@ -1,64 +1,62 @@
 /**
-* Class managing the timer to display a warning on a expiring lock
-*/
-var locktimer = {
-    sack: null,
+ * Class managing the timer to display a warning on a expiring lock
+ */
+var dw_locktimer = {
     timeout: 0,
+    draft: false,
     timerID: null,
     lasttime: null,
     msg: '',
     pageid: '',
 
-    init: function(timeout,msg,draft,edid){
-        var edit = $(edid);
-        if(!edit) return;
-        if(edit.readOnly) return;
+    /**
+     * Initialize the lock timer
+     *
+     * @param int timeout Lenght of timeout in seconds
+     * @param bool draft  save drafts
+     */
+    init: function(timeout,draft){ //FIXME which elements to pass here?
+        var $edit = jQuery('#wiki__text');
+        if(!$edit.length) return;
+        if($edit.attr('readonly')) return;
 
         // init values
-        this.timeout = timeout*1000;
-        this.msg = msg;
-        this.draft = draft;
-        this.lasttime = new Date();
+        dw_locktimer.timeout  = timeout*1000;
+        dw_locktimer.draft    = draft;
+        dw_locktimer.lasttime = new Date();
 
-        if(jQuery('#dw__editform').length == 0) return;
-        this.pageid = jQuery('#dw__editform input[name=id]').val();
-        if(!this.pageid) return;
-
-        if(jQuery('#wiki__text').attr('readonly')) return;
+        dw_locktimer.pageid   = jQuery('#dw__editform input[name=id]').val();
+        if(!dw_locktimer.pageid) return;
 
         // register refresh event
-        jQuery('#dw__editform').keypress(
-            function() {
-                locktimer.refresh();
-            }
-        );
+        jQuery('#wiki__text').keypress(dw_locktimer.refresh);
         // start timer
-        this.reset();
+        dw_locktimer.reset();
     },
 
     /**
      * (Re)start the warning timer
      */
     reset: function(){
-        this.clear();
-        this.timerID = window.setTimeout("locktimer.warning()", this.timeout);
+        dw_locktimer.clear();
+        dw_locktimer.timerID = window.setTimeout(dw_locktimer.warning, dw_locktimer.timeout);
     },
 
     /**
      * Display the warning about the expiring lock
      */
     warning: function(){
-        this.clear();
-        alert(this.msg);
+        dw_locktimer.clear();
+        alert(LANG.willexpire.replace(/\\n/,"\n"));
     },
 
     /**
      * Remove the current warning timer
      */
     clear: function(){
-        if(this.timerID !== null){
-            window.clearTimeout(this.timerID);
-            this.timerID = null;
+        if(dw_locktimer.timerID !== null){
+            window.clearTimeout(dw_locktimer.timerID);
+            dw_locktimer.timerID = null;
         }
     },
 
@@ -71,11 +69,11 @@ var locktimer = {
         var now = new Date();
         var params = {};
         // refresh every minute only
-        if(now.getTime() - this.lasttime.getTime() > 30*1000){
+        if(now.getTime() - dw_locktimer.lasttime.getTime() > 30*1000){
             params['call'] = 'lock';
-            params['id'] = locktimer.pageid;
+            params['id'] = dw_locktimer.pageid;
 
-            if(locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){
+            if(dw_locktimer.draft && jQuery('#dw__editform textarea[name=wikitext]').length > 0){
                 params['prefix'] = jQuery('#dw__editform input[name=prefix]').val();
                 params['wikitext'] = jQuery('#dw__editform textarea[name=wikitext]').val();
                 params['suffix'] = jQuery('#dw__editform input[name=suffix]').val();
@@ -87,12 +85,10 @@ var locktimer = {
             jQuery.post(
                 DOKU_BASE + 'lib/exe/ajax.php',
                 params,
-                function (data) {
-                    locktimer.refreshed(data);
-                },
+                dw_locktimer.refreshed,
                 'html'
             );
-            this.lasttime = now;
+            dw_locktimer.lasttime = now;
         }
     },
 
@@ -105,6 +101,6 @@ var locktimer = {
 
         jQuery('#draft__status').html(data);
         if(error != '1') return; // locking failed
-        this.reset();
+        dw_locktimer.reset();
     }
 };