Add link to term and privacy on register page, a=chris

Chris Pollett [2014-06-13 18:Jun:th]
Add link to term and privacy on register page, a=chris
Filename
locale/ar/configure.ini
locale/bn/configure.ini
locale/de/configure.ini
locale/en-US/configure.ini
locale/en-US/statistics.txt
locale/es/configure.ini
locale/fa/configure.ini
locale/fr-FR/configure.ini
locale/he/configure.ini
locale/hi/configure.ini
locale/in-ID/configure.ini
locale/it/configure.ini
locale/ja/configure.ini
locale/kn/configure.ini
locale/ko/configure.ini
locale/pl/configure.ini
locale/pt/configure.ini
locale/ru/configure.ini
locale/te/configure.ini
locale/th/configure.ini
locale/tr/configure.ini
locale/vi-VN/configure.ini
locale/zh-CN/configure.ini
views/register_view.php
diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini
index 4d573f5a3..fb2dcd5bf 100755
--- a/locale/ar/configure.ini
+++ b/locale/ar/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "تسجيل الدخول الناجحة!!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "اسم المستخدم أو كلمة المرور غير صحيحة!"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "Login to continue configuration (default: u=root, p=)"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = "توقفت عن تحديثات الحالة."
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "حدد تتبع الارتباطات"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = "تتبع الارتباطات الافتراضية"
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "حدد تتبع الارتباطات"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = "تتبع الارتباطات الافتراضية"
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "لم يكشف عن اسمه الزحف"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "الزحف ميكس إنشاؤها!"
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "الزحف ميكس حذف!"
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "ميكسحذف لاتوجد لا!"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "إضافة عمليات تتبع الارتباطات"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "عدد من النتائج"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "الوزن"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "إجراءات"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "إضافة استعلام"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "الزحف ميكس التغييرات المحفوظة!"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "تسجيل الخروج"
 ; subsearch_element.php line: 68
 subsearch_element_more = "أكثر"
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "العودة إلى يوب"
 ;
 ; search_view.php line: 85
diff --git a/locale/bn/configure.ini b/locale/bn/configure.ini
index 151f1a62a..9f85588e4 100755
--- a/locale/bn/configure.ini
+++ b/locale/bn/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/de/configure.ini b/locale/de/configure.ini
index 4427f9dd3..c9a9bcd39 100755
--- a/locale/de/configure.ini
+++ b/locale/de/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini
index 1f7f38331..595789583 100755
--- a/locale/en-US/configure.ini
+++ b/locale/en-US/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = "Cookies needed to login!!"
 ; admin_controller.php line: 143
 admin_controller_login_successful = "Login Successful!!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = "Account not active. Maybe request password reset?"
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = "No Back Button During Login!"
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "Username or Password Incorrect!"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "Login to continue configuration (default: u=root, p=)"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = "Status updates have stopped."
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = "Account Access"
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = "Social"
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = "Crawls"
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = "System Settings"
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = "Equals"
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = "Not equals"
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = "Contains"
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = "Begins with"
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = "Ends with"
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = "Equals"
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = "Not equals"
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = "No sort"
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = "Ascending"
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = "Descending"
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = "%s joined %s!"
 ; social_component.php line: 779
 social_component_join_group_detail = "On %s, you joined the group  %s."
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = "Missing Fields!"
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = "%s Wiki Page Created!"
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = "Discuss the page in this thread!"
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = "Page Saved!"
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = "Back"
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = "Historical Version of %s from %s."
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = "Back"
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = "%s line differences between %s and %s."
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = "Revert to %s."
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = "Page Reverted!"
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = "Error Reverting Page!"
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = "Main"
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = "Small"
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = "Medium"
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = "Large"
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = "Size"
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = "Header row:"
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = "Example"
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = "Table Title"
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = "Submit"
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = "Cancel"
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = "Bold text"
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = "Italic text"
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = "Underlined text"
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = "Striked text"
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = "Heading"
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = "Level 1 Heading"
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = "Level 2 Heading"
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = "Level 3 Heading"
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = "Level 4 Heading"
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = "Unordered list item"
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = "Ordered list item"
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = "Insert non-formatted text here"
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = "Add Search Bar Form"
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = "Size"
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = "Add Wiki Table"
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = "Column Count:"
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = "Row Count:"
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = "Add Hyperlink"
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = "Text:"
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = "URL:"
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "Select Crawl"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = "Default Crawl"
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "Select Crawl"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = "Default Crawl"
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "Unnamed Crawl"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "Crawl Mix Created!"
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = "Invalid Timestamp!"
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "Crawl Mix Deleted!"
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "Mix to Delete Does not Exist!"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = "Mix Successfully Imported!"
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = "Setting Crawl To Use as Index"
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = "Error in comment data!"
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = "Shared Mix Has An Invalid Timestamp"
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = "Cannot post to that group!"
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = "Try out this crawl mix!"
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = "%s is sharing the crawl mix %s!"
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = "Thread Created!"
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = "Not Mix Owner!"
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "Add Crawls"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "Results Shown"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = "Remove"
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "Weight"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = "Name"
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = "Keywords"
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "Actions"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "Add Query"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = "Delete"
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = "Too Many Search Result Fragments!"
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "Crawl Mix Changes Saved!"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "Sign Out"
 ; subsearch_element.php line: 68
 subsearch_element_more = "More"
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = "Feed"
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = "Wiki"
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = "%s Page"
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = "Read"
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = "Edit"
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = "Pages"
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = "%s page does not exist."
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = "You can create this page by clicking on the edit link above."
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = "Or you can use the form below to create or edit a different page."
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = "Submit"
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = "Wiki Syntax Guide"
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = "%s page does not exist."
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = "If you have sufficient access you might be able to create the page by logging in and navigating back here."
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = "%s page does not exist."
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = "History"
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = "Discuss"
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = "Locale: %s"
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = "Page: %s"
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = "To archive a page so it won't appear in search results delete its text and save."
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = "Edit Reason:"
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = "Save"
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = "%s Group Wiki Page List"
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = "Search group page titles"
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = "Go"
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = "Create Page: %s"
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = "Back"
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = "Difference:"
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = "Go"
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = "First"
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = "Second"
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = "First"
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = "Second"
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = "Edited by %s. "
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = "(%s bytes)."
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = "Revert"
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = "Revert"
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = "Recovery Info:"
 ; register_view.php line: 309
 register_view_human_check = "Human Check:"
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = "By clicking Create Account, I agree to the"
+;
+; register_view.php line: 326
+register_view_terms = "Yioop Terms"
+;
+; register_view.php line: 328
+register_view_and = "and"
+;
+; register_view.php line: 330
+register_view_privacy = "Privacy Policy"
+;
+; register_view.php line: 332
+register_view_period = "."
+;
+; register_view.php line: 342
 register_view_create_account = "Create Account"
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "Return to Yioop"
 ;
 ; search_view.php line: 85
diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt
index 5a165df53..b6bef56f0 100755
--- a/locale/en-US/statistics.txt
+++ b/locale/en-US/statistics.txt
@@ -1 +1 @@
-d:100;
\ No newline at end of file
+d:99;
\ No newline at end of file
diff --git a/locale/es/configure.ini b/locale/es/configure.ini
index a85546c87..f9f58c122 100755
--- a/locale/es/configure.ini
+++ b/locale/es/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "Inicio de sesión con éxito."
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "El nombre de usuario o la contraseña introducidos no son correctos."
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "Inicia sesión para continuar con la configuración (default: u=root, p=)"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = "Las actualizaciones se han detenido."
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "Seleccionar Rastreo"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "Seleccionar Rastreo"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "Rastreo sin nombre"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "Rastreo Mix creado!"
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "Rastreo Mix eliminado!"
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "Mix para eliminar (borrar) no existe!"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "Añadir Rastreos"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "Número de Resultados"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "Tamaño"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "Acciones"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "Agregar consulta"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "Guardados los Cambios del Rastreo Mix!"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini
index a7a5b85c5..ecb20736a 100755
--- a/locale/fa/configure.ini
+++ b/locale/fa/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "با موفقیت وارد شدید!!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "نام کاربری یا رمز عبور اشتباه است!"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "برای ادامهٔ تنظیمات وارد شوید (پیش‌فرض: نام کاربری=root و رمز عبور=)"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = "به روز رسانی وضعیت متوقف شده است."
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "یک خزش انتخاب کنید"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = "خزش پیش‌فرض"
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "یک خزش انتخاب کنید"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = "خزش پیش‌فرض"
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "خزش بی‌نام"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "ترکیب خزش ساخته شد!"
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "ترکیب خزش حذف شد!"
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "ترکیبی که می‌خواهید حذف کنید وجود ندارد!"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "خزش اضافه کن"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "تعداد نتایج"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "وزن"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "فرمان‌ها"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "پُرسمان اضافه کن"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "تغییرات ترکیب خزش ذخیره شد!"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "خروج"
 ; subsearch_element.php line: 68
 subsearch_element_more = "بیشتر"
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "بازگشت به Yioop"
 ;
 ; search_view.php line: 85
diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini
index e04efdad3..7eb47bed2 100755
--- a/locale/fr-FR/configure.ini
+++ b/locale/fr-FR/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "Déconnexion réussie!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "Déconnexion"
 ; subsearch_element.php line: 68
 subsearch_element_more = "Plus"
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "Retourner à Yioop"
 ;
 ; search_view.php line: 85
diff --git a/locale/he/configure.ini b/locale/he/configure.ini
index 76e7c0af3..1084290f2 100755
--- a/locale/he/configure.ini
+++ b/locale/he/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "סיסמא / שם משתמש אינו נכון"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "התחבר על מנת להמשך בתהליך"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini
index f63ace03c..0972e5b63 100755
--- a/locale/hi/configure.ini
+++ b/locale/hi/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "लॉग इन सफल"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "लॉग इन असफल"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "कॉन्फ़िगर करने के लिए लॉगिन करें"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "साइन आउट करें"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "वापस Yioop! पर"
 ;
 ; search_view.php line: 85
diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini
index dbba57e62..9f536d4b7 100755
--- a/locale/in-ID/configure.ini
+++ b/locale/in-ID/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "Login berhasil"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "Login tidak berhasil"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "Keluar"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/it/configure.ini b/locale/it/configure.ini
index 5065c1f83..d0baa6ece 100755
--- a/locale/it/configure.ini
+++ b/locale/it/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "Accesso effettuato!!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "Utente o Password non corretto!"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "Accedi per continuare la configurazione (utente=root; nessuna password)"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = "Aggiornamenti stato interrotti."
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "Seleziona Scansione"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "Seleziona Scansione"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "Scansione senza nome"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "Unione Scansioni creata!"
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "Unione Scansioni cancellata!"
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "Unione Scansioni da cancellare inesistente!"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "Aggiungi scansione"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "Numero di risultati"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "Peso"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "Azioni"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "Aggiungi Ricerca"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "Cambiamenti Unione Scansioni effettuati!"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "Esci"
 ; subsearch_element.php line: 68
 subsearch_element_more = "Più"
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "Ritorna a Yioop"
 ;
 ; search_view.php line: 85
diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini
index 09553d95d..4fa0bf161 100755
--- a/locale/ja/configure.ini
+++ b/locale/ja/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "ログイン成功"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "無効なユーザー名またはパスワード"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "ログアウト"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "ウィオップ!に戻る"
 ;
 ; search_view.php line: 85
diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini
index 0f85248fb..36f499f2e 100755
--- a/locale/kn/configure.ini
+++ b/locale/kn/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "ಒಳಪ್ರವೇಶಣೆ ಸಫಲ"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "ಒಳಪ್ರವೇಶಣೆ ವಿಫಲ, ಬಳಕೆದಾರನ ಹೆಸರು ಅಥವಾ ಪ್ರವೇಶ ಪದ ತಪ್ಪಾಗಿದೆ "
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "ಸಂರಚನೆ ಮುಂದುವರೆಸಲು ಒಳಪ್ರವೇಶಿಸಿ"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "ಹೆಸರಿಡದ ಕ್ರಾವ್ಲ"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "ಕ್ರಾವ್ಲಗಳ ಮಿಶ್ರಣ ಸೃಜಿಸಲಾಯಿತು"
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಳಿಸಲಾಗಿದೆ"
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "ಅಳಿಸಬೇಕಾದ ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "ಕ್ರಾವ್ಲಗಳನ್ನು ಸೇರಿಸಿ"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "ಫಲಿತಾಂಶಗಳ ಸಂಖ್ಯೆ"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "ಗೌರವ"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "ಕ್ರಿಯೆಗಳು"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "ಪ್ರಶ್ನೆಯನ್ನು ಸೇರಿಸು"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "ಕ್ರಾವ್ಲ್ ಮಿಶ್ರಣದಲ್ಲಿ ಬದಲಾವಣೆಯನ್ನು ಉಳಿಸು"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "ನಿಷ್ಕ್ರಮಿಸಿ"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "ಯೂಪ್'ಗೆ ಮರಳಿರಿ"
 ;
 ; search_view.php line: 85
diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini
index df4c9a755..309fa8f35 100755
--- a/locale/ko/configure.ini
+++ b/locale/ko/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "로그인 성공!!!"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "로그인 실패!!!"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "관리 (default: u=root, p=)"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "로그 아웃"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "Yioop 으로 돌아가기"
 ;
 ; search_view.php line: 85
diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini
index 2d856984d..e29cc339c 100755
--- a/locale/pl/configure.ini
+++ b/locale/pl/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini
index 312e04e63..3b613cb1c 100755
--- a/locale/pt/configure.ini
+++ b/locale/pt/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini
index 3a0f344ff..0331739dd 100755
--- a/locale/ru/configure.ini
+++ b/locale/ru/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/te/configure.ini b/locale/te/configure.ini
index f9d485473..3e64211d3 100755
--- a/locale/te/configure.ini
+++ b/locale/te/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "లాగిన్ విజయవంతం"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "యుసర్ నేం లెదా పాస్వర్ద్ సరి లేదు"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "కాంఫిగరేషన్ కొరకు లాగిన్ చేయండి"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "క్రాల్ ఎంచుకోండి"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = "డిఫాల్ట  క్రాల్"
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "క్రాల్ ఎంచుకోండి"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = "డిఫాల్ట  క్రాల్"
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "పేరు లేని క్రాల్"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "క్రాల్ లు జోడించుము"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "బరువు"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "యాక్సన్ లు"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "క్వెరి జోడించుము"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "సైన్ ఔట్ "
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/th/configure.ini b/locale/th/configure.ini
index efea456f6..cc4641a60 100755
--- a/locale/th/configure.ini
+++ b/locale/th/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini
index cf88f2e01..a4e47907a 100755
--- a/locale/tr/configure.ini
+++ b/locale/tr/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = ""
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = ""
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = ""
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = ""
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = ""
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = ""
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = ""
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = ""
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = ""
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = ""
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = ""
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = ""
 ;
 ; search_view.php line: 85
diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini
index 43f5d343e..25266ba18 100755
--- a/locale/vi-VN/configure.ini
+++ b/locale/vi-VN/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "Đăng nhập thành công"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "Tên đăng nhập họăc khẩu không đúng"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "đăng nhập để cấu hình"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = ""
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "Chọn thu thập thông tin"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "Chọn thu thập thông tin"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "Vô danh"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = "Tạo ra hỗn hợp "
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = "Xóa kết hợp "
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = "Kết hợp này không tồn tại"
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "Cộng thêm thu thập"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "Số kết quả"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "Trọng lượng"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "Hành động"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "Cộng thêm truy vấn"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = "Kết hợp đã được lưu dữ"
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "Thoát"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "Trở lại trang Yioop"
 ;
 ; search_view.php line: 85
diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini
index 0ed3d4a55..5cac8b008 100755
--- a/locale/zh-CN/configure.ini
+++ b/locale/zh-CN/configure.ini
@@ -34,61 +34,61 @@ admin_controller_need_cookies = ""
 ; admin_controller.php line: 143
 admin_controller_login_successful = "登入成功"
 ;
-; admin_controller.php line: 147
+; admin_controller.php line: 149
 admin_controller_account_not_active = ""
 ;
-; admin_controller.php line: 164
+; admin_controller.php line: 165
 admin_controller_no_back_button = ""
 ;
-; admin_controller.php line: 171
+; admin_controller.php line: 172
 admin_controller_login_failed = "登入失敗"
 ;
-; admin_controller.php line: 178
+; admin_controller.php line: 179
 admin_controller_login_to_config = "登入管理介面"
 ;
-; admin_controller.php line: 182
+; admin_controller.php line: 183
 admin_controller_status_updates_stopped = "管理員終止更新"
 ;
-; admin_controller.php line: 318
+; admin_controller.php line: 319
 admin_controller_account_access = ""
 ;
-; admin_controller.php line: 319
+; admin_controller.php line: 320
 admin_controller_social = ""
 ;
-; admin_controller.php line: 320
+; admin_controller.php line: 321
 admin_controller_crawl_settings = ""
 ;
-; admin_controller.php line: 321
+; admin_controller.php line: 322
 admin_controller_system_settings = ""
 ;
-; admin_controller.php line: 475
+; admin_controller.php line: 476
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 476
+; admin_controller.php line: 477
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 477
+; admin_controller.php line: 478
 admin_controller_contains = ""
 ;
-; admin_controller.php line: 478
+; admin_controller.php line: 479
 admin_controller_begins_with = ""
 ;
-; admin_controller.php line: 479
+; admin_controller.php line: 480
 admin_controller_ends_with = ""
 ;
-; admin_controller.php line: 482
+; admin_controller.php line: 483
 admin_controller_equal = ""
 ;
-; admin_controller.php line: 483
+; admin_controller.php line: 484
 admin_controller_not_equal = ""
 ;
-; admin_controller.php line: 486
+; admin_controller.php line: 487
 admin_controller_no_sort = ""
 ;
-; admin_controller.php line: 487
+; admin_controller.php line: 488
 admin_controller_sort_ascending = ""
 ;
-; admin_controller.php line: 488
+; admin_controller.php line: 489
 admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop//controllers/components
@@ -645,214 +645,214 @@ social_component_join_group = ""
 ; social_component.php line: 779
 social_component_join_group_detail = ""
 ;
-; social_component.php line: 983
+; social_component.php line: 996
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 989
+; social_component.php line: 1002
 group_controller_page_created = ""
 ;
-; social_component.php line: 990
+; social_component.php line: 1003
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 994
+; social_component.php line: 1007
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1030
+; social_component.php line: 1043
 group_controller_back = ""
 ;
-; social_component.php line: 1031
+; social_component.php line: 1044
 group_controller_history_page = ""
 ;
-; social_component.php line: 1064
+; social_component.php line: 1077
 group_controller_back = ""
 ;
-; social_component.php line: 1065
+; social_component.php line: 1078
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1077
+; social_component.php line: 1090
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1081
+; social_component.php line: 1094
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1086
+; social_component.php line: 1099
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1144
+; social_component.php line: 1157
 group_controller_main = ""
 ;
-; social_component.php line: 1212
+; social_component.php line: 1225
 wiki_js_small = ""
 ;
-; social_component.php line: 1213
+; social_component.php line: 1226
 wiki_js_medium = ""
 ;
-; social_component.php line: 1214
+; social_component.php line: 1227
 wiki_js_large = ""
 ;
-; social_component.php line: 1215
+; social_component.php line: 1228
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1216
+; social_component.php line: 1229
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1217
+; social_component.php line: 1230
 wiki_js_example = ""
 ;
-; social_component.php line: 1218
+; social_component.php line: 1231
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1219
+; social_component.php line: 1232
 wiki_js_submit = ""
 ;
-; social_component.php line: 1220
+; social_component.php line: 1233
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1221
+; social_component.php line: 1234
 wiki_js_bold = ""
 ;
-; social_component.php line: 1222
+; social_component.php line: 1235
 wiki_js_italic = ""
 ;
-; social_component.php line: 1223
+; social_component.php line: 1236
 wiki_js_underline = ""
 ;
-; social_component.php line: 1224
+; social_component.php line: 1237
 wiki_js_strike = ""
 ;
-; social_component.php line: 1225
+; social_component.php line: 1238
 wiki_js_heading = ""
 ;
-; social_component.php line: 1226
+; social_component.php line: 1239
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 1227
+; social_component.php line: 1240
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 1228
+; social_component.php line: 1241
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 1229
+; social_component.php line: 1242
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 1230
+; social_component.php line: 1243
 wiki_js_bullet = ""
 ;
-; social_component.php line: 1231
+; social_component.php line: 1244
 wiki_js_enum = ""
 ;
-; social_component.php line: 1232
+; social_component.php line: 1245
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 1233
+; social_component.php line: 1246
 wiki_js_add_search = ""
 ;
-; social_component.php line: 1234
+; social_component.php line: 1247
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1235
+; social_component.php line: 1248
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 1236
+; social_component.php line: 1249
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 1237
+; social_component.php line: 1250
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 1238
+; social_component.php line: 1251
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 1239
+; social_component.php line: 1252
 wiki_js_link_text = ""
 ;
-; social_component.php line: 1240
+; social_component.php line: 1253
 wiki_js_link_url = ""
 ;
-; social_component.php line: 1278
+; social_component.php line: 1291
 social_component_select_crawl = "搜尋選擇"
 ;
-; social_component.php line: 1279
+; social_component.php line: 1292
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1281
+; social_component.php line: 1294
 social_component_select_crawl = "搜尋選擇"
 ;
-; social_component.php line: 1283
+; social_component.php line: 1296
 social_component_default_crawl = ""
 ;
-; social_component.php line: 1305
+; social_component.php line: 1318
 social_component_unnamed = "未命名"
 ;
-; social_component.php line: 1312
+; social_component.php line: 1325
 social_component_mix_created = ""
 ;
-; social_component.php line: 1319
+; social_component.php line: 1332
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 1325
+; social_component.php line: 1338
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 1343
+; social_component.php line: 1356
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 1353
+; social_component.php line: 1366
 social_component_mix_imported = ""
 ;
-; social_component.php line: 1357
+; social_component.php line: 1370
 social_component_set_index = ""
 ;
-; social_component.php line: 1378
+; social_component.php line: 1391
 social_component_comment_error = ""
 ;
-; social_component.php line: 1386
+; social_component.php line: 1399
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 1405
+; social_component.php line: 1418
 social_component_no_post_access = ""
 ;
-; social_component.php line: 1410
+; social_component.php line: 1423
 social_component_share_title = ""
 ;
-; social_component.php line: 1412
+; social_component.php line: 1425
 social_component_share_description = ""
 ;
-; social_component.php line: 1417
+; social_component.php line: 1430
 social_component_thread_created = ""
 ;
-; social_component.php line: 1462
+; social_component.php line: 1475
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 1475
+; social_component.php line: 1488
 social_component_add_crawls = "增加索引"
 ;
-; social_component.php line: 1477
+; social_component.php line: 1490
 social_component_num_results = "結果數量"
 ;
-; social_component.php line: 1479
+; social_component.php line: 1492
 social_component_del_frag = ""
 ;
-; social_component.php line: 1481
+; social_component.php line: 1494
 social_component_weight = "元素重量"
 ;
-; social_component.php line: 1482
+; social_component.php line: 1495
 social_component_name = ""
 ;
-; social_component.php line: 1484
+; social_component.php line: 1497
 social_component_add_keywords = ""
 ;
-; social_component.php line: 1486
+; social_component.php line: 1499
 social_component_actions = "元素活動"
 ;
-; social_component.php line: 1488
+; social_component.php line: 1501
 social_component_add_query = "增加查詢"
 ;
-; social_component.php line: 1489
+; social_component.php line: 1502
 social_component_delete = ""
 ;
-; social_component.php line: 1537
+; social_component.php line: 1550
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 1548
+; social_component.php line: 1561
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 83
@@ -2774,112 +2774,112 @@ signin_element_signout = "登出"
 ; subsearch_element.php line: 68
 subsearch_element_more = ""
 ;
-; wiki_element.php line: 88
+; wiki_element.php line: 97
 groupfeed_element_feed = ""
 ;
-; wiki_element.php line: 89
+; wiki_element.php line: 98
 wiki_view_wiki = ""
 ;
-; wiki_element.php line: 92
+; wiki_element.php line: 101
 wiki_view_page = ""
 ;
-; wiki_element.php line: 96
+; wiki_element.php line: 105
 wiki_view_read = ""
 ;
-; wiki_element.php line: 97
+; wiki_element.php line: 106
 wiki_view_edit = ""
 ;
-; wiki_element.php line: 100
+; wiki_element.php line: 109
 wiki_view_pages = ""
 ;
-; wiki_element.php line: 155
+; wiki_element.php line: 164
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 157
+; wiki_element.php line: 166
 wiki_view_create_edit = ""
 ;
-; wiki_element.php line: 158
+; wiki_element.php line: 167
 wiki_view_use_form_below = ""
 ;
-; wiki_element.php line: 171
+; wiki_element.php line: 180
 wiki_element_submit = ""
 ;
-; wiki_element.php line: 176
+; wiki_element.php line: 186
 wiki_view_syntax_summary = ""
 ;
-; wiki_element.php line: 178
+; wiki_element.php line: 189
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 180
+; wiki_element.php line: 191
 wiki_view_signin_edit = ""
 ;
-; wiki_element.php line: 182
+; wiki_element.php line: 193
 wiki_view_page_no_exist = ""
 ;
-; wiki_element.php line: 200
+; wiki_element.php line: 211
 wiki_element_history = ""
 ;
-; wiki_element.php line: 204
+; wiki_element.php line: 215
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 219
+; wiki_element.php line: 237
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 223
+; wiki_element.php line: 241
 wiki_element_page = ""
 ;
-; wiki_element.php line: 231
+; wiki_element.php line: 249
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 235
+; wiki_element.php line: 253
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 242
+; wiki_element.php line: 260
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 268
+; wiki_element.php line: 286
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 281
+; wiki_element.php line: 299
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 284
+; wiki_element.php line: 302
 wiki_element_go = ""
 ;
-; wiki_element.php line: 288
+; wiki_element.php line: 306
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 342
 wiki_view_back = ""
 ;
-; wiki_element.php line: 339
+; wiki_element.php line: 357
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 345
+; wiki_element.php line: 363
 wiki_view_go = ""
 ;
-; wiki_element.php line: 365
+; wiki_element.php line: 383
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 386
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 372
+; wiki_element.php line: 390
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 373
+; wiki_element.php line: 391
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 379
+; wiki_element.php line: 397
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 383
+; wiki_element.php line: 401
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 385
+; wiki_element.php line: 403
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 388
+; wiki_element.php line: 406
 wiki_view_revert = ""
 ;
 ; group_view.php line: 77
@@ -3240,10 +3240,25 @@ register_view_account_recovery = ""
 ; register_view.php line: 309
 register_view_human_check = ""
 ;
-; register_view.php line: 327
+; register_view.php line: 324
+register_view_i_agree = ""
+;
+; register_view.php line: 326
+register_view_terms = ""
+;
+; register_view.php line: 328
+register_view_and = ""
+;
+; register_view.php line: 330
+register_view_privacy = ""
+;
+; register_view.php line: 332
+register_view_period = ""
+;
+; register_view.php line: 342
 register_view_create_account = ""
 ;
-; register_view.php line: 337
+; register_view.php line: 352
 signin_view_return_yioop = "回到首頁"
 ;
 ; search_view.php line: 85
diff --git a/views/register_view.php b/views/register_view.php
index 4b9a24c71..41cf0d893 100755
--- a/views/register_view.php
+++ b/views/register_view.php
@@ -318,6 +318,19 @@ class RegisterView extends View
                         <?php
                     }
                     ?>
+                    <tr>
+                        <td></td>
+                        <td class="table-input border-top narrow-field" ><?php
+                        e(tl('register_view_i_agree'))?>
+                        <a href="<?php e(BASE_URL);
+                            ?>terms.php"><?php e(tl('register_view_terms'));
+                            ?></a>
+                        <?php e(tl('register_view_and')); ?>
+                        <a href="<?php e(BASE_URL);
+                            ?>privacy.php"><?php e(tl('register_view_privacy'));
+                            ?></a><?php e(tl('register_view_period')); ?>
+                        </td>
+                    </tr>
                     <tr>
                         <td></td>
                         <td class="table-input border-top">
ViewGit