Make manage locales also filter through translations, more tweak to locale string ids to remove _yioop, a=chris

Chris Pollett [2015-07-28 18:Jul:th]
Make manage locales also filter through translations, more tweak to locale string ids to remove _yioop, a=chris
Filename
src/controllers/SearchController.php
src/controllers/components/SystemComponent.php
src/locale/ar/configure.ini
src/locale/bn/configure.ini
src/locale/de/configure.ini
src/locale/en_US/configure.ini
src/locale/es/configure.ini
src/locale/fa/configure.ini
src/locale/fr_FR/configure.ini
src/locale/he/configure.ini
src/locale/hi/configure.ini
src/locale/hi/statistics.txt
src/locale/in_ID/configure.ini
src/locale/it/configure.ini
src/locale/it/statistics.txt
src/locale/ja/configure.ini
src/locale/kn/configure.ini
src/locale/ko/configure.ini
src/locale/nl/configure.ini
src/locale/nl/statistics.txt
src/locale/pl/configure.ini
src/locale/pt/configure.ini
src/locale/ru/configure.ini
src/locale/te/configure.ini
src/locale/th/configure.ini
src/locale/tr/configure.ini
src/locale/vi_VN/configure.ini
src/locale/vi_VN/statistics.txt
src/locale/zh_CN/configure.ini
src/views/RecoverView.php
src/views/RegisterView.php
src/views/SettingsView.php
src/views/SigninView.php
src/views/SuggestView.php
src/views/elements/ServersettingsElement.php
diff --git a/src/controllers/SearchController.php b/src/controllers/SearchController.php
index 272221f7f..3fa9a0b64 100755
--- a/src/controllers/SearchController.php
+++ b/src/controllers/SearchController.php
@@ -777,7 +777,7 @@ class SearchController extends Controller implements CrawlConstants
                 }
                 $data['QUERY'] = urlencode($this->clean($query, "string"));
                 if(C\nsdefined("ADVERTISEMENT_TYPE") &&
-                    C\ADVERTISEMENT_TYPE == 'yioop_advertisements') {
+                    C\ADVERTISEMENT_TYPE == 'keyword_advertisements') {
                     $data['ELEMENT'] = "displayadvertisement";
                     $advertisement_model = $this->model("advertisement");
                     if (isset($_REQUEST['a']) &&
@@ -1421,7 +1421,7 @@ class SearchController extends Controller implements CrawlConstants
         $type = $cache_item[self::TYPE];
         $loc_url = ($in_url == "") ? $url : $in_url;
         $cache_file = "<html><head><title>" .
-            tl('search_controller_yioop_cache') . "</title></head>".
+            tl('search_controller_site_cache') . "</title></head>".
             "<body><object onclick=\"document.location='$loc_url'\"".
             " data='data:$type;base64,".
             base64_encode($cache_file)."' type='$type' />";
@@ -1539,7 +1539,7 @@ class SearchController extends Controller implements CrawlConstants
             $cache_file = strip_tags($cache_file, $body_tags);
             $cache_file = wordwrap($cache_file, 80);
             $cache_file = "<html><head><title>".
-                tl('search_controller_yioop_cache') . "</title></head>".
+                tl('search_controller_site_cache') . "</title></head>".
                 "<body>".$cache_file."</body></html>";
             $dom = new \DOMDocument();
             @$dom->loadHTML($cache_file);
diff --git a/src/controllers/components/SystemComponent.php b/src/controllers/components/SystemComponent.php
index ec2ef510e..c8124cb77 100755
--- a/src/controllers/components/SystemComponent.php
+++ b/src/controllers/components/SystemComponent.php
@@ -465,7 +465,8 @@ class SystemComponent extends Component
                         $data["filter"] = $filter;
                         foreach ($data['STRINGS'] as
                             $string_id => $translation) {
-                            if (strpos($string_id, $filter) === false) {
+                            if (mb_stripos($string_id, $filter) === false &&
+                                mb_stripos($translation, $filter) === false) {
                                 unset($data['STRINGS'][$string_id]);
                                 unset($data['DEFAULT_STRINGS'][$string_id]);
                             }
@@ -616,8 +617,8 @@ class SystemComponent extends Component
         $data['ADVERTISEMENT_TYPES'] = array (
             'no_advertisements' =>
                 tl('system_component_configure_no_advertisements'),
-            'yioop_advertisements' =>
-                tl('system_component_configure_yioop_advertisements'),
+            'keyword_advertisements' =>
+                tl('system_component_configure_keyword_advertisements'),
             'external_advertisements' =>
                 tl('system_component_configure_external_advertisements'),
              );
@@ -630,7 +631,7 @@ class SystemComponent extends Component
         $data['show_ad_info'] = "false";
         if (isset($data['ADVERTISEMENT_TYPE']) &&
             in_array($data['ADVERTISEMENT_TYPE'],
-                ['no_advertisements', 'yioop_advertisements'])) {
+                ['no_advertisements', 'keyword_advertisements'])) {
             $data['show_ad_info'] = "true";
         }
         $data['no_mail_php'] =  ($data["USE_MAIL_PHP"]) ? "false" :"true";
@@ -661,14 +662,14 @@ class SystemComponent extends Component
     elt('ad-registration').onchange = function () {
         var show_ad_info = false;
         var ad_type = elt('ad-registration').value;
-        no_external_ad = ['no_advertisements', 'yioop_advertisements'];
+        no_external_ad = ['no_advertisements', 'keyword_advertisements'];
         if (no_external_ad.indexOf(ad_type)
             < 0) {
             show_ad_info = true;
         }
         setDisplay('ad-location-info', show_ad_info);
         setDisplay('ad-payment-processing',
-            (ad_type == 'yioop_advertisements'));
+            (ad_type == 'keyword_advertisements'));
     };
 EOD;
         if (class_exists("\Memcache")) {
diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini
index eb030ad5a..e4640ce4a 100755
--- a/src/locale/ar/configure.ini
+++ b/src/locale/ar/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "مشكلة في تحديث قاعدة البيانات!"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "تحديث الشخصية!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "تحديث الشخصية!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "يجب استخدام مسار مطلق لدليل العمل"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "تعيين دليل العمل! قد تحتاج إلى إعادة تسجيل الدخول! "
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "الرجاء تسمية الروبوت الخاص بك"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "يعمل الدليل والشخصية التي تم إنشاؤها!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "تعذر التحديث config.php الملف!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "غير قادر على إنشاء الشخصية!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "دليل العمل هو صالح! لا يمكن إنشاء الشخصية! "
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "دليل العمل هو صالح! لا يمكن إنشاء الشخصية! "
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "تحديث الشخصية!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "يرجى وصف الروبوت الخاص بك"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "بي إتش بي الإصدار 5.3 أو أحدث"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "configs/config.php ليس ملقم ويب للكتابة."
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "دليل العمل يجب أن يكون قابل للكتابة من قبل ملقم ويب."
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "pnp.ini ملف post_max_size متغيرينبغي أن يكون مالا يقل عن 32 م"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "مطلوب ما يلي العناصر في عداد المفقودين:  %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "كانت العناصر الاختيارية التالية مفقودة:  %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "تمرير الاختيار."
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "استخدام configs/local_config.php حتى تغيير دليل العمل أعلاه قد لا تعمل."
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = "موقع على شبكة الإنترنت قد طلبت هذه الصفحة لم تتم أرشفة."
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = "هذه الصورة التي ظهرت على الصفحة:"
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "تأخير الزحف ييوببوت"
 search_controller_cache_comment = "يوب ذاكرة التخزين المؤقت الصفحة... هذه الصفحة قد تم تعديل لإضافة توجيه الروبوتات، وجعل ارتباطات مطلقة، إضافة ملخصات المستخرجة، وتسليط الضوء على مصطلحات الاستعلام."
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "تم الحصول على هذه النسخة المخزنة مؤقتاً من  %s الزاحف يوب على  %s."
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "العودة إلى يوب"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "العودة إلى يوب"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "يوب! بي إتش بي محرك البحث "
@@ -4236,7 +4236,7 @@ settings_view_search_index = "البحث في الفهرس:"
 settings_view_language_label = "اللغة:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "العودة"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "حفظ الإعدادات"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "العودة إلى يوب"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = "بي إتش بي محرك البحث-يوب!"
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "العودة إلى يوب"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini
index e12e24e17..66f6455da 100755
--- a/src/locale/bn/configure.ini
+++ b/src/locale/bn/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini
index bc70c46dc..7525b0e05 100755
--- a/src/locale/de/configure.ini
+++ b/src/locale/de/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index d5f4870fe..b0acf2137 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -340,7 +340,7 @@ crawl_component_no_description = "No Description for Crawl"
 crawl_component_use_below = "Use options below"
 ;
 ; CrawlComponent.php line: 338
-crawl_component_use_defaults = "Use Yioop! defaults"
+crawl_component_use_defaults = "Use Yioop defaults"
 ;
 ; CrawlComponent.php line: 341
 crawl_component_use_below = "Use options below"
@@ -442,7 +442,7 @@ crawl_component_scores = "{1}%% confidence, {2}%% disagreement"
 crawl_component_use_below = "Use options below"
 ;
 ; CrawlComponent.php line: 825
-crawl_component_use_defaults = "Use Yioop! defaults"
+crawl_component_use_defaults = "Use Yioop defaults"
 ;
 ; CrawlComponent.php line: 827
 crawl_component_use_below = "Use options below"
@@ -1230,139 +1230,139 @@ system_component_all_strings = "All Strings"
 ; SystemComponent.php line: 448
 system_component_missing_strings = "Missing Strings"
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "Problem Updating Database!"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "Profile Updated!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = "Disable Registration"
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = "No Activation"
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = "Email Activation"
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = "Admin Activation"
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = "No Advertisements"
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = "Keyword Advertisements"
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = "Keyword Advertisements"
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = "External Ad Server"
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = "Text Captcha"
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = "Hash Captcha"
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = "Image Captcha"
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = "Normal Authentication"
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = "ZKP Authentication"
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = "Normal Authentication"
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = "Settings Updated!"
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = "No Settings Were Changed!"
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = "No Resource Folder!"
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = "Invalid File Type!"
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = "File Too Big!"
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "Profile Updated!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = "Reset Completed"
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "Must use an Absolute path for Work Directory"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = "Work Directory cannot be contained in Yioop folder!"
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "Work Directory Set! You may need to re-login!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "Please Name Your robot"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "Working Directory and Profile Created!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "Unable to Update config.php File!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "Unable to Create Profile!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "Profile Updated!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "Please Describe Your Robot"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP Version 5.3 or Newer"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "configs/config.php not web server writable."
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "Work directory needs to be writable by web server. "
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "php.ini file variable post_max_size should be at least 2M"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "The following required items were missing: %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "The following optional items were missing: %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "Check Passed."
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "Using configs/LocalConfig.php so changing work directory above may not work."
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = "Download Fetcher: %s"
 search_controller_no_archive_page = "The website in question has requested this page not be archived."
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = "Yioop Cache"
+search_controller_site_cache = "Yioop Cache"
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = "This image appeared on the page:"
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "YioopBot Crawl Delay"
 search_controller_cache_comment = "Yioop Cache Page... This page has been modified to add a robots directive,  make links absolute, add extracted summaries, and to highlight query terms."
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = "Yioop Cache"
+search_controller_site_cache = "Yioop Cache"
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "This cached version of %s was obtained by the Yioop crawler on %s."
@@ -1588,7 +1588,7 @@ settings_controller_settings_saved = "Settings Saved!"
 static_controller_logout_successful = "Logout Successful"
 ;
 ; StaticController.php line: 147
-static_controller_complete_title = "Yioop! - %s"
+static_controller_complete_title = "Yioop - %s"
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/views
 ;
@@ -3846,10 +3846,10 @@ rss_layout_title = "PHP Search Engine - Yioop! : %s"
 rss_layout_description = "Search results for: %s"
 ;
 ; WebLayout.php line: 64
-web_layout_title = "PHP Search Engine - Yioop!"
+web_layout_title = "This Search Engine - This Site"
 ;
 ; WebLayout.php line: 74
-web_layout_description = "PHP Crawler and Search Engine Software"
+web_layout_description = "This Search Engine Site needs to be described. Software from Seekquarry.com"
 ;
 ; WebLayout.php line: 76
 web_layout_site_author = "Chris Pollett"
@@ -3963,7 +3963,7 @@ register_view_human_check = "Human Check:"
 recover_view_recover_password = "Recover Account"
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "Return to Yioop"
+recover_view_return = "Return to Yioop"
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = "Which lives or lasts the longest?"
@@ -4161,10 +4161,10 @@ register_view_period = "."
 register_view_create_account = "Create Account"
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "Return to Yioop"
+register_view_return = "Return to Yioop"
 ;
 ; SearchView.php line: 90
-search_view_title = "Yioop! PHP Search Engine"
+search_view_title = "Yioop - PHP Search Engine"
 ;
 ; SearchView.php line: 117
 search_view_input_label = "Enter the terms you would like to search the web for"
@@ -4236,13 +4236,13 @@ settings_view_search_index = "Search Index:"
 settings_view_language_label = "Language:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "Return"
+settings_view_return = "Return"
 ;
 ; SettingsView.php line: 110
 settings_view_save = "Save Settings"
 ;
 ; SettingsView.php line: 117
-settings_install_search_plugin = "Install Yioop! Open Search Plugin"
+settings_install_search_plugin = "Install Yioop Open Search Plugin"
 ;
 ; SigninView.php line: 67
 signin_view_signin = "Signin"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = "Forgot Password?"
 signin_view_create_account = "Create Account"
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "Return to Yioop"
+signin_view_return = "Return"
 ;
 ; StaticView.php line: 74
 static_view_title = "PHP Search Engine - Yioop!"
@@ -4356,7 +4356,7 @@ suggest_view_human_check = "Human Check:"
 suggest_view_submit_url = "Submit"
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "Return to Yioop"
+suggest_view_return = "Return to Yioop"
 ;
 ; View.php line: 52
 view_locale_version14 = "Version 14"
diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini
index d5af29680..6e5c2f134 100755
--- a/src/locale/es/configure.ini
+++ b/src/locale/es/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "Problema al actualizar la base de datos!"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "Perfil actualizado!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "Perfil actualizado!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "Debe utilizar una ruta absoluta para el directorio de trabajo"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "El trabajo conjunto de Directorio! Puede que tenga que volver a entrar!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "Por favor, Nombre tu Robot"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "Directorio de Trabajo y Perfil creados!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "No se puede actualizar el archivo config.php!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "Directorio de trabajo es inv&aacute;lido! No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "Directorio de trabajo es inv&aacute;lido! No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "Perfil actualizado!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "Por favor describa su robot"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP Version 5.3 o la M&aacute;s Reciente"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "configs/config.php el servidor web no es escribible."
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "Directorio de trabajo tiene que ser escribible por el servidor web"
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "La variable post_max_size del archivo php.ini deber�a ser de al menos 32M"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "Los siguientes elementos necesarios (requeridos), no estaban: %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "Los siguientes elementos opcionales, no estaban: %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "Entrada Aprobada"
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "Rastreo Retrasado de YioopBot"
 search_controller_cache_comment = "P&aacute;gina de cache Yioop ... Esta p&aacute;gina ha sido modificada para a&ntilde;adir una directiva robots, hacer enlaces absolutos, a&ntilde;adir res&uacute;menes extra&iacute;dos, y para resaltar los t&eacute;rminos de la consulta."
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "Esta versi&oacute;n en cach&eacute; de %s se obtuvo mediante el rastreador Yioop en %s."
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini
index f89731fd6..a12d1690b 100755
--- a/src/locale/fa/configure.ini
+++ b/src/locale/fa/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "در به روز رسانی پایگاه داده مشکلی پیش آمده است! "
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "پروفایل به روز شد!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "پروفایل به روز شد!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "باید از مسیر مطلق برای پوشهٔ کار استفاده کرد"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = "پوشهٔ کار نمی&zwnj;تواند در پوشهٔ Yioop باشد."
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "پوشهٔ کار تنظیم شد! احتمالن لازم است دوباره وارد شوید.!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "لطفن برای رباتتان نامی بگذارید"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "پوشهٔ کار و پروفایل ساخته شدند!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "نمی&zwnj;توان فایل config.php را به روز کرد!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "پوشهٔ کار معتبر نیست! نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "پوشهٔ کار معتبر نیست! نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "پروفایل به روز شد!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "لطفن رباتتان را توصیف کنید"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP نسخهٔ ۳.۵ یا جدیدتر"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "وب سرور نمی&zwnj;تواند در configs/config.php بنویسد."
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "وب سرور باید بتواند در پوشهٔ کار بنویسد."
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "متغیر post_max_size در php.ini باید حداقل ۲ مگابایت باشد. "
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "موارد لازم زیر خالی هستند: %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "موارد اختیاری زیر خالی هستند: %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "در بررسی مشکلی پیدا نشد."
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "از configs/local_config.php استفاده می&zwnj;شود، بنابراین ممکن است تغییر بالا عمل نکند."
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = "وب&zwnj;سایت مورد نظر نمی&zwnj;خواهد این صفحه بایگانی شود."
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = "این تصویر در صفحهٔ زیر دیده شده است: "
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "تاخیر در خزش YioopBot"
 search_controller_cache_comment = "صفحه کش Yioop ... این صفحه برای اضافه کردن دستورالعمل ربات، ایجاد لینک های مطلق، اضافه کردن خلاصه&zwnj;های استخراج شده، و برجسته سازی کلمات مورد پرسمان اصلاح شده است."
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "این نسخه کش شدهٔ ‪%‬s را خزندهٔ Yioop در ‪%‬s به دست آورده است."
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "بازگشت به Yioop"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "بازگشت به Yioop"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "Yioop! موتور جستجوی PHP"
@@ -4236,7 +4236,7 @@ settings_view_search_index = "نمایهٔ جستجو:"
 settings_view_language_label = "زبان:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "بازگشت"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "ذخیرهٔ تنظیمات"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "بازگشت به Yioop"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = "موتور جستجوی PHP - Yioop!"
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "بازگشت به Yioop"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini
index e6fa6a714..3e4522202 100755
--- a/src/locale/fr_FR/configure.ini
+++ b/src/locale/fr_FR/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "Retourner &agrave; Yioop"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "Retourner &agrave; Yioop"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "Moteur de recherche PHP -Yioop!"
@@ -4236,7 +4236,7 @@ settings_view_search_index = "L&#039;index de recherche:"
 settings_view_language_label = "Langage:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "Retourner &agrave; Yioop"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "Enregistrer les pr&eacute;f&eacute;rences"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "Retourner &agrave; Yioop"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "Retourner &agrave; Yioop"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini
index cbfd1a1bd..aaa987b1e 100755
--- a/src/locale/he/configure.ini
+++ b/src/locale/he/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "פרופייל עודכן"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "פרופייל עודכן"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "פרופייל עודכן"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini
index 130e7d201..350d65a77 100755
--- a/src/locale/hi/configure.ini
+++ b/src/locale/hi/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "वापस Yioop! पर"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "वापस Yioop! पर"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = "खोज अनुक्रमणिका"
 settings_view_language_label = "भाषा"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "Yioop! पर लौटें "
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "परिवर्तन सहेजें "
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "वापस Yioop! पर"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "वापस Yioop! पर"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/hi/statistics.txt b/src/locale/hi/statistics.txt
index ada6b5ac3..fdbc9d39e 100755
--- a/src/locale/hi/statistics.txt
+++ b/src/locale/hi/statistics.txt
@@ -1 +1 @@
-d:2;
\ No newline at end of file
+d:1;
\ No newline at end of file
diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini
index d42b330ab..78cebbe75 100755
--- a/src/locale/in_ID/configure.ini
+++ b/src/locale/in_ID/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini
index 9f3e3b27c..cd973e402 100755
--- a/src/locale/it/configure.ini
+++ b/src/locale/it/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "Problema aggiornamento database!"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "Profilo aggiornato!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "Profilo aggiornato!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "Devi usare un percorso assoluto per la Cartella di Lavoro"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "Cartella di Lavoro creata! Potrebbe essere necessario ri-accedere!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "Dai un nome al tuo Robot"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "Cartella di Lavoro e Profilo creati!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "Impossibile aggiornare il file config.php!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "Profilo aggiornato!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "Descrivi il tuo Robot"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP Versione 5.3 o maggiore"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "File configs/config.php non scrivibile dal web server."
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "La Cartella di Lavoro deve essere scrivibile dal web server. "
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "La variabile post_max_size nel file php.ini dovrebbe essere minimo 32M"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "I seguenti oggetti richiesti sono mancanti: %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "I seguenti oggetti opzionali sono mancanti: %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "Controllo passato."
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "Usando configs/local_config.php la Cartella di Lavoro sopra potrebbe non funzionare."
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "Ritardo Scansione YioopBot"
 search_controller_cache_comment = "Pagina archiviata Yioop... Questa pagina &egrave; stata modificata per aggiungere una direttiva al Robot, creare link assoluti, aggiungere sommari estratti, e evidenziari termini di ricerca."
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "Questa versione archiviata di %s &egrave; stata ottenuta dal Crawler di Yioop il %s."
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "Ritorna a Yioop"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "Ritorna a Yioop"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "Yioop! Motore di Ricerca in PHP"
@@ -4236,7 +4236,7 @@ settings_view_search_index = "Cerca nell&#039;Indice:"
 settings_view_language_label = "Lingua:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "Ritorna a Yioop!"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "Salva impostazioni"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "Ritorna a Yioop"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = "Yioop! Motore di Ricerca in PHP"
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "Ritorna a Yioop"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/it/statistics.txt b/src/locale/it/statistics.txt
index 9a3fa5a61..b752bdd23 100755
--- a/src/locale/it/statistics.txt
+++ b/src/locale/it/statistics.txt
@@ -1 +1 @@
-d:29;
\ No newline at end of file
+d:28;
\ No newline at end of file
diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini
index b7140e1a0..996d7130c 100755
--- a/src/locale/ja/configure.ini
+++ b/src/locale/ja/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "ディータベースの更新ない"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "プロフィールの変更できました。"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "プロフィールの変更できました。"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "ボット名を入力してください。"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "config.phpファイルのできない。更新"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "プロフィールの変更できました。"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "ロボットの説明してください。"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "%sのこのキャッシュされたバージョンは%sのウィオップから入手しました。"
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "ウィオップ!に戻る"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "ウィオップ!に戻る"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = "検索指数"
 settings_view_language_label = "言語:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "ウィオップ!に戻る"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "設定の保存"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "ウィオップ!に戻る"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "ウィオップ!に戻る"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini
index 17e32cd87..b6b1fd6c2 100755
--- a/src/locale/kn/configure.ini
+++ b/src/locale/kn/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ನಿಗದಿಪಡಿಸಲಾಗಿದೆ!  ನೀವು ಮರು ಪ್ರವೇಶಿಸಬೇಕಾಗಬಹುದು"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "configs/config.php ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಲ್ಲ"
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆ ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಾಗಿರಬೇಕು"
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "php.ini ಕಡಿತದ ಚರಾಂಶ post_max_size ಕನಿಷ್ಠ ಪಕ್ಷ ೧೬ ಎಂ.ಬಿ. ಇರಬೇಕು"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "ಬರುವ ಅವಶ್ಯಕವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "ಬರುವ ಕಡ್ಡಾಯವಲ್ಲದ ವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆಯಾಗಿದೆ"
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು "
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "ಯೂಪ್&#039;ಗೆ ಮರಳಿರಿ"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "ಯೂಪ್&#039;ಗೆ ಮರಳಿರಿ"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "ಯೂಪ್!, ಪಿಹೆಚಪಿ ಶೋಧನಾ ಯಂತ್ರ "
@@ -4236,7 +4236,7 @@ settings_view_search_index = "ಶೋಧನಾ ಸೂಚಿಕೆ"
 settings_view_language_label = "ಭಾಷೆ:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "ಯೂಪ್&#039;ಗೆ ಮರಳಿರಿ"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "ಈ ಹೊಂದಾಣಿಕೆಯನ್ನು ಉಳಿಸಿ"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "ಯೂಪ್&#039;ಗೆ ಮರಳಿರಿ"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "ಯೂಪ್&#039;ಗೆ ಮರಳಿರಿ"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini
index 2147d7c27..ae12a1704 100755
--- a/src/locale/ko/configure.ini
+++ b/src/locale/ko/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "데이터베이스를 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다."
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "로봇 이름을 정해 주십시요."
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다."
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "config.php 파일을  업데이트 실패했습니다."
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "당신의 로봇을 기술해 주십시요."
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "현재 캐시 버젼 %s 은 Yioop 크롤 %s 에 의하여 얻어 졌습니다. "
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "Yioop 으로 돌아가기"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "Yioop 으로 돌아가기"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = "인덱스 찾기:"
 settings_view_language_label = "언어:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "Yioop 으로 돌아가기!"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "세팅 저장"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "Yioop 으로 돌아가기"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "Yioop 으로 돌아가기"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini
index 20f3a135a..a535bcbc8 100644
--- a/src/locale/nl/configure.ini
+++ b/src/locale/nl/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = "All Strings"
 ; SystemComponent.php line: 448
 system_component_missing_strings = "Ontbrekende Strings"
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "Probleem bijwerken Database!"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "Profiel ge&iuml;pdatet!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = "Uitschakelen Registratie"
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = "geen Activering"
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = "e-mail Activering"
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = "admin Activering"
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = "tekst Captcha"
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = "hash Captcha"
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = "Captcha image"
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = "normale Authenticatie"
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = "ZKP Authenticatie"
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = "normale Authenticatie"
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = "Instellingen Bijgewerkt!"
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = "Geen instellingen werden veranderd!"
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = "Geen Resource Folder!"
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = "Ongeldige File Type!"
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = "Bestand te groot!"
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "Profiel ge&iuml;pdatet!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = "Reset voltooid"
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "Moet een absoluut pad voor Werk Directory te gebruiken"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = "Werk Directory kan niet worden opgenomen in Yioop folder!"
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "Werken Directory Set! Het kan nodig zijn om opnieuw in te loggen!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "Gelieve Naam Je robot"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "Working Directory en Profile Gemaakt!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "Niet in staat om config.php bestand bij te werken!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "Kan geen profiel maak!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "Werk is ongeldig! Kan profiel niet maken!"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "Werk is ongeldig! Kan profiel niet maken!"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "Profiel ge&iuml;pdatet!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "Beschrijf uw Robot"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP versie 5.3 of nieuwer"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "configs / config.php niet webserver beschrijfbaar."
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "Werk map moet beschrijfbaar door web-server te zijn."
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "php.ini bestand variabele post_max_size moet minstens 2M"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "De volgende benodigde onderdelen ontbraken: %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "De volgende optionele onderdelen ontbraken: %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "Controleer Geslaagd."
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "Met behulp van configs / local_config.php dus veranderende werk directory hierboven kan niet werken."
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = "Download ophalen: %s"
 search_controller_no_archive_page = "De website in kwestie heeft verzocht deze pagina niet worden gearchiveerd."
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = "Yioop Cache"
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = "Deze afbeelding verscheen op de pagina:"
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "YioopBot Crawl Delay"
 search_controller_cache_comment = "Yioop Cache Pagina ... Deze pagina is aangepast om een robots richtlijn toe te voegen, maakt links absolute, voeg gewonnen samenvattingen, en om zoektermen te markeren."
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = "Yioop Cache"
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "Deze cached versie van %s werd verkregen door het Yioop crawler op %s."
@@ -3963,7 +3963,7 @@ register_view_human_check = "Human Check:"
 recover_view_recover_password = "Recover account"
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "Keer terug naar Yioop"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = "Die woont of duurt het langst?"
@@ -4161,7 +4161,7 @@ register_view_period = "."
 register_view_create_account = "Maak Een Account Aan"
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "Keer terug naar Yioop"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "Yioop! PHP Zoekmachine"
@@ -4236,7 +4236,7 @@ settings_view_search_index = "Zoek Index:"
 settings_view_language_label = "taal:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "terugkeer"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "Instellingen opslaan"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = "Wachtwoord Vergeten?"
 signin_view_create_account = "Maak Een Account Aan"
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "Keer terug naar Yioop"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = "PHP Search Engine - Yioop!"
@@ -4356,7 +4356,7 @@ suggest_view_human_check = "Human Check:"
 suggest_view_submit_url = "voorleggen"
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "Keer terug naar Yioop"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/nl/statistics.txt b/src/locale/nl/statistics.txt
index 8250db870..c895a77d5 100644
--- a/src/locale/nl/statistics.txt
+++ b/src/locale/nl/statistics.txt
@@ -1 +1 @@
-d:93;
\ No newline at end of file
+d:92;
\ No newline at end of file
diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini
index 1f0857a65..f4888c537 100755
--- a/src/locale/pl/configure.ini
+++ b/src/locale/pl/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini
index a210431a5..9049b256f 100755
--- a/src/locale/pt/configure.ini
+++ b/src/locale/pt/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini
index 63fe54335..61341d38c 100755
--- a/src/locale/ru/configure.ini
+++ b/src/locale/ru/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini
index ad5f30095..61d36be5f 100644
--- a/src/locale/te/configure.ini
+++ b/src/locale/te/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = "అన్ని స్ట్రింగ్ల
 ; SystemComponent.php line: 448
 system_component_missing_strings = "మిస్సింగ్ స్ట్రింగ్స్"
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "డేటాబేస్ నవీకరణలో సమస్య!"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "ప్రొఫైల్ అప్డేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = "రిజిస్ట్రేషన్ డిసేబుల్"
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = "నో ఏక్టివేషన్"
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = "ఇమెయిల్ ఏక్టివేషన్"
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = "అడ్మిన్  ఏక్టివేషన్"
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = "కేప్త్చపదం"
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = "హాష్ కేప్త్చ"
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = "కేప్త్చ చిత్రం"
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = "సాధారణ ఆతేంటికేషణ్"
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = "ZKP ఆతేంటికేషణ్"
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = "సాధారణ ఆతేంటికేషణ్"
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = "సెట్టింగ్స్ అప్డేట్ చెయ్యబడినవి!"
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = "ఏ సెట్టింగులు మార్చబడలేదు!"
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = "రిసోర్స్ ఫోల్డర్ లేదు!"
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = "చెల్లని ఫైల్ రకం!"
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = "చాలా పెద్ద ఫైలు!"
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "ప్రొఫైల్ అప్డేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = "రీసెట్ పూర్తి అయినది"
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "వర్క్ డైరెక్టరీ కోసం సరైన పాత్ ఉపయోగించాలి"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = "వర్క్ డైరెక్టరీ yioop ఫోల్డర్ లో ఉండకూడదు!"
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "వర్క్ డైరెక్టరీ సెట్  చేయండి! మీరు తిరిగి లాగిన్ చేయాలి!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "దయచేసి మీ రోబోట్ కి పేరు పెట్టండి"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "వర్కింగ్ డైరెక్టరీ మరియు ప్రొఫైల్ క్రియేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "config.php ఫైల్ అప్డేట్ చేయుట సాధ్యపడలేదు!"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "ప్రొఫైల్ తయారు చేయుట సాధ్యపడలేదు!"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "వర్క్ డైరెక్టరీ చెల్లదు! ప్రొఫైల్ సృష్టించలేరు!"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "వర్క్ డైరెక్టరీ చెల్లదు! ప్రొఫైల్ సృష్టించలేరు!"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "ప్రొఫైల్ అప్డేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "మీ రోబోట్ ని దయచేసి వివరించండి"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP వెర్షన్ 5.3 లేదా ఇంకా క్రొత్తది"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "క్రింది అవసరమైన అంశాలు మిస్ అయినవి: %s"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "క్రింది ఆప్షనల్ అంశాలు మిస్ అయినవి: %s"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = "డౌన్లోడ్ ఫెచ్చ
 search_controller_no_archive_page = "ఈ వెబ్ సైట్ ఈ పేజీ ఆర్కైవ్ చేయరాదని  అభ్యర్థించారు "
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = "Yioop కాష్"
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = "ఈ చిత్రం  కనిపించిన పేజి:"
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = "యూప్ బాట్ క్రాల్
 search_controller_cache_comment = "యూప్కా ష్ పేజ్ ... ఈ పేజీకి, ఒక రోబోట్ ఆదేశం జోడించండి లింకులు సంపూర్ణ తయారు, సేకరించిన సారాంశాలు జోడించడానికి మరియు ప్రశ్న నిబంధనలు హైలైట్ కు మార్చబడింది"
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = "Yioop కాష్"
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "ఈ కేషెడ్ వెర్షన్ %s యూప్ క్రాలర్ ద్వారా పొందారు %s"
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "తిరిగి yioop! కి"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = "."
 register_view_create_account = "ఖాతా సృష్టించు"
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "తిరిగి yioop! కి"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "యూప్ ! పిహెచ్పి సెర్చ్ ఇంజిన్"
@@ -4236,7 +4236,7 @@ settings_view_search_index = "శోధన సూచిక:"
 settings_view_language_label = "భాష:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "తిరిగి yioop! కి"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "సెట్టింగులను సేవ్ చేయి"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = "పాస్&zwnj;వర్డ్ మర్చ
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "తిరిగి yioop! కి"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = "PHP సెర్చ్ ఇంజిన్ - Yioop!"
@@ -4356,7 +4356,7 @@ suggest_view_human_check = "హ్యూమన్ చెక్:"
 suggest_view_submit_url = "సబ్మిట్"
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "తిరిగి yioop! కి"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini
index 7717affa2..de820114a 100755
--- a/src/locale/th/configure.ini
+++ b/src/locale/th/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini
index 33ac78215..5a3edc649 100755
--- a/src/locale/tr/configure.ini
+++ b/src/locale/tr/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = ""
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = ""
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = ""
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = ""
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = ""
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = ""
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = ""
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini
index a816cef92..8d8bf6f09 100755
--- a/src/locale/vi_VN/configure.ini
+++ b/src/locale/vi_VN/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = "Vấn đề cập nhật cơ sở dữ liệu"
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "C&ocirc;ng việc thiết lập thư mục bị đ&ocirc;ng cứng (Bạn c&oacute; thể cần phải đăng nhập)"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "Đặt t&ecirc;n cho r&ocirc; b&ocirc; của bạn"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "Thư mục l&agrave;m việc v&agrave; hồ sơ được tạo ra"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "Kh&ocirc;ng thể cập nhật hồ sơ config.php"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "Kh&ocirc;ng thể tạo hồ sơ"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = "Diễn tả r&ocirc; b&ocirc; của bạn"
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "Kiểm tra được th&ocirc;ng qua"
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = "Trang gốc n&agrave;y: %s đ&atilde; t&igrave;m được bởi c&ocirc;ng cụ t&igrave;m kiẽm Yioop v&agrave;o ng&agrave;y %s."
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "Trở lại trang Yioop"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "Trở lại trang Yioop"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = ""
@@ -4236,7 +4236,7 @@ settings_view_search_index = "T&igrave;m mục lục:"
 settings_view_language_label = "Ng&ocirc;n ngữ:"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "Trở lại trang Yioop"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "Giữ sự sắp đặt"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "Trở lại trang Yioop"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "Trở lại trang Yioop"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/locale/vi_VN/statistics.txt b/src/locale/vi_VN/statistics.txt
index 09559c0dd..1bdc2c466 100755
--- a/src/locale/vi_VN/statistics.txt
+++ b/src/locale/vi_VN/statistics.txt
@@ -1 +1 @@
-d:11;
\ No newline at end of file
+d:10;
\ No newline at end of file
diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini
index d4037c22d..56fdaf5bf 100755
--- a/src/locale/zh_CN/configure.ini
+++ b/src/locale/zh_CN/configure.ini
@@ -1230,139 +1230,139 @@ system_component_all_strings = ""
 ; SystemComponent.php line: 448
 system_component_missing_strings = ""
 ;
-; SystemComponent.php line: 566
+; SystemComponent.php line: 567
 system_component_configure_no_change_db = ""
 ;
-; SystemComponent.php line: 571
+; SystemComponent.php line: 572
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 574
+; SystemComponent.php line: 575
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 607
+; SystemComponent.php line: 608
 system_component_configure_disable_registration = ""
 ;
-; SystemComponent.php line: 609
+; SystemComponent.php line: 610
 system_component_configure_no_activation = ""
 ;
-; SystemComponent.php line: 611
+; SystemComponent.php line: 612
 system_component_configure_email_activation = ""
 ;
-; SystemComponent.php line: 613
+; SystemComponent.php line: 614
 system_component_configure_admin_activation = ""
 ;
-; SystemComponent.php line: 617
+; SystemComponent.php line: 618
 system_component_configure_no_advertisements = ""
 ;
-; SystemComponent.php line: 619
-system_component_configure_yioop_advertisements = ""
+; SystemComponent.php line: 620
+system_component_configure_keyword_advertisements = ""
 ;
-; SystemComponent.php line: 621
+; SystemComponent.php line: 622
 system_component_configure_external_advertisements = ""
 ;
-; SystemComponent.php line: 704
+; SystemComponent.php line: 705
 captchasettings_element_text_captcha = ""
 ;
-; SystemComponent.php line: 706
+; SystemComponent.php line: 707
 captchasettings_element_hash_captcha = ""
 ;
-; SystemComponent.php line: 708
+; SystemComponent.php line: 709
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 714
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 716
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 745
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 748
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 789
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 803
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 808
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 823
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 827
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 876
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 879
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 958
 system_component_configure_use_absolute_path = "使用絕對路徑"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 963
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 994
 system_component_configure_work_dir_set = "工作目錄配置"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1005
 system_component_name_your_bot = "取名"
 ;
-; SystemComponent.php line: 1029
+; SystemComponent.php line: 1030
 system_component_configure_work_profile_made = "工作設置已建立"
 ;
-; SystemComponent.php line: 1033
+; SystemComponent.php line: 1034
 system_component_configure_no_set_config = "無設置"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1041
 system_component_configure_no_create_profile = "未建立簡歷"
 ;
-; SystemComponent.php line: 1047
+; SystemComponent.php line: 1048
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1054
+; SystemComponent.php line: 1055
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1083
+; SystemComponent.php line: 1084
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1087
+; SystemComponent.php line: 1088
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1107
+; SystemComponent.php line: 1108
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1157
+; SystemComponent.php line: 1158
 system_component_php_version = "PHP版本"
 ;
-; SystemComponent.php line: 1165
+; SystemComponent.php line: 1166
 system_component_no_write_config_php = "PHP未寫入"
 ;
-; SystemComponent.php line: 1170
+; SystemComponent.php line: 1171
 system_component_no_write_work_dir = "未寫入目錄"
 ;
-; SystemComponent.php line: 1175
+; SystemComponent.php line: 1176
 system_component_post_size_small = "張貼小容量"
 ;
-; SystemComponent.php line: 1181
+; SystemComponent.php line: 1182
 system_component_missing_required = "缺少必要項目"
 ;
-; SystemComponent.php line: 1204
+; SystemComponent.php line: 1205
 system_component_missing_optional = "缺少選擇項目"
 ;
-; SystemComponent.php line: 1209
+; SystemComponent.php line: 1210
 system_component_check_passed = "通過檢查"
 ;
-; SystemComponent.php line: 1214
+; SystemComponent.php line: 1215
 system_component_using_local_config = "使用當地語言"
 ;
 ; MachineController.php line: 194
@@ -1528,7 +1528,7 @@ search_controller_download_fetcher = ""
 search_controller_no_archive_page = ""
 ;
 ; SearchController.php line: 1423
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1428
 search_controller_original_page = ""
@@ -1555,7 +1555,7 @@ search_controller_crawl_delay = ""
 search_controller_cache_comment = ""
 ;
 ; SearchController.php line: 1541
-search_controller_yioop_cache = ""
+search_controller_site_cache = ""
 ;
 ; SearchController.php line: 1576
 search_controller_cached_version = ""
@@ -3963,7 +3963,7 @@ register_view_human_check = ""
 recover_view_recover_password = ""
 ;
 ; RecoverView.php line: 212
-signin_view_return_yioop = "回到首頁"
+recover_view_return = ""
 ;
 ; RegisterView.php line: 77
 register_view_question0_most = ""
@@ -4161,7 +4161,7 @@ register_view_period = ""
 register_view_create_account = ""
 ;
 ; RegisterView.php line: 356
-signin_view_return_yioop = "回到首頁"
+register_view_return = ""
 ;
 ; SearchView.php line: 90
 search_view_title = "PHP 搜索引擎 - Yioop!"
@@ -4236,7 +4236,7 @@ settings_view_search_index = ""
 settings_view_language_label = "語言"
 ;
 ; SettingsView.php line: 107
-settings_view_return_yioop = "回到首頁"
+settings_view_return = ""
 ;
 ; SettingsView.php line: 110
 settings_view_save = "儲存"
@@ -4269,7 +4269,7 @@ signin_view_recover_password = ""
 signin_view_create_account = ""
 ;
 ; SigninView.php line: 130
-signin_view_return_yioop = "回到首頁"
+signin_view_return = ""
 ;
 ; StaticView.php line: 74
 static_view_title = ""
@@ -4356,7 +4356,7 @@ suggest_view_human_check = ""
 suggest_view_submit_url = ""
 ;
 ; SuggestView.php line: 174
-signin_view_return_yioop = "回到首頁"
+suggest_view_return = ""
 ;
 ; View.php line: 52
 view_locale_version14 = ""
diff --git a/src/views/RecoverView.php b/src/views/RecoverView.php
index 7ab83feab..121daae10 100644
--- a/src/views/RecoverView.php
+++ b/src/views/RecoverView.php
@@ -210,7 +210,7 @@ class RecoverView extends View
             </form>
             <div class="signin-exit">
                 <ul>
-                <li><a href="."><?= tl('signin_view_return_yioop') ?></a></li>
+                <li><a href="."><?= tl('recover_view_return') ?></a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/views/RegisterView.php b/src/views/RegisterView.php
index 8574383e1..de0acea35 100755
--- a/src/views/RegisterView.php
+++ b/src/views/RegisterView.php
@@ -354,7 +354,7 @@ class RegisterView extends View
             </form>
             <div class="signin-exit">
                 <ul>
-                <li><a href="."><?= tl('signin_view_return_yioop') ?></a></li>
+                <li><a href="."><?= tl('register_view_return') ?></a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/views/SettingsView.php b/src/views/SettingsView.php
index f7f3c10dd..2e24105be 100755
--- a/src/views/SettingsView.php
+++ b/src/views/SettingsView.php
@@ -105,7 +105,7 @@ if (count($data['LANGUAGES']) > 1) { ?>
         if (isset($data['RETURN'])) {
             e(' onclick="javascript:window.location.href='."'".
             $data['RETURN']."'".';return false;"');
-        } ?>><?php e(tl('settings_view_return_yioop'));
+        } ?>><?php e(tl('settings_view_return'));
     ?></button></td><td class="table-input">
 <button class="top-margin" type="submit" name="c" value="settings"><?=
     tl('settings_view_save') ?></button>
diff --git a/src/views/SigninView.php b/src/views/SigninView.php
index b040391e9..4c83da422 100755
--- a/src/views/SigninView.php
+++ b/src/views/SigninView.php
@@ -123,12 +123,12 @@ class SigninView extends View
                         } ?>" ><?=tl('signin_view_recover_password') ?></a></li>
                     <li><a href="./?c=register&amp;a=createAccount<?php
                         if ($logged_in) {
-                            e('&amp;'.C\CSRF_TOKEN."=".$data[C\XSRF_TOKEN]);
+                            e('&amp;'.C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]);
                         }?>"><?=tl('signin_view_create_account') ?></a></li>
                 <?php
                 }
             ?>
-                <li><a href="."><?=tl('signin_view_return_yioop') ?></a></li>
+                <li><a href="."><?=tl('signin_view_return') ?></a></li>
             </ul>
         </div>
         </div>
diff --git a/src/views/SuggestView.php b/src/views/SuggestView.php
index 5c477936e..373833d77 100644
--- a/src/views/SuggestView.php
+++ b/src/views/SuggestView.php
@@ -172,7 +172,7 @@ class SuggestView extends View
             </form>
             <div class="signin-exit">
                 <ul>
-                <li><a href="."><?= tl('signin_view_return_yioop') ?></a></li>
+                <li><a href="."><?= tl('suggest_view_return') ?></a></li>
                 </ul>
             </div>
         </div>
diff --git a/src/views/elements/ServersettingsElement.php b/src/views/elements/ServersettingsElement.php
index 60e8a0e63..4d25d4437 100644
--- a/src/views/elements/ServersettingsElement.php
+++ b/src/views/elements/ServersettingsElement.php
@@ -373,14 +373,14 @@ class ServersettingsElement extends Element
         function selectAdvertisingSource() {
             var show_ad_info = false;
             var ad_type = elt('ad-registration').value;
-            no_external_ad = ['no_advertisements', 'yioop_advertisements'];
+            no_external_ad = ['no_advertisements', 'keyword_advertisements'];
             if (no_external_ad.indexOf(ad_type)
                 < 0) {
                 show_ad_info = true;
             }
             setDisplay('ad-location-info', show_ad_info);
             setDisplay('ad-payment-processing',
-                (ad_type == 'yioop_advertisements'));
+                (ad_type == 'keyword_advertisements'));
         }
         </script>
     <?php
ViewGit