20 files changed, 42 insertions, 40 deletions
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 1501db636..8235ca960 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -81,8 +81,8 @@ function do_timeout_treatment($post_keyname, $check_key_treated = array())
 
       $must_repost = true;
       array_push($page['errors'],
-        l10n_dec('Execution time is out, treatment must be continue [Estmated time: %d second].',
-                 'Execution time is out, treatment must be continue [Estmated time: %d seconds].',
+        l10n_dec('Execution time is out, treatment must be continue [Estimated time: %d second].',
+                 'Execution time is out, treatment must be continue [Estimated time: %d seconds].',
                   $time_refresh));
     }
   }
diff --git a/language/ar_SA/admin.lang.php b/language/ar_SA/admin.lang.php
index a59a2e3ac..8ed00acfc 100644
--- a/language/ar_SA/admin.lang.php
+++ b/language/ar_SA/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'صور الألبوم الفرعي';
 $lang['Manage'] = 'إدارة';
 $lang['maximum height'] = 'الارتفاع الاقصى';
 $lang['maximum width'] = 'العرض الاقصى';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = ' أستنفذت الوقت المتاح للتنفيذ وهو %d دقيقة';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'أستنفذت الوقت المتاح للتنفيذ وهو %d دقائق';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = ' أستنفذت الوقت المتاح للتنفيذ وهو %d دقيقة';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'أستنفذت الوقت المتاح للتنفيذ وهو %d دقائق';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'الوقت المتاح لامراسلة قائمة المستخدمين محدود ،هناك متخدمين لم يتم اضافتهم في القائمة.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'الوقت للارسال محدود ، تم تجاهل بعض العناوين.';
 $lang['To send ?'] = 'إرسـال؟';
diff --git a/language/cs_CZ/admin.lang.php b/language/cs_CZ/admin.lang.php
index 09e483285..a89a3f992 100644
--- a/language/cs_CZ/admin.lang.php
+++ b/language/cs_CZ/admin.lang.php
@@ -253,8 +253,8 @@ $lang['manage sub-categories'] = 'Spravovat podkategorie';
 $lang['Manage'] = 'Správa';
 $lang['maximum height'] = 'maximální výška';
 $lang['maximum width'] = 'maximální šířka';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Vykonávání operace překročilo povolený čas, zvolte jestli chcete pokračovat [očekávaný čas: %d sekund].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Vykonávání překročilo maximální čas, zvolte jestli chcete pokračovat [očekávaný čas: %d sekund].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Vykonávání operace překročilo povolený čas, zvolte jestli chcete pokračovat [očekávaný čas: %d sekund].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Vykonávání překročilo maximální čas, zvolte jestli chcete pokračovat [očekávaný čas: %d sekund].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Nastavený čas pro zobrazení seznamu uživatelů byl překročen. Další uživatelé nebudou zobrazeni.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Nastavený čas pro odeslání zprávy byl překročen. Další zprávy nebudou odeslány.';
 $lang['To send ?'] = 'Odeslat?';
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 443d1a7ae..17402aedf 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -250,7 +250,7 @@ $lang['manage sub-categories'] = 'Unterkategorien verwalten';
 $lang['Manage'] = 'Verwalten';
 $lang['maximum height'] = 'maximale Höhe';
 $lang['maximum width'] = 'maximale Breite';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Ausführungszeit ist beendet, Vorgang muss manuell fortgesetzt werden [Verstrichene Zeit: %d Sekunde].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Ausführungszeit ist beendet, Vorgang muss manuell fortgesetzt werden [Verstrichene Zeit: %d Sekunde].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Die vorgesehene Zeit zum versenden von E-Mail ist begrenzt. Andere Benutzer werden nicht aufgelistet.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Die Zeit zum E-Mail versenden ist begrenzt. Nicht abgearbeitete Mails werden übersprungen';
 $lang['To send ?'] = 'Info-Mail schicken?';
@@ -722,7 +722,7 @@ $lang['Activate icon "%s"'] = 'Aktiviere Icon "%s"';
 $lang['Activate field "%s"'] = 'Aktiviere  Bereich "%s"';
 $lang['Photo Properties'] = 'Fotoeigenschaften';
 $lang['Allow user customization'] = 'Erlaube Anpassungen durch Benutzer';
-$lang['Execution time is out, treatment must be continued [Estmated time: %d seconds].'] = 'Zeit für die Ausführung ist abgelaufen, der Prozess muss fortgesetzt werden [Noch benötigte Zeit: %d Sekunden].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Zeit für die Ausführung ist abgelaufen, der Prozess muss fortgesetzt werden [Noch benötigte Zeit: %d Sekunden].';
 $lang['Languages'] = 'Sprachen';
 $lang['Installed Languages'] = 'Installierte Sprachen';
 $lang['Add New Language'] = 'Füge eine neue Sprache hinzu';
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 4e7e6fc33..12d277997 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -252,8 +252,8 @@ $lang['manage sub-categories'] = "Manage sub-categories";
 $lang['Manage'] = "Manage";
 $lang['maximum height'] = "Maximum height";
 $lang['maximum width'] = "Maximum width";
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = "Execution time is out, treatment must be continue [Estimated time: %d second].";
-$lang['Execution time is out, treatment must be continued [Estmated time: %d seconds].'] = "Execution time exceeded, the treatment must continue [Estimated time: %d seconds].";
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = "Execution time is out, treatment must be continue [Estimated time: %d second].";
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = "Execution time exceeded, the treatment must continue [Estimated time: %d seconds].";
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = "The time to prepare the list of users who will be sent mail is limited. Others users are not listed.";
 $lang['Time to send mail is limited. Others mails are skipped.'] = "The time to send mail is limited. Others mails have been skipped.";
 $lang['To send ?'] = "To send?";
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 5c90241cf..97ce0fe14 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -252,8 +252,8 @@ $lang['manage sub-categories'] = "Gérer les sous-catégories";
 $lang['Manage'] = "Gérer";
 $lang['maximum height'] = "Hauteur maximum";
 $lang['maximum width'] = "Largeur maximum";
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = "Le temps d'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d second].";
-$lang['Execution time is out, treatment must be continued [Estmated time: %d seconds].'] = "Le temps d'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d secondes].";
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = "Le temps d'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d second].";
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = "Le temps d'exécution étant dépassé, le traitement doit continuer [Temps estimé: %d secondes].";
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = "Le temps de préparation de la liste des utilisateurs pour l'envoi est limité. Les autres utilisateurs ne sont pas listés.";
 $lang['Time to send mail is limited. Others mails are skipped.'] = "Le temps d'envoi des mails est limité. Les autres envois de mail ont été ignorés.";
 $lang['To send ?'] = "A envoyer ?";
diff --git a/language/hr_HR/admin.lang.php b/language/hr_HR/admin.lang.php
index 4ffb4ed29..e15494b2a 100644
--- a/language/hr_HR/admin.lang.php
+++ b/language/hr_HR/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'upravljanje podskupinama';
 $lang['Manage'] = 'Uprava';
 $lang['maximum height'] = 'najveća visina';
 $lang['maximum width'] = 'najveća širina';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Vrijeme izvršenja je isteklo, obrada se mora nastaviti [Procijenjeno vrijeme: %d sekunde].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Vrijeme izvršenja je isteklo, obrada se mora nastaviti [Procijenjeno vrijeme: %d sekundi].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Vrijeme izvršenja je isteklo, obrada se mora nastaviti [Procijenjeno vrijeme: %d sekunde].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Vrijeme izvršenja je isteklo, obrada se mora nastaviti [Procijenjeno vrijeme: %d sekundi].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Predviđeno vrijeme za popis korisnika za slanje poruka je ograničeno. Ostali korisnici nisu izlistani.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Vrijeme za slanje poruke je ograničeno. Ostale poruke su preskočene.';
 $lang['To send ?'] = 'Poslati ?';
diff --git a/language/hu_HU/admin.lang.php b/language/hu_HU/admin.lang.php
index e7a365fb6..05723202a 100644
--- a/language/hu_HU/admin.lang.php
+++ b/language/hu_HU/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'Alkategóriák kezelése';
 $lang['Manage'] = 'Kezelés';
 $lang['maximum height'] = 'Maximális magasság';
 $lang['maximum width'] = 'Maximális szélesség';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Az átfutási idő lejárt, a műveletet folytatni kell [Idő: %d másodperc].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Az átfutási idő lejárt, a műveletet folytatni kell [Idő: %d másodperc].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Az átfutási idő lejárt, a műveletet folytatni kell [Idő: %d másodperc].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Az átfutási idő lejárt, a műveletet folytatni kell [Idő: %d másodperc].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Die vorgesehene Zeit zum versenden von E-mail ist begrenzt. Andere Felhasználó werden nicht aufgelistet.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Die Zeit zum E-mail versenden ist begrenzt. Nicht abgearbeitete Mails werden übersprungen';
 $lang['To send ?'] = 'Elküldjük?';
@@ -678,8 +678,9 @@ $lang['Thumbnail'] = 'Bélyegkép';
 $lang['Save Settings'] = 'Beállítások mentése';
 $lang['Your configuration settings are saved'] = 'A beállítások mentése sikeres';
 // --------- missing translations ---- from version 2.1.0 RC1
-$lang['Unable to check for upgrade.'] = 'A frissítés sikertelen.';
-$lang['Execution time is out, treatment must be continued [Estmated time: %d seconds].'] = 'Időtúllépés esetén a műveletet folytatni kell [Becsült idő: %d másodperc].';
+$lang['Categories sorted in descending order ⇑'] = 'Kategóriák csökkenő sorrendben ⇑';
+$lang['Unable to check for upgrade.'] = 'Unable to check for upgrade.';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Időtúllépés esetén a műveletet folytatni kell [Becsült idő: %d másodperc].';
 $lang['Processing treatment.'] = 'Feldolgozás.';
 $lang['Please wait...'] = 'Kérem várjon...';
 $lang['Tools'] = 'Eszközök';
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index ababee551..b18802ffb 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -252,8 +252,8 @@ $lang['manage sub-categories'] = 'Gestire le sottocategorie';
 $lang['Manage'] = 'Gestire';
 $lang['maximum height'] = 'Altezza massima';
 $lang['maximum width'] = 'Larghezza massima';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Il tempo di esecuzione è scaduto, il trattamento deve continuare [Tempo stimato: %d secondo].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Il tempo di esecuzione è scaduto, il trattamento deve continuare [Tempo stimato: %d secondi].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Il tempo di esecuzione è scaduto, il trattamento deve continuare [Tempo stimato: %d secondo].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Il tempo di esecuzione è scaduto, il trattamento deve continuare [Tempo stimato: %d secondi].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Il tempo di preparazione della lista degli utenti per l\'invio dell\'email è limitato. Gli altri utenti non sono elencati';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Il tempo per l\'invio dell\'email è limitato. L\'invio delle altre email verra ignorato.';
 $lang['To send ?'] = 'Inviare?';
diff --git a/language/ja_JP/admin.lang.php b/language/ja_JP/admin.lang.php
index 4695ae44f..e955e843a 100644
--- a/language/ja_JP/admin.lang.php
+++ b/language/ja_JP/admin.lang.php
@@ -249,7 +249,8 @@ $lang['manage sub-categories'] = 'サブカテゴリを管理する';
 $lang['Manage'] = '管理';
 $lang['maximum height'] = '最大高';
 $lang['maximum width'] = '最大幅';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = '実行時間が終了しました。処理を継続します [予想時間: %d 秒]。';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = '実行時間が終了しました。処理を継続します [予想時間: %d 秒]。';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = '実行時間が終了しました。処理を継続します  [予想時間: %d 秒].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'メール送信するユーザリストのユーザ数が制限されています。他のユーザは、リストに含まれていません。';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'メール送信時間が制限されています。他のメールはスキップされます。';
 $lang['To send ?'] = '送信?';
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 76b9c492c..fab93e719 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -250,7 +250,7 @@ $lang['manage sub-categories'] = 'Beheer sub-categorie';
 $lang['Manage'] = 'Beheer';
 $lang['maximum height'] = 'maximale hoogte';
 $lang['maximum width'] = 'maximale breedte';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Executie tijd is om, afhandeling moet verder gaan [Verwachte tijd: %d seconden].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Executie tijd is om, afhandeling moet verder gaan [Verwachte tijd: %d seconden].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Verwachte tijd voor de gebruikerslijst voor een mailing is gelimiteerd. Andere gebruikers staan niet op de lijst.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Tijd om email te sturen is gelimiteerd. Andere emailtjes worden overgeslagen.';
 $lang['To send ?'] = 'aan sturen ?';
@@ -719,7 +719,7 @@ $lang['Activate field "%s"'] = 'Activeer veld "%s"';
 $lang['Photo Properties'] = 'Foto-Eigenschappen';
 $lang['Allow user customization'] = 'Sta gebruikers-aanpassingen toe';
 $lang['Languages'] = 'Talen';
-$lang['Execution time is out, treatment must be continued [Estmated time: %d seconds].'] = 'Uitvoerings-tijd overschreden, de afhandeling moet verder gaan [Geschatte tijd: %d seconden].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Uitvoerings-tijd overschreden, de afhandeling moet verder gaan [Geschatte tijd: %d seconden].';
 $lang['Installed Languages'] = 'Geïnstalleerde talen';
 $lang['Add New Language'] = 'Voeg een nieuwe taal toe';
 $lang['Language has been successfully installed'] = 'Taal is succesvol geïnstalleerd';
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index 658eb08dc..eeac50882 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'zarządzaj podkategoriami';
 $lang['Manage'] = 'Zarządzaj';
 $lang['maximum height'] = 'maksymalna wysokość';
 $lang['maximum width'] = 'maksymalna szerokość';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Czas wykonania minął, proces musi być kontynuowany [Szacowany czas: %d sekund].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Czas wykonania minął, proces musi być kontynuowany [Szacowany czas: %d sekund].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Czas wykonania minął, proces musi być kontynuowany [Szacowany czas: %d sekund].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Czas wykonania minął, proces musi być kontynuowany [Szacowany czas: %d sekund].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Czas wysłania wiadomości do listy użytkowników jest ograniczony. Pozostali użytkownicy nie znajdują się na liście.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Czas wysłania wiadomości jest ograniczony. Pozostałe wiadomości zostaną pominięte.';
 $lang['To send ?'] = 'Do wysłania ?';
diff --git a/language/pt_BR/admin.lang.php b/language/pt_BR/admin.lang.php
index 98abb0dee..4bbe677f4 100644
--- a/language/pt_BR/admin.lang.php
+++ b/language/pt_BR/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'gerenciar subcategorias';
 $lang['Manage'] = 'Gerenciar';
 $lang['maximum height'] = 'altura máxima';
 $lang['maximum width'] = 'largura máxima';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundo].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundos].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundo].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundos].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'O tempo disponível para a criação da lista de usuários para enviar email é limitado. Outros usuários não estão listados.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'O tempo para enviar email é limitado. Outros emails estão desconsiderados.';
 $lang['To send ?'] = 'Enviar ?';
diff --git a/language/pt_PT/admin.lang.php b/language/pt_PT/admin.lang.php
index 415e2d3ee..24c8df067 100644
--- a/language/pt_PT/admin.lang.php
+++ b/language/pt_PT/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'gerenciar subcategorias';
 $lang['Manage'] = 'Gerenciar';
 $lang['maximum height'] = 'altura máxima';
 $lang['maximum width'] = 'largura máxima';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundo].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundos].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundo].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'O tempo de execução acabou, tratamento deve ser contínuo [Tempo estimado: %d segundos].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'O tempo disponível para a criação da lista de usuários para enviar email é limitado. Outros usuários não estão listados.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'O tempo para enviar email é limitado. Outros emails estão desconsiderados.';
 $lang['To send ?'] = 'Enviar ?';
diff --git a/language/ru_RU/admin.lang.php b/language/ru_RU/admin.lang.php
index d1ac7a87c..e28586943 100644
--- a/language/ru_RU/admin.lang.php
+++ b/language/ru_RU/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'управление подкатегория�
 $lang['Manage'] = 'Управление';
 $lang['maximum height'] = 'максимальная высота';
 $lang['maximum width'] = 'максимальная ширина';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Время выполнения превышено, обработка должна быть продолжена [Рассчетное время: %d сек].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Время выполнения превышено, обработка должна быть продолжена [Рассчетное время: %d сек].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Время выполнения превышено, обработка должна быть продолжена [Рассчетное время: %d сек].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Время выполнения превышено, обработка должна быть продолжена [Рассчетное время: %d сек].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Время подготовки списка пользователей для рассылки ограничено. Остальные пользователи не выведены.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Время для отправки почты ограничено. Другие письма пропущены.';
 $lang['To send ?'] = 'Отправить?';
diff --git a/language/sr_RS/admin.lang.php b/language/sr_RS/admin.lang.php
index befd034d5..d7e4e1723 100644
--- a/language/sr_RS/admin.lang.php
+++ b/language/sr_RS/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'upravljanje podkategorijama';
 $lang['Manage'] = 'Upravljaj';
 $lang['maximum height'] = 'najveća visina';
 $lang['maximum width'] = 'najveća širina';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Vreme izvršenja je isteklo, obrada se mora nastaviti [Procenjeno vreme: %d sekunde].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Vreme izvršenja je isteklo, obrada se mora nastaviti [Procenjeno vreme: %d sekundi].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Vreme izvršenja je isteklo, obrada se mora nastaviti [Procenjeno vreme: %d sekunde].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Vreme izvršenja je isteklo, obrada se mora nastaviti [Procenjeno vreme: %d sekundi].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Predviđeno vreme za popis korisnika za slanje poruka je ograničeno. Ostali korisnici nisu izlistani.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Vreme za slanje poruke je ograničeno. Ostale poruke su preskočene.';
 $lang['To send ?'] = 'Poslati ?';
diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php
index 6c8b39f1d..3ba38540f 100644
--- a/language/templates/admin.lang.php
+++ b/language/templates/admin.lang.php
@@ -256,8 +256,8 @@ $lang['manage sub-categories'] = 'manage sub-categories';
 $lang['manage'] = 'Manage';
 $lang['maximum height'] = 'maximum height';
 $lang['maximum width'] = 'maximum width';
-$lang['nbm_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estmated time: %d second].';
-$lang['nbm_background_treatment_redirect_seconds'] = 'Execution time is out, treatment must be continue [Estmated time: %d seconds].';
+$lang['nbm_background_treatment_redirect_second'] = 'Execution time is out, treatment must be continue [Estimated time: %d second].';
+$lang['nbm_background_treatment_redirect_seconds'] = 'Execution time is out, treatment must be continue [Estimated time: %d seconds].';
 $lang['nbm_break_timeout_list_user'] = 'Prepared time for list of users to send mail is limited. Others users are not listed.';
 $lang['nbm_break_timeout_send_mail'] = 'Time to send mail is limited. Others mails are skipped.';
 $lang['nbm_col_check_user_send_mail'] = 'To send ?';
diff --git a/language/vi_VN/admin.lang.php b/language/vi_VN/admin.lang.php
index 6b65641a2..3346dbfe9 100644
--- a/language/vi_VN/admin.lang.php
+++ b/language/vi_VN/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = 'quản lý các đề mục con';
 $lang['Manage'] = 'Quản lý';
 $lang['maximum height'] = 'Chiều cao tối đa';
 $lang['maximum width'] = 'Chiều rộng tối đa';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = 'Thời gian xử lý đã hết, quá trình xử lý cần phải được tiếp tục [Trong khoảng: %d giây].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = 'Thời gian xử lý đã hết, quá trình xử lý cần phải được tiếp tục [Trong khoảng: %d giây].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = 'Thời gian xử lý đã hết, quá trình xử lý cần phải được tiếp tục [Trong khoảng: %d giây].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = 'Thời gian xử lý đã hết, quá trình xử lý cần phải được tiếp tục [Trong khoảng: %d giây].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = 'Thời gian chuẩn bị cho danh sách người dùng cần gởi email là có giới hạn. Các thành viên khác không được liệt kê ra.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = 'Thời gian gởi mail là có giới hạn. Các email khác đã được bỏ qua.';
 $lang['To send ?'] = 'Để gởi ?';
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php
index c905f2875..a27a1c3e4 100644
--- a/language/zh_CN/admin.lang.php
+++ b/language/zh_CN/admin.lang.php
@@ -250,8 +250,8 @@ $lang['manage sub-categories'] = '管理子类';
 $lang['Manage'] = '管理';
 $lang['maximum height'] = '最高高度';
 $lang['maximum width'] = '最长长度';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d second].'] = '已超过执行时间, 处理还需时间[估计时间: %d 秒].';
-$lang['Execution time is out, treatment must be continue [Estmated time: %d seconds].'] = '已超过执行时间, 处理还需时间[估计时间: %d 秒].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d second].'] = '已超过执行时间, 处理还需时间[估计时间: %d 秒].';
+$lang['Execution time is out, treatment must be continue [Estimated time: %d seconds].'] = '已超过执行时间, 处理还需时间[估计时间: %d 秒].';
 $lang['Prepared time for list of users to send mail is limited. Others users are not listed.'] = '由于发送用户列表的准备时间受限制,其余用户将不被列出.';
 $lang['Time to send mail is limited. Others mails are skipped.'] = '发送邮件时间有限,其余邮件被忽略.';
 $lang['To send ?'] = '发送?';
diff --git a/upgrade.php b/upgrade.php
index fb7bc15e7..898926849 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -297,7 +297,7 @@ if (isset($_POST['submit']) and check_upgrade())
       if (!@file_put_contents($config_file, $config_file_contents))
       {
         array_push($page['infos'],
-		   l10n_args('in <i>%s</i>, before <b>?></b>, insert:', 
+		   l10n_args('In <i>%s</i>, before <b>?></b>, insert:', 
 			     'local/config/database.inc.php') . 
 		   '<p><textarea rows="4" cols="40">' .
 		   implode("\r\n" , $mysql_changes).'</textarea></p>'