diff --git a/phpmyfaq/admin/faqs.editor.php b/phpmyfaq/admin/faqs.editor.php
index f234d29326..74cc5e7467 100644
--- a/phpmyfaq/admin/faqs.editor.php
+++ b/phpmyfaq/admin/faqs.editor.php
@@ -247,7 +247,7 @@
 
     // Header
     if (0 !== $faqData['id'] && 'copyentry' !== $action) {
-        $currentRevision = sprintf('%s 1.%d', Translation::get('ad_entry_revision'), $selectedRevisionId);
+        $currentRevision = sprintf('%s 1.%d', Translation::get('msgRevision'), $selectedRevisionId);
 
         $faqUrl = sprintf(
             '%sindex.php?action=faq&cat=%s&id=%d&artlang=%s',
@@ -299,7 +299,7 @@
             'ad_changerev' => Translation::get('ad_changerev'),
             'revisions' => $revisions,
             'selectedRevisionId' => $selectedRevisionId,
-            'ad_entry_revision' => Translation::get('ad_entry_revision'),
+            'msgRevision' => Translation::get('msgRevision'),
         ];
     }
 
@@ -355,14 +355,14 @@
         'attachments' => $attList,
         'msgAddAttachment' => Translation::get('msgAddAttachment'),
         'msgTags' => Translation::get('msgTags'),
-        'ad_entry_keywords' => Translation::get('ad_entry_keywords'),
-        'ad_entry_author' => Translation::get('ad_entry_author'),
+        'msgKeywords' => Translation::get('msgKeywords'),
+        'msgAuthor' => Translation::get('msgAuthor'),
         'msgEmail' => Translation::get('msgEmail'),
         'msgSeoCenter' => Translation::get('msgSeoCenter'),
         'msgSerp' => Translation::get('msgSerp'),
         'msgSerpTitle' => Translation::get('msgSerpTitle'),
-        'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'),
-        'ad_entry_all_groups' => Translation::get('ad_entry_all_groups'),
+        'msgGroupPermissions' => Translation::get('msgGroupPermissions'),
+        'msgAccessAllGroups' => Translation::get('msgAccessAllGroups'),
         'allGroups' => $allGroups,
         'restrictedGroups' => $restrictedGroups,
         'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'),
@@ -381,7 +381,7 @@
         'ad_admin_notes' => Translation::get('ad_admin_notes'),
         'ad_entry_changelog_history' => Translation::get('ad_entry_changelog_history'),
         'changelogs' => $changelog->getByFaqId($faqData['id']),
-        'ad_entry_revision' => Translation::get('ad_entry_revision'),
+        'msgRevision' => Translation::get('msgRevision'),
         'ad_gen_reset' => Translation::get('ad_gen_reset'),
         'ad_entry_save' => Translation::get('ad_entry_save'),
         'msgUpdateFaqDate' => Translation::get('msgUpdateFaqDate'),
diff --git a/phpmyfaq/admin/import.csv.php b/phpmyfaq/admin/import.csv.php
index 8c46d868e7..fe52993d14 100644
--- a/phpmyfaq/admin/import.csv.php
+++ b/phpmyfaq/admin/import.csv.php
@@ -44,8 +44,8 @@
         'categoryId' => Translation::get('ad_categ_categ'),
         'question' => Translation::get('ad_entry_topic'),
         'answer' => Translation::get('msgAnswer'),
-        'keywords' => Translation::get('ad_entry_keywords'),
-        'author' => Translation::get('ad_entry_author'),
+        'keywords' => Translation::get('msgKeywords'),
+        'author' => Translation::get('msgAuthor'),
         'email' => Translation::get('msgEmail'),
         'languageCode' => Translation::get('msgLanguageCode'),
         'seperateWithCommas' => Translation::get('msgSeperateWithCommas'),
diff --git a/phpmyfaq/assets/templates/admin/content/category.add.twig b/phpmyfaq/assets/templates/admin/content/category.add.twig
index 1a56ac11ba..0d86df875a 100644
--- a/phpmyfaq/assets/templates/admin/content/category.add.twig
+++ b/phpmyfaq/assets/templates/admin/content/category.add.twig
@@ -109,14 +109,14 @@
         {% if permLevel != 'basic' %}
           <div class="row mb-2">
             <label class="col-lg-2 col-form-label" for="restricted_groups">
-              {{ ad_entry_grouppermission }}
+              {{ 'msgGroupPermissions' | translate }}
             </label>
             <div class="col-lg-4">
               <div class="form-check">
                 <input type="radio" name="grouppermission" id="grouppermission_all" value="all"
                        class="form-check-input" checked>
                 <label class="form-check-label" for="grouppermission_all">
-                  {{ ad_entry_all_groups }}
+                  {{ 'msgAccessAllGroups' | translate }}
                 </label>
               </div>
               <div class="form-check">
diff --git a/phpmyfaq/assets/templates/admin/content/category.edit.twig b/phpmyfaq/assets/templates/admin/content/category.edit.twig
index f338071c0d..77f89af097 100644
--- a/phpmyfaq/assets/templates/admin/content/category.edit.twig
+++ b/phpmyfaq/assets/templates/admin/content/category.edit.twig
@@ -102,14 +102,14 @@
 
           <div class="row mb-2">
             <label class="col-lg-2 col-form-label" for="restricted_groups">
-              {{ categoryGroupPermissionLabel }}
+              {{ 'msgGroupPermissions' | translate }}
             </label>
             <div class="col-lg-4">
               <div class="form-check">
                 <input type="radio" name="grouppermission" id="grouppermission_all" value="all"
                        class="form-check-input" {{ allGroups }}>
                 <label class="form-check-label" for="grouppermission_all">
-                  {{ categoryGroupPermissionAllLabel }}
+                  {{ 'msgAccessAllGroups' | translate }}
                 </label>
               </div>
               <div class="form-check">
diff --git a/phpmyfaq/assets/templates/admin/content/faq.editor.twig b/phpmyfaq/assets/templates/admin/content/faq.editor.twig
index c4371e10f0..92fc9d0bf7 100644
--- a/phpmyfaq/assets/templates/admin/content/faq.editor.twig
+++ b/phpmyfaq/assets/templates/admin/content/faq.editor.twig
@@ -80,7 +80,7 @@
                       {% for currentRevision in revisions %}
                         {% set selected = selectedRevisionId == faqData['revision_id'] %}
                         <option value="{{ currentRevision['revision_id'] }}" {{ selected == true ? ' selected' }}>
-                          {{ ad_entry_revision }} 1.{{ currentRevision['revision_id'] }}:
+                          {{ 'msgRevision' | translate }} 1.{{ currentRevision['revision_id'] }}:
                           {{ currentRevision['updated'] | createIsoDate }} - {{ currentRevision['author'] }}
                         </option>
                       {% endfor %}
@@ -230,18 +230,21 @@
 
               <!-- Keywords -->
               <div class="row mb-2">
-                <label class="col-lg-2 col-form-label" for="keywords">{{ ad_entry_keywords }}</label>
+                <label class="col-lg-2 col-form-label" for="keywords">
+                  {{ 'msgKeywords' | translate }}
+                </label>
                 <div class="col-lg-10">
                   <input type="text" name="keywords" id="keywords" maxlength="255" class="form-control"
-                         autocomplete="off"
-                         value="{{ faqData['keywords'] }}">
+                         autocomplete="off" value="{{ faqData['keywords'] }}">
                   <small id="keywordsHelp" class="form-text visually-hidden">{{ 'msgShowHelp' | translate }}</small>
                 </div>
               </div>
 
               <!-- Author -->
               <div class="row mb-2">
-                <label class="col-lg-2 col-form-label" for="author">{{ ad_entry_author }}</label>
+                <label class="col-lg-2 col-form-label" for="author">
+                  {{ 'msgAuthor' | translate }}
+                </label>
                 <div class="col-lg-10">
                   <input type="text" name="author" id="author" value="{{ faqData['author'] }}" class="form-control">
                 </div>
@@ -289,13 +292,15 @@
               {% if not isBasicPermission %}
                 <div class="form-group">
                   <div class="row">
-                    <div class="col-3 col-form-label pt-0">{{ ad_entry_grouppermission }}</div>
+                    <div class="col-3 col-form-label pt-0">
+                      {{ 'msgGroupPermissions' | translate }}
+                    </div>
                     <div class="col-6">
                       <div class="form-check">
                         <input type="radio" id="allgroups" name="grouppermission" value="all" class="form-check-input"
                           {{ allGroups ? 'checked' : '' }}>
                         <label class="form-check-label" for="allgroups">
-                          {{ ad_entry_all_groups }}
+                          {{ 'msgAccessAllGroups' | translate }}
                         </label>
                       </div>
                       <div class="form-check">
@@ -396,7 +401,7 @@
                         </div>
                         <div class="d-flex align-items-center me-3">
                           <i aria-hidden="true" class="bi bi-archive me-1"></i>
-                          {{ ad_entry_revision }} 1.{{ changelog['revision_id'] }}
+                          {{ 'msgRevision' | translate }} 1.{{ changelog['revision_id'] }}
                         </div>
                       </div>
                     </div>
diff --git a/phpmyfaq/assets/templates/admin/content/open-questions.twig b/phpmyfaq/assets/templates/admin/content/open-questions.twig
index a91c2825ad..0a61a54120 100644
--- a/phpmyfaq/assets/templates/admin/content/open-questions.twig
+++ b/phpmyfaq/assets/templates/admin/content/open-questions.twig
@@ -20,7 +20,7 @@
           <thead>
           <tr>
             <th></th>
-            <th>{{ msgAuthor }}</th>
+            <th>{{ 'msgAuthor' | translate }}</th>
             <th>{{ 'msgQuestion' | translate }}</th>
             <th colspan="2">{{ msgVisibility }}?</th>
           </tr>
diff --git a/phpmyfaq/src/admin-routes.php b/phpmyfaq/src/admin-routes.php
index bc3fc35a3a..da6073f5bc 100644
--- a/phpmyfaq/src/admin-routes.php
+++ b/phpmyfaq/src/admin-routes.php
@@ -128,6 +128,11 @@
         'controller' => [FaqController::class, 'add'],
         'methods' => 'GET'
     ],
+    'admin.faq.copy' => [
+        'path' => '/faq/copy/{faqId}/{faqLanguage}',
+        'controller' => [FaqController::class, 'copy'],
+        'methods' => 'GET'
+    ],
     'admin.faq.edit' => [
         'path' => '/faq/edit/{faqId}/{faqLanguage}',
         'controller' => [FaqController::class, 'edit'],
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/AbstractAdministrationController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/AbstractAdministrationController.php
index d59f5fb6d0..c5f37ee347 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/AbstractAdministrationController.php
+++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/AbstractAdministrationController.php
@@ -266,6 +266,7 @@ protected function getHeader(Request $request): array
             case 'admin.content.sticky-faqs':
             case 'admin.comments':
             case 'admin.faq.add':
+            case 'admin.faq.copy':
             case 'admin.faq.edit':
             case 'admin.faqs':
             case 'admin.glossary':
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php
index e6dabbee02..9e78840dfc 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php
+++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php
@@ -395,9 +395,7 @@ public function edit(Request $request): Response
                 'categoryOwnerOptions' => $userHelper->getAllUserOptions($categoryData->getUserId()),
                 'isMediumPermission' => $this->configuration->get('security.permLevel') !== 'basic',
                 'allGroupsOptions' => $allGroupsOptions,
-                'categoryGroupPermissionLabel' => Translation::get('ad_entry_grouppermission'),
                 'allGroups' => $allGroups ? 'checked' : '',
-                'categoryGroupPermissionAllLabel' => Translation::get('ad_entry_all_groups'),
                 'restrictedGroups' => $restrictedGroups ? 'checked' : '',
                 'restrictedGroupsLabel' => Translation::get('ad_entry_restricted_groups'),
                 'restrictedGroupsOptions' => $restrictedGroupOptions,
@@ -755,8 +753,6 @@ private function getBaseTemplateVars(): array
             'ad_entry_restricted_users' => Translation::get('ad_entry_restricted_users'),
             'ad_entry_userpermission' => Translation::get('ad_entry_userpermission'),
             'ad_categ_add' => Translation::get('ad_categ_add'),
-            'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'),
-            'ad_entry_all_groups' => Translation::get('ad_entry_all_groups'),
             'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'),
             'restricted_groups' => ($this->configuration->get('security.permLevel') === 'medium') ?
                 $this->currentUser->perm->getAllGroupsOptions([], $this->currentUser) : '',
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/FaqController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/FaqController.php
index cc43bf57f7..31dac30158 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/FaqController.php
+++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/FaqController.php
@@ -108,10 +108,8 @@ public function add(Request $request): Response
 
         $faq = $this->container->get('phpmyfaq.faq');
         $userHelper = $this->container->get('phpmyfaq.helper.user-helper');
-        $logging = $this->container->get('phpmyfaq.admin.admin-log');
-        $session = $this->container->get('session');
 
-        $logging->log($this->currentUser, 'admin-add-faq');
+        $this->container->get('phpmyfaq.admin.admin-log')->log($this->currentUser, 'admin-add-faq');
         $categories = [];
 
         $faqData = [
@@ -134,10 +132,6 @@ public function add(Request $request): Response
                 ... $this->getBaseTemplateVars(),
                 'header' => Translation::get('msgAddFAQ'),
                 'editExistingFaq' => false,
-                'isEditorEnabled' => $this->configuration->get('main.enableWysiwygEditor'),
-                'isMarkdownEditorEnabled' => $this->configuration->get('main.enableMarkdownEditor'),
-                'isBasicPermission' => $this->configuration->get('security.permLevel') === 'basic',
-                'defaultUrl' => $this->configuration->getDefaultUrl(),
                 'faqRevisionId' => 0,
                 'faqData' => $faqData,
                 'openQuestionId' => 0,
@@ -145,14 +139,6 @@ public function add(Request $request): Response
                 'notifyEmail' => '',
                 'categoryOptions' => $categoryHelper->renderOptions($categories),
                 'languageOptions' => LanguageHelper::renderSelectLanguage($faqData['lang'], false, [], 'lang'),
-                'hasPermissionForAddAttachments' => $this->currentUser->perm->hasPermission(
-                    $this->currentUser->getUserId(),
-                    PermissionType::ATTACHMENT_ADD->value
-                ),
-                'hasPermissionForDeleteAttachments' => $this->currentUser->perm->hasPermission(
-                    $this->currentUser->getUserId(),
-                    PermissionType::ATTACHMENT_DELETE->value
-                ),
                 'attachments' => [],
                 'allGroups' => true,
                 'restrictedGroups' => false,
@@ -168,10 +154,8 @@ public function add(Request $request): Response
                 ),
                 'isActive' => null,
                 'isInActive' => null,
-                'canBeNewRevision' => false,
                 'nextSolutionId' => $faq->getNextSolutionId(),
                 'nextFaqId' => $this->configuration->getDb()->nextId(Database::getTablePrefix() . 'faqdata', 'id'),
-                'maxAttachmentSize' => $this->configuration->get('records.maxAttachmentSize'),
             ]
         );
     }
@@ -199,17 +183,13 @@ public function edit(Request $request): Response
 
         $categoryRelation = new Relation($this->configuration, $category);
         $faq = $this->container->get('phpmyfaq.faq');
-        $faqPermission = $this->container->get('phpmyfaq.faq.permission');
-        $logging = $this->container->get('phpmyfaq.admin.admin-log');
-        $seo = $this->container->get('phpmyfaq.seo');
-        $tagging = $this->container->get('phpmyfaq.tags');
         $userHelper = $this->container->get('phpmyfaq.helper.user-helper');
 
         $faqId = Filter::filterVar($request->get('faqId'), FILTER_VALIDATE_INT);
         $faqLanguage = Filter::filterVar($request->get('faqLanguage'), FILTER_SANITIZE_SPECIAL_CHARS);
         $selectedRevisionId = Filter::filterVar($request->get('selectedRevisionId'), FILTER_VALIDATE_INT);
 
-        $logging->log($this->currentUser, 'admin-edit-faq ' . $faqId);
+        $this->container->get('phpmyfaq.admin.admin-log')->log($this->currentUser, 'admin-edit-faq ' . $faqId);
 
         $categories = $categoryRelation->getCategories($faqId, $faqLanguage);
 
@@ -217,44 +197,36 @@ public function edit(Request $request): Response
         $faqData = $faq->faqRecord;
 
         // Tags
-        $faqData['tags'] = implode(', ', $tagging->getAllTagsById((int) $faqData['id']));
+        $faqData['tags'] = implode(', ', $this->container->get('phpmyfaq.tags')->getAllTagsById($faqId));
 
         // SERP
         $seoEntity = new SeoEntity();
         $seoEntity
             ->setType(SeoType::FAQ)
-            ->setReferenceId((int) $faqData['id'])
-            ->setReferenceLanguage($faqData['lang']);
-        $seoData = $seo->get($seoEntity);
+            ->setReferenceId($faqId)
+            ->setReferenceLanguage($faqLanguage);
+        $seoData = $this->container->get('phpmyfaq.seo')->get($seoEntity);
         $faqData['serp-title'] = $seoData->getTitle();
         $faqData['serp-description'] = $seoData->getDescription();
 
-
-        $attList = AttachmentFactory::fetchByRecordId(
-            $this->configuration,
-            $faqId
-        );
-
-        if (is_null($selectedRevisionId)) {
-            $selectedRevisionId = $faqData['revision_id'];
-        }
+        $attachmentList = AttachmentFactory::fetchByRecordId($this->configuration, $faqId);
 
         $faqRevision = new Revision($this->configuration);
-        $revisions = $faqRevision->get($faqId, $faqData['lang'], $faqData['author']);
+        $revisions = $faqRevision->get($faqId, $faqLanguage, $faqData['author']);
 
         $faqUrl = sprintf(
             '%sindex.php?action=faq&cat=%s&id=%d&artlang=%s',
             $this->configuration->getDefaultUrl(),
-            $category->getCategoryIdFromFaq((int) $faqData['id']),
-            $faqData['id'],
-            $faqData['lang']
+            $category->getCategoryIdFromFaq($faqId),
+            $faqId,
+            $faqLanguage
         );
 
         $link = new Link($faqUrl, $this->configuration);
         $link->itemTitle = $faqData['title'];
 
         // User permissions
-        $userPermission = $faqPermission->get(Permission::USER, (int) $faqData['id']);
+        $userPermission = $this->container->get('phpmyfaq.faq.permission')->get(Permission::USER, $faqId);
         if (count($userPermission) == 0 || $userPermission[0] == -1) {
             $allUsers = true;
             $restrictedUsers = false;
@@ -265,7 +237,7 @@ public function edit(Request $request): Response
         }
 
         // Group permissions
-        $groupPermission = $faqPermission->get(Permission::GROUP, (int) $faqData['id']);
+        $groupPermission = $this->container->get('phpmyfaq.faq.permission')->get(Permission::GROUP, $faqId);
         if (count($groupPermission) == 0 || $groupPermission[0] == -1) {
             $allGroups = true;
             $restrictedGroups = false;
@@ -286,16 +258,12 @@ public function edit(Request $request): Response
                 ... $this->getBaseTemplateVars(),
                 'header' => Translation::get('ad_entry_edit_1') . ' ' . Translation::get('ad_entry_edit_2'),
                 'editExistingFaq' => true,
-                'currentRevision' => sprintf('%s 1.%d', Translation::get('ad_entry_revision'), $selectedRevisionId),
-                'isEditorEnabled' => $this->configuration->get('main.enableWysiwygEditor'),
-                'isMarkdownEditorEnabled' => $this->configuration->get('main.enableMarkdownEditor'),
-                'isBasicPermission' => $this->configuration->get('security.permLevel') === 'basic',
-                'defaultUrl' => $this->configuration->getDefaultUrl(),
+                'currentRevision' => sprintf('%s 1.%d', Translation::get('msgRevision'), $selectedRevisionId),
                 'numberOfRevisions' => count($revisions),
-                'faqId' => $faqData['id'],
-                'faqLang' => $faqData['lang'],
+                'faqId' => $faqId,
+                'faqLang' => $faqLanguage,
                 'revisions' => $revisions,
-                'selectedRevisionId' => $selectedRevisionId,
+                'selectedRevisionId' => $selectedRevisionId ?? $faqData['revision_id'],
                 'faqRevisionId' => $faqData['revision_id'],
                 'faqData' => $faqData,
                 'faqUrl' => $link->toString(),
@@ -304,15 +272,7 @@ public function edit(Request $request): Response
                 'notifyEmail' => '',
                 'categoryOptions' => $categoryHelper->renderOptions($categories),
                 'languageOptions' => LanguageHelper::renderSelectLanguage($faqLanguage, false, [], 'lang'),
-                'hasPermissionForAddAttachments' => $this->currentUser->perm->hasPermission(
-                    $this->currentUser->getUserId(),
-                    PermissionType::ATTACHMENT_ADD->value
-                ),
-                'hasPermissionForDeleteAttachments' => $this->currentUser->perm->hasPermission(
-                    $this->currentUser->getUserId(),
-                    PermissionType::ATTACHMENT_DELETE->value
-                ),
-                'attachments' => $attList,
+                'attachments' => $attachmentList,
                 'allGroups' => $allGroups,
                 'restrictedGroups' => $restrictedGroups,
                 'groupPermissionOptions' => ($this->configuration->get('security.permLevel') === 'medium') ?
@@ -320,21 +280,94 @@ public function edit(Request $request): Response
                 'allUsers' => $allUsers,
                 'restrictedUsers' => $restrictedUsers,
                 'userPermissionOptions' => $userHelper->getAllUserOptions(-1, true),
-                'changelogs' => $this->container->get('phpmyfaq.admin.changelog')->getByFaqId((int) $faqData['id']),
+                'changelogs' => $this->container->get('phpmyfaq.admin.changelog')->getByFaqId($faqId),
                 'hasPermissionForApprove' => $this->currentUser->perm->hasPermission(
                     $this->currentUser->getUserId(),
                     PermissionType::FAQ_APPROVE->value
                 ),
                 'isActive' => $faqData['active'] === 'yes' ? 'checked' : null,
                 'isInActive' => $faqData['active'] !== 'yes' ? 'checked' : null,
-                'canBeNewRevision' => !$this->configuration->get('records.enableAutoRevisions'),
                 'nextSolutionId' => $faq->getNextSolutionId(),
                 'nextFaqId' => $this->configuration->getDb()->nextId(Database::getTablePrefix() . 'faqdata', 'id'),
-                'maxAttachmentSize' => $this->configuration->get('records.maxAttachmentSize'),
             ]
         );
     }
 
+    /**
+     * @throws Exception
+     * @throws LoaderError
+     * @throws \Exception
+     * @todo refactor Twig template variables
+     */
+    #[Route('/faq/copy/:faqId/:faqLanguage', name: 'admin.faq.copy', methods: ['GET'])]
+    public function copy(Request $request): Response
+    {
+        $this->userHasPermission(PermissionType::FAQ_ADD);
+
+        [$currentAdminUser, $currentAdminGroups] = CurrentUser::getCurrentUserGroupId($this->currentUser);
+
+        $category = new Category($this->configuration, $currentAdminGroups, true);
+        $category->setUser($currentAdminUser);
+        $category->setGroups($currentAdminGroups);
+        $category->buildCategoryTree();
+
+        $categoryHelper = $this->container->get('phpmyfaq.helper.category-helper');
+        $categoryHelper->setCategory($category);
+
+        $faq = $this->container->get('phpmyfaq.faq');
+        $userHelper = $this->container->get('phpmyfaq.helper.user-helper');
+
+        $faqId = Filter::filterVar($request->get('faqId'), FILTER_VALIDATE_INT);
+        $faqLanguage = Filter::filterVar($request->get('faqLanguage'), FILTER_SANITIZE_SPECIAL_CHARS);
+
+        $this->container->get('phpmyfaq.admin.admin-log')->log($this->currentUser, 'admin-copy-faq ' . $faqId);
+
+        $categories = [];
+
+        $faq->getFaq($faqId, null, true);
+        $faqData = $faq->faqRecord;
+        $faqData['title'] = 'Copy of ' . $faqData['title'];
+
+        $this->addExtension(new IsoDateTwigExtension());
+        $this->addExtension(new UserNameTwigExtension());
+        $this->addExtension(new FormatBytesTwigExtension());
+        return $this->render(
+            '@admin/content/faq.editor.twig',
+            [
+                ... $this->getHeader($request),
+                ... $this->getFooter(),
+                ... $this->getBaseTemplateVars(),
+                'header' => Translation::get('ad_entry_edit_1') . ' ' . Translation::get('ad_entry_edit_2'),
+                'editExistingFaq' => false,
+                'faqId' => 0,
+                'faqLang' => $faqLanguage,
+                'faqRevisionId' => 0,
+                'faqData' => $faqData,
+                'openQuestionId' => 0,
+                'notifyUser' => '',
+                'notifyEmail' => '',
+                'categoryOptions' => $categoryHelper->renderOptions($categories),
+                'languageOptions' => LanguageHelper::renderSelectLanguage($faqLanguage, false, [], 'lang'),
+                'attachments' => [],
+                'allGroups' => true,
+                'restrictedGroups' => false,
+                'groupPermissionOptions' => ($this->configuration->get('security.permLevel') === 'medium') ?
+                    $this->currentUser->perm->getAllGroupsOptions([-1], $this->currentUser) : '',
+                'allUsers' => true,
+                'restrictedUsers' => false,
+                'userPermissionOptions' => $userHelper->getAllUserOptions(-1, true),
+                'changelogs' => [],
+                'hasPermissionForApprove' => $this->currentUser->perm->hasPermission(
+                    $this->currentUser->getUserId(),
+                    PermissionType::FAQ_APPROVE->value
+                ),
+                'isActive' => null,
+                'isInActive' => null,
+                'nextSolutionId' => $faq->getNextSolutionId(),
+                'nextFaqId' => $this->configuration->getDb()->nextId(Database::getTablePrefix() . 'faqdata', 'id'),
+            ]
+        );
+    }
 
     /**
      * @throws \Exception
@@ -345,14 +378,28 @@ private function getBaseTemplateVars(): array
         $session = $this->container->get('session');
         $token = Token::getInstance($session);
 
+        $canAddAttachments = $this->currentUser->perm->hasPermission(
+            $this->currentUser->getUserId(),
+            PermissionType::ATTACHMENT_ADD->value
+        );
+
+        $canDeleteAttachments = $this->currentUser->perm->hasPermission(
+            $this->currentUser->getUserId(),
+            PermissionType::ATTACHMENT_DELETE->value
+        );
+
         return [
             'csrfToken' => $token->getTokenString('edit-faq'),
             'csrfTokenDeleteAttachment' => $token->getTokenString('delete-attachment'),
             'csrfTokenUploadAttachment' => $token->getTokenString('upload-attachment'),
-            'ad_entry_keywords' => Translation::get('ad_entry_keywords'),
-            'ad_entry_author' => Translation::get('ad_entry_author'),
-            'ad_entry_grouppermission' => Translation::get('ad_entry_grouppermission'),
-            'ad_entry_all_groups' => Translation::get('ad_entry_all_groups'),
+            'isEditorEnabled' => $this->configuration->get('main.enableWysiwygEditor'),
+            'isMarkdownEditorEnabled' => $this->configuration->get('main.enableMarkdownEditor'),
+            'isBasicPermission' => $this->configuration->get('security.permLevel') === 'basic',
+            'defaultUrl' => $this->configuration->getDefaultUrl(),
+            'canBeNewRevision' => !$this->configuration->get('records.enableAutoRevisions'),
+            'maxAttachmentSize' => $this->configuration->get('records.maxAttachmentSize'),
+            'hasPermissionForAddAttachments' => $canAddAttachments,
+            'hasPermissionForDeleteAttachments' => $canDeleteAttachments,
             'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'),
             'ad_entry_userpermission' => Translation::get('ad_entry_userpermission'),
             'ad_entry_restricted_users' => Translation::get('ad_entry_restricted_users'),
@@ -361,7 +408,6 @@ private function getBaseTemplateVars(): array
             'ad_admin_notes_hint' => Translation::get('ad_admin_notes_hint'),
             'ad_admin_notes' => Translation::get('ad_admin_notes'),
             'ad_entry_changelog_history' => Translation::get('ad_entry_changelog_history'),
-            'ad_entry_revision' => Translation::get('ad_entry_revision'),
             'ad_gen_reset' => Translation::get('ad_gen_reset'),
             'ad_entry_save' => Translation::get('ad_entry_save'),
             'ad_entry_status' => Translation::get('ad_entry_status'),
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/ImportController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/ImportController.php
index c43b7cfa87..4590daa855 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/ImportController.php
+++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/ImportController.php
@@ -54,8 +54,8 @@ public function index(Request $request): Response
                 'categoryId' => Translation::get('ad_categ_categ'),
                 'question' => Translation::get('ad_entry_topic'),
                 'answer' => Translation::get('msgAnswer'),
-                'keywords' => Translation::get('ad_entry_keywords'),
-                'author' => Translation::get('ad_entry_author'),
+                'keywords' => Translation::get('msgKeywords'),
+                'author' => Translation::get('msgAuthor'),
                 'email' => Translation::get('msgEmail'),
                 'languageCode' => Translation::get('msgLanguageCode'),
                 'seperateWithCommas' => Translation::get('msgSeperateWithCommas'),
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/OpenQuestionsController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/OpenQuestionsController.php
index 0035578561..527e8396fd 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/OpenQuestionsController.php
+++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/OpenQuestionsController.php
@@ -54,7 +54,6 @@ public function index(Request $request): Response
                 'msgOpenQuestions' => Translation::get('msgOpenQuestions'),
                 'csrfTokenDeleteQuestion' => Token::getInstance($session)->getTokenString('delete-questions'),
                 'currentLocale' => $this->configuration->getLanguage()->getLanguage(),
-                'msgAuthor' => Translation::get('ad_entry_author'),
                 'msgQuestion' => Translation::get('msgQuestion'),
                 'msgVisibility' => Translation::get('ad_entry_visibility'),
                 'questions' => $question->getAll(),
diff --git a/phpmyfaq/translations/language_ar.php b/phpmyfaq/translations/language_ar.php
index cc6866f9a6..cec72055d1 100644
--- a/phpmyfaq/translations/language_ar.php
+++ b/phpmyfaq/translations/language_ar.php
@@ -172,8 +172,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'عنوان السؤال:';
 $PMF_LANG['msgAnswer'] = 'السؤال:';
-$PMF_LANG['ad_entry_keywords'] = 'كلمات البحث:';
-$PMF_LANG['ad_entry_author'] = 'الكاتب:';
+$PMF_LANG['msgKeywords'] = 'كلمات البحث:';
+$PMF_LANG['msgAuthor'] = 'الكاتب:';
 $PMF_LANG['msgCategory'] = 'التصنيف:';
 $PMF_LANG['ad_entry_active'] = 'نشط؟';
 $PMF_LANG['msgDate'] = 'التاريخ';
@@ -467,7 +467,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ مداخلات';
 $PMF_LANG['ad_entry_new_revision'] = 'أنشأ تعديل جديد ؟';
 $PMF_LANG['ad_entry_record_administration'] = 'إدارة المدخلة ';
-$PMF_LANG['ad_entry_revision'] = 'تعديل';
+$PMF_LANG['msgRevision'] = 'تعديل';
 $PMF_LANG['ad_changerev'] = 'إختار تعديل';
 $PMF_LANG['msgCaptcha'] = 'من فضلك أدخل الحروف التي تراها في هذة الصورة';
 $PMF_LANG['msgSelectCategories'] = 'بحث في ..';
@@ -585,10 +585,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'الخلاصة';
 $PMF_LANG['ad_menu_categ_structure'] = 'ملخص عن التصنيف يتضمن اللغات';
 $PMF_LANG['ad_entry_userpermission'] = 'صلاحيات المستخدم :';
-$PMF_LANG['ad_entry_grouppermission'] = 'صلاحيات المجموعة :';
+$PMF_LANG['msgGroupPermissions'] = 'صلاحيات المجموعة :';
 $PMF_LANG['msgAccessAllUsers'] = 'الدخول لكل المستخدمين';
 $PMF_LANG['ad_entry_restricted_users'] = 'الدخول محجوب لـ ';
-$PMF_LANG['ad_entry_all_groups'] = 'الدخول لكل المجموعات';
+$PMF_LANG['msgAccessAllGroups'] = 'الدخول لكل المجموعات';
 $PMF_LANG['ad_entry_restricted_groups'] = 'الدخول محجوب لـ';
 $PMF_LANG['ad_session_expiration'] = 'وقت إنتهاء الجلسة';
 $PMF_LANG['msgActive'] = 'نشط';
diff --git a/phpmyfaq/translations/language_bn.php b/phpmyfaq/translations/language_bn.php
index c58f3e63e0..c54da0743a 100644
--- a/phpmyfaq/translations/language_bn.php
+++ b/phpmyfaq/translations/language_bn.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Question";
 $PMF_LANG["msgAnswer"] = "Answer";
-$PMF_LANG["ad_entry_keywords"] = "Keywords";
-$PMF_LANG["ad_entry_author"] = "Author";
+$PMF_LANG["msgKeywords"] = "Keywords";
+$PMF_LANG["msgAuthor"] = "Author";
 $PMF_LANG["msgCategory"] = "Entity";
 $PMF_LANG["ad_entry_active"] = "Active?";
 $PMF_LANG["msgDate"] = "Date";
@@ -586,7 +586,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Create new revision?';
 $PMF_LANG['ad_entry_record_administration'] = 'Record administration';
 $PMF_LANG['ad_entry_changelog'] = 'Changelog';
-$PMF_LANG['ad_entry_revision'] = 'Revision';
+$PMF_LANG['msgRevision'] = 'Revision';
 $PMF_LANG['ad_changerev'] = 'Select Revision';
 $PMF_LANG['msgCaptcha'] = "ছবিতে দেখা অক্ষরগুলো লিখুন";
 $PMF_LANG['msgSelectCategories'] = 'খুঁজুন ...';
@@ -729,10 +729,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'User permissions';
-$PMF_LANG['ad_entry_grouppermission'] = 'Group permissions';
+$PMF_LANG['msgGroupPermissions'] = 'Group permissions';
 $PMF_LANG['msgAccessAllUsers'] = 'Access for all users';
 $PMF_LANG['ad_entry_restricted_users'] = 'Restricted access to';
-$PMF_LANG['ad_entry_all_groups'] = 'Access for all groups';
+$PMF_LANG['msgAccessAllGroups'] = 'Access for all groups';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Restricted access to';
 $PMF_LANG['ad_session_expiration'] = 'Time to your session expiration';
 $PMF_LANG['msgActive'] = 'active';
diff --git a/phpmyfaq/translations/language_bs.php b/phpmyfaq/translations/language_bs.php
index b91694e0c0..cd788d0300 100644
--- a/phpmyfaq/translations/language_bs.php
+++ b/phpmyfaq/translations/language_bs.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Tema";
 $PMF_LANG["msgAnswer"] = "Sadr&#382;aj";
-$PMF_LANG["ad_entry_keywords"] = "Klju&#269;ne re&#269;i";
-$PMF_LANG["ad_entry_author"] = "Autor";
+$PMF_LANG["msgKeywords"] = "Klju&#269;ne re&#269;i";
+$PMF_LANG["msgAuthor"] = "Autor";
 $PMF_LANG["msgCategory"] = "Kategorija";
 $PMF_LANG["ad_entry_active"] = "Aktivno?";
 $PMF_LANG["msgDate"] = "Datum";
@@ -581,7 +581,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Otvorite novu reviziju?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administracija unosa';
 $PMF_LANG['ad_entry_changelog'] = 'Izmene';
-$PMF_LANG['ad_entry_revision'] = 'Revizija';
+$PMF_LANG['msgRevision'] = 'Revizija';
 $PMF_LANG['ad_changerev'] = 'Izaberite Reviziju';
 $PMF_LANG['msgCaptcha'] = "Molimo Vas unesite znakove koje vidite na slici";
 $PMF_LANG['msgSelectCategories'] = 'Tra&#382;i u ...';
@@ -724,10 +724,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Ovla&scaron;&#263;enja korisnika:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Grupna ovla&scaron;&#263;enja:';
+$PMF_LANG['msgGroupPermissions'] = 'Grupna ovla&scaron;&#263;enja:';
 $PMF_LANG['msgAccessAllUsers'] = 'Pristup svim korisnicima';
 $PMF_LANG['ad_entry_restricted_users'] = 'Zabranjen pristup za';
-$PMF_LANG['ad_entry_all_groups'] = 'Pristup za sve grupe';
+$PMF_LANG['msgAccessAllGroups'] = 'Pristup za sve grupe';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Zabranjen pristup za';
 $PMF_LANG['ad_session_expiration'] = 'Vreme do isticanja sesije';
 $PMF_LANG['msgActive'] = 'aktivno';
diff --git a/phpmyfaq/translations/language_cs.php b/phpmyfaq/translations/language_cs.php
index 090c962c40..bf0526b797 100644
--- a/phpmyfaq/translations/language_cs.php
+++ b/phpmyfaq/translations/language_cs.php
@@ -175,8 +175,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Téma:';
 $PMF_LANG['msgAnswer'] = 'Obsah:';
-$PMF_LANG['ad_entry_keywords'] = 'Klíčová slova:';
-$PMF_LANG['ad_entry_author'] = 'Autor:';
+$PMF_LANG['msgKeywords'] = 'Klíčová slova:';
+$PMF_LANG['msgAuthor'] = 'Autor:';
 $PMF_LANG['msgCategory'] = 'Kategorie:';
 $PMF_LANG['ad_entry_active'] = 'Aktivovat zobrazení tohoto záznamu:';
 $PMF_LANG['msgDate'] = 'Datum';
@@ -476,7 +476,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Záznam';
 $PMF_LANG['ad_entry_new_revision'] = 'Vytvořit novou revizi?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administrace záznamu';
-$PMF_LANG['ad_entry_revision'] = 'Verze';
+$PMF_LANG['msgRevision'] = 'Verze';
 $PMF_LANG['ad_changerev'] = 'Vybrat revizi';
 $PMF_LANG['msgCaptcha'] = 'Prosím, opište všechny znaky z obrázku';
 $PMF_LANG['msgSelectCategories'] = 'Vyhledat ';
@@ -595,10 +595,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Přehled';
 $PMF_LANG['ad_menu_categ_structure'] = 'Přehled kategorií obsahuje tyto jazyky';
 $PMF_LANG['ad_entry_userpermission'] = 'Oprávnění uživatelů:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Oprávnění skupin:';
+$PMF_LANG['msgGroupPermissions'] = 'Oprávnění skupin:';
 $PMF_LANG['msgAccessAllUsers'] = 'Přístup pro všechny uživatele';
 $PMF_LANG['ad_entry_restricted_users'] = 'Omezit přístup na';
-$PMF_LANG['ad_entry_all_groups'] = 'Přístup pro všechny skupiny';
+$PMF_LANG['msgAccessAllGroups'] = 'Přístup pro všechny skupiny';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Omezený přístup na';
 $PMF_LANG['ad_session_expiration'] = 'Čas expirace Vaší sessiony';
 $PMF_LANG['msgActive'] = 'aktivní';
diff --git a/phpmyfaq/translations/language_cy.php b/phpmyfaq/translations/language_cy.php
index ad3d7cf44c..3683dc848e 100644
--- a/phpmyfaq/translations/language_cy.php
+++ b/phpmyfaq/translations/language_cy.php
@@ -208,8 +208,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Thema";
 $PMF_LANG["msgAnswer"] = "Cynnwys";
-$PMF_LANG["ad_entry_keywords"] = "Geiriau Allweddol";
-$PMF_LANG["ad_entry_author"] = "Awdur";
+$PMF_LANG["msgKeywords"] = "Geiriau Allweddol";
+$PMF_LANG["msgAuthor"] = "Awdur";
 $PMF_LANG["msgCategory"] = "Categori";
 $PMF_LANG["ad_entry_active"] = "Gweithredol?";
 $PMF_LANG["msgDate"] = "Dyddiad";
@@ -580,7 +580,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Creu adolygiad newydd?';
 $PMF_LANG['ad_entry_record_administration'] = 'Cofnodi gweinyddiaeth';
 $PMF_LANG['ad_entry_changelog'] = 'Newid log';
-$PMF_LANG['ad_entry_revision'] = 'Adolygu';
+$PMF_LANG['msgRevision'] = 'Adolygu';
 $PMF_LANG['ad_changerev'] = 'Dethol Adolygu';
 $PMF_LANG['msgCaptcha'] = "Nodwch y cymeriadau yr ydych yn eu darllen yn y ddelwedd";
 $PMF_LANG['msgSelectCategories'] = 'Chwilio ym ...';
diff --git a/phpmyfaq/translations/language_da.php b/phpmyfaq/translations/language_da.php
index d27456134a..f98473935a 100644
--- a/phpmyfaq/translations/language_da.php
+++ b/phpmyfaq/translations/language_da.php
@@ -174,8 +174,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Tema:';
 $PMF_LANG['msgAnswer'] = 'Indhold:';
-$PMF_LANG['ad_entry_keywords'] = 'Nøgleord:';
-$PMF_LANG['ad_entry_author'] = 'Forfatter:';
+$PMF_LANG['msgKeywords'] = 'Nøgleord:';
+$PMF_LANG['msgAuthor'] = 'Forfatter:';
 $PMF_LANG['msgCategory'] = 'Kategori:';
 $PMF_LANG['ad_entry_active'] = 'Aktiv?';
 $PMF_LANG['msgDate'] = 'Dato';
@@ -473,7 +473,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ-indl&aelig;g';
 $PMF_LANG['ad_entry_new_revision'] = 'Opret ny revision?';
 $PMF_LANG['ad_entry_record_administration'] = 'Tilg&aelig;ngelighed af indl&aelig;g';
-$PMF_LANG['ad_entry_revision'] = 'Revision';
+$PMF_LANG['msgRevision'] = 'Revision';
 $PMF_LANG['ad_changerev'] = 'V&aelig;lg revision';
 $PMF_LANG['msgCaptcha'] = 'Indtast venligst de bogstaver, som du kan se i billedet';
 $PMF_LANG['msgSelectCategories'] = 'S&oslash;g i ...';
@@ -591,10 +591,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Overblik';
 $PMF_LANG['ad_menu_categ_structure'] = 'Entity Overview including its languages';
 $PMF_LANG['ad_entry_userpermission'] = 'Bruger-rettigheder:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Gruppe-rettigheder:';
+$PMF_LANG['msgGroupPermissions'] = 'Gruppe-rettigheder:';
 $PMF_LANG['msgAccessAllUsers'] = 'Adgang for alle brugere';
 $PMF_LANG['ad_entry_restricted_users'] = 'Kun adgang for';
-$PMF_LANG['ad_entry_all_groups'] = 'Adgang for alle grupper';
+$PMF_LANG['msgAccessAllGroups'] = 'Adgang for alle grupper';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Kun adgang for';
 $PMF_LANG['ad_session_expiration'] = 'Time to your session expiration';
 $PMF_LANG['msgActive'] = 'Aktiv';
diff --git a/phpmyfaq/translations/language_de.php b/phpmyfaq/translations/language_de.php
index 0d5407a372..31f487a7b1 100755
--- a/phpmyfaq/translations/language_de.php
+++ b/phpmyfaq/translations/language_de.php
@@ -204,8 +204,8 @@
 $PMF_LANG['ad_entry_edit_2'] = "bearbeiten";
 $PMF_LANG['msgQuestion'] = "Frage";
 $PMF_LANG['msgAnswer'] = "Antwort";
-$PMF_LANG['ad_entry_keywords'] = "Suchbegriffe";
-$PMF_LANG['ad_entry_author'] = "Verfasser";
+$PMF_LANG['msgKeywords'] = "Suchbegriffe";
+$PMF_LANG['msgAuthor'] = "Verfasser";
 $PMF_LANG['msgCategory'] = "Kategorie";
 $PMF_LANG['ad_entry_active'] = "Aktiviert";
 $PMF_LANG['msgDate'] = "Datum";
@@ -564,7 +564,7 @@
 $PMF_LANG['ad_entry_faq_record'] = "FAQ Eintrag";
 $PMF_LANG['ad_entry_new_revision'] = "Neue Revision";
 $PMF_LANG['ad_entry_record_administration'] = "FAQ Bearbeitung";
-$PMF_LANG['ad_entry_revision'] = "Revision";
+$PMF_LANG['msgRevision'] = "Revision";
 $PMF_LANG['ad_changerev'] = "Revisionsauswahl";
 $PMF_LANG['msgCaptcha'] = "Bitte gebe den Captcha-Code ein";
 $PMF_LANG['msgSelectCategories'] = "Suche in ...";
@@ -706,10 +706,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = "Benutzerrechte";
-$PMF_LANG['ad_entry_grouppermission'] = "Gruppenrechte";
+$PMF_LANG['msgGroupPermissions'] = "Gruppenrechte";
 $PMF_LANG['msgAccessAllUsers'] = "Zugriff für alle Benutzer";
 $PMF_LANG['ad_entry_restricted_users'] = "Zugriff nur für";
-$PMF_LANG['ad_entry_all_groups'] = "Zugriff für alle Gruppen";
+$PMF_LANG['msgAccessAllGroups'] = "Zugriff für alle Gruppen";
 $PMF_LANG['ad_entry_restricted_groups'] = "Zugriff nur für";
 $PMF_LANG['ad_session_expiration'] = "Ablauf der Session";
 $PMF_LANG['msgActive'] = "aktiv";
diff --git a/phpmyfaq/translations/language_el.php b/phpmyfaq/translations/language_el.php
index d9d6cbd3d7..d2240f1b73 100644
--- a/phpmyfaq/translations/language_el.php
+++ b/phpmyfaq/translations/language_el.php
@@ -175,8 +175,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Συνδυασμός γραφικών:';
 $PMF_LANG['msgAnswer'] = 'Περιεχόμενο:';
-$PMF_LANG['ad_entry_keywords'] = 'Λέξεις κλειδιά:';
-$PMF_LANG['ad_entry_author'] = 'Συγγραφέας:';
+$PMF_LANG['msgKeywords'] = 'Λέξεις κλειδιά:';
+$PMF_LANG['msgAuthor'] = 'Συγγραφέας:';
 $PMF_LANG['msgCategory'] = 'Κατηγορία:';
 $PMF_LANG['ad_entry_active'] = 'Ενεργή;';
 $PMF_LANG['msgDate'] = 'Ημερομηνία';
@@ -476,7 +476,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ καταχώρηση';
 $PMF_LANG['ad_entry_new_revision'] = 'Δημιουργία νέας έκδοσης;';
 $PMF_LANG['ad_entry_record_administration'] = 'Ρυθμίσεις καταχωρήσεων';
-$PMF_LANG['ad_entry_revision'] = 'Έκδοση';
+$PMF_LANG['msgRevision'] = 'Έκδοση';
 $PMF_LANG['ad_changerev'] = 'Επιλογή έκδοσης';
 $PMF_LANG['msgCaptcha'] = 'Παρακαλώ εισάγετε τους χαρακτήρες που διαβάζετε στην εικόνα';
 $PMF_LANG['msgSelectCategories'] = 'Αναζήτηση σε ...';
@@ -597,10 +597,10 @@
 $PMF_LANG['ad_menu_categ_structure'] = 'Η επισκόπηση κατηγορίας με τις μεταφράσεις';
 $PMF_LANG['ad_entry_userpermission'] = 'Δικαιώματα χρηστών:';
 $LANG_CONF['records.numberOfRelatedArticles'] = array("input", "Σύνολο συναφών καταχωρήσεων");
-$PMF_LANG['ad_entry_grouppermission'] = 'Δικαιώματα ομάδων:';
+$PMF_LANG['msgGroupPermissions'] = 'Δικαιώματα ομάδων:';
 $PMF_LANG['msgAccessAllUsers'] = 'Προσβάσιμη για όλους τους χρήστες';
 $PMF_LANG['ad_entry_restricted_users'] = 'Περιορισμένη πρόσβαση σε';
-$PMF_LANG['ad_entry_all_groups'] = 'Προσβάσιμη για όλες τις ομάδες';
+$PMF_LANG['msgAccessAllGroups'] = 'Προσβάσιμη για όλες τις ομάδες';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Περιορισμένη πρόσβαση σε';
 $PMF_LANG['ad_session_expiration'] = 'Υπόλοιπος χρόνος μεχρι ακύρωση συνεδρίας';
 $PMF_LANG['msgActive'] = 'ενεργός';
diff --git a/phpmyfaq/translations/language_en.php b/phpmyfaq/translations/language_en.php
index 8b6ab56f3c..003c9a0b8e 100644
--- a/phpmyfaq/translations/language_en.php
+++ b/phpmyfaq/translations/language_en.php
@@ -205,8 +205,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Question";
 $PMF_LANG["msgAnswer"] = "Answer";
-$PMF_LANG["ad_entry_keywords"] = "Keywords";
-$PMF_LANG["ad_entry_author"] = "Author";
+$PMF_LANG["msgKeywords"] = "Keywords";
+$PMF_LANG["msgAuthor"] = "Author";
 $PMF_LANG["msgCategory"] = "Category";
 $PMF_LANG["ad_entry_active"] = "Visible";
 $PMF_LANG["msgDate"] = "Date";
@@ -566,7 +566,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ record';
 $PMF_LANG['ad_entry_new_revision'] = 'Create new revision?';
 $PMF_LANG['ad_entry_record_administration'] = 'Record administration';
-$PMF_LANG['ad_entry_revision'] = 'Revision';
+$PMF_LANG['msgRevision'] = 'Revision';
 $PMF_LANG['ad_changerev'] = 'Select revision';
 $PMF_LANG['msgCaptcha'] = "Please enter the captcha code";
 $PMF_LANG['msgSelectCategories'] = 'Search in ...';
@@ -708,10 +708,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'User permissions';
-$PMF_LANG['ad_entry_grouppermission'] = 'Group permissions';
+$PMF_LANG['msgGroupPermissions'] = 'Group permissions';
 $PMF_LANG['msgAccessAllUsers'] = 'Access for all users';
 $PMF_LANG['ad_entry_restricted_users'] = 'Restricted access to';
-$PMF_LANG['ad_entry_all_groups'] = 'Access for all groups';
+$PMF_LANG['msgAccessAllGroups'] = 'Access for all groups';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Restricted access to';
 $PMF_LANG['ad_session_expiration'] = 'Session expires in';
 $PMF_LANG['msgActive'] = 'active';
diff --git a/phpmyfaq/translations/language_es.php b/phpmyfaq/translations/language_es.php
index 8e0e93b7e1..0ea1bfd838 100644
--- a/phpmyfaq/translations/language_es.php
+++ b/phpmyfaq/translations/language_es.php
@@ -205,8 +205,8 @@
 $PMF_LANG['ad_entry_edit_2'] = 'editar';
 $PMF_LANG['msgQuestion'] = 'Pregunta';
 $PMF_LANG['msgAnswer'] = 'Respuesta';
-$PMF_LANG['ad_entry_keywords'] = 'Buscar palabras claves:';
-$PMF_LANG['ad_entry_author'] = 'Autor';
+$PMF_LANG['msgKeywords'] = 'Buscar palabras claves:';
+$PMF_LANG['msgAuthor'] = 'Autor';
 $PMF_LANG['msgCategory'] = 'Categoría';
 $PMF_LANG['ad_entry_active'] = 'Activado';
 $PMF_LANG['msgDate'] = 'Fecha';
@@ -565,7 +565,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Entrada en la FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'Nueva revisión?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administración de FAQ';
-$PMF_LANG['ad_entry_revision'] = 'Revisión';
+$PMF_LANG['msgRevision'] = 'Revisión';
 $PMF_LANG['ad_changerev'] = 'Elegir Revisión';
 $PMF_LANG['msgCaptcha'] = 'Por favor, introduzca el código del captcha';
 $PMF_LANG['msgSelectCategories'] = 'Buscar en ...';
@@ -707,10 +707,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Permisos de usuario';
-$PMF_LANG['ad_entry_grouppermission'] = 'Permisos del grupo';
+$PMF_LANG['msgGroupPermissions'] = 'Permisos del grupo';
 $PMF_LANG['msgAccessAllUsers'] = 'Acceso para todos los usuarios';
 $PMF_LANG['ad_entry_restricted_users'] = 'Acceso sólo para';
-$PMF_LANG['ad_entry_all_groups'] = 'Acceso para todos los grupos';
+$PMF_LANG['msgAccessAllGroups'] = 'Acceso para todos los grupos';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Acceso sólo para';
 $PMF_LANG['ad_session_expiration'] = 'La sesión expira en';
 $PMF_LANG['msgActive'] = 'activo';
diff --git a/phpmyfaq/translations/language_eu.php b/phpmyfaq/translations/language_eu.php
index 1c508a320e..d472e0e4cc 100644
--- a/phpmyfaq/translations/language_eu.php
+++ b/phpmyfaq/translations/language_eu.php
@@ -211,8 +211,8 @@
 $PMF_LANG["ad_entry_edit_2"] = ". erregistroa editatu";
 $PMF_LANG["msgQuestion"] = "Galdera";
 $PMF_LANG["msgAnswer"] = "Edukia";
-$PMF_LANG["ad_entry_keywords"] = "Hitz gakoak";
-$PMF_LANG["ad_entry_author"] = "Egilea";
+$PMF_LANG["msgKeywords"] = "Hitz gakoak";
+$PMF_LANG["msgAuthor"] = "Egilea";
 $PMF_LANG["msgCategory"] = "Atala";
 $PMF_LANG["ad_entry_active"] = "Aktibatu?";
 $PMF_LANG["msgDate"] = "Eguna";
diff --git a/phpmyfaq/translations/language_fa.php b/phpmyfaq/translations/language_fa.php
index f939acb9b6..594bea969e 100644
--- a/phpmyfaq/translations/language_fa.php
+++ b/phpmyfaq/translations/language_fa.php
@@ -176,8 +176,8 @@
 $PMF_LANG['ad_entry_edit_2'] = 'ویرایش رکورد';
 $PMF_LANG['msgQuestion'] = 'تیتر مطلب:';
 $PMF_LANG['msgAnswer'] = 'محتوا:';
-$PMF_LANG['ad_entry_keywords'] = 'کلیدواژه:';
-$PMF_LANG['ad_entry_author'] = 'نویسنده:';
+$PMF_LANG['msgKeywords'] = 'کلیدواژه:';
+$PMF_LANG['msgAuthor'] = 'نویسنده:';
 $PMF_LANG['msgCategory'] = 'موضوع:';
 $PMF_LANG['ad_entry_active'] = 'قابل مشاهده';
 $PMF_LANG['msgDate'] = 'تاریخ';
@@ -481,7 +481,7 @@
 $PMF_LANG['ad_entry_FAQ_record'] = 'مطلب پرسش‌های متداول';
 $PMF_LANG['ad_entry_new_revision'] = 'ایجاد تجدیدنظر جدید?';
 $PMF_LANG['ad_entry_record_administration'] = 'مدیریت مطالب';
-$PMF_LANG['ad_entry_revision'] = 'تجدید نظر';
+$PMF_LANG['msgRevision'] = 'تجدید نظر';
 $PMF_LANG['ad_changerev'] = 'انتخاب تجدید نظر';
 $PMF_LANG['msgCaptcha'] = 'حروف داخل تصویر را تایپ کنید';
 $PMF_LANG['msgSelectCategories'] = 'جستجو در ...';
diff --git a/phpmyfaq/translations/language_fi.php b/phpmyfaq/translations/language_fi.php
index d8303a650c..ba6639744e 100644
--- a/phpmyfaq/translations/language_fi.php
+++ b/phpmyfaq/translations/language_fi.php
@@ -177,8 +177,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Kysymys:';
 $PMF_LANG['msgAnswer'] = 'Vastaus:';
-$PMF_LANG['ad_entry_keywords'] = 'Avainsanat:';
-$PMF_LANG['ad_entry_author'] = 'Kysyjä:';
+$PMF_LANG['msgKeywords'] = 'Avainsanat:';
+$PMF_LANG['msgAuthor'] = 'Kysyjä:';
 $PMF_LANG['msgCategory'] = 'Kategoria:';
 $PMF_LANG['ad_entry_active'] = 'Aktiivinen:';
 $PMF_LANG['msgDate'] = 'Päiväys';
@@ -481,7 +481,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Kysymys';
 $PMF_LANG['ad_entry_new_revision'] = 'Luo uusi revisio?';
 $PMF_LANG['ad_entry_record_administration'] = 'Tietueen ylläpito';
-$PMF_LANG['ad_entry_revision'] = 'Revisio';
+$PMF_LANG['msgRevision'] = 'Revisio';
 $PMF_LANG['ad_changerev'] = 'Valitse revisio';
 $PMF_LANG['msgCaptcha'] = 'Kirjoita kuvan merkit viereiseen kenttään';
 $PMF_LANG['msgSelectCategories'] = 'Etsi...';
@@ -604,10 +604,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Yleiskatsaus';
 $PMF_LANG['ad_menu_categ_structure'] = 'Kategoraien yhteenveto sisältäen sen kielet';
 $PMF_LANG['ad_entry_userpermission'] = 'Käyttäjäoikeudet:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Ryhmäoikeudet:';
+$PMF_LANG['msgGroupPermissions'] = 'Ryhmäoikeudet:';
 $PMF_LANG['msgAccessAllUsers'] = 'Näytä kaikille käyttäjille';
 $PMF_LANG['ad_entry_restricted_users'] = 'Rajoita käyttäjille';
-$PMF_LANG['ad_entry_all_groups'] = 'Näytä kaikille ryhmille';
+$PMF_LANG['msgAccessAllGroups'] = 'Näytä kaikille ryhmille';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Rajoita ryhmille';
 $PMF_LANG['ad_session_expiration'] = 'Istunto voimassa';
 $PMF_LANG['msgActive'] = 'aktiivinen';
diff --git a/phpmyfaq/translations/language_fr-ca.php b/phpmyfaq/translations/language_fr-ca.php
index 585b746c53..6c90487df9 100644
--- a/phpmyfaq/translations/language_fr-ca.php
+++ b/phpmyfaq/translations/language_fr-ca.php
@@ -174,8 +174,8 @@
 $PMF_LANG['ad_entry_edit_2'] = 'Editer article';
 $PMF_LANG['msgQuestion'] = 'Question :';
 $PMF_LANG['msgAnswer'] = 'Réponse :';
-$PMF_LANG['ad_entry_keywords'] = 'Mots-clef :';
-$PMF_LANG['ad_entry_author'] = 'Auteur :';
+$PMF_LANG['msgKeywords'] = 'Mots-clef :';
+$PMF_LANG['msgAuthor'] = 'Auteur :';
 $PMF_LANG['msgCategory'] = 'Catégorie :';
 $PMF_LANG['ad_entry_active'] = 'Publier ?';
 $PMF_LANG['msgDate'] = 'Date';
@@ -559,7 +559,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Enregistrement FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'Créer une nouvelle révision :';
 $PMF_LANG['ad_entry_record_administration'] = 'Publication';
-$PMF_LANG['ad_entry_revision'] = 'Révision';
+$PMF_LANG['msgRevision'] = 'Révision';
 $PMF_LANG['ad_changerev'] = 'Sélectionner une révision';
 $PMF_LANG['msgCaptcha'] = 'Merci de saisir les caractères que vous lisez sur l\'image.';
 $PMF_LANG['msgSelectCategories'] = 'Rechercher dans...';
@@ -695,10 +695,10 @@
 $PMF_LANG['msgOnlineVersionCheck'] = 'Vérification en ligne de la version';
 $PMF_LANG['ad_system_info'] = 'Informations sur votre système';
 $PMF_LANG['ad_entry_userpermission'] = 'Permissions des utilisateurs :';
-$PMF_LANG['ad_entry_grouppermission'] = 'Permissions des groupes :';
+$PMF_LANG['msgGroupPermissions'] = 'Permissions des groupes :';
 $PMF_LANG['msgAccessAllUsers'] = 'Accessible à tous les utilisateurs';
 $PMF_LANG['ad_entry_restricted_users'] = 'Réservé à';
-$PMF_LANG['ad_entry_all_groups'] = 'Accessible à tous les groupes';
+$PMF_LANG['msgAccessAllGroups'] = 'Accessible à tous les groupes';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Réservé à';
 $PMF_LANG['msgTags'] = 'Balises ';
 $PMF_LANG['ad_stat_management'] = 'Gestion des sessions';
diff --git a/phpmyfaq/translations/language_fr.php b/phpmyfaq/translations/language_fr.php
index bba17e15c8..5dae9fff30 100644
--- a/phpmyfaq/translations/language_fr.php
+++ b/phpmyfaq/translations/language_fr.php
@@ -206,8 +206,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Question";
 $PMF_LANG["msgAnswer"] = "Réponse";
-$PMF_LANG["ad_entry_keywords"] = "Mots-clés";
-$PMF_LANG["ad_entry_author"] = "Auteur";
+$PMF_LANG["msgKeywords"] = "Mots-clés";
+$PMF_LANG["msgAuthor"] = "Auteur";
 $PMF_LANG["msgCategory"] = "Catégorie";
 $PMF_LANG["ad_entry_active"] = "Visible";
 $PMF_LANG["msgDate"] = "Date";
@@ -568,7 +568,7 @@
 $PMF_LANG["ad_entry_faq_record"] = "Enregistrement FAQ";
 $PMF_LANG["ad_entry_new_revision"] = "Créer une nouvelle révision ?";
 $PMF_LANG["ad_entry_record_administration"] = "Publication";
-$PMF_LANG["ad_entry_revision"] = "Révision";
+$PMF_LANG["msgRevision"] = "Révision";
 $PMF_LANG["ad_changerev"] = "Sélectionner une révision";
 $PMF_LANG["msgCaptcha"] = "Merci de saisir le code Captcha";
 $PMF_LANG["msgSelectCategories"] = "Rechercher dans...";
@@ -710,10 +710,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG["ad_entry_userpermission"] = "Permissions des utilisateurs :";
-$PMF_LANG["ad_entry_grouppermission"] = "Permissions des groupes :";
+$PMF_LANG["msgGroupPermissions"] = "Permissions des groupes :";
 $PMF_LANG["msgAccessAllUsers"] = "Accessible à tous les utilisateurs";
 $PMF_LANG["ad_entry_restricted_users"] = "Accès restreint à";
-$PMF_LANG["ad_entry_all_groups"] = "Accessible à tous les groupes";
+$PMF_LANG["msgAccessAllGroups"] = "Accessible à tous les groupes";
 $PMF_LANG["ad_entry_restricted_groups"] = "Accès restreint à";
 $PMF_LANG["ad_session_expiration"] = "La session expire dans";
 $PMF_LANG["msgActive"] = "Actif";
diff --git a/phpmyfaq/translations/language_he.php b/phpmyfaq/translations/language_he.php
index 3d6a988b52..d9abcaacd8 100644
--- a/phpmyfaq/translations/language_he.php
+++ b/phpmyfaq/translations/language_he.php
@@ -175,8 +175,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'כותרת:';
 $PMF_LANG['msgAnswer'] = 'תוכן:';
-$PMF_LANG['ad_entry_keywords'] = 'מילות מפתח:';
-$PMF_LANG['ad_entry_author'] = 'מחבר:';
+$PMF_LANG['msgKeywords'] = 'מילות מפתח:';
+$PMF_LANG['msgAuthor'] = 'מחבר:';
 $PMF_LANG['msgCategory'] = 'קטגוריה: ';
 $PMF_LANG['ad_entry_active'] = 'פעיל?';
 $PMF_LANG['msgDate'] = 'תאריך';
@@ -473,7 +473,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'ערך';
 $PMF_LANG['ad_entry_new_revision'] = 'ליצור גירסה חדשה?';
 $PMF_LANG['ad_entry_record_administration'] = 'ניהול ערכים';
-$PMF_LANG['ad_entry_revision'] = 'גירסה';
+$PMF_LANG['msgRevision'] = 'גירסה';
 $PMF_LANG['ad_changerev'] = 'בחר גירסה';
 $PMF_LANG['msgCaptcha'] = 'אנא הקלד את הסימנים';
 $PMF_LANG['msgSelectCategories'] = 'חפש ב ...';
@@ -591,10 +591,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'מבט על';
 $PMF_LANG['ad_menu_categ_structure'] = 'מבט על על קטגוריה בשפות הבאות';
 $PMF_LANG['ad_entry_userpermission'] = 'הרשאות משתמש:';
-$PMF_LANG['ad_entry_grouppermission'] = 'הרשאות קבוצה:';
+$PMF_LANG['msgGroupPermissions'] = 'הרשאות קבוצה:';
 $PMF_LANG['msgAccessAllUsers'] = 'גישה לכל המשתמשים';
 $PMF_LANG['ad_entry_restricted_users'] = 'גישה מוגבלת ל';
-$PMF_LANG['ad_entry_all_groups'] = 'גישה לכל הקבוצות';
+$PMF_LANG['msgAccessAllGroups'] = 'גישה לכל הקבוצות';
 $PMF_LANG['ad_entry_restricted_groups'] = 'גישה מוגבלת ל';
 $PMF_LANG['ad_session_expiration'] = 'זמן נותר עד לפקיעת הסשן שלך';
 $PMF_LANG['msgActive'] = 'פעיל';
diff --git a/phpmyfaq/translations/language_hi.php b/phpmyfaq/translations/language_hi.php
index 2733cee248..fb4e4aa679 100644
--- a/phpmyfaq/translations/language_hi.php
+++ b/phpmyfaq/translations/language_hi.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "प्रश्न";
 $PMF_LANG["msgAnswer"] = "ऊत्तर";
-$PMF_LANG["ad_entry_keywords"] = "कुंजी शब्द";
-$PMF_LANG["ad_entry_author"] = "लेखक";
+$PMF_LANG["msgKeywords"] = "कुंजी शब्द";
+$PMF_LANG["msgAuthor"] = "लेखक";
 $PMF_LANG["msgCategory"] = "वर्ग";
 $PMF_LANG["ad_entry_active"] = "सक्रिय?";
 $PMF_LANG["msgDate"] = "दिनांक";
@@ -587,7 +587,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'नया पुनवलोकन करें?';
 $PMF_LANG['ad_entry_record_administration'] = 'रिकॉर्ड प्रबंधन';
 $PMF_LANG['ad_entry_changelog'] = 'लॉग';
-$PMF_LANG['ad_entry_revision'] = 'पुनवलोकन';
+$PMF_LANG['msgRevision'] = 'पुनवलोकन';
 $PMF_LANG['ad_changerev'] = 'पुनवलोकन चुने';
 $PMF_LANG['msgCaptcha'] = "चित्र में जो शब्द आपको दिख रहे हैं वो यहाँ लिखें";
 $PMF_LANG['msgSelectCategories'] = 'इसमें खोजें ...';
@@ -730,10 +730,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'प्रयोगकर्ता के अधिकार:';
-$PMF_LANG['ad_entry_grouppermission'] = 'दल के अधिकार:';
+$PMF_LANG['msgGroupPermissions'] = 'दल के अधिकार:';
 $PMF_LANG['msgAccessAllUsers'] = 'सभी के लिए अभिगम्य';
 $PMF_LANG['ad_entry_restricted_users'] = 'प्रवेश सिमित';
-$PMF_LANG['ad_entry_all_groups'] = 'सभी दलों के लिए अभिगम्य';
+$PMF_LANG['msgAccessAllGroups'] = 'सभी दलों के लिए अभिगम्य';
 $PMF_LANG['ad_entry_restricted_groups'] = 'प्रवेश सिमित';
 $PMF_LANG['ad_session_expiration'] = 'आपके सत्र समाप्ति का समय';
 $PMF_LANG['msgActive'] = 'सक्रिय';
diff --git a/phpmyfaq/translations/language_hu.php b/phpmyfaq/translations/language_hu.php
index 566ba959f7..862a51cea9 100644
--- a/phpmyfaq/translations/language_hu.php
+++ b/phpmyfaq/translations/language_hu.php
@@ -175,8 +175,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Téma:';
 $PMF_LANG['msgAnswer'] = 'Bejegyzés:';
-$PMF_LANG['ad_entry_keywords'] = 'Kulcsszavak:';
-$PMF_LANG['ad_entry_author'] = 'Szerző:';
+$PMF_LANG['msgKeywords'] = 'Kulcsszavak:';
+$PMF_LANG['msgAuthor'] = 'Szerző:';
 $PMF_LANG['msgCategory'] = 'Kategória:';
 $PMF_LANG['ad_entry_active'] = 'Aktív?';
 $PMF_LANG['msgDate'] = 'Dátum';
@@ -689,7 +689,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Bejegyzés';
 $PMF_LANG['ad_entry_new_revision'] = 'Új revízió létrehozása?';
 $PMF_LANG['ad_entry_record_administration'] = 'Record administration';
-$PMF_LANG['ad_entry_revision'] = 'Revízió';
+$PMF_LANG['msgRevision'] = 'Revízió';
 $PMF_LANG['ad_changerev'] = 'Revízió választása';
 $PMF_LANG['msgCaptcha'] = 'Kérem a captcha kódot';
 $PMF_LANG['msgSelectCategories'] = 'Keresés ...';
@@ -805,11 +805,11 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Kategória áttekintése';
 $PMF_LANG['ad_menu_categ_structure'] = 'Entity Overview including its languages';
 $PMF_LANG['ad_entry_userpermission'] = 'Felhasználó engedélyek:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Csoport engedélyek:';
+$PMF_LANG['msgGroupPermissions'] = 'Csoport engedélyek:';
 $LANG_CONF['records.numberOfRelatedArticles'] = array('input', 'Number of related entries');
 $PMF_LANG['msgAccessAllUsers'] = 'Minden felhasználó hozzáférhet';
 $PMF_LANG['ad_entry_restricted_users'] = 'Hozzáférés megtiltva: ';
-$PMF_LANG['ad_entry_all_groups'] = 'Minden csoport hozzáférése';
+$PMF_LANG['msgAccessAllGroups'] = 'Minden csoport hozzáférése';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Hozzáférés megtiltva: ';
 $PMF_LANG['ad_session_expiration'] = 'Munkamenet lejár:';
 $PMF_LANG['msgActive'] = 'aktív';
diff --git a/phpmyfaq/translations/language_id.php b/phpmyfaq/translations/language_id.php
index a7d7affd0c..372f240159 100644
--- a/phpmyfaq/translations/language_id.php
+++ b/phpmyfaq/translations/language_id.php
@@ -208,8 +208,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Pertanyaan";
 $PMF_LANG["msgAnswer"] = "Jawaban";
-$PMF_LANG["ad_entry_keywords"] = "Kata Kunci";
-$PMF_LANG["ad_entry_author"] = "Penulis";
+$PMF_LANG["msgKeywords"] = "Kata Kunci";
+$PMF_LANG["msgAuthor"] = "Penulis";
 $PMF_LANG["msgCategory"] = "Kategori";
 $PMF_LANG["ad_entry_active"] = "Aktif?";
 $PMF_LANG["msgDate"] = "Tanggal";
@@ -587,7 +587,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Buat revisi baru?';
 $PMF_LANG['ad_entry_record_administration'] = 'Pengelolaan materi';
 $PMF_LANG['ad_entry_changelog'] = 'Changelog';
-$PMF_LANG['ad_entry_revision'] = 'Revisi';
+$PMF_LANG['msgRevision'] = 'Revisi';
 $PMF_LANG['ad_changerev'] = 'Pilih Revisi';
 $PMF_LANG['msgCaptcha'] = "Silakan ketik huruf dan angka yang anda lihat di bawah ini";
 $PMF_LANG['msgSelectCategories'] = 'Cari di ...';
@@ -730,10 +730,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Hak Akses Pengguna:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Hak Akses Grup:';
+$PMF_LANG['msgGroupPermissions'] = 'Hak Akses Grup:';
 $PMF_LANG['msgAccessAllUsers'] = 'Akses untuk semua pengguna';
 $PMF_LANG['ad_entry_restricted_users'] = 'Batasi hanya untuk';
-$PMF_LANG['ad_entry_all_groups'] = 'Akses untuk semua grup';
+$PMF_LANG['msgAccessAllGroups'] = 'Akses untuk semua grup';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Batasi hanya untuk';
 $PMF_LANG['ad_session_expiration'] = 'Sisa waktu sebelum sesi berakhir';
 $PMF_LANG['msgActive'] = 'aktif';
diff --git a/phpmyfaq/translations/language_it.php b/phpmyfaq/translations/language_it.php
index 6a8b5dbd7a..eb8bf68156 100644
--- a/phpmyfaq/translations/language_it.php
+++ b/phpmyfaq/translations/language_it.php
@@ -178,8 +178,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Tema:';
 $PMF_LANG['msgAnswer'] = 'Contenuto:';
-$PMF_LANG['ad_entry_keywords'] = 'Parole chiave:';
-$PMF_LANG['ad_entry_author'] = 'Autore:';
+$PMF_LANG['msgKeywords'] = 'Parole chiave:';
+$PMF_LANG['msgAuthor'] = 'Autore:';
 $PMF_LANG['msgCategory'] = 'Categoria:';
 $PMF_LANG['ad_entry_active'] = 'Attivo?';
 $PMF_LANG['msgDate'] = 'Data';
@@ -479,7 +479,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Dati della FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'Vuoi creare una nuova versione?';
 $PMF_LANG['ad_entry_record_administration'] = 'Gestione della FAQ';
-$PMF_LANG['ad_entry_revision'] = 'Versione';
+$PMF_LANG['msgRevision'] = 'Versione';
 $PMF_LANG['ad_changerev'] = 'Seleziona la versione';
 $PMF_LANG['msgCaptcha'] = 'Scrivi le lettere e i numeri che leggi nella immagine';
 $PMF_LANG['msgSelectCategories'] = 'Cerca in: ';
@@ -597,10 +597,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Sommario';
 $PMF_LANG['ad_menu_categ_structure'] = 'Sommario delle Categorie e delle lingue presenti';
 $PMF_LANG['ad_entry_userpermission'] = 'Permessi dell\'utente:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Permessi del gruppo:';
+$PMF_LANG['msgGroupPermissions'] = 'Permessi del gruppo:';
 $PMF_LANG['msgAccessAllUsers'] = 'Accesso per tutti gli utenti';
 $PMF_LANG['ad_entry_restricted_users'] = 'Accesso ristretto a';
-$PMF_LANG['ad_entry_all_groups'] = 'Accesso per tutti i gruppi';
+$PMF_LANG['msgAccessAllGroups'] = 'Accesso per tutti i gruppi';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Accesso ristretto a';
 $PMF_LANG['ad_session_expiration'] = 'La sessione scadrà entro';
 $PMF_LANG['msgActive'] = 'attivo';
diff --git a/phpmyfaq/translations/language_ja.php b/phpmyfaq/translations/language_ja.php
index 4f5113002a..6fdad3c55f 100644
--- a/phpmyfaq/translations/language_ja.php
+++ b/phpmyfaq/translations/language_ja.php
@@ -174,8 +174,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = '質問:';
 $PMF_LANG['msgAnswer'] = '回答:';
-$PMF_LANG['ad_entry_keywords'] = 'キーワード:';
-$PMF_LANG['ad_entry_author'] = '作成者:';
+$PMF_LANG['msgKeywords'] = 'キーワード:';
+$PMF_LANG['msgAuthor'] = '作成者:';
 $PMF_LANG['msgCategory'] = 'カテゴリー:';
 $PMF_LANG['ad_entry_active'] = '有効にする';
 $PMF_LANG['msgDate'] = '日付';
@@ -475,7 +475,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ レコード';
 $PMF_LANG['ad_entry_new_revision'] = '新しい改訂を作成しますか?';
 $PMF_LANG['ad_entry_record_administration'] = 'レコード管理';
-$PMF_LANG['ad_entry_revision'] = '改訂';
+$PMF_LANG['msgRevision'] = '改訂';
 $PMF_LANG['ad_changerev'] = '改訂の選択';
 $PMF_LANG['msgCaptcha'] = '画像の中で読める文字を入力してください';
 $PMF_LANG['msgSelectCategories'] = '検索 ...';
@@ -593,10 +593,10 @@
 $PMF_LANG['msgCategoryMatrix'] = '概要';
 $PMF_LANG['ad_menu_categ_structure'] = '言語を含むカテゴリー概要';
 $PMF_LANG['ad_entry_userpermission'] = 'ユーザー権限:';
-$PMF_LANG['ad_entry_grouppermission'] = 'グループ権限:';
+$PMF_LANG['msgGroupPermissions'] = 'グループ権限:';
 $PMF_LANG['msgAccessAllUsers'] = 'すべてのユーザーのアクセス';
 $PMF_LANG['ad_entry_restricted_users'] = '次のアクセスを制限:';
-$PMF_LANG['ad_entry_all_groups'] = 'すべてのグループのアクセス';
+$PMF_LANG['msgAccessAllGroups'] = 'すべてのグループのアクセス';
 $PMF_LANG['ad_entry_restricted_groups'] = '次のアクセスを制限:';
 $PMF_LANG['ad_session_expiration'] = 'セッションの期限切れ時間';
 $PMF_LANG['msgActive'] = '有効';
diff --git a/phpmyfaq/translations/language_ko.php b/phpmyfaq/translations/language_ko.php
index f3530f46c8..221279eea7 100644
--- a/phpmyfaq/translations/language_ko.php
+++ b/phpmyfaq/translations/language_ko.php
@@ -208,8 +208,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "제목";
 $PMF_LANG["msgAnswer"] = "내용";
-$PMF_LANG["ad_entry_keywords"] = "키워드";
-$PMF_LANG["ad_entry_author"] = "작성자";
+$PMF_LANG["msgKeywords"] = "키워드";
+$PMF_LANG["msgAuthor"] = "작성자";
 $PMF_LANG["msgCategory"] = "카테고리";
 $PMF_LANG["ad_entry_active"] = "사용";
 $PMF_LANG["msgDate"] = "날짜";
diff --git a/phpmyfaq/translations/language_lt.php b/phpmyfaq/translations/language_lt.php
index 57f1478c1f..e05da889b1 100755
--- a/phpmyfaq/translations/language_lt.php
+++ b/phpmyfaq/translations/language_lt.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Klausimas";
 $PMF_LANG["msgAnswer"] = "Atsakymas";
-$PMF_LANG["ad_entry_keywords"] = "Raktažodžiai";
-$PMF_LANG["ad_entry_author"] = "Autorius";
+$PMF_LANG["msgKeywords"] = "Raktažodžiai";
+$PMF_LANG["msgAuthor"] = "Autorius";
 $PMF_LANG["msgCategory"] = "Grupė";
 $PMF_LANG["ad_entry_active"] = "Aktyvus?";
 $PMF_LANG["msgDate"] = "Data";
@@ -592,7 +592,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Sukurti naują pataisą?';
 $PMF_LANG['ad_entry_record_administration'] = 'Įrašų administravimas';
 $PMF_LANG['ad_entry_changelog'] = 'Keitimų žurnalas';
-$PMF_LANG['ad_entry_revision'] = 'Pataisa';
+$PMF_LANG['msgRevision'] = 'Pataisa';
 $PMF_LANG['ad_changerev'] = 'Išrinkite pataisą';
 $PMF_LANG['msgCaptcha'] = "Prašome įvesti simbolius, kuriuos matote paveiksle";
 $PMF_LANG['msgSelectCategories'] = 'Ieškoti ...';
@@ -735,10 +735,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Naudotojo teisės:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Naudotojų grupės teisės:';
+$PMF_LANG['msgGroupPermissions'] = 'Naudotojų grupės teisės:';
 $PMF_LANG['msgAccessAllUsers'] = 'Prieiga visiems naudotojams';
 $PMF_LANG['ad_entry_restricted_users'] = 'Ribotoji prieiga';
-$PMF_LANG['ad_entry_all_groups'] = 'Prieiga visoms grupėms';
+$PMF_LANG['msgAccessAllGroups'] = 'Prieiga visoms grupėms';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Ribotoji prieiga';
 $PMF_LANG['ad_session_expiration'] = 'Laikas iki seanso galiojimo pabaigos';
 $PMF_LANG['msgActive'] = 'aktyvus';
diff --git a/phpmyfaq/translations/language_lv.php b/phpmyfaq/translations/language_lv.php
index 3d1f0b84e2..d04a231439 100644
--- a/phpmyfaq/translations/language_lv.php
+++ b/phpmyfaq/translations/language_lv.php
@@ -209,8 +209,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Jaut&acirc;jums (virsraksts)";
 $PMF_LANG["msgAnswer"] = "Atbilde";
-$PMF_LANG["ad_entry_keywords"] = "Atsl&ccedil;gv&acirc;rdi";
-$PMF_LANG["ad_entry_author"] = "Autors";
+$PMF_LANG["msgKeywords"] = "Atsl&ccedil;gv&acirc;rdi";
+$PMF_LANG["msgAuthor"] = "Autors";
 $PMF_LANG["msgCategory"] = "Sada&iuml;a";
 $PMF_LANG["ad_entry_active"] = "Akt&icirc;vs?";
 $PMF_LANG["msgDate"] = "Datums";
diff --git a/phpmyfaq/translations/language_mn.php b/phpmyfaq/translations/language_mn.php
index 07bf77b7e2..910c539ce0 100644
--- a/phpmyfaq/translations/language_mn.php
+++ b/phpmyfaq/translations/language_mn.php
@@ -204,8 +204,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Асуулт";
 $PMF_LANG["msgAnswer"] = "Хариулт:";
-$PMF_LANG["ad_entry_keywords"] = "Түлхүүр үг:";
-$PMF_LANG["ad_entry_author"] = "Зохиогч:";
+$PMF_LANG["msgKeywords"] = "Түлхүүр үг:";
+$PMF_LANG["msgAuthor"] = "Зохиогч:";
 $PMF_LANG["msgCategory"] = "Ангилал:";
 $PMF_LANG["ad_entry_active"] = "Хандах боломжтой:";
 $PMF_LANG["msgDate"] = "Огноо:";
@@ -569,7 +569,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Шинэ хяналт үүсгэх үү?';
 $PMF_LANG['ad_entry_record_administration'] = 'Бичлэгийн удирдлага';
 $PMF_LANG['ad_entry_changelog'] = 'Өөрчлөлт';
-$PMF_LANG['ad_entry_revision'] = 'Хяналт';
+$PMF_LANG['msgRevision'] = 'Хяналт';
 $PMF_LANG['ad_changerev'] = 'Хяналт сонгох';
 $PMF_LANG['msgCaptcha'] = "Хамгаалалтын captcha коод оруулна уу";
 $PMF_LANG['msgSelectCategories'] = 'Хайлт хийх ...';
@@ -717,10 +717,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Хэрэглэгчийн зөвшөөрлүүд:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Бүлгийн зөвшөөрлүүд:';
+$PMF_LANG['msgGroupPermissions'] = 'Бүлгийн зөвшөөрлүүд:';
 $PMF_LANG['msgAccessAllUsers'] = 'Бүх хэрэглэгчид хандах боломжтой';
 $PMF_LANG['ad_entry_restricted_users'] = 'Хязгаарлалттай хандалт';
-$PMF_LANG['ad_entry_all_groups'] = 'Бүх бүлэг хандах боломжтой';
+$PMF_LANG['msgAccessAllGroups'] = 'Бүх бүлэг хандах боломжтой';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Хязгаарлалттай хандалт';
 $PMF_LANG['ad_session_expiration'] = 'Session expires in';
 $PMF_LANG['msgActive'] = 'идэвхтэй';
diff --git a/phpmyfaq/translations/language_ms.php b/phpmyfaq/translations/language_ms.php
index 3d2b60d2a0..85b31316be 100644
--- a/phpmyfaq/translations/language_ms.php
+++ b/phpmyfaq/translations/language_ms.php
@@ -174,8 +174,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Soalan:';
 $PMF_LANG['msgAnswer'] = 'Jawapan:';
-$PMF_LANG['ad_entry_keywords'] = 'Katakunci:';
-$PMF_LANG['ad_entry_author'] = 'Pengarang:';
+$PMF_LANG['msgKeywords'] = 'Katakunci:';
+$PMF_LANG['msgAuthor'] = 'Pengarang:';
 $PMF_LANG['msgCategory'] = 'Kategori:';
 $PMF_LANG['ad_entry_active'] = 'Aktif?';
 $PMF_LANG['msgDate'] = 'Tarikh';
@@ -475,7 +475,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Rekod FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'Cipta semakan baru?';
 $PMF_LANG['ad_entry_record_administration'] = 'Rekod Pentadbiran';
-$PMF_LANG['ad_entry_revision'] = 'Semakan';
+$PMF_LANG['msgRevision'] = 'Semakan';
 $PMF_LANG['ad_changerev'] = 'Pilih Semakan';
 $PMF_LANG['msgCaptcha'] = 'Sila masukkan huruf seperti dalam imej';
 $PMF_LANG['msgSelectCategories'] = 'Cari dalam ...';
@@ -593,10 +593,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Gambaran keseluruhan';
 $PMF_LANG['ad_menu_categ_structure'] = 'Kategori gambaran keseluruhan termasuk bahasanya';
 $PMF_LANG['ad_entry_userpermission'] = 'Kebenaran pengguna:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Kebenaran kumpulan:';
+$PMF_LANG['msgGroupPermissions'] = 'Kebenaran kumpulan:';
 $PMF_LANG['msgAccessAllUsers'] = 'Akses untuk semua pengguna';
 $PMF_LANG['ad_entry_restricted_users'] = 'Akses terhad kepada';
-$PMF_LANG['ad_entry_all_groups'] = 'Akses untuk semua kumpulan';
+$PMF_LANG['msgAccessAllGroups'] = 'Akses untuk semua kumpulan';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Akses terhad kepada';
 $PMF_LANG['ad_session_expiration'] = 'Tempoh masa untuk sesi anda tamat';
 $PMF_LANG['msgActive'] = 'aktif';
diff --git a/phpmyfaq/translations/language_nb.php b/phpmyfaq/translations/language_nb.php
index cd6435dcda..153ba80c58 100644
--- a/phpmyfaq/translations/language_nb.php
+++ b/phpmyfaq/translations/language_nb.php
@@ -173,8 +173,8 @@
 $PMF_LANG['ad_entry_edit_2'] = 'Rediger OSS 2';
 $PMF_LANG['msgQuestion'] = 'Tema';
 $PMF_LANG['msgAnswer'] = 'Innhold:';
-$PMF_LANG['ad_entry_keywords'] = 'Nøkkelord:';
-$PMF_LANG['ad_entry_author'] = 'Forfatter:';
+$PMF_LANG['msgKeywords'] = 'Nøkkelord:';
+$PMF_LANG['msgAuthor'] = 'Forfatter:';
 $PMF_LANG['msgCategory'] = 'Kategori:';
 $PMF_LANG['ad_entry_active'] = 'Synlig:';
 $PMF_LANG['msgDate'] = 'Dato';
@@ -459,7 +459,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ-oppføring';
 $PMF_LANG['ad_entry_new_revision'] = 'Lage ny revisjon';
 $PMF_LANG['ad_entry_record_administration'] = 'Revisjonsadministrasjon';
-$PMF_LANG['ad_entry_revision'] = 'Revisjon';
+$PMF_LANG['msgRevision'] = 'Revisjon';
 $PMF_LANG['ad_changerev'] = 'Velg Revisjon';
 $PMF_LANG['msgCaptcha'] = 'Vennligst skriv inn tegnene du ser i bildet';
 $PMF_LANG['msgSelectCategories'] = 'Søk i ...';
@@ -573,10 +573,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Oversikt';
 $PMF_LANG['ad_menu_categ_structure'] = 'Kategorioversikten inkluderer dette språket';
 $PMF_LANG['ad_entry_userpermission'] = 'Brukertillatelser';
-$PMF_LANG['ad_entry_grouppermission'] = 'Gruppetillatelser:';
+$PMF_LANG['msgGroupPermissions'] = 'Gruppetillatelser:';
 $PMF_LANG['msgAccessAllUsers'] = 'Tilgang for alle brukere';
 $PMF_LANG['ad_entry_restricted_users'] = 'Begrenset tilgang til';
-$PMF_LANG['ad_entry_all_groups'] = 'Tilgang for alle brukere';
+$PMF_LANG['msgAccessAllGroups'] = 'Tilgang for alle brukere';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Begrens tilgangen til';
 $PMF_LANG['ad_session_expiration'] = 'Tid til utløp av sesjon';
 $PMF_LANG['msgActive'] = 'aktiv';
diff --git a/phpmyfaq/translations/language_nl.php b/phpmyfaq/translations/language_nl.php
index 3a9f4d0aa0..7499d0c8a1 100644
--- a/phpmyfaq/translations/language_nl.php
+++ b/phpmyfaq/translations/language_nl.php
@@ -176,8 +176,8 @@
 $PMF_LANG['ad_entry_edit_2'] = 'bewerken';
 $PMF_LANG['msgQuestion'] = 'Thema:';
 $PMF_LANG['msgAnswer'] = 'Inhoud:';
-$PMF_LANG['ad_entry_keywords'] = 'Trefwoorden:';
-$PMF_LANG['ad_entry_author'] = 'Auteur:';
+$PMF_LANG['msgKeywords'] = 'Trefwoorden:';
+$PMF_LANG['msgAuthor'] = 'Auteur:';
 $PMF_LANG['msgCategory'] = 'Categorie:';
 $PMF_LANG['ad_entry_active'] = 'Zichtbaar:';
 $PMF_LANG['msgDate'] = 'Datum';
@@ -460,7 +460,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Veelgestelde vraag';
 $PMF_LANG['ad_entry_new_revision'] = 'Creëer nieuwe revisie?';
 $PMF_LANG['ad_entry_record_administration'] = 'Vragen administratie';
-$PMF_LANG['ad_entry_revision'] = 'Revisie';
+$PMF_LANG['msgRevision'] = 'Revisie';
 $PMF_LANG['ad_changerev'] = 'Selecteer Revisie';
 $PMF_LANG['msgCaptcha'] = 'Geef a.u.b. de karakters op die u ziet in de afbeelding';
 $PMF_LANG['msgSelectCategories'] = 'Zoek in ...';
@@ -571,10 +571,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Overzicht';
 $PMF_LANG['ad_menu_categ_structure'] = 'Overzicht van de categoriën met de talen';
 $PMF_LANG['ad_entry_userpermission'] = 'Gebruikersrechten:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Groepsrechten:';
+$PMF_LANG['msgGroupPermissions'] = 'Groepsrechten:';
 $PMF_LANG['msgAccessAllUsers'] = 'Toegang voor alle gebruikers';
 $PMF_LANG['ad_entry_restricted_users'] = 'Beperkte toegang voor';
-$PMF_LANG['ad_entry_all_groups'] = 'Toegang voor alle groepen';
+$PMF_LANG['msgAccessAllGroups'] = 'Toegang voor alle groepen';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Beperkte toegang voor';
 $PMF_LANG['ad_session_expiration'] = 'Sessie verloopt in';
 $PMF_LANG['msgActive'] = 'actief';
diff --git a/phpmyfaq/translations/language_pl.php b/phpmyfaq/translations/language_pl.php
index 89d5079cf8..258cc2d993 100644
--- a/phpmyfaq/translations/language_pl.php
+++ b/phpmyfaq/translations/language_pl.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Pytanie";
 $PMF_LANG["msgAnswer"] = "Odpowiedź";
-$PMF_LANG["ad_entry_keywords"] = "Słowa kluczowe";
-$PMF_LANG["ad_entry_author"] = "Autor";
+$PMF_LANG["msgKeywords"] = "Słowa kluczowe";
+$PMF_LANG["msgAuthor"] = "Autor";
 $PMF_LANG["msgCategory"] = "Kategoria";
 $PMF_LANG["ad_entry_active"] = "Widoczne";
 $PMF_LANG["msgDate"] = "Data";
@@ -570,7 +570,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'FAQ rekord';
 $PMF_LANG['ad_entry_new_revision'] = 'Utworzyć nową wersję?';
 $PMF_LANG['ad_entry_record_administration'] = 'Zarządzanie rekordami';
-$PMF_LANG['ad_entry_revision'] = 'Wersja';
+$PMF_LANG['msgRevision'] = 'Wersja';
 $PMF_LANG['ad_changerev'] = 'Wybierz wersję';
 $PMF_LANG['msgCaptcha'] = "Proszę wpisać kod captcha";
 $PMF_LANG['msgSelectCategories'] = 'Szukaj w...';
@@ -713,10 +713,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Uprawnienia użytkownika:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Uprawnienia grupy:';
+$PMF_LANG['msgGroupPermissions'] = 'Uprawnienia grupy:';
 $PMF_LANG['msgAccessAllUsers'] = 'Dostęp dla wszystkich użytkowników';
 $PMF_LANG['ad_entry_restricted_users'] = 'Ograniczony dostęp do';
-$PMF_LANG['ad_entry_all_groups'] = 'Dostęp dla wszystkich grup';
+$PMF_LANG['msgAccessAllGroups'] = 'Dostęp dla wszystkich grup';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Ograniczony dostęp do';
 $PMF_LANG['ad_session_expiration'] = 'Sesja wygasa za';
 $PMF_LANG['msgActive'] = 'atywny';
diff --git a/phpmyfaq/translations/language_pt-br.php b/phpmyfaq/translations/language_pt-br.php
index bab032bb68..c8043a7abe 100644
--- a/phpmyfaq/translations/language_pt-br.php
+++ b/phpmyfaq/translations/language_pt-br.php
@@ -172,8 +172,8 @@
 $PMF_LANG['ad_entry_edit_1'] = 'Editar Registro';
 $PMF_LANG['msgQuestion'] = 'Tema:';
 $PMF_LANG['msgAnswer'] = 'Conteúdo:';
-$PMF_LANG['ad_entry_keywords'] = 'Palavras-Chave:';
-$PMF_LANG['ad_entry_author'] = 'Autor:';
+$PMF_LANG['msgKeywords'] = 'Palavras-Chave:';
+$PMF_LANG['msgAuthor'] = 'Autor:';
 $PMF_LANG['msgCategory'] = 'Categoria:';
 $PMF_LANG['ad_entry_active'] = 'Ativo?';
 $PMF_LANG['msgDate'] = 'Data';
@@ -469,7 +469,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Registro FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'Criar nova revisão?';
 $PMF_LANG['ad_entry_record_administration'] = 'Registro administração';
-$PMF_LANG['ad_entry_revision'] = 'Revisão';
+$PMF_LANG['msgRevision'] = 'Revisão';
 $PMF_LANG['ad_changerev'] = 'Selecione a Revisão';
 $PMF_LANG['msgCaptcha'] = 'Digite os caracteres que aparecem na imagem';
 $PMF_LANG['msgSelectCategories'] = 'Pesquisando em...';
@@ -580,10 +580,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Resumo';
 $PMF_LANG['ad_menu_categ_structure'] = 'Resumo de categoria incluindo seus idiomas';
 $PMF_LANG['ad_entry_userpermission'] = 'Permissões de usuário:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Permissões de grupo:';
+$PMF_LANG['msgGroupPermissions'] = 'Permissões de grupo:';
 $PMF_LANG['msgAccessAllUsers'] = 'Acesso para todos usuários';
 $PMF_LANG['ad_entry_restricted_users'] = 'Restringir acesso para';
-$PMF_LANG['ad_entry_all_groups'] = 'Acesso para todos grupos';
+$PMF_LANG['msgAccessAllGroups'] = 'Acesso para todos grupos';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Restringir acesso para';
 $PMF_LANG['ad_session_expiration'] = 'Tempo para sua sessão expirar';
 $PMF_LANG['msgActive'] = 'ativo';
diff --git a/phpmyfaq/translations/language_pt.php b/phpmyfaq/translations/language_pt.php
index 39d53f7b4a..427f725c0b 100755
--- a/phpmyfaq/translations/language_pt.php
+++ b/phpmyfaq/translations/language_pt.php
@@ -174,8 +174,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Tema:';
 $PMF_LANG['msgAnswer'] = 'Conteúdo:';
-$PMF_LANG['ad_entry_keywords'] = 'Palavras-Chave:';
-$PMF_LANG['ad_entry_author'] = 'Autor:';
+$PMF_LANG['msgKeywords'] = 'Palavras-Chave:';
+$PMF_LANG['msgAuthor'] = 'Autor:';
 $PMF_LANG['msgCategory'] = 'Categoria:';
 $PMF_LANG['ad_entry_active'] = 'Ativo?';
 $PMF_LANG['msgDate'] = 'Data';
@@ -463,7 +463,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Registo da FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'Criar uma nova revisão?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administração de Registos';
-$PMF_LANG['ad_entry_revision'] = 'Revisão';
+$PMF_LANG['msgRevision'] = 'Revisão';
 $PMF_LANG['ad_changerev'] = 'Selecione uma Revisão';
 $PMF_LANG['msgCaptcha'] = 'Por favor insira os carateres que aparecem na imagem';
 $PMF_LANG['msgSelectCategories'] = 'Pesquisar em …';
@@ -580,10 +580,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Visão Geral';
 $PMF_LANG['ad_menu_categ_structure'] = 'Visão geral das Categorias <small>(incluindo os seus idiomas)</small>';
 $PMF_LANG['ad_entry_userpermission'] = 'Permissões de Utilizador:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Permissões de Grupo:';
+$PMF_LANG['msgGroupPermissions'] = 'Permissões de Grupo:';
 $PMF_LANG['msgAccessAllUsers'] = 'Acessível por todos os utilizadores';
 $PMF_LANG['ad_entry_restricted_users'] = 'Acesso restrito a';
-$PMF_LANG['ad_entry_all_groups'] = 'Acessível por todos os grupos';
+$PMF_LANG['msgAccessAllGroups'] = 'Acessível por todos os grupos';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Acesso restrito a';
 $PMF_LANG['ad_session_expiration'] = 'Tempo disponível até a sua sessão expirar';
 $PMF_LANG['msgActive'] = 'ativo';
diff --git a/phpmyfaq/translations/language_ro.php b/phpmyfaq/translations/language_ro.php
index 0e86bbcb53..56366d1588 100644
--- a/phpmyfaq/translations/language_ro.php
+++ b/phpmyfaq/translations/language_ro.php
@@ -174,8 +174,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Titlu:';
 $PMF_LANG['msgAnswer'] = '';
-$PMF_LANG['ad_entry_keywords'] = 'Cuvinte cheie:';
-$PMF_LANG['ad_entry_author'] = 'Autor:';
+$PMF_LANG['msgKeywords'] = 'Cuvinte cheie:';
+$PMF_LANG['msgAuthor'] = 'Autor:';
 $PMF_LANG['msgCategory'] = 'Categoria:';
 $PMF_LANG['ad_entry_active'] = 'Activ?';
 $PMF_LANG['msgDate'] = 'Data';
@@ -476,7 +476,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'Inregistrare Intrebare frecventa(FAQ)';
 $PMF_LANG['ad_entry_new_revision'] = 'Creezi o revizie noua?';
 $PMF_LANG['ad_entry_record_administration'] = 'Inregistreaza administrarea';
-$PMF_LANG['ad_entry_revision'] = 'Revizie';
+$PMF_LANG['msgRevision'] = 'Revizie';
 $PMF_LANG['ad_changerev'] = 'Selecteaza revizie';
 $PMF_LANG['msgCaptcha'] = 'Te rugam introdu carecterele din imagine';
 $PMF_LANG['msgSelectCategories'] = 'Cauta in...';
@@ -653,10 +653,10 @@
 $LANG_CONF['records.sortby'] = array('select', 'Sortarea inregistrarilor (descendent la ascendent)');
 $LANG_CONF['records.defaultActivation'] = array("checkbox", "Activati noi inregistrari (normal: dezactivat)");
 $LANG_CONF['records.defaultAllowComments'] = array("checkbox", "Permite comentarii pentru noile inregistrari(normal:nepermis)");
-$PMF_LANG['ad_entry_grouppermission'] = 'Permisiunile grupului:';
+$PMF_LANG['msgGroupPermissions'] = 'Permisiunile grupului:';
 $PMF_LANG['msgAccessAllUsers'] = 'Acces pentru toti userii';
 $PMF_LANG['ad_entry_restricted_users'] = 'Acces restrictionat pentru';
-$PMF_LANG['ad_entry_all_groups'] = 'Acces pentru toate grupurile';
+$PMF_LANG['msgAccessAllGroups'] = 'Acces pentru toate grupurile';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Acces restrcitionat pentru';
 $PMF_LANG['ad_session_expiration'] = 'Timpul ramas pana sesiunea expira';
 $PMF_LANG['msgActive'] = 'activ';
diff --git a/phpmyfaq/translations/language_ru.php b/phpmyfaq/translations/language_ru.php
index 9de318c5c1..c7fce25bf8 100644
--- a/phpmyfaq/translations/language_ru.php
+++ b/phpmyfaq/translations/language_ru.php
@@ -175,8 +175,8 @@
 $PMF_LANG['ad_entry_edit_2'] = ':';
 $PMF_LANG['msgQuestion'] = 'Вопрос:';
 $PMF_LANG['msgAnswer'] = 'Ответ:';
-$PMF_LANG['ad_entry_keywords'] = 'Ключи:';
-$PMF_LANG['ad_entry_author'] = 'Автор:';
+$PMF_LANG['msgKeywords'] = 'Ключи:';
+$PMF_LANG['msgAuthor'] = 'Автор:';
 $PMF_LANG['msgCategory'] = 'Раздел:';
 $PMF_LANG['ad_entry_active'] = 'Активировать?';
 $PMF_LANG['msgDate'] = 'Дата';
@@ -461,7 +461,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'В&О запись';
 $PMF_LANG['ad_entry_new_revision'] = 'Создать новую версию?';
 $PMF_LANG['ad_entry_record_administration'] = 'Администрация В&О';
-$PMF_LANG['ad_entry_revision'] = 'Версия';
+$PMF_LANG['msgRevision'] = 'Версия';
 $PMF_LANG['ad_changerev'] = 'Выбор версии';
 $PMF_LANG['msgCaptcha'] = 'Пожалуйста введите символы изображённые но картинке';
 $PMF_LANG['msgSelectCategories'] = 'Искать в ...';
@@ -572,10 +572,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Обзор';
 $PMF_LANG['ad_menu_categ_structure'] = 'Обзор категорий включая эти языки';
 $PMF_LANG['ad_entry_userpermission'] = 'Разрешения пользователя:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Права группы:';
+$PMF_LANG['msgGroupPermissions'] = 'Права группы:';
 $PMF_LANG['msgAccessAllUsers'] = 'Доступ для всех пользователей';
 $PMF_LANG['ad_entry_restricted_users'] = 'Ограниченный доступ к';
-$PMF_LANG['ad_entry_all_groups'] = 'Доступ для всех групп';
+$PMF_LANG['msgAccessAllGroups'] = 'Доступ для всех групп';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Ограниченный доступ к';
 $PMF_LANG['ad_session_expiration'] = 'Время сессии истечет в';
 $PMF_LANG['msgActive'] = 'активен';
diff --git a/phpmyfaq/translations/language_sk.php b/phpmyfaq/translations/language_sk.php
index 6f63841003..0d6acd1ca4 100644
--- a/phpmyfaq/translations/language_sk.php
+++ b/phpmyfaq/translations/language_sk.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Otázka";
 $PMF_LANG["msgAnswer"] = "Odpoveď";
-$PMF_LANG["ad_entry_keywords"] = "Kľúčové slová";
-$PMF_LANG["ad_entry_author"] = "Autor";
+$PMF_LANG["msgKeywords"] = "Kľúčové slová";
+$PMF_LANG["msgAuthor"] = "Autor";
 $PMF_LANG["msgCategory"] = "Kategória";
 $PMF_LANG["ad_entry_active"] = "Aktívny?";
 $PMF_LANG["msgDate"] = "Dátum";
@@ -586,7 +586,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Vytvoriť novú revíziu?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administrácia záznamov';
 $PMF_LANG['ad_entry_changelog'] = 'Changelog';
-$PMF_LANG['ad_entry_revision'] = 'Revízie';
+$PMF_LANG['msgRevision'] = 'Revízie';
 $PMF_LANG['ad_changerev'] = 'Vyberte revíziu';
 $PMF_LANG['msgCaptcha'] = "Prosím vložte znaky z obrázku";
 $PMF_LANG['msgSelectCategories'] = 'Vyhľadávať vo ...';
@@ -729,10 +729,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Oprávnenia užívateľov:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Oprávnenia skupiny:';
+$PMF_LANG['msgGroupPermissions'] = 'Oprávnenia skupiny:';
 $PMF_LANG['msgAccessAllUsers'] = 'Prístup pre všetkých užívateľov';
 $PMF_LANG['ad_entry_restricted_users'] = 'Obmedzený prístup pre';
-$PMF_LANG['ad_entry_all_groups'] = 'Prístup pre všetky skupiny';
+$PMF_LANG['msgAccessAllGroups'] = 'Prístup pre všetky skupiny';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Obmedzený prístup pre';
 $PMF_LANG['ad_session_expiration'] = 'Čas do konca porady';
 $PMF_LANG['msgActive'] = 'aktívny';
diff --git a/phpmyfaq/translations/language_sl.php b/phpmyfaq/translations/language_sl.php
index 9e6c40b5e4..816077d883 100644
--- a/phpmyfaq/translations/language_sl.php
+++ b/phpmyfaq/translations/language_sl.php
@@ -208,8 +208,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Tema";
 $PMF_LANG["msgAnswer"] = "Vsebina";
-$PMF_LANG["ad_entry_keywords"] = "Besede";
-$PMF_LANG["ad_entry_author"] = "Avtor";
+$PMF_LANG["msgKeywords"] = "Besede";
+$PMF_LANG["msgAuthor"] = "Avtor";
 $PMF_LANG["msgCategory"] = "Kategorija";
 $PMF_LANG["ad_entry_active"] = "Aktivno?";
 $PMF_LANG["msgDate"] = "Datum";
diff --git a/phpmyfaq/translations/language_sr.php b/phpmyfaq/translations/language_sr.php
index 0c32a05771..5c4367181a 100644
--- a/phpmyfaq/translations/language_sr.php
+++ b/phpmyfaq/translations/language_sr.php
@@ -210,8 +210,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Tema";
 $PMF_LANG["msgAnswer"] = "Sadr&#382;aj";
-$PMF_LANG["ad_entry_keywords"] = "Klju&#269;ne re&#269;i";
-$PMF_LANG["ad_entry_author"] = "Autor";
+$PMF_LANG["msgKeywords"] = "Klju&#269;ne re&#269;i";
+$PMF_LANG["msgAuthor"] = "Autor";
 $PMF_LANG["msgCategory"] = "Kategorija";
 $PMF_LANG["ad_entry_active"] = "Aktivno?";
 $PMF_LANG["msgDate"] = "Datum";
@@ -584,7 +584,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Otvorite novu reviziju?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administracija unosa';
 $PMF_LANG['ad_entry_changelog'] = 'Izmene';
-$PMF_LANG['ad_entry_revision'] = 'Revizija';
+$PMF_LANG['msgRevision'] = 'Revizija';
 $PMF_LANG['ad_changerev'] = 'Izaberite Reviziju';
 $PMF_LANG['msgCaptcha'] = "Molimo Vas unesite znakove koje vidite na slici";
 $PMF_LANG['msgSelectCategories'] = 'Tra&#382;i u ...';
@@ -727,10 +727,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Ovla&scaron;&#263;enja korisnika:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Grupna ovla&scaron;&#263;enja:';
+$PMF_LANG['msgGroupPermissions'] = 'Grupna ovla&scaron;&#263;enja:';
 $PMF_LANG['msgAccessAllUsers'] = 'Pristup svim korisnicima';
 $PMF_LANG['ad_entry_restricted_users'] = 'Zabranjen pristup za';
-$PMF_LANG['ad_entry_all_groups'] = 'Pristup za sve grupe';
+$PMF_LANG['msgAccessAllGroups'] = 'Pristup za sve grupe';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Zabranjen pristup za';
 $PMF_LANG['ad_session_expiration'] = 'Vreme do isticanja sesije';
 $PMF_LANG['msgActive'] = 'aktivno';
diff --git a/phpmyfaq/translations/language_sv.php b/phpmyfaq/translations/language_sv.php
index 7eea5ad15e..49e0e7764c 100755
--- a/phpmyfaq/translations/language_sv.php
+++ b/phpmyfaq/translations/language_sv.php
@@ -177,8 +177,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'Fråga:';
 $PMF_LANG['msgAnswer'] = 'Svar:';
-$PMF_LANG['ad_entry_keywords'] = 'Nyckelord:';
-$PMF_LANG['ad_entry_author'] = 'Författare:';
+$PMF_LANG['msgKeywords'] = 'Nyckelord:';
+$PMF_LANG['msgAuthor'] = 'Författare:';
 $PMF_LANG['msgCategory'] = 'Kategori:';
 $PMF_LANG['ad_entry_active'] = 'Aktiv?';
 $PMF_LANG['msgDate'] = 'Datum';
@@ -474,7 +474,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'inlägg';
 $PMF_LANG['ad_entry_new_revision'] = 'Skapa ny version?';
 $PMF_LANG['ad_entry_record_administration'] = 'Administration av inlägg';
-$PMF_LANG['ad_entry_revision'] = 'Ny version';
+$PMF_LANG['msgRevision'] = 'Ny version';
 $PMF_LANG['ad_changerev'] = 'Välj version';
 $PMF_LANG['msgCaptcha'] = 'Var vänlig skriv in bokstäverna du ser i bilden';
 $PMF_LANG['msgSelectCategories'] = 'Sök i ...';
@@ -592,10 +592,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'Översikt';
 $PMF_LANG['ad_menu_categ_structure'] = 'Kategoriöversikt inklusive språk';
 $PMF_LANG['ad_entry_userpermission'] = 'Användarbehörigheter:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Gruppbehörigheter:';
+$PMF_LANG['msgGroupPermissions'] = 'Gruppbehörigheter:';
 $PMF_LANG['msgAccessAllUsers'] = 'Behörigheter för alla användare';
 $PMF_LANG['ad_entry_restricted_users'] = 'Begränsad behörighet till';
-$PMF_LANG['ad_entry_all_groups'] = 'Behörigheter för alla grupper';
+$PMF_LANG['msgAccessAllGroups'] = 'Behörigheter för alla grupper';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Begränsad behörighet till';
 $PMF_LANG['ad_session_expiration'] = 'Tid till dess att din session går ut';
 $PMF_LANG['msgActive'] = 'aktiv';
diff --git a/phpmyfaq/translations/language_th.php b/phpmyfaq/translations/language_th.php
index 60d2c7a0e2..f6f3118b67 100644
--- a/phpmyfaq/translations/language_th.php
+++ b/phpmyfaq/translations/language_th.php
@@ -175,8 +175,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = 'คำถาม:';
 $PMF_LANG['msgAnswer'] = 'คำตอบ:';
-$PMF_LANG['ad_entry_keywords'] = 'คำค้น:';
-$PMF_LANG['ad_entry_author'] = 'ผู้เขียน:';
+$PMF_LANG['msgKeywords'] = 'คำค้น:';
+$PMF_LANG['msgAuthor'] = 'ผู้เขียน:';
 $PMF_LANG['msgCategory'] = 'หัวข้อ:';
 $PMF_LANG['ad_entry_active'] = 'เปิดใช้';
 $PMF_LANG['msgDate'] = 'วันที่';
@@ -476,7 +476,7 @@
 $PMF_LANG['ad_entry_faq_record'] = 'ข้อมูล FAQ';
 $PMF_LANG['ad_entry_new_revision'] = 'สร้างฉบับปรับปรุงแก้ไข?';
 $PMF_LANG['ad_entry_record_administration'] = 'การจัดการข้อมูล';
-$PMF_LANG['ad_entry_revision'] = 'ฉบับปรับปรุงแก้ไข';
+$PMF_LANG['msgRevision'] = 'ฉบับปรับปรุงแก้ไข';
 $PMF_LANG['ad_changerev'] = 'เลือกฉบับปรับปรุงแก้ไข';
 $PMF_LANG['msgCaptcha'] = 'โปรดกรอกข้อมูลตัวอักษรในภาพที่แสดงไว้';
 $PMF_LANG['msgSelectCategories'] = 'ค้นหา ...';
@@ -594,10 +594,10 @@
 $PMF_LANG['msgCategoryMatrix'] = 'หัวข้อโดยสรุป';
 $PMF_LANG['ad_menu_categ_structure'] = 'หัวข้อโดยสรุปและภาษาต่างๆ';
 $PMF_LANG['ad_entry_userpermission'] = 'สิทธิผู้ใช้:';
-$PMF_LANG['ad_entry_grouppermission'] = 'สิทธิกลุ่มผู้ใช้:';
+$PMF_LANG['msgGroupPermissions'] = 'สิทธิกลุ่มผู้ใช้:';
 $PMF_LANG['msgAccessAllUsers'] = 'อนุญาตให้ทุกคนในผู้ใช้งาน';
 $PMF_LANG['ad_entry_restricted_users'] = 'จำกัดสิทธิสำหรับ';
-$PMF_LANG['ad_entry_all_groups'] = 'อนุญาตสำหรับทุกกลุ่มผู้ใช้งาน';
+$PMF_LANG['msgAccessAllGroups'] = 'อนุญาตสำหรับทุกกลุ่มผู้ใช้งาน';
 $PMF_LANG['ad_entry_restricted_groups'] = 'จำกัดสิทธิใช้งานสำหรับ';
 $PMF_LANG['ad_session_expiration'] = 'เวลาที่จะสิ้นสุดการเชื่อมต่อ';
 $PMF_LANG['msgActive'] = 'ใช้งานปกติ';
diff --git a/phpmyfaq/translations/language_tr.php b/phpmyfaq/translations/language_tr.php
index c8f36a61ae..36265f5ea2 100644
--- a/phpmyfaq/translations/language_tr.php
+++ b/phpmyfaq/translations/language_tr.php
@@ -205,8 +205,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Soru";
 $PMF_LANG["msgAnswer"] = "Cevap";
-$PMF_LANG["ad_entry_keywords"] = "Anahtar sözcükler";
-$PMF_LANG["ad_entry_author"] = "Oluşturan";
+$PMF_LANG["msgKeywords"] = "Anahtar sözcükler";
+$PMF_LANG["msgAuthor"] = "Oluşturan";
 $PMF_LANG["msgCategory"] = "Kategori";
 $PMF_LANG["ad_entry_active"] = "Görünür";
 $PMF_LANG["msgDate"] = "Tarih";
@@ -571,7 +571,7 @@
 $PMF_LANG['ad_entry_new_revision'] = "Yeni sürüm oluştur?";
 $PMF_LANG['ad_entry_record_administration'] = "Kayıt yönetimi";
 $PMF_LANG['ad_entry_changelog'] = "Değişiklik günlüğü";
-$PMF_LANG['ad_entry_revision'] = "Sürüm";
+$PMF_LANG['msgRevision'] = "Sürüm";
 $PMF_LANG['ad_changerev'] = "Sürüm seç";
 $PMF_LANG['msgCaptcha'] = "Lütfen güvenlik kodunu girin";
 $PMF_LANG['msgSelectCategories'] = "Şurada ara...";
@@ -712,10 +712,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = "Kullanıcı izinleri";
-$PMF_LANG['ad_entry_grouppermission'] = "Grup izinleri";
+$PMF_LANG['msgGroupPermissions'] = "Grup izinleri";
 $PMF_LANG['msgAccessAllUsers'] = "Tüm kullanıcılara izin ver";
 $PMF_LANG['ad_entry_restricted_users'] = "Şu kullanıcıyla sınırlandır";
-$PMF_LANG['ad_entry_all_groups'] = "Tüm gruplara izin ver";
+$PMF_LANG['msgAccessAllGroups'] = "Tüm gruplara izin ver";
 $PMF_LANG['ad_entry_restricted_groups'] = "Şu grupla sınırlandır";
 $PMF_LANG['ad_session_expiration'] = "Oturum sonlanma zamanı";
 $PMF_LANG['msgActive'] = "Etkin";
diff --git a/phpmyfaq/translations/language_tw.php b/phpmyfaq/translations/language_tw.php
index 662d85a8f8..4a599dc177 100644
--- a/phpmyfaq/translations/language_tw.php
+++ b/phpmyfaq/translations/language_tw.php
@@ -205,8 +205,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "問題";
 $PMF_LANG["msgAnswer"] = "答案";
-$PMF_LANG["ad_entry_keywords"] = "關鍵字";
-$PMF_LANG["ad_entry_author"] = "作者";
+$PMF_LANG["msgKeywords"] = "關鍵字";
+$PMF_LANG["msgAuthor"] = "作者";
 $PMF_LANG["msgCategory"] = "類別";
 $PMF_LANG["ad_entry_active"] = "可被看到";
 $PMF_LANG["msgDate"] = "日期";
@@ -570,7 +570,7 @@
 $PMF_LANG['ad_entry_new_revision'] = "建立新的修正版次? Create new revision?";
 $PMF_LANG['ad_entry_record_administration'] = "記錄管理 Record administration";
 $PMF_LANG['ad_entry_changelog'] = "變更記錄 Changelog";
-$PMF_LANG['ad_entry_revision'] = "修正版次 Revision";
+$PMF_LANG['msgRevision'] = "修正版次 Revision";
 $PMF_LANG['ad_changerev'] = "選擇修正版次 Select Revision";
 $PMF_LANG['msgCaptcha'] = "請輸入 captcha 驗證碼";
 $PMF_LANG['msgSelectCategories'] = "搜尋 ...";
@@ -712,10 +712,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten 開發者
 $PMF_LANG['ad_entry_userpermission'] = "使用者權限 User permissions";
-$PMF_LANG['ad_entry_grouppermission'] = "群組權限 Group permissions";
+$PMF_LANG['msgGroupPermissions'] = "群組權限 Group permissions";
 $PMF_LANG['msgAccessAllUsers'] = "全部使用者的存取 Access for all users";
 $PMF_LANG['ad_entry_restricted_users'] = "限制存取 Restricted access to";
-$PMF_LANG['ad_entry_all_groups'] = "全部群組的存取 Access for all groups";
+$PMF_LANG['msgAccessAllGroups'] = "全部群組的存取 Access for all groups";
 $PMF_LANG['ad_entry_restricted_groups'] = "限制存取 Restricted access to";
 $PMF_LANG['ad_session_expiration'] = "連線 Session 時間終止於 Session expires in";
 $PMF_LANG['msgActive'] = "作用中 active";
diff --git a/phpmyfaq/translations/language_uk.php b/phpmyfaq/translations/language_uk.php
index ddcfcb1650..9bc318bb5d 100644
--- a/phpmyfaq/translations/language_uk.php
+++ b/phpmyfaq/translations/language_uk.php
@@ -207,8 +207,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "";
 $PMF_LANG["msgQuestion"] = "Питання";
 $PMF_LANG["msgAnswer"] = "Відповідь";
-$PMF_LANG["ad_entry_keywords"] = "Ключі";
-$PMF_LANG["ad_entry_author"] = "Автор";
+$PMF_LANG["msgKeywords"] = "Ключі";
+$PMF_LANG["msgAuthor"] = "Автор";
 $PMF_LANG["msgCategory"] = "Розділ";
 $PMF_LANG["ad_entry_active"] = "Активувати?";
 $PMF_LANG["msgDate"] = "Дата";
@@ -585,7 +585,7 @@
 $PMF_LANG["ad_entry_new_revision"] = "Нова ревізія?";
 $PMF_LANG["ad_entry_record_administration"] = "Record administration";
 $PMF_LANG["ad_entry_changelog"] = "Changelog";
-$PMF_LANG["ad_entry_revision"] = "Ревізія";
+$PMF_LANG["msgRevision"] = "Ревізія";
 $PMF_LANG["ad_changerev"] = "Вибрати ревізію";
 $PMF_LANG["msgCaptcha"] = "Введіть Великими Літерами знаки, які видно на картинці";
 $PMF_LANG["msgSelectCategories"] = "Шукати в(у)...";
diff --git a/phpmyfaq/translations/language_vi.php b/phpmyfaq/translations/language_vi.php
index a5447077bb..f094af4ae4 100644
--- a/phpmyfaq/translations/language_vi.php
+++ b/phpmyfaq/translations/language_vi.php
@@ -210,8 +210,8 @@
 $PMF_LANG["ad_entry_edit_2"] = "Chỉnh sửa nội dung";
 $PMF_LANG["msgQuestion"] = "Câu hỏi";
 $PMF_LANG["msgAnswer"] = "Câu trả lời";
-$PMF_LANG["ad_entry_keywords"] = "Từ khóa";
-$PMF_LANG["ad_entry_author"] = "Tác giả";
+$PMF_LANG["msgKeywords"] = "Từ khóa";
+$PMF_LANG["msgAuthor"] = "Tác giả";
 $PMF_LANG["msgCategory"] = "Mục";
 $PMF_LANG["ad_entry_active"] = "Kích hoạt?";
 $PMF_LANG["msgDate"] = "Ngày";
@@ -581,7 +581,7 @@
 $PMF_LANG['ad_entry_new_revision'] = 'Tạo một hiệu đính mới ?';
 $PMF_LANG['ad_entry_record_administration'] = 'Nội dung quản trị';
 $PMF_LANG['ad_entry_changelog'] = 'Thay đổi';
-$PMF_LANG['ad_entry_revision'] = 'Hiệu đính';
+$PMF_LANG['msgRevision'] = 'Hiệu đính';
 $PMF_LANG['ad_changerev'] = 'Chọn một hiệu đính';
 $PMF_LANG['msgCaptcha'] = "Vui lòng đánh những ký tự dưới đây trong khung";
 $PMF_LANG['msgSelectCategories'] = 'Tìm kiếm trong';
@@ -727,10 +727,10 @@
 
 // added v2.0.0 - 2006-09-26 by Thorsten
 $PMF_LANG['ad_entry_userpermission'] = 'Quyền của thành viên:';
-$PMF_LANG['ad_entry_grouppermission'] = 'Quyền của nhóm:';
+$PMF_LANG['msgGroupPermissions'] = 'Quyền của nhóm:';
 $PMF_LANG['msgAccessAllUsers'] = 'Quyền truy cập cho mọi thành viên';
 $PMF_LANG['ad_entry_restricted_users'] = 'Quyền truy cập chỉ dành cho';
-$PMF_LANG['ad_entry_all_groups'] = 'Quyền truy cập cho mọi nhóm';
+$PMF_LANG['msgAccessAllGroups'] = 'Quyền truy cập cho mọi nhóm';
 $PMF_LANG['ad_entry_restricted_groups'] = 'Quyền truy cập chỉ dành cho';
 $PMF_LANG['ad_session_expiration'] = 'Session của bạn sẽ hết hạn trong';
 $PMF_LANG['msgActive'] = 'kích hoạt';
diff --git a/phpmyfaq/translations/language_zh.php b/phpmyfaq/translations/language_zh.php
index 6cbc7f291e..ef04a2c4dc 100644
--- a/phpmyfaq/translations/language_zh.php
+++ b/phpmyfaq/translations/language_zh.php
@@ -176,8 +176,8 @@
 $PMF_LANG['ad_entry_edit_2'] = '';
 $PMF_LANG['msgQuestion'] = '问题：';
 $PMF_LANG['msgAnswer'] = '答案：';
-$PMF_LANG['ad_entry_keywords'] = '关键词：';
-$PMF_LANG['ad_entry_author'] = '作者：';
+$PMF_LANG['msgKeywords'] = '关键词：';
+$PMF_LANG['msgAuthor'] = '作者：';
 $PMF_LANG['msgCategory'] = '类别：';
 $PMF_LANG['ad_entry_active'] = '激活？';
 $PMF_LANG['msgDate'] = '日期';
@@ -462,7 +462,7 @@
 $PMF_LANG['ad_entry_faq_record'] = '问答记录';
 $PMF_LANG['ad_entry_new_revision'] = '创建新修订?';
 $PMF_LANG['ad_entry_record_administration'] = '记录管理';
-$PMF_LANG['ad_entry_revision'] = '修订';
+$PMF_LANG['msgRevision'] = '修订';
 $PMF_LANG['ad_changerev'] = '选择修订';
 $PMF_LANG['msgCaptcha'] = '请输入图象中的字符';
 $PMF_LANG['msgSelectCategories'] = '搜索 ...';
@@ -573,10 +573,10 @@
 $PMF_LANG['msgCategoryMatrix'] = '概览';
 $PMF_LANG['ad_menu_categ_structure'] = '目录概览包含其语言';
 $PMF_LANG['ad_entry_userpermission'] = '用户许可:';
-$PMF_LANG['ad_entry_grouppermission'] = '组许可:';
+$PMF_LANG['msgGroupPermissions'] = '组许可:';
 $PMF_LANG['msgAccessAllUsers'] = '全部用户准入';
 $PMF_LANG['ad_entry_restricted_users'] = '限制准入到';
-$PMF_LANG['ad_entry_all_groups'] = '全部组别准入';
+$PMF_LANG['msgAccessAllGroups'] = '全部组别准入';
 $PMF_LANG['ad_entry_restricted_groups'] = '限制准入到';
 $PMF_LANG['ad_session_expiration'] = '您会话的失效期';
 $PMF_LANG['msgActive'] = '激活';