Adding drag and drop functionality for file uploads to wiki, a=chris

Chris Pollett [2015-01-01 21:Jan:st]
Adding drag and drop functionality for file uploads to wiki, a=chris
Filename
controllers/components/social_component.php
controllers/controller.php
css/search.css
locale/ar/configure.ini
locale/bn/configure.ini
locale/de/configure.ini
locale/en-US/configure.ini
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/te/statistics.txt
locale/th/configure.ini
locale/tr/configure.ini
locale/vi-VN/configure.ini
locale/zh-CN/configure.ini
models/group_model.php
scripts/basic.js
scripts/wiki.js
views/elements/configure_element.php
views/elements/wiki_element.php
views/helpers/fileupload_helper.php
diff --git a/controllers/components/social_component.php b/controllers/components/social_component.php
index 4787fc55f..14dc21b26 100644
--- a/controllers/components/social_component.php
+++ b/controllers/components/social_component.php
@@ -1433,6 +1433,7 @@ EOD;
                     /* if page not yet created than $page_info will be null
                        so in the below $page_info['ID'] won't be set.
                      */
+                    $upload_allowed = true;
                     if($missing_fields) {
                         $parent->redirectWithMessage(
                             tl("group_controller_missing_fields"));
@@ -1488,56 +1489,23 @@ EOD;
                             }
                             $page = $head_string."END_HEAD_VARS".$page;
                         }
-                        $group_model->setPageName($user_id,
+                        $page_info['ID'] = $group_model->setPageName($user_id,
                             $group_id, $page_name, $page,
                             $locale_tag, $edit_reason,
                             tl('group_controller_page_created', $page_name),
                             tl('group_controller_page_discuss_here'),
                             $read_address, $additional_substitutions);
-                        $parent->redirectWithMessage(
-                            tl("group_controller_page_saved"),
-                            array('arg', 'page_name', 'settings',
-                            'caret', 'scroll_top','back_params'));
-                    } else if(!$missing_fields &&
-                        isset($_FILES['page_resource']['name']) &&
-                        $_FILES['page_resource']['name'] != "") {
-                        if(!isset($page_info['ID'])) {
-                            $parent->redirectWithMessage(
-                                tl('social_component_resource_save_first'),
-                                array('arg', 'page_name', 'settings',
-                                'caret', 'scroll_top'));
-                        } else {
-                            $upload_parts = array('name', 'type', 'tmp_name');
-                            $file = array();
-                            $upload_okay = true;
-                            foreach($upload_parts as $part) {
-                                if(isset($_FILES['page_resource'][$part])) {
-                                    $file[$part] = $parent->clean(
-                                        $_FILES['page_resource'][$part],
-                                        'string');
-                                } else {
-                                    $upload_okay = false;
-                                    break;
-                                }
-                            }
-                        }
-                        if($upload_okay) {
-                            $group_model->copyFileToGroupPageResource(
-                                $file['tmp_name'], $file['name'], $file['type'],
-                                $group_id, $page_info['ID']);
+                        if(!isset($_FILES['page_resource']['name']) ||
+                            $_FILES['page_resource']['name'] == "") {
                             $parent->redirectWithMessage(
-                                tl('social_component_resource_uploaded'),
+                                tl("group_controller_page_saved"),
                                 array('arg', 'page_name', 'settings',
-                                'caret', 'scroll_top'));
-                        } else {
-                            $parent->redirectWithMessage(
-                                tl('social_component_upload_error'),
-                                array('arg', 'page_name', 'settings',
-                                'caret', 'scroll_top'));
+                                'caret', 'scroll_top','back_params'));
                         }
                     } else if(!$missing_fields && isset($_REQUEST['delete'])) {
                         $resource_name = $parent->clean($_REQUEST['delete'],
                             "string");
+                        $upload_allowed = false;
                         if(isset($page_info['ID']) &&
                             $group_model->deleteResource($resource_name,
                             $group_id, $page_info['ID'])) {
@@ -1554,6 +1522,7 @@ EOD;
                     } else if(!$missing_fields &&
                         isset($_REQUEST['new_resource_name']) &&
                         isset($_REQUEST['old_resource_name'])) {
+                        $upload_allowed = false;
                         $old_resource_name = $parent->clean(
                             $_REQUEST['old_resource_name'], "string");
                         $new_resource_name = $parent->clean(
@@ -1573,6 +1542,61 @@ EOD;
                                 'caret', 'scroll_top'));
                         }
                     }
+                    if($upload_allowed && !$missing_fields &&
+                        isset($_FILES['page_resource']['name']) &&
+                        $_FILES['page_resource']['name'] != "") {
+                        if(!isset($page_info['ID'])) {
+                            $parent->redirectWithMessage(
+                                tl('social_component_resource_save_first'),
+                                array('arg', 'page_name', 'settings',
+                                'caret', 'scroll_top'));
+                        } else {
+                            $upload_parts = array('name', 'type', 'tmp_name');
+                            $is_file_array = false;
+                            $num_files = 1;
+                            if(is_array($_FILES['page_resource']['name'])) {
+                                $num_files =
+                                    count($_FILES['page_resource']['name']);
+                                $is_file_array = true;
+                            }
+                            $files = array();
+                            $upload_okay = true;
+                            for($i = 0; $i < $num_files; $i ++) {
+                                foreach($upload_parts as $part) {
+                                    $file_part = ($is_file_array && isset(
+                                        $_FILES['page_resource'][$part][$i])) ?
+                                        $_FILES['page_resource'][$part][$i] :
+                                        ((!$is_file_array && isset(
+                                        $_FILES['page_resource'][$part])) ?
+                                        $_FILES['page_resource'][$part] :
+                                        false );
+                                    if($file_part) {
+                                        $files[$i][$part] = $parent->clean(
+                                            $file_part, 'string');
+                                    } else {
+                                        $upload_okay = false;
+                                        break 2;
+                                    }
+                                }
+                            }
+                        }
+                        if($upload_okay) {
+                            foreach($files as $file) {
+                                $group_model->copyFileToGroupPageResource(
+                                    $file['tmp_name'], $file['name'],
+                                    $file['type'], $group_id, $page_info['ID']);
+                            }
+                            $parent->redirectWithMessage(
+                                tl('social_component_resource_uploaded'),
+                                array('arg', 'page_name', 'settings',
+                                'caret', 'scroll_top'));
+                        } else {
+                            $parent->redirectWithMessage(
+                                tl('social_component_upload_error'),
+                                array('arg', 'page_name', 'settings',
+                                'caret', 'scroll_top'));
+                        }
+                    }
                     if(isset($page_info['ID'])) {
                         $data['RESOURCES_INFO'] =
                             $group_model->getGroupPageResourceUrls($group_id,
@@ -1873,6 +1897,7 @@ EOD;
                 setDisplay('save-container', !is_media_list || is_settings);
                 setDisplay("toggle-settings", !is_page_alias, "inline");
                 setDisplay("page-resources", !is_page_alias);
+                setDisplay("resource-upload-form", is_media_list);
                 ptype.onchange = function() {
                     var cur_type = ptype.options[ptype.selectedIndex].value;
                     if(cur_type == "media_list") {
@@ -1882,6 +1907,7 @@ EOD;
                         setDisplay("non-alias-type", true);
                         setDisplay("alias-type", false);
                         setDisplay("page-resources", true);
+                        setDisplay("resource-upload-form", true);
                     } else if(cur_type == "page_alias") {
                         setDisplay("toggle-settings", false);
                         setDisplay("media-list-page", false);
@@ -1896,6 +1922,7 @@ EOD;
                         setDisplay("non-alias-type", true);
                         setDisplay("alias-type", false);
                         setDisplay("page-resources", true);
+                        setDisplay("resource-upload-form", false);
                     }
                 }
 EOD;
@@ -2028,7 +2055,9 @@ EOD;
                 'wiki_js_slide_sample_title :"'.
                     tl('wiki_js_slide_sample_title').'",'.
                 'wiki_js_slide_sample_bullet :"'.
-                    tl('wiki_js_slide_sample_bullet').'"'.
+                    tl('wiki_js_slide_sample_bullet').'",'.
+                'wiki_js_resource_description : "'.
+                tl('wiki_js_slide_resource_description').'"'.
                 '};';
         }
         if($id != -1) {
diff --git a/controllers/controller.php b/controllers/controller.php
index b068f88b0..14d68969a 100755
--- a/controllers/controller.php
+++ b/controllers/controller.php
@@ -298,7 +298,12 @@ abstract class Controller
                 }
             }
         }
-        header("Location: $location");
+        if(isset($_SERVER['HTTP_X_REQUESTED_WITH']) &&
+            $_SERVER['HTTP_X_REQUESTED_WITH'] == "XMLHttpRequest") {
+            e("go$location");
+        } else {
+            header("Location: $location");
+        }
         if($message) {
             $_SESSION['DISPLAY_MESSAGE'] = $message;
         } else {
diff --git a/css/search.css b/css/search.css
index 9e61c3aea..3da9791cc 100755
--- a/css/search.css
+++ b/css/search.css
@@ -216,6 +216,10 @@ span.indent5
 {
     font-size:14pt;
 }
+.black
+{
+    color: black;
+}
 .red
 {
     color: red;
@@ -418,6 +422,18 @@ a.echo-link:hover
     border-radius: 5px;
     font-size:10pt;
     padding: 2px;
+    width:100%
+}
+.media-upload-box
+{
+    background-color: #CCC;
+    border:1px solid black;
+    border-radius: 5px;
+    font-size:10pt;
+    margin-bottom: 4px;
+    min-height:1in;
+    padding: 2px;
+    width:100%
 }
 .slight-pad
 {
diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini
index 82dc39062..5284236e8 100755
--- a/locale/ar/configure.ini
+++ b/locale/ar/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "حدد تتبع الارتباطات"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = "تتبع الارتباطات الافتراضية"
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "حدد تتبع الارتباطات"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = "تتبع الارتباطات الافتراضية"
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "الزحف ميكس إنشاؤها!"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "الزحف ميكس حذف!"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "ميكسحذف لاتوجد لا!"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "إضافة عمليات تتبع الارتباطات"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "عدد من النتائج"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "الوزن"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "إجراءات"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "إضافة استعلام"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "الزحف ميكس التغييرات المحفوظة!"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = "الإنشاء روبوت الزحف"
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "الزحف الروبوت اسم:"
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = "مثيل روبوت:"
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "وصف روبوت"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "تقديم"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "مرة أخرى"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = "قبل ساعات %s"
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/bn/configure.ini b/locale/bn/configure.ini
index fe20e3e25..bb2cd0b25 100755
--- a/locale/bn/configure.ini
+++ b/locale/bn/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/de/configure.ini b/locale/de/configure.ini
index a09be7020..e281a7cc2 100755
--- a/locale/de/configure.ini
+++ b/locale/de/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini
index 0586b8cb5..a9f376fa5 100755
--- a/locale/en-US/configure.ini
+++ b/locale/en-US/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = "Dashed"
 ; social_component.php line: 1398
 social_component_none = "None"
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = "Missing Fields!"
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = "Wiki Page Has Been Edited Since Your Version. Loading Changed Version!"
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = "%s Wiki Page Created!"
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = "Discuss the page in this thread!"
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = "Page Saved!"
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = "Need to Save Page Before Using Resources!"
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = "Resource Uploaded!"
-;
-; social_component.php line: 1533
-social_component_upload_error = "Upload Error!"
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = "Resource Deleted!"
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = "Resource Not Deleted! "
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = "Resource Renamed!"
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = "Resource not Renamed!"
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = "Need to Save Page Before Using Resources!"
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = "Resource Uploaded!"
+;
+; social_component.php line: 1594
+social_component_upload_error = "Upload Error!"
+;
+; social_component.php line: 1640
 group_controller_back = "Back"
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = "Historical Version of %s from %s."
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = "Back"
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = "%s line differences between %s and %s."
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = "Wiki Page Has Been Edited Since Your Version. Loading Changed Version!"
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = "Revert to %s."
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = "Page Reverted!"
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = "Error Reverting Page!"
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = "Main"
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = "Small"
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = "Medium"
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = "Large"
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = "Size"
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = "Header row:"
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = "Example"
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = "Table Title"
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = "Submit"
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = "Cancel"
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = "Bold text"
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = "Italic text"
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = "Underlined text"
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = "Striked text"
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = "Heading"
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = "Level 1 Heading"
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = "Level 2 Heading"
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = "Level 3 Heading"
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = "Level 4 Heading"
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = "Unordered list item"
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = "Ordered list item"
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = "Insert non-formatted text here"
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = "Add Search Bar Form"
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = "Size"
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = "Add Wiki Table"
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = "Column Count:"
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = "Row Count:"
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = "Add Hyperlink"
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = "Text:"
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = "URL:"
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = "Search Placeholder Text"
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = "This text is centered."
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = "This text is right-aligned."
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = "This text is left-aligned."
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = "Item"
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = "Definition"
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = "Title"
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = "Slide Item"
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = "Resource Description for "
+;
+; social_component.php line: 2099
 social_component_select_crawl = "Select Crawl"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = "Default Crawl"
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "Select Crawl"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = "Default Crawl"
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "Crawl Mix Created!"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = "Mix Name in Use or Invalid!"
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = "Invalid Timestamp!"
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "Crawl Mix Deleted!"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "Mix to Delete Does not Exist!"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = "Mix Successfully Imported!"
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = "Setting Crawl To Use as Index"
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = "Error in comment data!"
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = "Shared Mix Has An Invalid Timestamp"
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = "Cannot post to that group!"
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = "Try out this crawl mix!"
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = "%s is sharing the crawl mix %s!"
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = "Thread Created!"
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = "Invalid Timestamp!"
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = "Not Mix Owner!"
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "Add Crawls"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "Results Shown"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = "Remove"
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "Weight"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = "Name"
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = "Keywords"
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "Actions"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "Add Query"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = "Delete"
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = "Too Many Search Result Fragments!"
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "Crawl Mix Changes Saved!"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = "Favicon:"
 ; configure_element.php line: 268
 configure_element_toolbar = "Search Toolbar:"
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = "Timezone:"
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = "Web Cookie Name:"
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = "Web Token Name:"
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = "Auxiliary Style Directives"
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = "Reset Customizations"
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = "Crawl Robot Set-up"
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "Crawl Robot Name:"
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = "Robot Instance:"
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "Robot Description"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "Submit"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = "Invalid Filetype!"
-;
-; configure_element.php line: 349
-basic_js_file_too_big = "File Size is Too Big!"
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "Back"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = "History"
 ; wiki_element.php line: 283
 wiki_element_discuss = "Discuss"
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = "Locale: %s"
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = "Page: %s"
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = "Settings"
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = "Page Type:"
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = "Alias Page To:"
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = "Page Border:"
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = "Table of Contents:"
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = "Title:"
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = "Author:"
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = "Meta Robots:"
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = "Meta Description:"
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = "Header Page Name:"
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = "Footer Page Name:"
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = "To archive a page so it won&#039;t appear in search results delete its text and save."
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = "Edit Reason:"
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = "Save"
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = "Media List Page"
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = "The uploaded items below will all appear when this page is read as a gallery or media list."
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = "Page Resources"
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = "Resources are images, videos, or files associated with this page."
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = "Upload"
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = "Resource Description"
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = "File must be less than %s bytes!"
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = "Rename Failed!"
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = "Percent Uploaded: "
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = "Upload Information Unavailable"
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = "Upload Error!"
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = "Upload Cancelled!"
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = "Rename"
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = "Add to Page"
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = "No resources have been saved to this page yet."
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = "%s Group Wiki Page List"
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = "Search group page titles"
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = "Go"
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = "Create Page: %s"
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = "Redirects to:"
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = "This group has no pages yet for the %s locale. Search for a nonexistant page and click edit to create it."
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = "Back"
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = "Difference:"
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = "Go"
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = "First"
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = "Second"
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = "First"
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = "Second"
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = "Edited by %s. "
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = "(%s bytes)."
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = "Revert"
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = "Revert"
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = "%s m %s s ago"
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = "%s hours ago"
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = "Drag items into the textarea to add them..."
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = "or click to select them."
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = "Drag or ..."
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = "choose."
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = "Invalid Filetype!"
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = "File Size is Too Big!"
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = "Upload Progress: "
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = "Upload Progress Meter Disabled"
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = "Upload Error!"
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = "Upload Canceled!"
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = "Trying to add too many files!"
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = "?"
 ;
diff --git a/locale/es/configure.ini b/locale/es/configure.ini
index bcdf91151..f0ca6419c 100755
--- a/locale/es/configure.ini
+++ b/locale/es/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "Seleccionar Rastreo"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "Seleccionar Rastreo"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "Rastreo Mix creado!"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "Rastreo Mix eliminado!"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "Mix para eliminar (borrar) no existe!"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "A&ntilde;adir Rastreos"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "N&uacute;mero de Resultados"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "Tama&ntilde;o"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "Acciones"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "Agregar consulta"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "Guardados los Cambios del Rastreo Mix!"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "Nombre de robot rastreador:"
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = "Robot Instance:"
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "Descripci&oacute;n del robot"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "Enviar"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "Atr&aacute;s"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini
index a02365521..96c6e2474 100755
--- a/locale/fa/configure.ini
+++ b/locale/fa/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "یک خزش انتخاب کنید"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = "خزش پیش&zwnj;فرض"
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "یک خزش انتخاب کنید"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = "خزش پیش&zwnj;فرض"
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "ترکیب خزش ساخته شد!"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "ترکیب خزش حذف شد!"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "ترکیبی که می&zwnj;خواهید حذف کنید وجود ندارد!"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "خزش اضافه کن"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "تعداد نتایج"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "وزن"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "فرمان&zwnj;ها"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "پُرسمان اضافه کن"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "تغییرات ترکیب خزش ذخیره شد!"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = "تنظیم ربات خزنده"
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "نام ربات خزنده:"
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = "نمونهٔ ربات:"
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "توضیح ربات"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "ارسال"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "قبل"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = "%s ساعت پیش"
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini
index faa56b889..72739ee71 100755
--- a/locale/fr-FR/configure.ini
+++ b/locale/fr-FR/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = "il y a %s heures"
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/he/configure.ini b/locale/he/configure.ini
index ed511c8df..a1a45fc47 100755
--- a/locale/he/configure.ini
+++ b/locale/he/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "שלח"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "חזור"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini
index b8993bfb1..b1aa011a2 100755
--- a/locale/hi/configure.ini
+++ b/locale/hi/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini
index 6daf5d775..0c55cdd7b 100755
--- a/locale/in-ID/configure.ini
+++ b/locale/in-ID/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/it/configure.ini b/locale/it/configure.ini
index 69479c8ef..75105b26a 100755
--- a/locale/it/configure.ini
+++ b/locale/it/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "Seleziona Scansione"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "Seleziona Scansione"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "Unione Scansioni creata!"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "Unione Scansioni cancellata!"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "Unione Scansioni da cancellare inesistente!"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "Aggiungi scansione"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "Numero di risultati"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "Peso"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "Azioni"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "Aggiungi Ricerca"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "Cambiamenti Unione Scansioni effettuati!"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = "Impostazione Robot Scansione"
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "Nome Robot Scansione:"
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = "Istanza Robot:"
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "Descrizione Robot"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "Invia"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "Indietro"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini
index 1ff105234..dea7bf4e3 100755
--- a/locale/ja/configure.ini
+++ b/locale/ja/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = "検索ロボット設定"
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "ロボット名"
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "ロボット説明"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "サブミット"
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "戻る"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini
index b8df9f6e1..1d901cd0f 100755
--- a/locale/kn/configure.ini
+++ b/locale/kn/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "ಕ್ರಾವ್ಲಗಳ ಮಿಶ್ರಣ ಸೃಜಿಸಲಾಯಿತು"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಳಿಸಲಾಗಿದೆ"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "ಅಳಿಸಬೇಕಾದ ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "ಕ್ರಾವ್ಲಗಳನ್ನು ಸೇರಿಸಿ"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "ಫಲಿತಾಂಶಗಳ ಸಂಖ್ಯೆ"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "ಗೌರವ"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "ಕ್ರಿಯೆಗಳು"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "ಪ್ರಶ್ನೆಯನ್ನು ಸೇರಿಸು"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "ಕ್ರಾವ್ಲ್ ಮಿಶ್ರಣದಲ್ಲಿ ಬದಲಾವಣೆಯನ್ನು ಉಳಿಸು"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini
index 7912d2e11..154d986e1 100755
--- a/locale/ko/configure.ini
+++ b/locale/ko/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = "크롤 로봇 설정"
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = "로봇 기술 "
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "크롤 로봇 이름:"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = "제출 "
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "뒤"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini
index 0fe5e2261..2a956dc33 100755
--- a/locale/pl/configure.ini
+++ b/locale/pl/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini
index 93e8d7a7d..ab34b359e 100755
--- a/locale/pt/configure.ini
+++ b/locale/pt/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini
index 7ef9a2278..905123584 100755
--- a/locale/ru/configure.ini
+++ b/locale/ru/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/te/configure.ini b/locale/te/configure.ini
index ba4da31f7..2f9d9fcd1 100644
--- a/locale/te/configure.ini
+++ b/locale/te/configure.ini
@@ -1,24 +1,24 @@
-; ***** BEGIN LICENSE BLOCK *****
-;  SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer
-;  Copyright (C) 2009 - 2014  Chris Pollett chris@pollett.org
-;
-;  This program is free software: you can redistribute it and/or modify
-;  it under the terms of the GNU General Public License as published by
-;  the Free Software Foundation, either version 3 of the License, or
-;  (at your option) any later version.
-;
-;  This program is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;  ***** END LICENSE BLOCK *****
-;
-; configure.ini
-;
-; te configuration file
+; ***** BEGIN LICENSE BLOCK *****
+;  SeekQuarry/Yioop Open Source Pure PHP Search Engine, Crawler, and Indexer
+;  Copyright (C) 2009 - 2014  Chris Pollett chris@pollett.org
+;
+;  This program is free software: you can redistribute it and/or modify
+;  it under the terms of the GNU General Public License as published by
+;  the Free Software Foundation, either version 3 of the License, or
+;  (at your option) any later version.
+;
+;  This program is distributed in the hope that it will be useful,
+;  but WITHOUT ANY WARRANTY; without even the implied warranty of
+;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;  GNU General Public License for more details.
+;
+;  You should have received a copy of the GNU General Public License
+;  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;  ***** END LICENSE BLOCK *****
+;
+; configure.ini
+;
+; te configuration file
 ;
 [general]
 ;
@@ -26,7 +26,7 @@
 ;
 [strings]
 ;
-; C:/xampp/htdocs/yioop//controllers
+; /Applications/MAMP/htdocs/git/yioop//controllers
 ;
 ; admin_controller.php line: 103
 admin_controller_need_cookies = "లాగిన్ అవడానికి కుకీలు అవసరము!!"
@@ -91,7 +91,7 @@ admin_controller_sort_ascending = "ఆరోహణ క్రమం "
 ; admin_controller.php line: 520
 admin_controller_sort_descending = "అవరోహణ క్రమం"
 ;
-; C:/xampp/htdocs/yioop//controllers/components
+; /Applications/MAMP/htdocs/git/yioop//controllers/components
 ;
 ; accountaccess_component.php line: 134
 accountaccess_component_no_posts_yet = "ఇంకా పోస్ట్లు ఏవీ లేవు"
@@ -822,268 +822,271 @@ social_component_dashed = " "
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = "కొన్ని ఫీల్డ్స్ మిస్ అయినవి!"
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = "మీ వెర్షన్ తరువాత వికీ పేజీ సవరించబడింది.మార్చబడిన వెర్షన్ లోడ్ అవుతోంది!"
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = "%s వికీ పేజ్ సృష్టించబడినది!"
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = "ఈ థ్రెడ్ లో పేజీ గురించి చర్చించండి!"
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = "పేజ్ సేవ్ చేయబడినది!"
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = "రిసోర్సెస్ వాడే ముందు పేజ్ సేవ్ చేయాలి!"
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = "రిసోర్స్ అప్ లోడ్ అయినది!"
-;
-; social_component.php line: 1533
-social_component_upload_error = "అప్ లోడ్ పొరపాటు"
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = "రిసోర్స్ డిలీట్ చేయబడినది!"
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = "రిసోర్స్ డిలీట్ చేయబడలేదు!"
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = "రిసోర్స్ పేరు మార్చబడింది!"
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = "రిసోర్స్ పేరు మార్చలేదు!"
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = "రిసోర్సెస్ వాడే ముందు పేజ్ సేవ్ చేయాలి!"
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = "రిసోర్స్ అప్ లోడ్ అయినది!"
+;
+; social_component.php line: 1594
+social_component_upload_error = "అప్ లోడ్ పొరపాటు"
+;
+; social_component.php line: 1640
 group_controller_back = "వెనుకకు "
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = "చారిత్రక వెర్షన్ %s నుండి %s."
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = "వెనుకకు "
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = "%s లైన్ తేడాలు%s మరియు %s మధ్య"
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = "మీ వెర్షన్ తరువాత వికీ పేజీ సవరించబడింది.మార్చబడిన వెర్షన్ లోడ్ అవుతోంది!"
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = "తిరిగి వెనుకకు %s"
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = "పేజీ వెనుకకు మార్చబడింది!"
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = "పేజీ వెనుకకు మార్చుటలో లోపం!"
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = "ప్రధాన"
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = "చిన్న"
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = "మధ్యస్థం"
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = "పెద్ద"
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = "పరిమాణం"
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = "శీర్షిక పంక్తి:"
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = "ఉదాహరణ"
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = "టేబుల్ పేరు"
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = "మనవి చేయి"
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = "రద్దు చెయ్యి"
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = "బోల్డ్ టెక్స్ట్"
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = "ఇటాలిక్ టెక్స్ట్"
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = "అండర్ లైన్డ్ టెక్స్ట్"
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = "స్ట్రైక్డ్ టెక్స్ట్"
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = "హెడ్డింగ్"
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = "లెవెల్ 1 హెడ్డింగ్"
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = "లెవెల్ 2 హెడ్డింగ్"
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = "లెవెల్ 3 హెడ్డింగ్"
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = "లెవెల్ 4 హెడ్డింగ్"
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = "క్రమం లేని జాబితా అంశం"
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = "క్రమంలో జాబితా అంశం"
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = "ఇక్కడ ఫార్మాట్ చేయని టెక్స్ట్ ఇన్సర్ట్ చేయండి"
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = "శోధన రూపం జోడించండి"
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = "పరిమాణం"
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = "వికీ టేబుల్ ఆడ్ చెయ్యండి "
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = "కాలమ్ కౌంట్:"
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = "వరుస కౌంట్:"
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = "హైపర్ లింక్ ఆడ్ చెయ్యండి"
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = "టెక్స్ట్:"
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = "యుఆర్ఎల్:"
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = "ప్లేస్ హోల్డర్ టెక్స్ట్ శోధన"
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = "ఈ టెక్స్ట్ మధ్య సమలేఖనమైంది."
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = "ఈ టెక్స్ట్ కుడి సమలేఖనమైంది. "
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = "ఈ టెక్స్ట్ ఎడమ సమలేఖనమైంది."
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = "అంశము"
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = "నిర్వచనం"
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = "శీర్షిక"
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = "స్లయిడ్ అంశము"
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "క్రాల్ ఎంచుకోండి"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = "డిఫాల్ట  క్రాల్"
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "క్రాల్ ఎంచుకోండి"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = "డిఫాల్ట  క్రాల్"
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "క్రాల్ మిక్స్ సృష్టించబడినది!"
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = "మిక్స్ పేరు వాడుక లో వుంది లేదా చెల్లదు!"
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = "టైం స్టాంప్ వేలిడ్ కాదు!"
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "క్రాల్ మిక్స్ డిలీట్ చేయబడినది!"
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "తొలగించవలసిన మిక్స్ లేదు!"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = "మిక్స్ విజయవంతంగా దిగుమతి చేయబడినది!"
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = "సూచికగా ఉపయోగించడానికి క్రాల్ సెట్ చేస్తోంది  "
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = "వ్యాఖ్య డేటాలో పొరపాటు ఉన్నది!"
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = "షేర్డ్ మిక్స్ టైమ్ స్టాంప్ చెల్లదు"
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = "ఆ గ్రూప్ కు పోస్ట్ చెయ్యలేరు!"
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = "ఈ క్రాల్ మిక్స్ ప్రయత్నించండి!"
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = "%s పంచుకుంటున్నారు  క్రాల్ మిక్స్%sని!"
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = "థ్రెడ్ సృష్టించబడినది!"
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = "టైం స్టాంప్ వేలిడ్ కాదు!"
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = "మిక్స్ యజమాని కాదు!"
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "క్రాల్ లు జోడించుము"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "ఫలితాలను చూపించాయి"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = "తొలగించు"
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "బరువు"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = "పేరు "
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = "కీ పదాలు"
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "యాక్సన్ లు"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "క్వెరి జోడించుము"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = "తొలగించు"
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = "చాలా శోధన ఫలిత శకలాలు!"
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "క్రాల్ మిక్స్ మార్పులు సేవ్ చేయబడినవి!"
 ;
 ; system_component.php line: 82
@@ -1494,7 +1497,7 @@ static_controller_logout_successful = "లాగ్అవుట్ విజయ
 ; static_controller.php line: 148
 static_controller_complete_title = "Yioop! -%s"
 ;
-; C:/xampp/htdocs/yioop//views
+; /Applications/MAMP/htdocs/git/yioop//views
 ;
 ; admin_view.php line: 73
 admin_view_admin = "అడ్మిన్ "
@@ -1631,7 +1634,7 @@ crawlstatus_view_delete = "తొలగించు"
 ; crawlstatus_view.php line: 268
 crawlstatus_view_no_previous_crawl = "మునుపటి క్రాల్స్ ఏమి లేవు"
 ;
-; C:/xampp/htdocs/yioop//views/elements
+; /Applications/MAMP/htdocs/git/yioop//views/elements
 ;
 ; activity_element.php line: 57
 activity_element_activities = "చర్యలు"
@@ -1723,42 +1726,36 @@ configure_element_favicon = "ఫవికన్:"
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = "సేవ్ చేయి"
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3467,7 +3449,7 @@ group_view_myfeeds = ""
 ; group_view.php line: 141
 adminview_auto_logout_one_minute = "ఒక నిమిషం లో ఆటో లాగ్అవుట్ అవుతుంది!!"
 ;
-; C:/xampp/htdocs/yioop//views/helpers
+; /Applications/MAMP/htdocs/git/yioop//views/helpers
 ;
 ; feeds_helper.php line: 66
 feeds_helper_view_feed_results = ""
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
@@ -3562,7 +3565,7 @@ toggle_helper_on = ""
 ; toggle_helper.php line: 80
 toggle_helper_off = ""
 ;
-; C:/xampp/htdocs/yioop//views/layouts
+; /Applications/MAMP/htdocs/git/yioop//views/layouts
 ;
 ; rss_layout.php line: 63
 rss_layout_title = ""
@@ -4083,7 +4086,7 @@ wiki_view_wiki = ""
 ; wiki_view.php line: 160
 adminview_auto_logout_one_minute = "ఒక నిమిషం లో ఆటో లాగ్అవుట్ అవుతుంది!!"
 ;
-; C:/xampp/htdocs/yioop//lib/indexing_plugins
+; /Applications/MAMP/htdocs/git/yioop//lib/indexing_plugins
 ;
 ; wordfilter_plugin.php line: 347
 wordfilter_plugin_settings_saved = "వర్డ్ ఫ్యాక్టరీ సెట్టింగులు సేవ్ చేయబడినవి! "
diff --git a/locale/te/statistics.txt b/locale/te/statistics.txt
index b76794965..9602e5a6f 100755
--- a/locale/te/statistics.txt
+++ b/locale/te/statistics.txt
@@ -1 +1 @@
-d:54;
\ No newline at end of file
+d:53;
\ No newline at end of file
diff --git a/locale/th/configure.ini b/locale/th/configure.ini
index 80153812b..7304e9eb7 100755
--- a/locale/th/configure.ini
+++ b/locale/th/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini
index 88ae2aea1..f7a35f263 100755
--- a/locale/tr/configure.ini
+++ b/locale/tr/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = ""
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = ""
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = ""
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = ""
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = ""
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = ""
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini
index 3da966638..37ebbc1a6 100755
--- a/locale/vi-VN/configure.ini
+++ b/locale/vi-VN/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "Chọn thu thập th&ocirc;ng tin"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "Chọn thu thập th&ocirc;ng tin"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = "Tạo ra hỗn hợp "
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = "X&oacute;a kết hợp "
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = "Kết hợp n&agrave;y kh&ocirc;ng tồn tại"
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "Cộng th&ecirc;m thu thập"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "Số kết quả"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "Trọng lượng"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "H&agrave;nh động"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "Cộng th&ecirc;m truy vấn"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = "Kết hợp đ&atilde; được lưu dữ"
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = "M&ocirc; tả r&ocirc;-bốt"
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = "Trở lại"
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = ""
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini
index da1fdde97..667b28626 100755
--- a/locale/zh-CN/configure.ini
+++ b/locale/zh-CN/configure.ini
@@ -822,268 +822,271 @@ social_component_dashed = ""
 ; social_component.php line: 1398
 social_component_none = ""
 ;
-; social_component.php line: 1437
+; social_component.php line: 1438
 group_controller_missing_fields = ""
 ;
-; social_component.php line: 1443
+; social_component.php line: 1444
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1493
+; social_component.php line: 1494
 group_controller_page_created = ""
 ;
-; social_component.php line: 1494
+; social_component.php line: 1495
 group_controller_page_discuss_here = ""
 ;
-; social_component.php line: 1497
+; social_component.php line: 1500
 group_controller_page_saved = ""
 ;
-; social_component.php line: 1505
-social_component_resource_save_first = ""
-;
-; social_component.php line: 1528
-social_component_resource_uploaded = ""
-;
-; social_component.php line: 1533
-social_component_upload_error = ""
-;
-; social_component.php line: 1544
+; social_component.php line: 1512
 social_component_resource_deleted = ""
 ;
-; social_component.php line: 1549
+; social_component.php line: 1517
 social_component_resource_not_deleted = ""
 ;
-; social_component.php line: 1565
+; social_component.php line: 1534
 social_component_resource_renamed = ""
 ;
-; social_component.php line: 1570
+; social_component.php line: 1539
 social_component_resource_not_renamed = ""
 ;
-; social_component.php line: 1616
+; social_component.php line: 1549
+social_component_resource_save_first = ""
+;
+; social_component.php line: 1589
+social_component_resource_uploaded = ""
+;
+; social_component.php line: 1594
+social_component_upload_error = ""
+;
+; social_component.php line: 1640
 group_controller_back = ""
 ;
-; social_component.php line: 1617
+; social_component.php line: 1641
 group_controller_history_page = ""
 ;
-; social_component.php line: 1650
+; social_component.php line: 1674
 group_controller_back = ""
 ;
-; social_component.php line: 1651
+; social_component.php line: 1675
 group_controller_diff_page = ""
 ;
-; social_component.php line: 1665
+; social_component.php line: 1689
 social_component_wiki_edited_elsewhere = ""
 ;
-; social_component.php line: 1673
+; social_component.php line: 1697
 group_controller_page_revert_to = ""
 ;
-; social_component.php line: 1677
+; social_component.php line: 1701
 group_controller_page_reverted = ""
 ;
-; social_component.php line: 1681
+; social_component.php line: 1705
 group_controller_revert_error = ""
 ;
-; social_component.php line: 1752
+; social_component.php line: 1776
 group_controller_main = ""
 ;
-; social_component.php line: 1990
+; social_component.php line: 2017
 wiki_js_small = ""
 ;
-; social_component.php line: 1991
+; social_component.php line: 2018
 wiki_js_medium = ""
 ;
-; social_component.php line: 1992
+; social_component.php line: 2019
 wiki_js_large = ""
 ;
-; social_component.php line: 1993
+; social_component.php line: 2020
 wiki_js_search_size = ""
 ;
-; social_component.php line: 1994
+; social_component.php line: 2021
 wiki_js_prompt_heading = ""
 ;
-; social_component.php line: 1995
+; social_component.php line: 2022
 wiki_js_example = ""
 ;
-; social_component.php line: 1996
+; social_component.php line: 2023
 wiki_js_table_title = ""
 ;
-; social_component.php line: 1997
+; social_component.php line: 2024
 wiki_js_submit = ""
 ;
-; social_component.php line: 1998
+; social_component.php line: 2025
 wiki_js_cancel = ""
 ;
-; social_component.php line: 1999
+; social_component.php line: 2026
 wiki_js_bold = ""
 ;
-; social_component.php line: 2000
+; social_component.php line: 2027
 wiki_js_italic = ""
 ;
-; social_component.php line: 2001
+; social_component.php line: 2028
 wiki_js_underline = ""
 ;
-; social_component.php line: 2002
+; social_component.php line: 2029
 wiki_js_strike = ""
 ;
-; social_component.php line: 2003
+; social_component.php line: 2030
 wiki_js_heading = ""
 ;
-; social_component.php line: 2004
+; social_component.php line: 2031
 wiki_js_heading1 = ""
 ;
-; social_component.php line: 2005
+; social_component.php line: 2032
 wiki_js_heading2 = ""
 ;
-; social_component.php line: 2006
+; social_component.php line: 2033
 wiki_js_heading3 = ""
 ;
-; social_component.php line: 2007
+; social_component.php line: 2034
 wiki_js_heading4 = ""
 ;
-; social_component.php line: 2008
+; social_component.php line: 2035
 wiki_js_bullet = ""
 ;
-; social_component.php line: 2009
+; social_component.php line: 2036
 wiki_js_enum = ""
 ;
-; social_component.php line: 2010
+; social_component.php line: 2037
 wiki_js_nowiki = ""
 ;
-; social_component.php line: 2011
+; social_component.php line: 2038
 wiki_js_add_search = ""
 ;
-; social_component.php line: 2012
+; social_component.php line: 2039
 wiki_js_search_size = ""
 ;
-; social_component.php line: 2013
+; social_component.php line: 2040
 wiki_js_add_wiki_table = ""
 ;
-; social_component.php line: 2014
+; social_component.php line: 2041
 wiki_js_for_table_cols = ""
 ;
-; social_component.php line: 2015
+; social_component.php line: 2042
 wiki_js_for_table_rows = ""
 ;
-; social_component.php line: 2016
+; social_component.php line: 2043
 wiki_js_add_hyperlink = ""
 ;
-; social_component.php line: 2017
+; social_component.php line: 2044
 wiki_js_link_text = ""
 ;
-; social_component.php line: 2018
+; social_component.php line: 2045
 wiki_js_link_url = ""
 ;
-; social_component.php line: 2019
+; social_component.php line: 2046
 wiki_js_placeholder = ""
 ;
-; social_component.php line: 2020
+; social_component.php line: 2047
 wiki_js_centeraligned = ""
 ;
-; social_component.php line: 2021
+; social_component.php line: 2048
 wiki_js_rightaligned = ""
 ;
-; social_component.php line: 2022
+; social_component.php line: 2049
 wiki_js_leftaligned = ""
 ;
-; social_component.php line: 2024
+; social_component.php line: 2051
 wiki_js_definitionlist_item = ""
 ;
-; social_component.php line: 2026
+; social_component.php line: 2053
 wiki_js_definitionlist_definition = ""
 ;
-; social_component.php line: 2028
+; social_component.php line: 2055
 wiki_js_slide_sample_title = ""
 ;
-; social_component.php line: 2030
+; social_component.php line: 2057
 wiki_js_slide_sample_bullet = ""
 ;
-; social_component.php line: 2070
+; social_component.php line: 2059
+wiki_js_slide_resource_description = ""
+;
+; social_component.php line: 2099
 social_component_select_crawl = "搜尋選擇"
 ;
-; social_component.php line: 2071
+; social_component.php line: 2100
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2073
+; social_component.php line: 2102
 social_component_select_crawl = "搜尋選擇"
 ;
-; social_component.php line: 2075
+; social_component.php line: 2104
 social_component_default_crawl = ""
 ;
-; social_component.php line: 2106
+; social_component.php line: 2135
 social_component_mix_created = ""
 ;
-; social_component.php line: 2109
+; social_component.php line: 2138
 social_component_invalid_name = ""
 ;
-; social_component.php line: 2117
+; social_component.php line: 2146
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2121
+; social_component.php line: 2150
 social_component_mix_deleted = ""
 ;
-; social_component.php line: 2140
+; social_component.php line: 2169
 social_component_mix_doesnt_exists = ""
 ;
-; social_component.php line: 2148
+; social_component.php line: 2177
 social_component_mix_imported = ""
 ;
-; social_component.php line: 2162
+; social_component.php line: 2191
 social_component_set_index = ""
 ;
-; social_component.php line: 2172
+; social_component.php line: 2201
 social_component_comment_error = ""
 ;
-; social_component.php line: 2178
+; social_component.php line: 2207
 social_component_invalid_timestamp = ""
 ;
-; social_component.php line: 2196
+; social_component.php line: 2225
 social_component_no_post_access = ""
 ;
-; social_component.php line: 2200
+; social_component.php line: 2229
 social_component_share_title = ""
 ;
-; social_component.php line: 2202
+; social_component.php line: 2231
 social_component_share_description = ""
 ;
-; social_component.php line: 2207
+; social_component.php line: 2236
 social_component_thread_created = ""
 ;
-; social_component.php line: 2259
+; social_component.php line: 2288
 social_component_mix_invalid_timestamp = ""
 ;
-; social_component.php line: 2264
+; social_component.php line: 2293
 social_component_mix_not_owner = ""
 ;
-; social_component.php line: 2274
+; social_component.php line: 2303
 social_component_add_crawls = "增加索引"
 ;
-; social_component.php line: 2276
+; social_component.php line: 2305
 social_component_num_results = "結果數量"
 ;
-; social_component.php line: 2278
+; social_component.php line: 2307
 social_component_del_frag = ""
 ;
-; social_component.php line: 2280
+; social_component.php line: 2309
 social_component_weight = "元素重量"
 ;
-; social_component.php line: 2281
+; social_component.php line: 2310
 social_component_name = ""
 ;
-; social_component.php line: 2283
+; social_component.php line: 2312
 social_component_add_keywords = ""
 ;
-; social_component.php line: 2285
+; social_component.php line: 2314
 social_component_actions = "元素活動"
 ;
-; social_component.php line: 2287
+; social_component.php line: 2316
 social_component_add_query = "增加查詢"
 ;
-; social_component.php line: 2288
+; social_component.php line: 2317
 social_component_delete = ""
 ;
-; social_component.php line: 2335
+; social_component.php line: 2364
 social_component_too_many_fragments = ""
 ;
-; social_component.php line: 2346
+; social_component.php line: 2375
 social_component_mix_saved = ""
 ;
 ; system_component.php line: 82
@@ -1723,42 +1726,36 @@ configure_element_favicon = ""
 ; configure_element.php line: 268
 configure_element_toolbar = ""
 ;
-; configure_element.php line: 278
+; configure_element.php line: 279
 configure_element_site_timezone = ""
 ;
-; configure_element.php line: 284
+; configure_element.php line: 285
 configure_element_cookie_name = ""
 ;
-; configure_element.php line: 290
+; configure_element.php line: 291
 configure_element_token_name = ""
 ;
-; configure_element.php line: 296
+; configure_element.php line: 297
 configure_element_auxiliary_css = ""
 ;
-; configure_element.php line: 304
+; configure_element.php line: 305
 configure_element_reset_customizations = ""
 ;
-; configure_element.php line: 311
+; configure_element.php line: 312
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 313
+; configure_element.php line: 314
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 321
+; configure_element.php line: 322
 configure_element_robot_instance = ""
 ;
-; configure_element.php line: 328
+; configure_element.php line: 329
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 338
+; configure_element.php line: 339
 serversettings_element_submit = ""
 ;
-; configure_element.php line: 347
-basic_js_invalid_filetype = ""
-;
-; configure_element.php line: 349
-basic_js_file_too_big = ""
-;
 ; crawloptions_element.php line: 58
 crawloptions_element_back_to_manage = ""
 ;
@@ -3308,145 +3305,130 @@ wiki_element_history = ""
 ; wiki_element.php line: 283
 wiki_element_discuss = ""
 ;
-; wiki_element.php line: 319
+; wiki_element.php line: 320
 wiki_element_locale_name = ""
 ;
-; wiki_element.php line: 324
+; wiki_element.php line: 325
 wiki_element_page = ""
 ;
-; wiki_element.php line: 327
+; wiki_element.php line: 328
 configure_element_toggle_page_settings = ""
 ;
-; wiki_element.php line: 332
+; wiki_element.php line: 333
 wiki_element_page_type = ""
 ;
-; wiki_element.php line: 341
+; wiki_element.php line: 342
 wiki_element_page_alias = ""
 ;
-; wiki_element.php line: 350
+; wiki_element.php line: 351
 wiki_element_page_border = ""
 ;
-; wiki_element.php line: 358
+; wiki_element.php line: 359
 wiki_element_table_of_contents = ""
 ;
-; wiki_element.php line: 368
+; wiki_element.php line: 369
 wiki_element_title = ""
 ;
-; wiki_element.php line: 375
+; wiki_element.php line: 376
 wiki_element_meta_author = ""
 ;
-; wiki_element.php line: 382
+; wiki_element.php line: 383
 wiki_element_meta_robots = ""
 ;
-; wiki_element.php line: 389
+; wiki_element.php line: 390
 wiki_element_meta_description = ""
 ;
-; wiki_element.php line: 398
+; wiki_element.php line: 399
 wiki_element_page_header = ""
 ;
-; wiki_element.php line: 405
+; wiki_element.php line: 406
 wiki_element_page_footer = ""
 ;
-; wiki_element.php line: 425
+; wiki_element.php line: 430
 wiki_element_archive_info = ""
 ;
-; wiki_element.php line: 429
+; wiki_element.php line: 434
 wiki_element_edit_reason = ""
 ;
-; wiki_element.php line: 436
+; wiki_element.php line: 441
 wiki_element_savebutton = ""
 ;
-; wiki_element.php line: 440
+; wiki_element.php line: 445
 wiki_element_media_list = ""
 ;
-; wiki_element.php line: 441
+; wiki_element.php line: 446
 wiki_element_ml_description = ""
 ;
-; wiki_element.php line: 470
+; wiki_element.php line: 449
 wiki_view_page_resources = ""
 ;
-; wiki_element.php line: 471
+; wiki_element.php line: 450
 wiki_view_resources_info = ""
 ;
-; wiki_element.php line: 475
+; wiki_element.php line: 481
 wiki_view_upload = ""
 ;
-; wiki_element.php line: 485
-wiki_element_resource_description = ""
-;
-; wiki_element.php line: 495
-wiki_element_file_too_big = ""
-;
-; wiki_element.php line: 511
+; wiki_element.php line: 497
 wiki_element_rename_failed = ""
 ;
-; wiki_element.php line: 545
-wiki_element_upload_progress = ""
-;
-; wiki_element.php line: 549
-wiki_element_progress_meter_disabled = ""
-;
-; wiki_element.php line: 563
-wiki_element_upload_error = ""
-;
-; wiki_element.php line: 569
-wiki_element_upload_cancelled = ""
-;
-; wiki_element.php line: 631
+; wiki_element.php line: 565
 wiki_element_rename = ""
 ;
-; wiki_element.php line: 637
+; wiki_element.php line: 571
 wiki_element_add_to_page = ""
 ;
-; wiki_element.php line: 677
+; wiki_element.php line: 591
+wiki_element_no_resources = ""
+;
+; wiki_element.php line: 614
 wiki_view_wiki_page_list = ""
 ;
-; wiki_element.php line: 691
+; wiki_element.php line: 628
 wiki_view_filter_or_create = ""
 ;
-; wiki_element.php line: 694
+; wiki_element.php line: 631
 wiki_element_go = ""
 ;
-; wiki_element.php line: 698
+; wiki_element.php line: 635
 wiki_view_create_page = ""
 ;
-; wiki_element.php line: 709
+; wiki_element.php line: 646
 wiki_element_redirect_to = ""
 ;
-; wiki_element.php line: 730
+; wiki_element.php line: 667
 wiki_view_no_pages = ""
 ;
-; wiki_element.php line: 753
+; wiki_element.php line: 690
 wiki_view_back = ""
 ;
-; wiki_element.php line: 769
+; wiki_element.php line: 706
 wiki_view_difference = ""
 ;
-; wiki_element.php line: 775
+; wiki_element.php line: 712
 wiki_view_go = ""
 ;
-; wiki_element.php line: 795
+; wiki_element.php line: 732
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 798
+; wiki_element.php line: 735
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 802
+; wiki_element.php line: 739
 wiki_view_diff_first = ""
 ;
-; wiki_element.php line: 803
+; wiki_element.php line: 740
 wiki_view_diff_second = ""
 ;
-; wiki_element.php line: 809
+; wiki_element.php line: 746
 wiki_view_edited_by = ""
 ;
-; wiki_element.php line: 813
+; wiki_element.php line: 750
 wiki_view_page_len = ""
 ;
-; wiki_element.php line: 815
+; wiki_element.php line: 752
 wiki_view_revert = ""
 ;
-; wiki_element.php line: 818
+; wiki_element.php line: 755
 wiki_view_revert = ""
 ;
 ; group_view.php line: 80
@@ -3481,18 +3463,39 @@ feeds_helper_view_minsecs = ""
 ; feeds_helper.php line: 171
 feeds_helper_view_hourdate = "%s小时前"
 ;
-; fileupload_helper.php line: 68
+; fileupload_helper.php line: 77
+fileupload_helper_drag_textarea = ""
+;
+; fileupload_helper.php line: 78
+fileupload_helper_click_textarea = ""
+;
+; fileupload_helper.php line: 80
 fileupload_helper_drag_above = ""
 ;
-; fileupload_helper.php line: 70
+; fileupload_helper.php line: 81
 fileupload_helper_click_upload = ""
 ;
-; fileupload_helper.php line: 96
+; fileupload_helper.php line: 123
 basic_js_invalid_filetype = ""
 ;
-; fileupload_helper.php line: 98
+; fileupload_helper.php line: 125
 basic_js_file_too_big = ""
 ;
+; fileupload_helper.php line: 127
+basic_js_upload_progress = ""
+;
+; fileupload_helper.php line: 129
+basic_js_progress_meter_disabled = ""
+;
+; fileupload_helper.php line: 131
+basic_js_upload_error = ""
+;
+; fileupload_helper.php line: 133
+basic_js_upload_cancelled = ""
+;
+; fileupload_helper.php line: 135
+basic_js_too_many_files = ""
+;
 ; helpbutton_helper.php line: 91
 wiki_question_mark = ""
 ;
diff --git a/models/group_model.php b/models/group_model.php
index 59cd4da99..2cde64de8 100644
--- a/models/group_model.php
+++ b/models/group_model.php
@@ -930,6 +930,7 @@ class GroupModel extends Model
      *     on wiki page that use short syntax
      * @param array $additional_substitutions list of pairs additional wiki
      *      page rewrites to do when parsing wiki pages
+     * @return int $page_id id of added or updated page
      */
     function setPageName($user_id, $group_id, $page_name, $page, $locale_tag,
         $edit_comment, $thread_title, $thread_description, $base_address = "",
@@ -960,6 +961,7 @@ class GroupModel extends Model
             VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
         $result = $db->execute($sql, array($page_id, $user_id, $group_id,
             $page_name, $page, $locale_tag, $pubdate, $edit_comment));
+        return $page_id;
     }
     /**
      * Looks up the page_id of a wiki page based on the group it belongs to,
diff --git a/scripts/basic.js b/scripts/basic.js
index 2c8583616..425efdbd2 100755
--- a/scripts/basic.js
+++ b/scripts/basic.js
@@ -149,7 +149,9 @@ function tag(name)
 }
 /*
  *
- *
+ * @param object object
+ * @param String event_type
+ * @param Function handler
  */
 function listen(object, event_type, handler)
 {
@@ -157,55 +159,139 @@ function listen(object, event_type, handler)
 }
 /*
  *
+ */
+was_submitted = false;
+/*
+ *
+ */
+file_list = new Array();
+/*
  *
+ * @param String drop_id
+ * @param String file_id
+ * @param String drop_kind
+ * @param Array types
+ * @param Boolean multiple
  */
-function initializeFileHandler(drop_id, file_id, max_size, drop_kind, types)
+function initializeFileHandler(drop_id, file_id, max_size, drop_kind, types,
+    multiple)
 {
     var drop_elt = document.getElementById(drop_id);
     var file_elt = document.getElementById(file_id);
-    listen(drop_elt, "dragenter", dragNotDrop);
-    listen(drop_elt, "dragexit", dragNotDrop);
-    listen(drop_elt, "dragover", dragNotDrop);
+    var parent_form = file_elt.form;
+    var last_call = "clear";
+    listen(parent_form, "submit", fileUploadSubmit);
+    listen(drop_elt, "dragenter", stopNoPropagate);
+    listen(drop_elt, "dragexit", stopNoPropagate);
+    listen(drop_elt, "dragover", stopNoPropagate);
     listen(drop_elt, "drop", drop);
     listen(file_elt, "change",
         function(event)
         {
-            checkAndSetFile(file_elt.files);
+            if(last_call != "drop") {
+                checkAndSetFile(file_elt.files);
+            }
+            last_call = "clear";
         }
     );
-    function drop(evt)
+    function fileUploadSubmit(event)
+    {
+        stopNoPropagate(event);
+        if(was_submitted) {
+            return;
+        }
+        was_submitted = true;
+        var form_data = new FormData();
+        var form_elements = parent_form.elements;
+        for(var i = 0; i <  form_elements.length; i++) {
+            var element = form_elements[i];
+            if(element.type == "file") {
+                var name = element.name;
+                if(file_list[name] === undefined) {
+                    continue;
+                }
+                if(file_list[name].length == 1 &&
+                    file_list[name][0].length == 1) {
+                    form_data.append(name,
+                        file_list[name][0][0]);
+                } else {
+                    var k = 0;
+                    for(var j = 0; j < file_list[name].length; j++) {
+                        for(var m = 0; m < file_list[name][j].length; m++) {
+                            form_data.append(name + "[" + k + "]",
+                                file_list[name][j][m]);
+                            k++;
+                        }
+                    }
+                }
+            } else {
+                form_data.append(element.name, element.value);
+            }
+        }
+        var request = new XMLHttpRequest();
+        request.upload.addEventListener("progress", uploadProgress, false);
+        request.addEventListener("load", uploadComplete, false);
+        request.addEventListener("error", uploadFailed, false);
+        request.addEventListener("abort", uploadCanceled, false);
+        request.open("post", parent_form.action);
+        request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+        request.send(form_data);
+    }
+    function drop(event)
     {
-        dragNotDrop(evt);
-        var files = evt.dataTransfer.files;
+        stopNoPropagate(event);
+        var files = event.dataTransfer.files;
         var count = files.length;
         if(count > 0) {
+            last_call = "drop";
             checkAndSetFile(files);
         }
     }
     function checkAndSetFile(files)
     {
-        if(!checkAllowedType(files[0])) {
+        if(!multiple && files.length > 1) {
             doMessage('<h1 class=\"red\" >' +
-                tl["basic_js_invalid_filetype"] + '</h1>');
-            file_elt.files[0] = NULL;
+                tl["basic_js_too_many_files"] + '</h1>');
             return;
         }
-        if(max_size > 0 && files[0].size > max_size) {
-            doMessage('<h1 class=\"red\" >' +
-                tl["basic_js_file_too_big"] + '</h1>');
-            file_elt.files[0] = NULL;
-            return;
+        for(var i = 0; i < files.length; i++) {
+            if(!checkAllowedType(files[i])) {
+                doMessage('<h1 class=\"red\" >' +
+                    tl["basic_js_invalid_filetype"] + '</h1>');
+                return;
+            }
+            if(max_size > 0 && files[i].size > max_size) {
+                doMessage('<h1 class=\"red\" >' +
+                    tl["basic_js_file_too_big"] + '</h1>');
+                return;
+            }
+        }
+        if(file_list[file_elt.name] === undefined) {
+            file_list[file_elt.name] = new Array();
+        }
+        if(multiple) {
+            file_list[file_elt.name][file_list[file_elt.name].length] = files;
+        } else {
+            file_list[file_elt.name][0] = files;
         }
         if(drop_kind == "image") {
-            file_elt.files = files;
             var img_url = URL.createObjectURL(files[0]);
             drop_elt.src = img_url;
+        } else if(drop_kind == "textarea") {
+            for(var j = 0; j < files.length; j++) {
+                addToPage(files[j].name, drop_id);
+            }
         } else if(drop_kind == "all" || drop_kind == "text") {
-            file_elt.files = files;
-            drop_elt.innerHTML = files[0].name;
+            if(drop_elt.innerHTML == "&nbsp;") {
+                drop_elt.innerHTML = "";
+            }
+            for(var i = 0; i < files.length; i++) {
+                var br = (drop_elt.innerHTML == "") ? "" : "<br />";
+                drop_elt.innerHTML += br + files[i].name;
+            }
         }
     }
-    function dragNotDrop(event)
+    function stopNoPropagate(event)
     {
         event.stopPropagation();
         event.preventDefault();
@@ -222,6 +308,41 @@ function initializeFileHandler(drop_id, file_id, max_size, drop_kind, types)
         }
         return false;
     }
+    function uploadProgress(event)
+    {
+        var progress = elt('message');
+        if(event.lengthComputable) {
+            var percent_complete =
+                Math.round(event.loaded * 100 / event.total);
+            progress.innerHTML = '<h1 class=\"red\" >' +
+                tl["basic_js_upload_progress"] +
+                percent_complete.toString() + '%</h1>';
+        } else {
+            progress.innerHTML = '<h1 class=\"red\" >' +
+                tl["basic_js_progress_meter_disabled"] +'</h1>';
+        }
+    }
+    function uploadComplete(event)
+    {
+        /* This event is raised when the server sends back a response */
+        if(event.target.responseText.substring(0,2) == "go") {
+            window.location = event.target.responseText.substring(2);
+        } else {
+            document.open();
+            document.write(event.target.responseText);
+            document.close();
+        }
+    }
+    function uploadFailed(event)
+    {
+        doMessage('<h1 class=\"red\" >' +
+                tl["basic_js_upload_error"] +'</h1>');
+    }
+    function uploadCanceled(event)
+    {
+        doMessage('<h1 class=\"red\" >' +
+            tl["basic_js_upload_cancelled"] +'</h1>');
+    }
 }
 /*
  * Sets whether an elt is styled as display:none or block
diff --git a/scripts/wiki.js b/scripts/wiki.js
index d4d25c61a..f53ba7f2c 100755
--- a/scripts/wiki.js
+++ b/scripts/wiki.js
@@ -103,7 +103,7 @@ function editorize(id)
         alert("No textarea found with id = " + id);
         return false;
     }else{
-        node.addEventListener("focus",function(event)
+        node.addEventListener("focus", function(event)
         {
             enableKBShortcuts(id);
         }, true);
@@ -137,7 +137,7 @@ function editorize(id)
      */
     var editor_toolbar = '<div id="wiki-popup-prompt-' + id +
         '" class="wiki-popup-prompt" style="display: none;"></div>' +
-        '<form><div class="wiki-buttons">' + button_string;
+        '<div class="wiki-buttons">' + button_string;
     /*
         check if heading was desired and render if was.
      */
@@ -169,7 +169,7 @@ function editorize(id)
             ' onclick="addWikiSearch(\''+ id +'\');" />';
     }

-    editor_toolbar += '</div></form>';
+    editor_toolbar += '</div>';

     /*
         Insert the toolbar div before the textarea
@@ -757,7 +757,11 @@ function createSearchWidgetForm(id)
     search_elt.innerHTML = search_form;
     return search_elt;
 }
-
+/*
+ * Sets up keyboard events for a wiki textarea after it is in focus
+ * @param String id identifier of the textarea used to handle keyboard events
+ *      for
+ */
 function enableKBShortcuts(id)
 {
     var ctrl_down = false;
@@ -781,4 +785,14 @@ function enableKBShortcuts(id)
             return false;
         }
     };
-}
\ No newline at end of file
+}
+/*
+ * Used to add the wiki text for including a resource into a wiki page
+ * @param String id identifier of the textarea used to insert wiki text
+ */
+function addToPage(resource_name, textarea_id)
+{
+    wikify("((resource:", "|" + tl['wiki_js_resource_description'] +
+        resource_name + "))",
+        resource_name, textarea_id);
+}
diff --git a/views/elements/configure_element.php b/views/elements/configure_element.php
index 64b038e20..59e86d801 100644
--- a/views/elements/configure_element.php
+++ b/views/elements/configure_element.php
@@ -272,7 +272,8 @@ class ConfigureElement extends Element
                 >&nbsp;</div><?php
                 $this->view->helper("fileupload")->render(
                     'current-toolbar',
-                    'SEARCHBAR_PATH', 'toolbar', -1, 'text', array("text/xml"));
+                    'SEARCHBAR_PATH', 'toolbar',
+                    1000000, 'text', array("text/xml"));
                 ?></td></tr></table>
                 </div>
                 <div class="top-margin"><label for="timezone"><?php
@@ -342,24 +343,6 @@ class ConfigureElement extends Element
         <?php } ?>
         </form>
         </div>
-        <script type="text/javascript">
-     /*   var tl = Array();
-        tl["basic_js_invalid_filetype"] = '<?php
-            e(tl("basic_js_invalid_filetype")) ?>';
-        tl["basic_js_file_too_big"] = '<?php
-            e(tl("basic_js_file_too_big")) ?>';
-        var max_icon_size = <?php e(THUMB_SIZE)?>;
-        document.getElementsByTagName('body')[0].onload = function() {
-            var image_types = ['image/png', 'image/gif', 'image/x-icon',
-                'image/jpeg'];
-            initializeFileHandler('current-site-logo', 'site-logo',
-                max_icon_size, image_types);
-            initializeFileHandler('current-favicon', 'favicon', max_icon_size,
-                image_types);
-            initializeFileHandler('current-mobile-logo', 'mobile-logo',
-                max_icon_size, image_types);
-        };*/
-        </script>
     <?php
     }
 }
diff --git a/views/elements/wiki_element.php b/views/elements/wiki_element.php
index 9e9881974..aede706e0 100644
--- a/views/elements/wiki_element.php
+++ b/views/elements/wiki_element.php
@@ -76,7 +76,7 @@ class WikiElement extends Element implements CrawlConstants
             $other_base_query .= $csrf_token;
             $csrf_token = "&amp;".CSRF_TOKEN."=".$data[CSRF_TOKEN];
         }
-        if(($is_admin || $logged_in) && (!isset($data['page_type']) ||
+        if(($is_admin || $logged_in) &&!MOBILE&& (!isset($data['page_type']) ||
             $data['page_type'] != 'presentation')) { ?>
             <div class="float-same admin-collapse sidebar"><a id='arrows-link'
             href="<?php e($other_base_query) ?>" onclick="
@@ -284,6 +284,7 @@ class WikiElement extends Element implements CrawlConstants
             e(tl('wiki_element_discuss'))?></a>]
         </div>
         <form id="editpageForm" method="post"
+            enctype="multipart/form-data"
             onsubmit="elt('caret-pos').value =
             (elt('wiki-page').selectionStart) ?
             elt('wiki-page').selectionStart : 0;
@@ -422,7 +423,11 @@ class WikiElement extends Element implements CrawlConstants
                 data-buttons='<?php e($data_buttons); ?>' ><?php
                 e($data['PAGE']);
             ?></textarea>
-            <div class="green"><?php
+            <div class="green center"><?php
+            $this->view->helper("fileupload")->render(
+                'wiki-page', 'page_resource', 'wiki-page-resource',
+                metricToInt(ini_get('upload_max_filesize')), 'textarea', NULL,
+                true);
             e(tl('wiki_element_archive_info'));
             ?></div>
             <div class="top-margin">
@@ -441,7 +446,9 @@ class WikiElement extends Element implements CrawlConstants
         <h2><?php e(tl('wiki_element_media_list'))?></h2>
         <p><?php e(tl('wiki_element_ml_description'))?></p>
         </div>
-        <form id="resourceUploadForm" method="post"
+        <div id="page-resources">
+        <h3><?php e(tl('wiki_view_page_resources'));?></h3>
+        <form id="resource-upload-form" method="post"
             enctype="multipart/form-data">
         <input type="hidden" name="c" value="<?php e($data['CONTROLLER']);
             ?>" />
@@ -467,39 +474,24 @@ class WikiElement extends Element implements CrawlConstants
             e($data['PAGE_NAME']); ?>" />
         <input type="hidden" name="settings" value="<?php
             e($data['settings']); ?>" />
-        <div id="page-resources">
-        <h3><?php e(tl('wiki_view_page_resources'));?></h3>
-        <p><?php e(tl('wiki_view_resources_info'));?></p>
-        <input type="file" class="slight-pad wide-field"
-            id='page-resource' name='page_resource' />
-            <button class="button-box" type="submit"><?php
-            e(tl('wiki_view_upload')); ?></button></div>
+        <div class="center">
+        <div id="current-media-page-resource" class="media-upload-box"
+                >&nbsp;</div>
+        <?php
+        $this->view->helper("fileupload")->render(
+            'current-media-page-resource', 'page_resource',
+            'media-page-resource', metricToInt(ini_get('upload_max_filesize')),
+            'text', NULL, true);
+        ?><button class="button-box" type="submit"><?php
+            e(tl('wiki_view_upload')); ?></button>
+        </div>
         </form>
-        <h3 id="progress-bar" class="red indent"></h3>
+        <p><?php e(tl('wiki_view_resources_info'));?></p>
+        </div>
         <?php
             $this->renderResources($data, false);
         ?>
         <script type="text/javascript">
-        function addToPage(resource_name)
-        {
-            wikify("((resource:","|<?php
-                e(tl('wiki_element_resource_description'));
-                ?>))", resource_name, "wiki-page");
-        }
-        function checkUploadResource()
-        {
-            var max_resource_size = <?php e(metricToInt(
-                ini_get('upload_max_filesize'))); ?>;
-            var page_resource = elt('page-resource').files[0];
-            if(page_resource.size > max_resource_size) {
-                doMessage('<h1 class=\"red\" ><?php
-                    e(tl("wiki_element_file_too_big", metricToInt(
-                        ini_get('upload_max_filesize'))));
-                    ?></h1>');
-                return false;
-            }
-            return true;
-        }
         function renameResource(old_name, id)
         {
             var name_elt = elt("resource-"+id);
@@ -519,58 +511,6 @@ class WikiElement extends Element implements CrawlConstants
                 "&old_resource_name=" + old_name;
             window.location = location;
         }
-        function uploadForm(event)
-        {
-            if(!checkUploadResource()) {
-                event.preventDefault();
-                return;
-            }
-            var resource_form = elt('resourceUploadForm');
-            var form_data = new FormData(resource_form);
-            var request = new XMLHttpRequest();
-            request.upload.addEventListener("progress", uploadProgress, false);
-            request.addEventListener("load", uploadComplete, false);
-            request.addEventListener("error", uploadFailed, false);
-            request.addEventListener("abort", uploadCanceled, false);
-            request.open("post", "./");
-            request.send(form_data);
-            event.preventDefault();
-        }
-        function uploadProgress(event)
-        {
-            var progress = elt('progress-bar');
-            if(event.lengthComputable) {
-                var percent_complete =
-                    Math.round(event.loaded * 100 / event.total);
-                progress.innerHTML = '<?php
-                    e(tl('wiki_element_upload_progress')) ?>' +
-                    percent_complete.toString() + '%';
-            } else {
-                progress.innerHTML = '<?php
-                    e(tl("wiki_element_progress_meter_disabled")); ?>';
-            }
-        }
-        function uploadComplete(event)
-        {
-            /* This event is raised when the server send back a response */
-            document.open();
-            document.write(event.target.responseText);
-            document.close();
-        }
-
-        function uploadFailed(event)
-        {
-            doMessage('<h1 class=\"red\" ><?php
-                e(tl("wiki_element_upload_error")); ?></h1>');
-        }
-
-        function uploadCanceled(event)
-        {
-            doMessage('<h1 class=\"red\" ><?php
-                e(tl("wiki_element_upload_cancelled")); ?></h1>');
-        }
-        var resource_form = document.getElementById('resourceUploadForm');
-        resource_form.addEventListener('submit', uploadForm);
         </script>
         <?php
     }
@@ -634,7 +574,7 @@ class WikiElement extends Element implements CrawlConstants
                             $data['page_type'] != 'media_list')) {
                             ?>
                             <button onclick='javascript:addToPage("<?php
-                            e($name);?>")'><?php e(
+                            e($name);?>", "wiki-page")'><?php e(
                             tl('wiki_element_add_to_page')); ?></button>
                             <?php
                         }
@@ -651,8 +591,11 @@ class WikiElement extends Element implements CrawlConstants
                     $i++;
                 }
                 e('</table>');
+                return;
             }
+
         }
+        e("<div class='red'>".tl('wiki_element_no_resources')."</div>");
     }
     /**
      * Used to draw a list of Wiki Pages for the current group. It also
diff --git a/views/helpers/fileupload_helper.php b/views/helpers/fileupload_helper.php
index ef07e1731..4afb09dd7 100644
--- a/views/helpers/fileupload_helper.php
+++ b/views/helpers/fileupload_helper.php
@@ -69,22 +69,31 @@ class FileUploadHelper extends Helper
      *  @param array $allowed_types what mime types are legal to upload
      */
     public function render($drop_id, $form_name, $elt_id, $max_size,
-        $drop_kind, $allowed_types)
+        $drop_kind, $allowed_types, $multiple = false)
     {
         if($this->isFileUploadInitialized == false) {
             $this->setupFileUploadParams();
         }
+        if($drop_kind == "textarea") {
+            $drag_above_text = tl('fileupload_helper_drag_textarea');
+            $click_link_text = tl('fileupload_helper_click_textarea');
+        } else {
+            $drag_above_text = tl('fileupload_helper_drag_above');
+            $click_link_text = tl('fileupload_helper_click_upload');
+        }
         ?>
-        <div class="upload-gray-box center">
+        <div class="upload-gray-box center black">
         <input type="file" id="<?php e($elt_id); ?>"
             name="<?php e($form_name); ?>" class="none"
             <?php
             if($drop_kind == "image") {
                 e(' accept="image/*" capture="true" ');
+            } else if($multiple) {
+                e(' multiple="multiple" ');
             } ?> />
-        <?php e(tl('fileupload_helper_drag_above'));?>
+        <?php e($drag_above_text);?>
         <a href="javascript:elt('<?php e($elt_id); ?>').click()"><?php
-            e(tl('fileupload_helper_click_upload'));?></a>
+            e($click_link_text);?></a>
         </div>
         <script type="text/javascript">
         window.addEventListener("load",
@@ -92,7 +101,8 @@ class FileUploadHelper extends Helper
                 initializeFileHandler('<?php e($drop_id); ?>', '<?php
                     e($elt_id); ?>', <?php
                     e($max_size); ?>, '<?php e($drop_kind); ?>', <?php
-                    e(json_encode($allowed_types)); ?>);
+                    e(json_encode($allowed_types)); ?>, <?php
+                    e(($multiple) ? "true" : "false" ); ?>);
             },
             false
         );
@@ -114,6 +124,16 @@ class FileUploadHelper extends Helper
             e(tl("basic_js_invalid_filetype")); ?>';
         tl["basic_js_file_too_big"] = '<?php
             e(tl("basic_js_file_too_big")); ?>';
+        tl["basic_js_upload_progress"] = '<?php
+            e(tl("basic_js_upload_progress")); ?>';
+        tl["basic_js_progress_meter_disabled"] = '<?php
+            e(tl("basic_js_progress_meter_disabled")); ?>';
+        tl["basic_js_upload_error"] = '<?php
+            e(tl("basic_js_upload_error")); ?>';
+        tl["basic_js_upload_cancelled"] = '<?php
+            e(tl("basic_js_upload_cancelled")); ?>';
+        tl["basic_js_too_many_files"] = '<?php
+            e(tl("basic_js_too_many_files")); ?>';
         </script>
         <?php
     }
ViewGit