Changeset 1885 in products for quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Timestamp:

Mar 11, 2010 1:13:01 PM (14 years ago)

Author:

liebster

Message:

#165: Refactoring using Check Keywords in seo-context-properties view

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Files:

• browser/keywords.py (modified) (3 diffs)
• locales/quintagroup.seoptimizer.pot (modified) (2 diffs)
• locales/uk/LC_MESSAGES/quintagroup.seoptimizer.po (modified) (2 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/browser/keywords.py

@@ -5 +5 @@
 from Products.Five.browser import BrowserView
 
+from Products.CMFPlone.utils import safe_unicode, getSiteEncoding
 from Products.CMFCore.utils import getToolByName
 
@@ -18 +19 @@
         ts = getToolByName(self.context, 'translation_service')
         # extract keywords from text
+        enc = getSiteEncoding(self.context)
         if text.lower().strip():
-            keywords = map(lambda x: x.strip(), text.lower().strip().split('\n'))
+            keywords = filter(None, map(lambda x: safe_unicode(x.strip(), enc),
+                                         text.lower().strip().split('\n')))
         else:
-            return ts.utranslate(domain='quintagroup.seoptimizer', msgid=_(u'Keywords list is empty!'), context=self.context)
+            return ts.utranslate(domain='quintagroup.seoptimizer',
+                                 msgid=_(u'Keywords list is empty!'),
+                                 context=self.context)
         # request html page of context object
         url = '%s?without_metatag_keywords=1' % self.context.absolute_url()
@@ -28 +33 @@
         page_text = commands.getoutput('lynx --dump --nolist %s' % url).lower()
         if page_text and page_text != 'sh: lynx: command not found':
-            page_text = page_text.decode('utf8')
+            page_text = safe_unicode(page_text, 'utf-8')
         else:
-            return ts.utranslate(domain='quintagroup.seoptimizer', msgid=_(u'Could not find lynx browser!'), context=self.context)
+            return ts.utranslate(domain='quintagroup.seoptimizer',
+                                 msgid=_(u'Could not find lynx browser!'),
+                                 context=self.context)
 
         # check every keyword on appearing in body of html page
-        missing = []
-        finding = []
-        added = {}
-        finded = {}
+        result = []
         for keyword in keywords:
-            keyword = keyword.decode('utf8')
-            if keyword:
-                keyword_on_page =  len(re.findall(u'\\b%s\\b' % keyword, page_text, re.I|re.U))
-                if keyword not in added.keys() and not keyword_on_page:
-                    missing.append(keyword+u' - 0')
-                    added[keyword] = 1
-                if keyword not in finded.keys() and keyword_on_page:
-                    finding.append(keyword+u' - '+repr(keyword_on_page))
-                    finded[keyword] = 1
-        # return list of missing and fount keywords
-        if missing or finding:
-            msg = ts.utranslate(domain='quintagroup.seoptimizer', msgid=_(u'number_keywords',
-                                default=u'Number of keywords at page:\n${found}\n${missing}',
-                                mapping={'missing':'\n'.join(missing), 'found': '\n'.join(finding)}),
-                                context=self.context)
-        else:
-            msg = ''
-        return msg
+            keyword_on_page = unicode(len(re.findall(u'\\b%s\\b' % keyword, page_text, re.I|re.U)))
+            result.append(' - '.join((keyword, keyword_on_page)))
+        return ts.utranslate(domain='quintagroup.seoptimizer',
+                             msgid=_(u'number_keywords',
+                               default=u'Number of keywords at page:\n${result}',
+                               mapping={'result':'\n'.join(result)}),
+                             context=self.context)
 
     def walkTextNodes(self, parent, page_words=[]):

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/locales/quintagroup.seoptimizer.pot

@@ -5 +5 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-02-16 12:25+0000\n"
+"POT-Creation-Date: 2010-03-11 12:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -18 +18 @@
 "Domain: quintagroup.seoptimizer\n"
 
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:32
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:131
+msgid ""
+msgstr ""
+
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:38
 msgid "Could not find lynx browser!"
 msgstr ""
 
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:23
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:27
 msgid "Keywords list is empty!"
 msgstr ""
 
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/Document.xml
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/File.xml
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/News_Item.xml
+#. Default: "SEO Properties"
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/actions.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/upgrade_2_to_3/actions.xml
 msgid "SEO Properties"
 msgstr ""
 
+#. Default: "Search Engine Optimizer"
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/controlpanel.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/upgrade_2_to_3/controlpanel.xml
 msgid "Search Engine Optimizer"
 msgstr ""
 
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:126
+msgid "Search Engine Optimizer configuration"
+msgstr ""
+
 #. Default: "Canonical URL mast be in ${pdomain} domain."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:375
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:166
 msgid "canonical_msg"
 msgstr ""
 
 #. Default: "This form allows you to edit html header meta tags that are produced by Plone CMS to incrase Search Engine visibility. The values generated by Plone are present as default values in input fields. To override default value, check corresponding checkbox and input value itself in the corresponding field."
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:36
+msgid "description_edit_seo_properties"
+msgstr ""
+
+#. Default: "Select content types that will have SEO properties enabled."
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:50
+msgid "description_seo_content_types"
+msgstr ""
+
+#. Default: "Controls if <abbr title=\"Dublin Core\">DC</abbr> metatags are exposed to page header. They include DC.description, DC.type, DC.format, DC.creator and others."
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:31
+msgid "description_seo_dc_metatags"
+msgstr ""
+
+#. Default: "Edit SEO Properties"
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:35
-msgid "description_edit_seo_properties"
-msgstr ""
-
-#. Default: "Select content types that will have SEO properties enabled."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:155
-msgid "description_seo_content_types"
-msgstr ""
-
-#. Default: "Controls if <abbr title=\"Dublin Core\">DC</abbr> metatags are exposed to page header. They include DC.description, DC.type, DC.format, DC.creator and others."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:35
-msgid "description_seo_dc_metatags"
-msgstr ""
-
-#. Default: "Edit SEO Properties"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:34
 msgid "heading_edit_seo_properties"
 msgstr ""
 
-#. Default: "Use this field when you want that your content types receive additional keywords from the ones you manually specify. Enter one keyword per line."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:74
-msgid "help_additional_keywords"
-msgstr ""
-
 #. Default: "Fill in custom metatag names (one per line) which will appear on qseo_properties edit tab. Example: \"metaname|metacontent\" or \"metaname\"."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:46
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:60
 msgid "help_default_custom_metatags"
 msgstr ""
 
 #. Default: "Fill in meta tags (one per line) in the order in which they will appear on site source pages. Example: \"metaname accessor\"."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:60
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:42
 msgid "help_metatags_order"
 msgstr ""
 
 #. Default: "Specify your canonical URL. If your site has identical or vastly similar content that's accessible through multiple URLs, this format provides you with more control over the URL returned in search results."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:237
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:238
 msgid "help_seo_canonical"
 msgstr ""
 
 #. Default: "Here you can manage your custom meta tags. Specify local Meta Tags parameters to be added to the global Meta Tags. If metacontent field is empty, then a meta tag will not be present on this page."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:270
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:271
 msgid "help_seo_custommetatags"
 msgstr ""
 
 #. Default: "Description of the document to be indexed by Search Engines. This text will be present in meta description tag in page HTML source."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:87
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:88
 msgid "help_seo_description"
 msgstr ""
 
 #. Default: "Distribution meta tag to designate time and area distribution of the document."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:206
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:207
 msgid "help_seo_distribution"
 msgstr ""
 
 #. Default: "Comments embedded into HTML header."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:150
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:151
 msgid "help_seo_html_comment"
 msgstr ""
 
 #. Default: "Keywords, the page will be indexed with. <strong>Enter each keyword in separate line, please.</strong> Though the relevance of listing meta keywords is of questionable value now, it is useful to set meta keywords for pages - for future reference.<br />Use 'Check Keywords' button to check whether words you entered in this block as SEO keywords are present in content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:115
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:116
 msgid "help_seo_keywords"
 msgstr ""
 
 #. Default: "Robots meta tag value. Allows or denies indexing, following links, etc. for spiders indexing your content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:177
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:178
 msgid "help_seo_robots"
 msgstr ""
 
 #. Default: "Text to be present in &lt;TITLE&gt; tag. It is displayed in browser title bar. Search engines display it as a title of the document."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:57
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:58
 msgid "help_seo_title"
 msgstr ""
 
-#. Default: "Controls global and local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:127
-msgid "help_settings_use_keywords_lg"
-msgstr ""
-
-#. Default: "Controls Plone categories (also known as keywords or tags) and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:89
-msgid "help_settings_use_keywords_sg"
-msgstr ""
-
-#. Default: "Additional keywords that should be added to the content types."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:71
-msgid "label_additional_keywords"
-msgstr ""
-
 #. Default: "Canonical URL"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:234
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:235
 msgid "label_canonical_tag"
 msgstr ""
 
 #. Default: "Content Types"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:153
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:49
 msgid "label_content_type_title"
 msgstr ""
 
 #. Default: "Custom Meta Tags"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:267
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:268
 msgid "label_custom_metatags"
 msgstr ""
 
 #. Default: "Default custom metatags."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:43
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:59
 msgid "label_default_custom_metatags"
 msgstr ""
 
 #. Default: "Distribution Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:203
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:204
 msgid "label_distribution_tag"
 msgstr ""
 
 #. Default: "Expose <abbr title=\"Dublin Core\">DC</abbr> meta tags"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:32
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:29
 msgid "label_exposeDCMetaTags"
 msgstr ""
 
 #. Default: "HTML Comment"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:147
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:148
 msgid "label_html_comment"
 msgstr ""
 
-#. Default: "Merge global and local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:145
-msgid "label_merge_seoglobal_and_seolocal"
-msgstr ""
-
-#. Default: "Merge Plone categories and global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:117
-msgid "label_merge_subject_and_seoglobal"
-msgstr ""
-
 #. Default: "Meta Description Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:84
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:85
 msgid "label_meta_description_tag"
 msgstr ""
 
 #. Default: "Meta Keywords Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:112
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:113
 msgid "label_meta_keywords_tag"
 msgstr ""
 
 #. Default: "Meta tags order in the page."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:57
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:40
 msgid "label_metatags_order"
 msgstr ""
 
 #. Default: "Override"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:69
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:70
 msgid "label_override"
 msgstr ""
 
 #. Default: "Page Title Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:54
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:55
 msgid "label_page_title_tag"
 msgstr ""
 
 #. Default: "Robot Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:174
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:175
 msgid "label_robot_tag"
 msgstr ""
 
-#. Default: "Global SEO keywords override local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:135
-msgid "label_seoglobal_override_seolocal"
-msgstr ""
-
-#. Default: "Global SEO keywords override Plone categories"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:107
-msgid "label_seoglobal_override_subject"
-msgstr ""
-
-#. Default: "Settings to control global SEO keywords vs local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:124
-msgid "label_settings_use_keywords_lg"
-msgstr ""
-
-#. Default: "Settings to control Plone categories and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:86
-msgid "label_settings_use_keywords_sg"
-msgstr ""
-
-#. Default: "Plone categories override global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:97
-msgid "label_subject_override_seoglobal"
-msgstr ""
-
-#. Default: "Up to Plone Setup"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:15
-msgid "label_up_to_plone_setup"
-msgstr ""
-
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:51
+#. Default: "Number of keywords at page:\n${result}"
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:47
 msgid "number_keywords"
 msgstr ""
 
 #. Default: "You can select what content types are qSEOptimizer-enabled, and control if Dublin Core metatags are exposed in the header of content pages."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:20
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:127
 msgid "seo_configlet_description"
 msgstr ""
 
 #. Default: "Content SEO properties have been saved."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:480
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:271
 msgid "seoproperties_saved"
 msgstr ""

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/locales/uk/LC_MESSAGES/quintagroup.seoptimizer.po

@@ -5 +5 @@
 msgstr ""
 "Project-Id-Version: quintagroup.seoptimizer\n"
-"POT-Creation-Date: 2010-02-16 12:25+0000\n"
+"POT-Creation-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "PO-Revision-Date: 2010-02-11 14:05+0300\n"
 "Last-Translator: Olha <olha.pelishok@gmail.com>\n"
@@ -18 +18 @@
 "Domain: quintagroup.seoptimizer\n"
 
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:32
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:38
 msgid "Could not find lynx browser!"
 msgstr ""
 
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:23
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:27
 msgid "Keywords list is empty!"
 msgstr "Список ключових слів порожній!"
 
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/Document.xml
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/File.xml
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/types/News_Item.xml
+#. Default: "SEO Properties"
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/actions.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/upgrade_2_to_3/actions.xml
 msgid "SEO Properties"
-msgstr ""
-
+msgstr "SEO налаштування"
+
+#. Default: "Search Engine Optimizer"
 #: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/default/controlpanel.xml
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/profiles/upgrade_2_to_3/controlpanel.xml
 msgid "Search Engine Optimizer"
 msgstr ""
 
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:126
+msgid "Search Engine Optimizer configuration"
+msgstr ""
+
 #. Default: "Canonical URL mast be in ${pdomain} domain."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:375
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:166
 msgid "canonical_msg"
 msgstr "Canonical URL повинен знаходитись в домені \"${pdomain}\"."
 
 #. Default: "This form allows you to edit html header meta tags that are produced by Plone CMS to incrase Search Engine visibility. The values generated by Plone are present as default values in input fields. To override default value, check corresponding checkbox and input value itself in the corresponding field."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:35
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:36
 msgid "description_edit_seo_properties"
 msgstr "Ця форма дозволяє редагувати мета теґи, які генерує СКВ Plone, з метою збільшення видимості сайту для пошукових систем. Значення, які генерує Plone по замовчуванню, введено у відповідних полях. Щоб перекрити значення за замовчуванням, поставте галочку біля відповідного поля та введіть потрібне значення."
 
 #. Default: "Select content types that will have SEO properties enabled."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:155
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:50
 msgid "description_seo_content_types"
 msgstr "Виберіть типи вмісту, для яких буде можливо прописувати SEO властивості."
 
 #. Default: "Controls if <abbr title=\"Dublin Core\">DC</abbr> metatags are exposed to page header. They include DC.description, DC.type, DC.format, DC.creator and others."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:35
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:31
 msgid "description_seo_dc_metatags"
 msgstr "Чи показувати <abbr title=\"Dublin Core\">DC</abbr> мета теґи в коді сторінки, включаючи такі мета теґи,  як DC.description, DC.type, DC.format, DC.creator тощо."
 
 #. Default: "Edit SEO Properties"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:34
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:35
 msgid "heading_edit_seo_properties"
 msgstr "Редагувати властивості SEO"
 
-#. Default: "Use this field when you want that your content types receive additional keywords from the ones you manually specify. Enter one keyword per line."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:74
-msgid "help_additional_keywords"
-msgstr "Використовуйте це поле, якщо Ви хочете, щоб об'єкти на цьому сайті отримали додаткові ключові слова крім тих, які Ви вказали вручну для кожного з них. Введіть по одному слову в кожен рядок."
-
 #. Default: "Fill in custom metatag names (one per line) which will appear on qseo_properties edit tab. Example: \"metaname|metacontent\" or \"metaname\"."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:46
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:60
 msgid "help_default_custom_metatags"
 msgstr "Введіть назви додаткових мета теґів (по 1 в кожному рядку), які з'являться при редагуванні  SEO властивостей об'єктів сайту. Наприклад: \ \"metaname | metacontent \" або \ \"metaname \"."
 
 #. Default: "Fill in meta tags (one per line) in the order in which they will appear on site source pages. Example: \"metaname accessor\"."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:60
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:42
 msgid "help_metatags_order"
 msgstr "Ввведіть по 1 мета теґу в рядок у тому порядку, в якому вони будуть з'являтися при перегляді коду сторінки. Наприклад: \ \"metaname accessor\"."
 
 #. Default: "Specify your canonical URL. If your site has identical or vastly similar content that's accessible through multiple URLs, this format provides you with more control over the URL returned in search results."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:237
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:238
 msgid "help_seo_canonical"
 msgstr "Вкажіть canonical URL. Якщо на Вашому сайті є ідентичні або дуже схожі за вмістом сторінки, доступні за кількома URL-адресами, це поле забезпечить Вам більший контроль над тією URL-адресою, яка відображатиметься  в результатах пошуку."
 
 #. Default: "Here you can manage your custom meta tags. Specify local Meta Tags parameters to be added to the global Meta Tags. If metacontent field is empty, then a meta tag will not be present on this page."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:270
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:271
 msgid "help_seo_custommetatags"
 msgstr "Тут ви можете управляти додатковими мета теґами. Вкажіть параметри локальних мета теґів, які буде додано до глобальних мета-теґів. Якщо поле metacontent - пусте, то такий мета теґ не буде показано на цій сторінці."
 
 #. Default: "Description of the document to be indexed by Search Engines. This text will be present in meta description tag in page HTML source."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:87
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:88
 msgid "help_seo_description"
 msgstr "Опис документа, який будуть використовувати пошукові системи. Цей текст буде присутній в мета тезі description в коді сторінки."
 
 #. Default: "Distribution meta tag to designate time and area distribution of the document."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:206
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:207
 msgid "help_seo_distribution"
 msgstr "Мета теґ Distribution використовується для позначення часу та місця розповсюдження документа."
 
 #. Default: "Comments embedded into HTML header."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:150
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:151
 msgid "help_seo_html_comment"
 msgstr "Коментарі, додані в HTML заголовок."
 
 #. Default: "Keywords, the page will be indexed with. <strong>Enter each keyword in separate line, please.</strong> Though the relevance of listing meta keywords is of questionable value now, it is useful to set meta keywords for pages - for future reference.<br />Use 'Check Keywords' button to check whether words you entered in this block as SEO keywords are present in content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:115
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:116
 msgid "help_seo_keywords"
 msgstr "Ключові слова, по яких сторінку буде проіндексовано. <strong>Буль-ласка, введіть кожне ключове слово в окремому рядку.</strong> <br /> Використовуйте кнопку 'Check Keywords', щоб перевірити чи слова, які ви вказали в цьому блоці, є наявні на сторінці."
 
 #. Default: "Robots meta tag value. Allows or denies indexing, following links, etc. for spiders indexing your content."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:177
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:178
 msgid "help_seo_robots"
 msgstr "Значення мета теґу Robots. Дозволяє або забороняє індексування, перехід за посиланнями тощо."
 
 #. Default: "Text to be present in &lt;TITLE&gt; tag. It is displayed in browser title bar. Search engines display it as a title of the document."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:57
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:58
 msgid "help_seo_title"
 msgstr "Текст, який буде показано в тезі  &lt;TITLE&gt;. Його буде видно у заголовку переглядача. Пошукові системи відображатимуть цей текст як назву документа."
 
-#. Default: "Controls global and local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:127
-msgid "help_settings_use_keywords_lg"
-msgstr "Контроль поведінки глобальних та локальних SEO ключових слів."
-
-#. Default: "Controls Plone categories (also known as keywords or tags) and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:89
-msgid "help_settings_use_keywords_sg"
-msgstr "Контроль поведінки Plone категорій (відомих також як ключові слова чи теґи) та глобальних SEO ключових слів."
-
-#. Default: "Additional keywords that should be added to the content types."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:71
-msgid "label_additional_keywords"
-msgstr "Додаткові ключові слова, які потрібно додати до типів вмісту."
-
 #. Default: "Canonical URL"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:234
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:235
 msgid "label_canonical_tag"
 msgstr ""
 
 #. Default: "Content Types"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:153
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:49
 msgid "label_content_type_title"
 msgstr "Типи вмісту"
 
 #. Default: "Custom Meta Tags"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:267
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:268
 msgid "label_custom_metatags"
 msgstr "Додаткові мета теґи"
 
 #. Default: "Default custom metatags."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:43
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:59
 msgid "label_default_custom_metatags"
 msgstr "Додаткові мета теґи"
 
 #. Default: "Distribution Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:203
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:204
 msgid "label_distribution_tag"
 msgstr "Мета теґ Distribution"
 
 #. Default: "Expose <abbr title=\"Dublin Core\">DC</abbr> meta tags"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:32
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:29
 msgid "label_exposeDCMetaTags"
 msgstr "Показувати мета теґи <abbr title=\"Dublin Core\">DC</abbr>"
 
 #. Default: "HTML Comment"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:147
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:148
 msgid "label_html_comment"
 msgstr "Коментар HTML"
 
-#. Default: "Merge global and local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:145
-msgid "label_merge_seoglobal_and_seolocal"
-msgstr "Злиття глобальних і локальних SEO ключових слів"
-
-#. Default: "Merge Plone categories and global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:117
-msgid "label_merge_subject_and_seoglobal"
-msgstr "Злиття Plone категорій та глобальних SEO ключових слів"
-
 #. Default: "Meta Description Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:84
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:85
 msgid "label_meta_description_tag"
 msgstr "Мета теґ Description"
 
 #. Default: "Meta Keywords Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:112
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:113
 msgid "label_meta_keywords_tag"
 msgstr "Мета теґ Keywords"
 
 #. Default: "Meta tags order in the page."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:57
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:40
 msgid "label_metatags_order"
 msgstr "Порядок мета теґів на сторінці."
 
 #. Default: "Override"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:69
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:70
 msgid "label_override"
 msgstr "Перекрити"
 
 #. Default: "Page Title Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:54
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:55
 msgid "label_page_title_tag"
 msgstr "Мета теґ Title"
 
 #. Default: "Robot Tag"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:174
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_context_properties.pt:175
 msgid "label_robot_tag"
 msgstr "Мета теґ Robot"
 
-#. Default: "Global SEO keywords override local SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:135
-msgid "label_seoglobal_override_seolocal"
-msgstr "Глобальні SEO ключові слова перекривають локальні"
-
-#. Default: "Global SEO keywords override Plone categories"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:107
-msgid "label_seoglobal_override_subject"
-msgstr "Глобальні SEO ключові слова перекривають Plone категорії"
-
-#. Default: "Settings to control global SEO keywords vs local SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:124
-msgid "label_settings_use_keywords_lg"
-msgstr "Налаштування поведінки глобальних та локальних SEO ключових слів."
-
-#. Default: "Settings to control Plone categories and global SEO keywords behaviour."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:86
-msgid "label_settings_use_keywords_sg"
-msgstr "Налаштування поведінки Plone ключових слів та глобальних SEO ключових слів."
-
-#. Default: "Plone categories override global SEO keywords"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:97
-msgid "label_subject_override_seoglobal"
-msgstr "Plone категорії перекривають глобальні SEO ключові слова"
-
-#. Default: "Up to Plone Setup"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:15
-msgid "label_up_to_plone_setup"
-msgstr "Вгору до Налаштувань Plone"
-
-#. Default: "Number of keywords at page:\n${found}\n${missing}"
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:51
+#. Default: "Number of keywords at page:\n${result}"
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/keywords.py:47
 msgid "number_keywords"
 msgstr ""
 "Кількість знайдених ключових слів на сторінці:\n"
-"${found}\n"
-"${missing}"
+"${result}"
 
 #. Default: "You can select what content types are qSEOptimizer-enabled, and control if Dublin Core metatags are exposed in the header of content pages."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/templates/seo_controlpanel.pt:20
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/seo_configlet.py:127
 msgid "seo_configlet_description"
 msgstr "Тут Ви можете вибрати, які типи вмісту матимуть можливіть налаштування SEO властивостей, а також налаштувати інші SEO параметри на Вашому сайті."
 
 #. Default: "Content SEO properties have been saved."
-#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:480
+#: ./quintagroup.seoptimizer/quintagroup/seoptimizer/browser/views.py:271
 msgid "seoproperties_saved"
 msgstr "SEO властивості збереженно."