Merge remote-tracking branch 'origin' into smforigin/smf

Conflicts:
	chat/lib/custom.php

41 files changed, 0 insertions, 41 deletions

diff --git a/chat/lib/lang/ar.php b/chat/lib/lang/ar.php
index b04e55c..5e6f0c7 100644
--- a/chat/lib/lang/ar.php
+++ b/chat/lib/lang/ar.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'الوقت';
 $lang['logsSearch'] = 'بحث';
 $lang['logsPrivateChannels'] = 'القنوات الخاصة';
 $lang['logsPrivateMessages'] = 'الرسائل الخاصة';
-?>
diff --git a/chat/lib/lang/bg.php b/chat/lib/lang/bg.php
index 1a5e43d..1c76f1d 100644
--- a/chat/lib/lang/bg.php
+++ b/chat/lib/lang/bg.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Време';
 $lang['logsSearch'] = 'Търсене';
 $lang['logsPrivateChannels'] = 'Лични канали';
 $lang['logsPrivateMessages'] = 'Лични съобщения';
-?>
diff --git a/chat/lib/lang/ca.php b/chat/lib/lang/ca.php
index d059a3b..7c11091 100644
--- a/chat/lib/lang/ca.php
+++ b/chat/lib/lang/ca.php
@@ -125,4 +125,3 @@ $lang['logsSearch'] = 'Buscar';
 $lang['logsPrivateChannels'] = 'Canals privats';
 $lang['logsPrivateMessages'] = 'Missatges privats';
 
-?>
diff --git a/chat/lib/lang/cy.php b/chat/lib/lang/cy.php
index 9e47e45..4202928 100644
--- a/chat/lib/lang/cy.php
+++ b/chat/lib/lang/cy.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Amser';
 $lang['logsSearch'] = 'Chwilio';
 $lang['logsPrivateChannels'] = 'Sianeli Preifat';
 $lang['logsPrivateMessages'] = 'Negeseuon Preifat';
-?>
diff --git a/chat/lib/lang/cz.php b/chat/lib/lang/cz.php
index 4eb3ca2..cda3b7d 100644
--- a/chat/lib/lang/cz.php
+++ b/chat/lib/lang/cz.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Čas';
 $lang['logsSearch'] = 'Hledej';
 $lang['logsPrivateChannels'] = 'Soukromé místnosti';
 $lang['logsPrivateMessages'] = 'Soukromé zprávy';
-?>
diff --git a/chat/lib/lang/da.php b/chat/lib/lang/da.php
index d710eb6..9616189 100644
--- a/chat/lib/lang/da.php
+++ b/chat/lib/lang/da.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Tid';
 $lang['logsSearch'] = 'Søg';
 $lang['logsPrivateChannels'] = 'Private Kanaler';
 $lang['logsPrivateMessages'] = 'Private Beskeder';
-?>
diff --git a/chat/lib/lang/de.php b/chat/lib/lang/de.php
index 9522648..1a236ec 100644
--- a/chat/lib/lang/de.php
+++ b/chat/lib/lang/de.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Uhrzeit';
 $lang['logsSearch'] = 'Suche';
 $lang['logsPrivateChannels'] = 'Private Räume';
 $lang['logsPrivateMessages'] = 'Private Nachrichten';
-?>
diff --git a/chat/lib/lang/el.php b/chat/lib/lang/el.php
index a906ca8..36d486c 100644
--- a/chat/lib/lang/el.php
+++ b/chat/lib/lang/el.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Ώρα';
 $lang['logsSearch'] = 'Αναζήτηση';
 $lang['logsPrivateChannels'] = 'Πριβέ κανάλια';
 $lang['logsPrivateMessages'] = 'προσωπικά μηνύματα';
-?>
diff --git a/chat/lib/lang/en.php b/chat/lib/lang/en.php
index 97e18cf..138e249 100644
--- a/chat/lib/lang/en.php
+++ b/chat/lib/lang/en.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Time';
 $lang['logsSearch'] = 'Search';
 $lang['logsPrivateChannels'] = 'Private Channels';
 $lang['logsPrivateMessages'] = 'Private Messages';
-?>
diff --git a/chat/lib/lang/es.php b/chat/lib/lang/es.php
index afc91c8..4532ae5 100644
--- a/chat/lib/lang/es.php
+++ b/chat/lib/lang/es.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Hora';
 $lang['logsSearch'] = 'Buscar';
 $lang['logsPrivateChannels'] = 'Canales Privados';
 $lang['logsPrivateMessages'] = 'Mensajes Privados';
-?>
diff --git a/chat/lib/lang/et.php b/chat/lib/lang/et.php
index bd438db..f3cfbec 100644
--- a/chat/lib/lang/et.php
+++ b/chat/lib/lang/et.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Kellaaeg';
 $lang['logsSearch'] = 'Otsi';
 $lang['logsPrivateChannels'] = 'Privaat-kanalid';
 $lang['logsPrivateMessages'] = 'Privaat-sõnumid';
-?>
diff --git a/chat/lib/lang/fa.php b/chat/lib/lang/fa.php
index 0c64586..3b2a47e 100644
--- a/chat/lib/lang/fa.php
+++ b/chat/lib/lang/fa.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'زمان';
 $lang['logsSearch'] = 'جست و جو';
 $lang['logsPrivateChannels'] = 'اطاق های خصوصی';
 $lang['logsPrivateMessages'] = 'پیغام های خصوصی';
-?>
diff --git a/chat/lib/lang/fi.php b/chat/lib/lang/fi.php
index e30782b..094ecd6 100644
--- a/chat/lib/lang/fi.php
+++ b/chat/lib/lang/fi.php
@@ -125,4 +125,3 @@ $lang['logsTime'] = 'Aika';
 $lang['logsSearch'] = 'Etsi';
 $lang['logsPrivateChannels'] = 'Näytä yksityiset kanavat';
 $lang['logsPrivateMessages'] = 'Yksityiset viestit';
-?>
diff --git a/chat/lib/lang/fr.php b/chat/lib/lang/fr.php
index ac14e15..e260853 100644
--- a/chat/lib/lang/fr.php
+++ b/chat/lib/lang/fr.php
@@ -125,4 +125,3 @@ $lang['logsTime'] = 'Heure';
 $lang['logsSearch'] = 'Chercher';
 $lang['logsPrivateChannels'] = 'Salons privés';
 $lang['logsPrivateMessages'] = 'Messages privés';
-?>
diff --git a/chat/lib/lang/gl.php b/chat/lib/lang/gl.php
index 7491cb9..2161faf 100644
--- a/chat/lib/lang/gl.php
+++ b/chat/lib/lang/gl.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Hora';
 $lang['logsSearch'] = 'Buscar';
 $lang['logsPrivateChannels'] = 'Canles privadas';
 $lang['logsPrivateMessages'] = 'mensaxes privadas';
-?>
diff --git a/chat/lib/lang/he.php b/chat/lib/lang/he.php
index 80f3ba0..78c6b85 100644
--- a/chat/lib/lang/he.php
+++ b/chat/lib/lang/he.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'זמן';
 $lang['logsSearch'] = 'חיפוש';
 $lang['logsPrivateChannels'] = 'ערוצים פרטיים';
 $lang['logsPrivateMessages'] = 'הודעות פרטיות';
-?>
diff --git a/chat/lib/lang/hr.php b/chat/lib/lang/hr.php
index 49bb6e8..c628362 100644
--- a/chat/lib/lang/hr.php
+++ b/chat/lib/lang/hr.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Vrijeme';
 $lang['logsSearch'] = 'Traži';
 $lang['logsPrivateChannels'] = 'Privatni kanali';
 $lang['logsPrivateMessages'] = 'Privatne poruke';
-?>
diff --git a/chat/lib/lang/hu.php b/chat/lib/lang/hu.php
index 146b381..7c7975d 100644
--- a/chat/lib/lang/hu.php
+++ b/chat/lib/lang/hu.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Idő';
 $lang['logsSearch'] = 'Keresés';
 $lang['logsPrivateChannels'] = 'Privát szobák';
 $lang['logsPrivateMessages'] = 'Privát üzenetek';
-?>
diff --git a/chat/lib/lang/in.php b/chat/lib/lang/in.php
index 8940d1d..0fb3f19 100644
--- a/chat/lib/lang/in.php
+++ b/chat/lib/lang/in.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'Waktu';
 $lang['logsSearch'] = 'Cari';
 $lang['logsPrivateChannels'] = 'Saluran-saluran privasi';
 $lang['logsPrivateMessages'] = 'Pesan Pribadi';
-?>
diff --git a/chat/lib/lang/it.php b/chat/lib/lang/it.php
index 6901053..87264eb 100644
--- a/chat/lib/lang/it.php
+++ b/chat/lib/lang/it.php
@@ -125,4 +125,3 @@ $lang['logsTime'] = 'Ora';
 $lang['logsSearch'] = 'Cerca';
 $lang['logsPrivateChannels'] = 'Canali Privati';
 $lang['logsPrivateMessages'] = 'Messaggi privati';
-?>
diff --git a/chat/lib/lang/ja.php b/chat/lib/lang/ja.php
index efe3080..324b749 100644
--- a/chat/lib/lang/ja.php
+++ b/chat/lib/lang/ja.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = '時間';
 $lang['logsSearch'] = '検索';
 $lang['logsPrivateChannels'] = '二人きりモード';
 $lang['logsPrivateMessages'] = 'プライベートメッセージ';
-?>
diff --git a/chat/lib/lang/ka.php b/chat/lib/lang/ka.php
index 96cb954..cffdffd 100644
--- a/chat/lib/lang/ka.php
+++ b/chat/lib/lang/ka.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = 'დრო';
 $lang['logsSearch'] = 'ძიება';
 $lang['logsPrivateChannels'] = 'პირადი არხები';
 $lang['logsPrivateMessages'] = 'პირადი გზავნილები';
-?>
diff --git a/chat/lib/lang/kr.php b/chat/lib/lang/kr.php
index 1dc4c1e..2d57dd2 100644
--- a/chat/lib/lang/kr.php
+++ b/chat/lib/lang/kr.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = '시간';
 $lang['logsSearch'] = '검색';
 $lang['logsPrivateChannels'] = '개인채널';
 $lang['logsPrivateMessages'] = '개인 메시지';
-?>
diff --git a/chat/lib/lang/mk.php b/chat/lib/lang/mk.php
index d713ad3..d9c3c2d 100644
--- a/chat/lib/lang/mk.php
+++ b/chat/lib/lang/mk.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Време';
 $lang['logsSearch'] = 'Пребарување';
 $lang['logsPrivateChannels'] = 'Приватни канали';
 $lang['logsPrivateMessages'] = 'Приватни пораки';
-?>
diff --git a/chat/lib/lang/nl-be.php b/chat/lib/lang/nl-be.php
index 8449aeb..594cb8d 100644
--- a/chat/lib/lang/nl-be.php
+++ b/chat/lib/lang/nl-be.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Tijd';
 $lang['logsSearch'] = 'Zoek';
 $lang['logsPrivateChannels'] = 'Privékanalen';
 $lang['logsPrivateMessages'] = 'Privéberichten';
-?>
diff --git a/chat/lib/lang/nl.php b/chat/lib/lang/nl.php
index f984db5..8a3c267 100644
--- a/chat/lib/lang/nl.php
+++ b/chat/lib/lang/nl.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Tijd';
 $lang['logsSearch'] = 'Zoek';
 $lang['logsPrivateChannels'] = 'Privékanalen';
 $lang['logsPrivateMessages'] = 'Privéberichten';
-?>
diff --git a/chat/lib/lang/no.php b/chat/lib/lang/no.php
index 855efd5..c562821 100644
--- a/chat/lib/lang/no.php
+++ b/chat/lib/lang/no.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Tid';
 $lang['logsSearch'] = 'Søk';
 $lang['logsPrivateChannels'] = 'Private Kanaler';
 $lang['logsPrivateMessages'] = 'Private Meldinger';
-?>
diff --git a/chat/lib/lang/pl.php b/chat/lib/lang/pl.php
index dd041f1..9b60db6 100644
--- a/chat/lib/lang/pl.php
+++ b/chat/lib/lang/pl.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Czas';
 $lang['logsSearch'] = 'Szukaj';
 $lang['logsPrivateChannels'] = 'Prywatne pokoje';
 $lang['logsPrivateMessages'] = 'Prywatne wiadomości';
-?>
diff --git a/chat/lib/lang/pt-br.php b/chat/lib/lang/pt-br.php
index 8837a1e..01a2191 100644
--- a/chat/lib/lang/pt-br.php
+++ b/chat/lib/lang/pt-br.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Hora';
 $lang['logsSearch'] = 'Pesquisar';
 $lang['logsPrivateChannels'] = 'Canais privados';
 $lang['logsPrivateMessages'] = 'Mensagens privadas';
-?>
diff --git a/chat/lib/lang/pt-pt.php b/chat/lib/lang/pt-pt.php
index 0576b30..d1d2374 100644
--- a/chat/lib/lang/pt-pt.php
+++ b/chat/lib/lang/pt-pt.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Tempo';
 $lang['logsSearch'] = 'Procurar';
 $lang['logsPrivateChannels'] = 'Salas privadas';
 $lang['logsPrivateMessages'] = 'Mensagens privadas';
-?>
diff --git a/chat/lib/lang/ro.php b/chat/lib/lang/ro.php
index db62fb5..4810422 100644
--- a/chat/lib/lang/ro.php
+++ b/chat/lib/lang/ro.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Ora';
 $lang['logsSearch'] = 'Caută';
 $lang['logsPrivateChannels'] = 'Canale private';
 $lang['logsPrivateMessages'] = 'Mesaje private';
-?>
diff --git a/chat/lib/lang/ru.php b/chat/lib/lang/ru.php
index 5fb6d91..1ee1c89 100644
--- a/chat/lib/lang/ru.php
+++ b/chat/lib/lang/ru.php
@@ -125,4 +125,3 @@ $lang['logsTime'] = 'Время';
 $lang['logsSearch'] = 'Поиск';
 $lang['logsPrivateChannels'] = 'Приватные каналы';
 $lang['logsPrivateMessages'] = 'Приватные сообщения';
-?>
diff --git a/chat/lib/lang/sk.php b/chat/lib/lang/sk.php
index 752190d..886a114 100644
--- a/chat/lib/lang/sk.php
+++ b/chat/lib/lang/sk.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Čas';
 $lang['logsSearch'] = 'Vyhľadávanie';
 $lang['logsPrivateChannels'] = 'Súkromný kanál';
 $lang['logsPrivateMessages'] = 'Súkromná správa';
-?>
diff --git a/chat/lib/lang/sl.php b/chat/lib/lang/sl.php
index 4a5a7b6..a80b1c4 100644
--- a/chat/lib/lang/sl.php
+++ b/chat/lib/lang/sl.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Ura';
 $lang['logsSearch'] = 'Iskanje';
 $lang['logsPrivateChannels'] = 'Privatne sobe';
 $lang['logsPrivateMessages'] = 'Privatna sporočila';
-?>
diff --git a/chat/lib/lang/sr.php b/chat/lib/lang/sr.php
index 1a99a3e..f391083 100644
--- a/chat/lib/lang/sr.php
+++ b/chat/lib/lang/sr.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Vreme';
 $lang['logsSearch'] = 'Pretraga';
 $lang['logsPrivateChannels'] = 'Privatne sobe';
 $lang['logsPrivateMessages'] = 'Privatne poruke';
-?>
diff --git a/chat/lib/lang/sv.php b/chat/lib/lang/sv.php
index 4bf8403..f2d6060 100644
--- a/chat/lib/lang/sv.php
+++ b/chat/lib/lang/sv.php
@@ -124,4 +124,3 @@ $lang['logsTime']			= 'Tid';
 $lang['logsSearch']			= 'Sök';
 $lang['logsPrivateChannels']		= 'Privata Kanaler';
 $lang['logsPrivateMessages']		= 'Privata Meddelanden';
-?>
diff --git a/chat/lib/lang/th.php b/chat/lib/lang/th.php
index 1b0149d..2412bd6 100644
--- a/chat/lib/lang/th.php
+++ b/chat/lib/lang/th.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'เวลา';
 $lang['logsSearch'] = 'ค้นหา';
 $lang['logsPrivateChannels'] = 'ห้องส่วนตัว';
 $lang['logsPrivateMessages'] = 'ข้อความส่วนตัว';
-?>
diff --git a/chat/lib/lang/tr.php b/chat/lib/lang/tr.php
index 07709bb..4bf2336 100644
--- a/chat/lib/lang/tr.php
+++ b/chat/lib/lang/tr.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Saat';
 $lang['logsSearch'] = 'Ara';
 $lang['logsPrivateChannels'] = 'Özel Kanallar';
 $lang['logsPrivateMessages'] = 'Özel Mesajlar';
-?>
diff --git a/chat/lib/lang/uk.php b/chat/lib/lang/uk.php
index d8bb72e..ffb5391 100644
--- a/chat/lib/lang/uk.php
+++ b/chat/lib/lang/uk.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = 'Час';
 $lang['logsSearch'] = 'Пошук';
 $lang['logsPrivateChannels'] = 'Приватні кімнати';
 $lang['logsPrivateMessages'] = 'Приватні повідомлення';
-?>
diff --git a/chat/lib/lang/zh-tw.php b/chat/lib/lang/zh-tw.php
index 1224004..0eda611 100644
--- a/chat/lib/lang/zh-tw.php
+++ b/chat/lib/lang/zh-tw.php
@@ -123,4 +123,3 @@ $lang['logsTime'] = '時間';
 $lang['logsSearch'] = '搜尋';
 $lang['logsPrivateChannels'] = '私人房';
 $lang['logsPrivateMessages'] = '悄悄話';
-?>
diff --git a/chat/lib/lang/zh.php b/chat/lib/lang/zh.php
index 18677e6..a742ad7 100644
--- a/chat/lib/lang/zh.php
+++ b/chat/lib/lang/zh.php
@@ -124,4 +124,3 @@ $lang['logsTime'] = '时间';
 $lang['logsSearch'] = '搜索';
 $lang['logsPrivateChannels'] = '私人频道';
 $lang['logsPrivateMessages'] = '私人消息';
-?>