refactor: simplifed code

thorsten · Jul 19, 2024 · f14c8d0 · f14c8d0
1 parent dd618a2
commit f14c8d0
Show file tree

Hide file tree

Showing 48 changed files with 159 additions and 164 deletions.
diff --git a/phpmyfaq/admin/comments.php b/phpmyfaq/admin/comments.php
@@ -24,7 +24,6 @@
 use phpMyFAQ\Session\Token;
 use phpMyFAQ\Template\FaqTwigExtension;
 use phpMyFAQ\Template\TwigWrapper;
-use phpMyFAQ\Translation;
 use phpMyFAQ\User\CurrentUser;
 use Twig\Extra\Intl\IntlExtension;
 
@@ -51,14 +50,10 @@
     $newsComments = $comment->getAllComments(CommentType::NEWS);
 
     $templateVars = [
-        'adminHeaderComments' => Translation::get('ad_comment_administration'),
-        'msgTabFaqComments' => Translation::get('ad_comment_faqs'),
-        'msgTabNewsComments' => Translation::get('ad_comment_news'),
         'currentLocale' => $faqConfig->getLanguage()->getLanguage(),
         'faqComments' => $faqComments,
         'newsComments' => $newsComments,
         'csrfToken' => Token::getInstance()->getTokenString('delete-comment'),
-        'buttonDelete' => Translation::get('ad_entry_delete'),
     ];
 
     echo $template->render($templateVars);

diff --git a/phpmyfaq/admin/glossary.php b/phpmyfaq/admin/glossary.php
@@ -48,7 +48,7 @@
         'msgGlossaryItem' => Translation::get('ad_glossary_item'),
         'msgGlossaryDefinition' => Translation::get('ad_glossary_definition'),
         'glossaryItems' => $glossary->fetchAll(),
-        'buttonDelete' => Translation::get('ad_entry_delete'),
+        'buttonDelete' => Translation::get('msgDelete'),
         'csrfTokenDelete' => Token::getInstance()->getTokenString('delete-glossary'),
         'currentLanguage' => $faqLangCode,
         'addGlossaryTitle' => Translation::get('ad_glossary_add'),

diff --git a/phpmyfaq/admin/open-questions.php b/phpmyfaq/admin/open-questions.php
@@ -79,7 +79,7 @@
         'msg2answerFAQ' => Translation::get('msg2answerFAQ'),
         'msgTakeQuestion' => Translation::get('ad_ques_take'),
         'csrfTokenToggleVisibility' => Token::getInstance()->getTokenString('toggle-question-visibility'),
-        'msgDeleteAllOpenQuestions' => Translation::get('ad_entry_delete'),
+        'msgDeleteAllOpenQuestions' => Translation::get('msgDelete'),
     ];
 
     echo $template->render($templateVars);

diff --git a/phpmyfaq/admin/tags.php b/phpmyfaq/admin/tags.php
@@ -61,7 +61,7 @@
     'noTags' => Translation::get('ad_news_nodata'),
     'buttonEdit' => Translation::get('ad_user_edit'),
     'msgConfirm' => Translation::get('ad_user_del_3'),
-    'buttonDelete' => Translation::get('ad_entry_delete'),
+    'buttonDelete' => Translation::get('msgDelete'),
 ];
 
 echo $template->render($templateVars);

diff --git a/phpmyfaq/assets/templates/admin/content/comments.twig b/phpmyfaq/assets/templates/admin/content/comments.twig
@@ -1,7 +1,7 @@
 <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
   <h1 class="h2">
     <i aria-hidden="true" class="bi bi-chat-right-dots"></i>
-    {{ adminHeaderComments }}
+    {{ 'adminHeaderComments' | translate }}
   </h1>
 </div>
 
@@ -11,13 +11,13 @@
   <li class="nav-item" role="presentation">
     <button class="nav-link active" id="home-tab" data-bs-toggle="tab" data-bs-target="#faqs-tab-pane" type="button"
             role="tab" aria-controls="home-tab-pane" aria-selected="true">
-      {{ msgTabFaqComments }}
+      {{ 'msgAdminCommentFaqs' | translate }}
     </button>
   </li>
   <li class="nav-item" role="presentation">
     <button class="nav-link" id="profile-tab" data-bs-toggle="tab" data-bs-target="#news-tab-pane" type="button"
             role="tab" aria-controls="news-tab-pane" aria-selected="false">
-      {{ msgTabNewsComments }}
+      {{ 'msgAdminCommentNews' | translate }}
     </button>
   </li>
 </ul>
@@ -51,7 +51,7 @@
     </form>
     <div class="text-end">
       <button class="btn btn-danger" id="pmf-button-delete-faq-comments" type="button">
-        {{ buttonDelete }}
+        {{ 'msgDelete' | translate }}
       </button>
     </div>
   </div>
@@ -84,7 +84,7 @@
     </form>
     <div class="text-end">
       <button class="btn btn-danger" id="pmf-button-delete-news-comments" type="button">
-        {{ buttonDelete }}
+        {{ 'msgDelete' | translate }}
       </button>
     </div>
   </div>

diff --git a/phpmyfaq/translations/language_ar.php b/phpmyfaq/translations/language_ar.php
@@ -183,7 +183,7 @@
 $PMF_LANG['ad_entry_commentby'] = 'التعليق بواسطة';
 $PMF_LANG['ad_entry_comment'] = 'التعليقات :';
 $PMF_LANG['ad_entry_save'] = 'حفظ';
-$PMF_LANG['ad_entry_delete'] = 'حذف';
+$PMF_LANG['msgDelete'] = 'حذف';
 $PMF_LANG['ad_entry_delcom_1'] = 'هل أنت متأكد من أن تعليق المستخدم';
 $PMF_LANG['ad_entry_delcom_2'] = 'سوف يتم الحذف؟';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'تم حذف التعليق بنجاح .';
@@ -781,9 +781,9 @@
 $PMF_LANG['permission::delgroup'] = 'حذف حسابات مجموعة';
 $PMF_LANG['ad_news_link_parent'] = 'افتح الرابط في نفس الصفحة';
 $PMF_LANG['ad_menu_comments'] = 'تعليقات';
-$PMF_LANG['ad_comment_administration'] = 'ادارة التعليقات';
-$PMF_LANG['ad_comment_faqs'] = 'التعليقات على هذا المدخل :';
-$PMF_LANG['ad_comment_news'] = 'التعليقات على الخبر :';
+$PMF_LANG['adminHeaderComments'] = 'ادارة التعليقات';
+$PMF_LANG['msgAdminCommentFaqs'] = 'التعليقات على هذا المدخل :';
+$PMF_LANG['msgAdminCommentNews'] = 'التعليقات على الخبر :';
 $PMF_LANG['ad_groups'] = 'المجموعات';
 $PMF_LANG['ad_conf_order_id'] = 'ID (default)';
 $PMF_LANG['ad_conf_order_thema'] = 'العنوان';

diff --git a/phpmyfaq/translations/language_bn.php b/phpmyfaq/translations/language_bn.php
@@ -218,7 +218,7 @@
 $PMF_LANG["ad_entry_commentby"] = "Comment by";
 $PMF_LANG["ad_entry_comment"] = "Comments";
 $PMF_LANG["ad_entry_save"] = "Save";
-$PMF_LANG["ad_entry_delete"] = "delete";
+$PMF_LANG["msgDelete"] = "delete";
 $PMF_LANG["ad_entry_delcom_1"] = "Are you sure that the comment of the user";
 $PMF_LANG["ad_entry_delcom_2"] = "should be deleted?";
 $PMF_LANG["ad_entry_commentdelsuc"] = "The comment was <strong>successfully</strong> deleted.";
@@ -784,9 +784,9 @@
 
 // added v2.0.0 - 2007-03-04 by Thorsten
 $PMF_LANG['ad_menu_comments'] = 'Comments';
-$PMF_LANG['ad_comment_administration'] = 'Comments administration';
-$PMF_LANG['ad_comment_faqs'] = 'Comments in FAQ records:';
-$PMF_LANG['ad_comment_news'] = 'Comments in News records:';
+$PMF_LANG['adminHeaderComments'] = 'Comments administration';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Comments in FAQ records:';
+$PMF_LANG['msgAdminCommentNews'] = 'Comments in News records:';
 $PMF_LANG['ad_groups'] = 'Groups';
 
 // added v2.0.0 - 2007-03-10 by Thorsten

diff --git a/phpmyfaq/translations/language_bs.php b/phpmyfaq/translations/language_bs.php
@@ -223,7 +223,7 @@
 $PMF_LANG["ad_entry_commentby"] = "Komentar korisnika";
 $PMF_LANG["ad_entry_comment"] = "Komentari";
 $PMF_LANG["ad_entry_save"] = "Snimi";
-$PMF_LANG["ad_entry_delete"] = "Obri&#353;i";
+$PMF_LANG["msgDelete"] = "Obri&#353;i";
 $PMF_LANG["ad_entry_delcom_1"] = "Da li ste sigurni da komentar od korisnika";
 $PMF_LANG["ad_entry_delcom_2"] = "treba obrisati?";
 $PMF_LANG["ad_entry_commentdelsuc"] = "Komentar je uspe&#353;no obrisan.";
@@ -784,9 +784,9 @@
 
 // added v2.0.0 - 2007-03-04 by Thorsten
 $PMF_LANG['ad_menu_comments'] = 'Komentari';
-$PMF_LANG['ad_comment_administration'] = 'Administracija komentara';
-$PMF_LANG['ad_comment_faqs'] = 'Komentari u FAQ unosima:';
-$PMF_LANG['ad_comment_news'] = 'Komentari u Vestima:';
+$PMF_LANG['adminHeaderComments'] = 'Administracija komentara';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Komentari u FAQ unosima:';
+$PMF_LANG['msgAdminCommentNews'] = 'Komentari u Vestima:';
 $PMF_LANG['ad_groups'] = 'Grupe';
 
 // added v2.0.0 - 2007-03-10 by Thorsten

diff --git a/phpmyfaq/translations/language_cs.php b/phpmyfaq/translations/language_cs.php
@@ -186,7 +186,7 @@
 $PMF_LANG['ad_entry_commentby'] = 'Komentář od';
 $PMF_LANG['ad_entry_comment'] = 'Komentáře:';
 $PMF_LANG['ad_entry_save'] = 'Ulož';
-$PMF_LANG['ad_entry_delete'] = 'smaž';
+$PMF_LANG['msgDelete'] = 'smaž';
 $PMF_LANG['ad_entry_delcom_1'] = 'Určitě má být komentář uživatele';
 $PMF_LANG['ad_entry_delcom_2'] = 'vymazán?';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'Komentář byl <strong>úspěšně</strong> vymazán.';
@@ -633,9 +633,9 @@
 $PMF_LANG['permission::delgroup'] = 'smazat účty skupiny';
 $PMF_LANG['ad_news_link_parent'] = 'Odkaz otevřít ve stejném okně';
 $PMF_LANG['ad_menu_comments'] = 'Komentáře';
-$PMF_LANG['ad_comment_administration'] = 'Administrace komentářů';
-$PMF_LANG['ad_comment_faqs'] = 'Komentáře záznamů:';
-$PMF_LANG['ad_comment_news'] = 'Komentáře novinek:';
+$PMF_LANG['adminHeaderComments'] = 'Administrace komentářů';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Komentáře záznamů:';
+$PMF_LANG['msgAdminCommentNews'] = 'Komentáře novinek:';
 $PMF_LANG['ad_groups'] = 'Skupiny';
 $LANG_CONF['records.orderby'] = array('select', 'Řazení záznamů (dle vlastnosti záznamu)');
 $LANG_CONF['records.sortby'] = array('select', 'Řazení záznamů (sestupně nebo vzestupně)');

diff --git a/phpmyfaq/translations/language_cy.php b/phpmyfaq/translations/language_cy.php
@@ -225,7 +225,7 @@
 $PMF_LANG["ad_entry_commentby"] = "Sylw gan";
 $PMF_LANG["ad_entry_comment"] = "Sylwadau";
 $PMF_LANG["ad_entry_save"] = "Cadw";
-$PMF_LANG["ad_entry_delete"] = "dileu";
+$PMF_LANG["msgDelete"] = "dileu";
 $PMF_LANG["ad_entry_delcom_1"] = "Ydych chi'n siwr dylid dileu sylw'r defnyddiwr";
 $PMF_LANG["ad_entry_delcom_2"] = " Dylid ei ddileu?";
 $PMF_LANG["ad_entry_commentdelsuc"] = "Dilëwyd y sylw yn <strong>llwyddiannus</strong>.";

diff --git a/phpmyfaq/translations/language_da.php b/phpmyfaq/translations/language_da.php
@@ -185,7 +185,7 @@
 $PMF_LANG['ad_entry_commentby'] = 'Kommentar af';
 $PMF_LANG['ad_entry_comment'] = 'Kommentarer:';
 $PMF_LANG['ad_entry_save'] = 'Gem';
-$PMF_LANG['ad_entry_delete'] = 'Slet';
+$PMF_LANG['msgDelete'] = 'Slet';
 $PMF_LANG['ad_entry_delcom_1'] = 'Er du sikker på at brugerens kommentar';
 $PMF_LANG['ad_entry_delcom_2'] = 'skal slettes?';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'Kommentaren er <strong>slettet</strong>.';
@@ -629,9 +629,9 @@
 $PMF_LANG['permission::delgroup'] = 'slet grupper';
 $PMF_LANG['ad_news_link_parent'] = 'Link &aring;bner i parent window';
 $PMF_LANG['ad_menu_comments'] = 'Kommentarer';
-$PMF_LANG['ad_comment_administration'] = 'Administration af kommentarer';
-$PMF_LANG['ad_comment_faqs'] = 'Kommentarer til FAQ-indl&aelig;g:';
-$PMF_LANG['ad_comment_news'] = 'Kommentarer til nyheder:';
+$PMF_LANG['adminHeaderComments'] = 'Administration af kommentarer';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Kommentarer til FAQ-indl&aelig;g:';
+$PMF_LANG['msgAdminCommentNews'] = 'Kommentarer til nyheder:';
 $PMF_LANG['ad_groups'] = 'Grupper';
 $LANG_CONF['records.orderby'] = array('select', 'Sortering af indl&aelig;g (afh&aelig;nger af egenskab)');
 $LANG_CONF['records.sortby'] = array('select', 'Sortering af indl&aelig;g (faldende eller stigende)');

diff --git a/phpmyfaq/translations/language_de.php b/phpmyfaq/translations/language_de.php
@@ -230,7 +230,7 @@
 $PMF_LANG['ad_entry_commentby'] = "Kommentar von";
 $PMF_LANG['ad_entry_comment'] = "Kommentare";
 $PMF_LANG['ad_entry_save'] = "Speichern";
-$PMF_LANG['ad_entry_delete'] = "Löschen";
+$PMF_LANG['msgDelete'] = "Löschen";
 $PMF_LANG['ad_entry_delcom_1'] = "Sicher, dass der Kommentar des Benutzers";
 $PMF_LANG['ad_entry_delcom_2'] = "gelöscht werden soll?";
 $PMF_LANG['ad_entry_commentdelsuc'] = "Der Kommentar wurde erfolgreich gelöscht.";
@@ -777,9 +777,9 @@
 
 // added v2.0.0 - 2007-03-04 by Thorsten
 $PMF_LANG['ad_menu_comments'] = "Kommentare";
-$PMF_LANG['ad_comment_administration'] = "Kommentarverwaltung";
-$PMF_LANG['ad_comment_faqs'] = "Kommentare in FAQs";
-$PMF_LANG['ad_comment_news'] = "Kommentare in Neuigkeiten";
+$PMF_LANG['adminHeaderComments'] = "Kommentarverwaltung";
+$PMF_LANG['msgAdminCommentFaqs'] = "Kommentare in FAQs";
+$PMF_LANG['msgAdminCommentNews'] = "Kommentare in Neuigkeiten";
 $PMF_LANG['msgPDF'] = 'PDF-Version';
 $PMF_LANG['ad_groups'] = "Gruppen";
 

diff --git a/phpmyfaq/translations/language_el.php b/phpmyfaq/translations/language_el.php
@@ -186,7 +186,7 @@
 $PMF_LANG['ad_entry_commentby 	'] = 'Σχόλια από';
 $PMF_LANG['ad_entry_comment'] = 'Σχόλια:';
 $PMF_LANG['ad_entry_save'] = 'Αποθήκευση';
-$PMF_LANG['ad_entry_delete'] = 'διαγραφή';
+$PMF_LANG['msgDelete'] = 'διαγραφή';
 $PMF_LANG['ad_entry_delcom_1'] = 'Είστε σίγουροι ότι θέλετε το σχόλιο του χρήστη';
 $PMF_LANG['ad_entry_delcom_2'] = 'να διαγραφεί;';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'Το σχόλιο διεγράφη με <strong>επιτυχία</strong>.';
@@ -635,9 +635,9 @@
 $PMF_LANG['permission::delgroup'] = 'Διαγραφη λογαριασμών ομάδων';
 $PMF_LANG['ad_news_link_parent'] = 'Ο δεσμός ανοίγει σε νέο παράθυρο';
 $PMF_LANG['ad_menu_comments'] = 'Σχόλια';
-$PMF_LANG['ad_comment_administration'] = 'Διαχείριση σχολίων';
-$PMF_LANG['ad_comment_faqs'] = 'Σχόλια για καταχωρήσεις:';
-$PMF_LANG['ad_comment_news'] = 'Σχόλια για ειδήσεις:';
+$PMF_LANG['adminHeaderComments'] = 'Διαχείριση σχολίων';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Σχόλια για καταχωρήσεις:';
+$PMF_LANG['msgAdminCommentNews'] = 'Σχόλια για ειδήσεις:';
 $PMF_LANG['ad_groups'] = 'Ομάδες';
 $PMF_LANG['ad_conf_order_id'] = 'Αναγνωριστικό (προεπιλογή)';
 $PMF_LANG['ad_conf_order_thema'] = 'Τίτλος';

diff --git a/phpmyfaq/translations/language_en.php b/phpmyfaq/translations/language_en.php
@@ -232,7 +232,7 @@
 $PMF_LANG["ad_entry_commentby"] = "Comment by";
 $PMF_LANG["ad_entry_comment"] = "Comments";
 $PMF_LANG["ad_entry_save"] = "Save";
-$PMF_LANG["ad_entry_delete"] = "delete";
+$PMF_LANG["msgDelete"] = "delete";
 $PMF_LANG["ad_entry_delcom_1"] = "Are you sure ";
 $PMF_LANG["ad_entry_delcom_2"] = "'s comment should be deleted?";
 $PMF_LANG["ad_entry_commentdelsuc"] = "The comment was <strong>successfully</strong> deleted.";
@@ -780,9 +780,9 @@
 
 // added v2.0.0 - 2007-03-04 by Thorsten
 $PMF_LANG['ad_menu_comments'] = 'Comments';
-$PMF_LANG['ad_comment_administration'] = 'Comments administration';
-$PMF_LANG['ad_comment_faqs'] = 'Comments in FAQ entries:';
-$PMF_LANG['ad_comment_news'] = 'Comments in News entries:';
+$PMF_LANG['adminHeaderComments'] = 'Comments administration';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Comments in FAQ entries:';
+$PMF_LANG['msgAdminCommentNews'] = 'Comments in News entries:';
 $PMF_LANG['msgPDF'] = 'PDF version';
 $PMF_LANG['ad_groups'] = 'Groups';
 

diff --git a/phpmyfaq/translations/language_es.php b/phpmyfaq/translations/language_es.php
@@ -231,7 +231,7 @@
 $PMF_LANG['ad_entry_commentby'] = 'Comentario de';
 $PMF_LANG['ad_entry_comment'] = 'Comentarios';
 $PMF_LANG['ad_entry_save'] = 'Guardar';
-$PMF_LANG['ad_entry_delete'] = 'Eliminar';
+$PMF_LANG['msgDelete'] = 'Eliminar';
 $PMF_LANG['ad_entry_delcom_1'] = '¿Estás seguro que el comentario del usuario ';
 $PMF_LANG['ad_entry_delcom_2'] = 'debería ser eliminado?';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'El comentario fue <strong>correctamente</strong> eliminado.';
@@ -777,9 +777,9 @@
 
 // added v2.0.0 - 2007-03-04 by Thorsten
 $PMF_LANG['ad_menu_comments'] = 'Comentarios';
-$PMF_LANG['ad_comment_administration'] = 'Administración de comentarios';
-$PMF_LANG['ad_comment_faqs'] = 'Comentarios en registros de FAQ';
-$PMF_LANG['ad_comment_news'] = 'Comentarios en registros de noticias:';
+$PMF_LANG['adminHeaderComments'] = 'Administración de comentarios';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Comentarios en registros de FAQ';
+$PMF_LANG['msgAdminCommentNews'] = 'Comentarios en registros de noticias:';
 $PMF_LANG['msgPDF'] = 'Versión PDF';
 $PMF_LANG['ad_groups'] = 'Grupos';
 

diff --git a/phpmyfaq/translations/language_eu.php b/phpmyfaq/translations/language_eu.php
@@ -228,7 +228,7 @@
 $PMF_LANG["ad_entry_commentby"] = "Iruzkinaren autorea";
 $PMF_LANG["ad_entry_comment"] = "Iruzkinak";
 $PMF_LANG["ad_entry_save"] = "Gorde";
-$PMF_LANG["ad_entry_delete"] = "Ezabatu";
+$PMF_LANG["msgDelete"] = "Ezabatu";
 $PMF_LANG["ad_entry_delcom_1"] = "Ziur zaude ";
 $PMF_LANG["ad_entry_delcom_2"] = "-(r)en iruzkin hau ezabatzekoa dela?";
 $PMF_LANG["ad_entry_commentdelsuc"] = "Iruzkina <strong>betiko</strong> ezabatu da.";

diff --git a/phpmyfaq/translations/language_fa.php b/phpmyfaq/translations/language_fa.php
@@ -187,7 +187,7 @@
 $PMF_LANG['ad_entry_commentby'] = 'نظر توسط';
 $PMF_LANG['ad_entry_comment'] = 'نظرات:';
 $PMF_LANG['ad_entry_save'] = 'ذخیره';
-$PMF_LANG['ad_entry_delete'] = 'پاک کن';
+$PMF_LANG['msgDelete'] = 'پاک کن';
 $PMF_LANG['ad_entry_delcom_1'] = 'آیا مطمئن هستید؟ ';
 $PMF_LANG['ad_entry_delcom_2'] = 'باید پاک شود?';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'نظر با <strong>موفقیت</strong> پاک شد.';

diff --git a/phpmyfaq/translations/language_fi.php b/phpmyfaq/translations/language_fi.php
@@ -188,7 +188,7 @@
 $PMF_LANG['ad_entry_commentby 	'] = 'Kommentoija';
 $PMF_LANG['ad_entry_comment'] = 'Kommentit:';
 $PMF_LANG['ad_entry_save'] = 'Tallenna';
-$PMF_LANG['ad_entry_delete'] = 'Poista';
+$PMF_LANG['msgDelete'] = 'Poista';
 $PMF_LANG['ad_entry_delcom_1'] = 'Oletko varma, että käyttäjän';
 $PMF_LANG['ad_entry_delcom_2'] = 'kommentti poistetaan?';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'Kommentti poistettiin <strong>onnistuneesti</strong>.';
@@ -642,9 +642,9 @@
 $PMF_LANG['permission::delgroup'] = 'Poista ryhmätunnukset';
 $PMF_LANG['ad_news_link_parent'] = 'Linkki aukeaa edelliseen ikkunaan';
 $PMF_LANG['ad_menu_comments'] = 'Kommentit';
-$PMF_LANG['ad_comment_administration'] = 'Kommenttien ylläpito';
-$PMF_LANG['ad_comment_faqs'] = 'Kommentoidut kysymykset:';
-$PMF_LANG['ad_comment_news'] = 'Kommentteja uutisissa:';
+$PMF_LANG['adminHeaderComments'] = 'Kommenttien ylläpito';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Kommentoidut kysymykset:';
+$PMF_LANG['msgAdminCommentNews'] = 'Kommentteja uutisissa:';
 $PMF_LANG['ad_groups'] = 'Ryhmät';
 $LANG_CONF['records.orderby'] = array("select", "Arkiston lajittelu (kentän mukaa)");
 $LANG_CONF['records.sortby'] = array("select", "Arkiston lajittelu (laskeva tai nouseva)");

diff --git a/phpmyfaq/translations/language_fr-ca.php b/phpmyfaq/translations/language_fr-ca.php
@@ -185,7 +185,7 @@
 $PMF_LANG['ad_entry_commentby'] = 'Commenté par';
 $PMF_LANG['ad_entry_comment'] = 'Commentaires :';
 $PMF_LANG['ad_entry_save'] = 'Enregistrer';
-$PMF_LANG['ad_entry_delete'] = 'Supprimer';
+$PMF_LANG['msgDelete'] = 'Supprimer';
 $PMF_LANG['ad_entry_delcom_1'] = 'Etes vous sûr que le commentaire de l\'utilisateur';
 $PMF_LANG['ad_entry_delcom_2'] = 'doit être supprimé?';
 $PMF_LANG['ad_entry_commentdelsuc'] = 'Le commentaire a été <strong>correctement</strong> supprimé.';
@@ -455,9 +455,9 @@
 $PMF_LANG['ad_glossary_delete'] = 'Supprimer l\'élément';
 $PMF_LANG['ad_glossary_delete_success'] = 'L\'élément du glossaire a été supprimé avec succès !';
 $PMF_LANG['ad_glossary_delete_error'] = 'Une erreur est survenue pendant la suppression !';
-$PMF_LANG['ad_comment_administration'] = 'Administration des commentaires';
-$PMF_LANG['ad_comment_faqs'] = 'Commentaires dans la FAQ :';
-$PMF_LANG['ad_comment_news'] = 'Commentaires dans les nouveaux enregistrements :';
+$PMF_LANG['adminHeaderComments'] = 'Administration des commentaires';
+$PMF_LANG['msgAdminCommentFaqs'] = 'Commentaires dans la FAQ :';
+$PMF_LANG['msgAdminCommentNews'] = 'Commentaires dans les nouveaux enregistrements :';
 $PMF_LANG['msgPDF'] = 'version PDF';
 $PMF_LANG['ad_xml_head'] = 'Sauvegarde XML';
 $PMF_LANG['ad_xml_hint'] = 'Sauvegarder tous les articles de votre FAQ dans un fichier XML.';

diff --git a/phpmyfaq/translations/language_fr.php b/phpmyfaq/translations/language_fr.php
@@ -233,7 +233,7 @@
 $PMF_LANG["ad_entry_commentby"] = "Commenté par";
 $PMF_LANG["ad_entry_comment"] = "Commentaires";
 $PMF_LANG["ad_entry_save"] = "Enregistrer";
-$PMF_LANG["ad_entry_delete"] = "Supprimer";
+$PMF_LANG["msgDelete"] = "Supprimer";
 $PMF_LANG["ad_entry_delcom_1"] = "Êtes-vous sûr que le commentaire de l'utilisateur";
 $PMF_LANG["ad_entry_delcom_2"] = "doit être supprimé ?";
 $PMF_LANG["ad_entry_commentdelsuc"] = "Le commentaire a été <strong>correctement</strong> supprimé.";
@@ -780,9 +780,9 @@
 
 // added v2.0.0 - 2007-03-04 by Thorsten
 $PMF_LANG["ad_menu_comments"] = "Commentaires";
-$PMF_LANG["ad_comment_administration"] = "Administration des commentaires";
-$PMF_LANG["ad_comment_faqs"] = "Commentaires dans la FAQ :";
-$PMF_LANG["ad_comment_news"] = "Commentaires dans les nouveaux enregistrements :";
+$PMF_LANG["adminHeaderComments"] = "Administration des commentaires";
+$PMF_LANG["msgAdminCommentFaqs"] = "Commentaires dans la FAQ :";
+$PMF_LANG["msgAdminCommentNews"] = "Commentaires dans les nouveaux enregistrements :";
 $PMF_LANG["msgPDF"] = "Version PDF";
 $PMF_LANG["ad_groups"] = "Groupes";