diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php index 2bb059282..95cd52cfc 100644 --- a/src/controllers/components/SocialComponent.php +++ b/src/controllers/components/SocialComponent.php @@ -1560,8 +1560,12 @@ class SocialComponent extends Component implements CrawlConstants } $this->addAnyBotResponses($thread_id, $group_id, $bots_called, "--" . $title, $post_parts); - return $parent->redirectWithMessage( - tl('social_component_thread_created')); + $thread_url = B\feedsUrl('thread', $thread_id, true) . + C\CSRF_TOKEN . "=" . + $parent->generateCSRFToken($_SESSION["USER_ID"]) ; + $_SESSION['DISPLAY_MESSAGE'] = + tl('social_component_thread_created'); + return $parent->redirectLocation($thread_url); break; case "status": $data['REFRESH'] = "feedstatus"; @@ -3077,8 +3081,8 @@ EOD; foreach ($page_ids as $recent_page_id) { $page_info = $group_model->getPageInfoByPageId( $recent_page_id); - $group_name = $group_model->getGroupName( - $page_info['GROUP_ID']); + $group_name = empty($page_info['GROUP_ID']) ? "" : + $group_model->getGroupName($page_info['GROUP_ID']); if (!empty($page_info) && ($page_info['PAGE_NAME'] != $data['PAGE_NAME'])) { $data['RECENT_PAGES'][ diff --git a/src/css/search.css b/src/css/search.css index 3e8126063..2aac1393a 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -472,6 +472,18 @@ a.echo-link:hover { margin-top: .2in; } +.top-bottom-margin +{ + margin: .2in 0 .2in 0; +} +.mobile .top-margin +{ + margin-top: 6px; +} +.mobile .top-bottom-margin +{ + margin: 6px 0 6px 0; +} .no-margin { margin: 0; @@ -774,23 +786,45 @@ body.mobile z-index:50; } /* controls */ -.anchor-button { - background-color: #AAA; - border-radius: 5px; - color: #EEE !important; +.anchor-button, +.anchor-button-consent +{ + background-color: #F0F0F0; + border: ridge 1px #DDD; + color: #000; cursor: pointer; display: inline-block; font-weight: bold; - margin: 8px; - padding: 5px 8px; + margin: 2px; + padding: 4px; text-align: center; text-decoration: none; } -.anchor-button:hover { - background-color: #888; - color: #FFF !important; +.anchor-button-consent +{ + background-color: #AAA; + border-radius: 5px; + color: #EEE; +} +.anchor-button:hover, +.anchor-button-consent:hover +{ text-decoration: underline; } +.anchor-button-consent:hover +{ + background-color: #888; + color: #FFF; +} +.button-anchor +{ + background:inherit; + border: 0; + color: blue; + font-size: 16px; + padding: 0; + text-decoration:underline; +} /* ComponentView styles */ @@ -2878,6 +2912,116 @@ td.instruct position:relative; top:25px; } +.dropdown-container +{ + display:inline-block; + padding:0; + margin: 0; +} +ul.link-dropdown +{ + position:relative; + top:4px; + display:inline-block; + font-family: Arial, Verdana; + font-size: 14px; + margin: 0; + padding: 0; + list-style: none; +} +ul.link-dropdown li +{ + display: block; + position: relative; + float: left; +} +ul.link-dropdown li ul +{ + display: none; + margin: 0; + padding: 0; + list-style: none; +} +ul.link-dropdown li +{ + background: #FCFCFC; + margin: 0; + padding: 2px 5px 2px 5px; + white-space: nowrap; +} + +ul.link-dropdown > li, +ul.link-dropdown ul li:first-child +{ + border-left: 1px solid #999; + border-right: 1px solid #999; + border-top: 1px solid #999; + border-top-left-radius: 5px; + border-top-right-radius: 5px; +} +ul.link-dropdown > li, +ul.link-dropdown ul li:last-child +{ + border-left: 1px solid #999; + border-right: 1px solid #999; + border-bottom: 1px solid #999; + border-bottom-left-radius: 5px; + border-bottom-right-radius: 5px; +} +ul.link-dropdown li input +{ + background: #FCFCFC; + border: 0; + font-size: unset; + font-weight: bold; + position: unset; + top: unset; + width: unset; +} +ul.link-dropdown li input:hover +{ + background: #FCFCFC; + border: 0; + text-decoration: underline; +} +ul.link-dropdown li a +{ + text-decoration: none; + color: #000; +} +ul.link-dropdown > li:focus-within +{ + padding:0; +} +ul.link-dropdown li:focus-within input +{ + padding: 2px 5px 2px 5px; +} +ul.link-dropdown li:focus-within a.opt-group +{ + padding-left: 10px; + padding-right: 10px; +} +ul.link-dropdown:focus-within li li +{ + float: none; + z-index:1000; +} +ul.link-dropdown:focus-within li:hover, +ul.link-dropdown:focus-within li a:hover +{ + background: #EEE; +} +ul.link-dropdown:focus-within li a:hover +{ + text-decoration: underline; + z-index:1001; +} +ul.link-dropdown:focus-within li ul +{ + position:absolute; + display: block; +} .mobile .link-dropdown { width: 240px; diff --git a/src/index.php b/src/index.php index eb0ee0640..e29e0d373 100644 --- a/src/index.php +++ b/src/index.php @@ -81,7 +81,9 @@ function bootstrap($web_site = null, $start_new_session = true) ini_set("memory_limit", C\INDEX_FILE_MEMORY_LIMIT); if (!empty($web_site)) { if ((empty($_REQUEST['c']) || $_REQUEST['c'] != 'resource')) { - $web_site->header("X-FRAME-OPTIONS: DENY"); //prevent click-jacking + $web_site->header( + "Content-Security-Policy: frame-ancestors 'self'"); + //prevent click-jacking } $web_site->header("X-Content-Type-Options: nosniff"); /* Let browsers know that we should be setting the mimetype correctly -- diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index 62afb50c9..a79ce219d 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "الاعتبار ليس خلق - اس ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "آلة الأوضاع" +machinestatus_view_manage_crawls = "إدارة يزحف" machinestatus_view_media_updater = "الإعلام محدث" machinestatus_view_configure_media_jobs = "تكوين وظائف وسائل الإعلام" machinestatus_view_nameserver = "اسم الخادم" @@ -815,7 +815,7 @@ signin_view_resend_activation = "إرسال تفعيل البريد الإلكت signin_view_return = "عودة" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "الزحف حالة" crawlstatus_view_manage_machines = "إدارة الآلات" crawlstatus_view_crawls = "يزحف" crawlstatus_view_query_stats = "إحصائيات الاستعلام" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "ردود الفعل المستخدم" wiki_element_locale_name = "الإعدادات المحلية: %s" wiki_element_page = "الصفحة: %s" wiki_element_resource_name = "الموارد: %s" -configure_element_toggle_page_settings = "الإعدادات" +wiki_element_toggle_page_settings = "الإعدادات" wiki_element_page_type = "نوع الصفحة:" wiki_element_page_alias = "الاسم المستعار الصفحة:" wiki_element_page_border = "الصفحة الحدود:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s بايت)." wiki_element_revert = "تعود" wiki_element_history = "التاريخ" wiki_element_discuss = "مناقشة" -wiki_element_toggle_page_settings = "الإعدادات" ; ; EditlocalesElement.php editlocales_element_edit_locale = "تحرير الإعدادات المحلية: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "حفظ" ; GroupfeedElement.php groupfeed_element_add_group = "إضافة مجموعة" groupfeed_element_request_add = "طلب إضافة مجموعة" -groupfeed_element_comment = "التعليق" +groupfeed_element_add_comment = "إضافة تعليق" +groupfeed_element_drag_textarea = "اسحب العناصر في النص لإضافة لهم..." +groupfeed_element_click_textarea = "أو انقر فوق إلى حدد لهم." +groupfeed_element_save = "حفظ" groupfeed_element_group_wiki = "ويكي" groupfeed_element_group_stats = "%s وظائف %s المواضيع" groupfeed_element_last_post = "آخر مشاركة:" -groupfeed_element_start_thread = "بدء موضوع جديد" groupfeed_element_no_posts_yet = "لا وظيفة حتى الآن!" groupfeed_element_thread_no_exist = "موضوع لا وجود له! ربما تم حذفها ؟ " +groupfeed_element_comment = "التعليق" groupfeed_element_edit = "تحرير" groupfeed_element_delete = "حذف" groupfeed_element_usericon = "رمز المستخدم" groupfeed_element_num_posts = "%s المشاركات" groupfeed_element_num_views = "%s وجهات النظر" -groupfeed_element_start_thread_in_group = "بدء موضوع جديد في %s" -groupfeed_element_new_thread_icon = "أيقونة موضوع جديد" groupfeed_element_last_edited = "آخر تحرير: %s" groupfeed_element_post_vote = "التصويت:" groupfeed_element_last_post_info = "آخر مشاركة:" +groupfeed_element_start_thread = "بدء موضوع جديد" +groupfeed_element_subject = "الموضوع" +groupfeed_element_post = "بعد" groupfeed_element_feedplaces = "تغذية الأماكن" groupfeed_element_mygroups = "جميع الأعلاف" groupfeed_element_userplaces = "المستخدم الأماكن" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s المجموعة الأماكن" groupfeed_element_wiki_name = "%s ويكي" groupfeed_element_recent_threads = "المواضيع الأخيرة" groupfeed_element_recent_groupfeeds = "الأعلاف الأخيرة" -groupfeed_element_drag_textarea = "اسحب العناصر في النص لإضافة لهم..." -groupfeed_element_click_textarea = "أو انقر فوق إلى حدد لهم." -groupfeed_element_add_comment = "إضافة تعليق" -groupfeed_element_save = "حفظ" -groupfeed_element_subject = "الموضوع" -groupfeed_element_post = "بعد" groupfeed_element_edit_post = "تحرير آخر" groupfeed_element_no_longer_update = "مجموعة يغذي لم يعد تحديث!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "حفظ" searchmenu_element_wiki_pages = "صفحات الويكي" searchmenu_element_suggest = "تشير إلى عنوان Url" searchmenu_element_tools = "أدوات" -searchmenu_install_plugin = "Yioop بحث البرنامج المساعد" ; ; ManagerolesElement.php manageroles_element_roles = "أدوار" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "الصف %s %s %s" pagingtable_helper_search = "البحث" pagingtable_helper_add = "إضافة" ; +; OptionsHelper.php +option_helper_go = "الذهاب" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "اسحب العناصر في النص لإضافة لهم..." fileupload_helper_click_textarea = "أو انقر فوق إلى حدد لهم." diff --git a/src/locale/ar/statistics.txt b/src/locale/ar/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/ar/statistics.txt +++ b/src/locale/ar/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 2835a7acf..9abcca48e 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "অ্যাকাউন্ট তৈ ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "মেশিন স্থিতিগুলিকে" +machinestatus_view_manage_crawls = "পরিচালনা হামাগুড়ি দেয়" machinestatus_view_media_updater = "মিডিয়া আপডেটার" machinestatus_view_configure_media_jobs = "কনফিগার মিডিয়া চাকরি" machinestatus_view_nameserver = "নাম সার্ভার" @@ -815,7 +815,7 @@ signin_view_resend_activation = "পুনরায় অ্যাক্টি signin_view_return = "রিটার্ন" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "হামাগুড়ি অবস্থা" crawlstatus_view_manage_machines = "পরিচালনা মেশিন" crawlstatus_view_crawls = "হামাগুড়ি দেয়" crawlstatus_view_query_stats = "ক্যোয়ারী পরিসংখ্যান" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "ব্যবহারকারী প্রতি wiki_element_locale_name = "লোকেল: %s" wiki_element_page = "পৃষ্ঠা: %s" wiki_element_resource_name = "সম্পদ: %s" -configure_element_toggle_page_settings = "সেটিংস" +wiki_element_toggle_page_settings = "সেটিংস" wiki_element_page_type = "পৃষ্ঠা টাইপ:" wiki_element_page_alias = "ওরফে পাতা থেকে:" wiki_element_page_border = "পৃষ্ঠা সীমানা:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s বাইট)." wiki_element_revert = "প্রত্যাবর্তন" wiki_element_history = "ইতিহাস" wiki_element_discuss = "আলোচনা" -wiki_element_toggle_page_settings = "সেটিংস" ; ; EditlocalesElement.php editlocales_element_edit_locale = "সম্পাদনা লোকেল: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "সংরক্ষণ করুন" ; GroupfeedElement.php groupfeed_element_add_group = "গ্রুপ যোগ করুন" groupfeed_element_request_add = "অনুরোধ গ্রুপ যোগ করুন" -groupfeed_element_comment = "মন্তব্য" +groupfeed_element_add_comment = "একটি মন্তব্য যোগ করুন" +groupfeed_element_drag_textarea = "ড্র্যাগ আইটেম মধ্যে textarea তাদের যোগ করার জন্য..." +groupfeed_element_click_textarea = "বা ক্লিক করার জন্য তাদের নির্বাচন করুন." +groupfeed_element_save = "সংরক্ষণ করুন" groupfeed_element_group_wiki = "উইকি" groupfeed_element_group_stats = "%s পোস্ট, থ্রেড %s" groupfeed_element_last_post = "সর্বশেষ পোস্ট:" -groupfeed_element_start_thread = "নতুন থ্রেড শুরু" groupfeed_element_no_posts_yet = "কোন পোস্ট এখনো!" groupfeed_element_thread_no_exist = "থ্রেড অস্তিত্ব নেই! হয়তো এটি মোছা হয়েছে?" +groupfeed_element_comment = "মন্তব্য" groupfeed_element_edit = "সম্পাদনা" groupfeed_element_delete = "মুছে দিন" groupfeed_element_usericon = "ব্যবহারকারী আইকন" groupfeed_element_num_posts = "%s পোস্ট" groupfeed_element_num_views = "%s দেখেছে" -groupfeed_element_start_thread_in_group = "শুরু নতুন থ্রেড %s" -groupfeed_element_new_thread_icon = "নতুন থ্রেড আইকন" groupfeed_element_last_edited = "সর্বশেষ সম্পাদনা: %s" groupfeed_element_post_vote = "ভোট:" groupfeed_element_last_post_info = "সর্বশেষ পোস্ট:" +groupfeed_element_start_thread = "নতুন থ্রেড শুরু" +groupfeed_element_subject = "বিষয়" +groupfeed_element_post = "পোস্ট" groupfeed_element_feedplaces = "ফিড স্থান" groupfeed_element_mygroups = "সব ফিড" groupfeed_element_userplaces = "ব্যবহারকারী স্থান" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s গ্রুপ জায়গা" groupfeed_element_wiki_name = "%s উইকি" groupfeed_element_recent_threads = "সাম্প্রতিক থ্রেড" groupfeed_element_recent_groupfeeds = "সাম্প্রতিক ফিড" -groupfeed_element_drag_textarea = "ড্র্যাগ আইটেম মধ্যে textarea তাদের যোগ করার জন্য..." -groupfeed_element_click_textarea = "বা ক্লিক করার জন্য তাদের নির্বাচন করুন." -groupfeed_element_add_comment = "একটি মন্তব্য যোগ করুন" -groupfeed_element_save = "সংরক্ষণ করুন" -groupfeed_element_subject = "বিষয়" -groupfeed_element_post = "পোস্ট" groupfeed_element_edit_post = "সম্পাদনা পোস্ট" groupfeed_element_no_longer_update = "গ্রুপ ফীড আর আপডেট!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "সংরক্ষণ করুন" searchmenu_element_wiki_pages = "উইকি পেজ" searchmenu_element_suggest = "সুপারিশ একটি Url" searchmenu_element_tools = "সরঞ্জাম" -searchmenu_install_plugin = "Yioop অনুসন্ধান প্লাগইন" ; ; ManagerolesElement.php manageroles_element_roles = "ভূমিকা" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "সারি %s %s এর %s" pagingtable_helper_search = "অনুসন্ধান" pagingtable_helper_add = "যোগ" ; +; OptionsHelper.php +option_helper_go = "যান" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "ড্র্যাগ আইটেম মধ্যে textarea তাদের যোগ করার জন্য..." fileupload_helper_click_textarea = "বা ক্লিক করার জন্য তাদের নির্বাচন করুন." diff --git a/src/locale/bn/statistics.txt b/src/locale/bn/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/bn/statistics.txt +++ b/src/locale/bn/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index d0466bdc2..9a83bd79a 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Konto nicht erstellt - Benutzername b ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Machine Status" +machinestatus_view_manage_crawls = "Verwalten Kriecht" machinestatus_view_media_updater = "Media-Updater" machinestatus_view_configure_media_jobs = "Konfigurieren Von Media Jobs" machinestatus_view_nameserver = "- Name-Server" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Aktivierungs E-Mail Erneut Senden" signin_view_return = "Zurück" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Crawl-Status" crawlstatus_view_manage_machines = "Verwalten Maschinen" crawlstatus_view_crawls = "Kriecht" crawlstatus_view_query_stats = "Abfrage Der Statistik" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Benutzer-Feedback" wiki_element_locale_name = "Gebietsschema: %s" wiki_element_page = "Seite: %s" wiki_element_resource_name = "Ressource: %s" -configure_element_toggle_page_settings = "Einstellungen" +wiki_element_toggle_page_settings = "Einstellungen" wiki_element_page_type = "Page-Type:" wiki_element_page_alias = "Alias-Seite An:" wiki_element_page_border = "Seite:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "Wiederherstellen" wiki_element_history = "Geschichte" wiki_element_discuss = "Diskutieren" -wiki_element_toggle_page_settings = "Einstellungen" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Edit Gebietsschema: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Speichern" ; GroupfeedElement.php groupfeed_element_add_group = "Gruppe Hinzufügen" groupfeed_element_request_add = "Anfrage Gruppe Hinzufügen" -groupfeed_element_comment = "Kommentar" +groupfeed_element_add_comment = "Fügen Sie einen Kommentar hinzu" +groupfeed_element_drag_textarea = "Ziehen Sie Elemente in die textarea-Komponente, um Sie hinzuzufügen..." +groupfeed_element_click_textarea = "oder klicken Sie auf, um Sie auszuwählen." +groupfeed_element_save = "Speichern" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s Beiträge, %s threads" groupfeed_element_last_post = "Letzter Beitrag:" -groupfeed_element_start_thread = "Starten Sie Einen Neuen Thread" groupfeed_element_no_posts_yet = "Keine Beiträge, noch nicht!" groupfeed_element_thread_no_exist = "Thread existiert nicht!!! Vielleicht wurde es gelöscht?" +groupfeed_element_comment = "Kommentar" groupfeed_element_edit = "Bearbeiten" groupfeed_element_delete = "Löschen" groupfeed_element_usericon = "User Icon" groupfeed_element_num_posts = "%s Beiträge" groupfeed_element_num_views = "%s Ansichten" -groupfeed_element_start_thread_in_group = "Starten Sie einen Neuen Thread in %s" -groupfeed_element_new_thread_icon = "Neuer Thread-Icon" groupfeed_element_last_edited = "Zuletzt Bearbeitet: %s" groupfeed_element_post_vote = "Abstimmung:" groupfeed_element_last_post_info = "Letzter Beitrag:" +groupfeed_element_start_thread = "Starten Sie Einen Neuen Thread" +groupfeed_element_subject = "Thema" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Feed Stellen" groupfeed_element_mygroups = "Alle Feeds" groupfeed_element_userplaces = "Benutzer Stellen" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Gruppe Stellen" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Den Letzten Threads" groupfeed_element_recent_groupfeeds = "Aktuelle Feeds" -groupfeed_element_drag_textarea = "Ziehen Sie Elemente in die textarea-Komponente, um Sie hinzuzufügen..." -groupfeed_element_click_textarea = "oder klicken Sie auf, um Sie auszuwählen." -groupfeed_element_add_comment = "Fügen Sie einen Kommentar hinzu" -groupfeed_element_save = "Speichern" -groupfeed_element_subject = "Thema" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Gruppe-Feeds Nicht Mehr Aktualisiert!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Speichern" searchmenu_element_wiki_pages = "Wiki-Seiten" searchmenu_element_suggest = "Schlage vor, eine Url -" searchmenu_element_tools = "Tools" -searchmenu_install_plugin = "Yioop Such-Plugin" ; ; ManagerolesElement.php manageroles_element_roles = "Rollen" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Zeile %s bis %s von %s" pagingtable_helper_search = "Suche" pagingtable_helper_add = "Hinzufügen" ; +; OptionsHelper.php +option_helper_go = "Gehen" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Ziehen Sie Elemente in die textarea-Komponente, um Sie hinzuzufügen..." fileupload_helper_click_textarea = "oder klicken Sie auf, um Sie auszuwählen." diff --git a/src/locale/de/statistics.txt b/src/locale/de/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/de/statistics.txt +++ b/src/locale/de/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 3401f5455..d2eb71e68 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "User Feedback" wiki_element_locale_name = "Locale: %s" wiki_element_page = "Page: %s" wiki_element_resource_name = "Resource: %s" -configure_element_toggle_page_settings = "Settings" +wiki_element_toggle_page_settings = "Settings" wiki_element_page_type = "Page Type:" wiki_element_page_alias = "Alias Page To:" wiki_element_page_border = "Page Border:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "Revert" wiki_element_history = "History" wiki_element_discuss = "Discuss" -wiki_element_toggle_page_settings = "Settings" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Edit Locale: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Save" ; GroupfeedElement.php groupfeed_element_add_group = "Add Group" groupfeed_element_request_add = "Request Add Group" -groupfeed_element_comment = "Comment" +groupfeed_element_add_comment = "Add a Comment" +groupfeed_element_drag_textarea = "Drag items into the textarea to add them..." +groupfeed_element_click_textarea = "or click to select them." +groupfeed_element_save = "Save" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posts, %s threads" groupfeed_element_last_post = "Last Post:" -groupfeed_element_start_thread = "Start New Thread" groupfeed_element_no_posts_yet = "No posts yet!" groupfeed_element_thread_no_exist = "Thread does not exist! Maybe it was deleted?" +groupfeed_element_comment = "Comment" groupfeed_element_edit = "Edit" groupfeed_element_delete = "Delete" groupfeed_element_usericon = "User Icon" groupfeed_element_num_posts = "%s posts" groupfeed_element_num_views = "%s views" -groupfeed_element_start_thread_in_group = "Start New Thread in %s" -groupfeed_element_new_thread_icon = "New Thread Icon" groupfeed_element_last_edited = "Last Edited: %s" groupfeed_element_post_vote = "Vote:" groupfeed_element_last_post_info = "Last Post:" +groupfeed_element_start_thread = "Start New Thread" +groupfeed_element_subject = "Subject" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Feed Places" groupfeed_element_mygroups = "All Feeds" groupfeed_element_userplaces = "User Places" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Group Places" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Recent Threads" groupfeed_element_recent_groupfeeds = "Recent Feeds" -groupfeed_element_drag_textarea = "Drag items into the textarea to add them..." -groupfeed_element_click_textarea = "or click to select them." -groupfeed_element_add_comment = "Add a Comment" -groupfeed_element_save = "Save" -groupfeed_element_subject = "Subject" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Group Feeds No Longer Updating!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Save" searchmenu_element_wiki_pages = "Wiki Pages" searchmenu_element_suggest = "Suggest a Url" searchmenu_element_tools = "Tools" -searchmenu_install_plugin = "Yioop Search Plugin" ; ; ManagerolesElement.php manageroles_element_roles = "Roles" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Row %s to %s of %s" pagingtable_helper_search = "Search" pagingtable_helper_add = "Add" ; +; OptionsHelper.php +option_helper_go = "Go" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Drag items into the textarea to add them..." fileupload_helper_click_textarea = "or click to select them." diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index e3545f654..6f91bea60 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "La cuenta no se crea - nombre de Usua ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "La Máquina De Estados" +machinestatus_view_manage_crawls = "Administrar Los Rastreos" machinestatus_view_media_updater = "Los Medios De Comunicación Updater" machinestatus_view_configure_media_jobs = "Configurar Los Empleos De Medios" machinestatus_view_nameserver = "Nombre Del Servidor" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Reenviar El Correo Electrónico De Activa signin_view_return = "Volver" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Rastreo De Estado" crawlstatus_view_manage_machines = "Gestionar Las Máquinas" crawlstatus_view_crawls = "Los rastreos" crawlstatus_view_query_stats = "Consulta Las Estadísticas" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Comentarios De Los Usuarios" wiki_element_locale_name = "Configuración regional: %s" wiki_element_page = "Página: %s" wiki_element_resource_name = "Recursos: %s" -configure_element_toggle_page_settings = "Configuración" +wiki_element_toggle_page_settings = "Configuración" wiki_element_page_type = "Tipo De Página:" wiki_element_page_alias = "Alias Página:" wiki_element_page_border = "Borde De Página:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "Volver" wiki_element_history = "La historia" wiki_element_discuss = "Discutir" -wiki_element_toggle_page_settings = "Configuración" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Editar Configuración Regional: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Guardar" ; GroupfeedElement.php groupfeed_element_add_group = "Agregar Grupo" groupfeed_element_request_add = "Solicitud De Agregar Grupo" -groupfeed_element_comment = "Comentario" +groupfeed_element_add_comment = "Agregar un Comentario" +groupfeed_element_drag_textarea = "Arrastre los elementos en el textarea para agregarlos..." +groupfeed_element_click_textarea = "o haga clic en seleccionar." +groupfeed_element_save = "Guardar" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s puestos, %s hilos" groupfeed_element_last_post = "Último Post:" -groupfeed_element_start_thread = "Inicio Nuevo Hilo" groupfeed_element_no_posts_yet = "No hay puestos todavía!" groupfeed_element_thread_no_exist = "Hilo no existe! Tal vez fue eliminado?" +groupfeed_element_comment = "Comentario" groupfeed_element_edit = "Editar" groupfeed_element_delete = "Eliminar" groupfeed_element_usericon = "Icono De Usuario" groupfeed_element_num_posts = "%s puestos" groupfeed_element_num_views = "%s opiniones" -groupfeed_element_start_thread_in_group = "Inicio Nuevo Hilo en %s" -groupfeed_element_new_thread_icon = "Nuevo Icono De Enlace" groupfeed_element_last_edited = "Última Edición: %s" groupfeed_element_post_vote = "Voto:" groupfeed_element_last_post_info = "Último Post:" +groupfeed_element_start_thread = "Inicio Nuevo Hilo" +groupfeed_element_subject = "Tema" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Alimentar A Los Lugares" groupfeed_element_mygroups = "Todas Las Fuentes" groupfeed_element_userplaces = "Usuario Lugares" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Lugares Del Grupo" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Los Últimos Hilos" groupfeed_element_recent_groupfeeds = "Los Últimos Feeds" -groupfeed_element_drag_textarea = "Arrastre los elementos en el textarea para agregarlos..." -groupfeed_element_click_textarea = "o haga clic en seleccionar." -groupfeed_element_add_comment = "Agregar un Comentario" -groupfeed_element_save = "Guardar" -groupfeed_element_subject = "Tema" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Editar El Post" groupfeed_element_no_longer_update = "Grupo Alimenta Dejado De Actualizar!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Guardar" searchmenu_element_wiki_pages = "Las Páginas De La Wiki" searchmenu_element_suggest = "Sugieren una Url" searchmenu_element_tools = "Herramientas" -searchmenu_install_plugin = "Yioop Plugin De Búsqueda" ; ; ManagerolesElement.php manageroles_element_roles = "Funciones" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Fila %s %s %s" pagingtable_helper_search = "Búsqueda" pagingtable_helper_add = "Agregar" ; +; OptionsHelper.php +option_helper_go = "Ir" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Arrastre los elementos en el textarea para agregarlos..." fileupload_helper_click_textarea = "o haga clic en seleccionar." diff --git a/src/locale/es/statistics.txt b/src/locale/es/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/es/statistics.txt +++ b/src/locale/es/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index cbbb4cffe..94c818d1e 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "حساب ایجاد نمی - نام ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "وضعیت دستگاه" +machinestatus_view_manage_crawls = "مدیریت می خزد" machinestatus_view_media_updater = "رسانه Updater" machinestatus_view_configure_media_jobs = "پیکربندی رسانه های مشاغل" machinestatus_view_nameserver = "نام سرور" @@ -815,7 +815,7 @@ signin_view_resend_activation = "ارسال دوباره ایمیل فعال س signin_view_return = "بازگشت" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "خزیدن وضعیت" crawlstatus_view_manage_machines = "مدیریت ماشین آلات" crawlstatus_view_crawls = "می خزد" crawlstatus_view_query_stats = "پرس و جو آمار" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "بازخورد کاربر" wiki_element_locale_name = "Locale: %s" wiki_element_page = "صفحه: %s" wiki_element_resource_name = "منبع: %s" -configure_element_toggle_page_settings = "تنظیمات" +wiki_element_toggle_page_settings = "تنظیمات" wiki_element_page_type = "نوع صفحه:" wiki_element_page_alias = "نام مستعار صفحه:" wiki_element_page_border = "صفحه مرز:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s بایت)." wiki_element_revert = "برگرداندن" wiki_element_history = "تاریخچه" wiki_element_discuss = "بحث" -wiki_element_toggle_page_settings = "تنظیمات" ; ; EditlocalesElement.php editlocales_element_edit_locale = "ویرایش زبان: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "صرفه جویی در" ; GroupfeedElement.php groupfeed_element_add_group = "اضافه کردن گروه" groupfeed_element_request_add = "درخواست اضافه کردن گروه" -groupfeed_element_comment = "نظر" +groupfeed_element_add_comment = "اضافه کردن نظر" +groupfeed_element_drag_textarea = "کشیدن آیتم ها به ناحیه ی متن به آنها اضافه..." +groupfeed_element_click_textarea = "و یا کلیک کنید تا آنها را انتخاب کنید." +groupfeed_element_save = "صرفه جویی در" groupfeed_element_group_wiki = "ویکی" groupfeed_element_group_stats = "%s پست %s موضوعات" groupfeed_element_last_post = "آخرین ارسال:" -groupfeed_element_start_thread = "شروع موضوع جدید" groupfeed_element_no_posts_yet = "هیچ نوشته نشده است!" groupfeed_element_thread_no_exist = "موضوع وجود ندارد! شاید آن ها هم پاک میشه ؟ " +groupfeed_element_comment = "نظر" groupfeed_element_edit = "ویرایش" groupfeed_element_delete = "حذف" groupfeed_element_usericon = "نماد کاربر" groupfeed_element_num_posts = "%s پست" groupfeed_element_num_views = "%s views" -groupfeed_element_start_thread_in_group = "شروع موضوع جدید در %s" -groupfeed_element_new_thread_icon = "موضوع جدید آیکون" groupfeed_element_last_edited = "آخرین ویرایش: %s" groupfeed_element_post_vote = "رای:" groupfeed_element_last_post_info = "آخرین ارسال:" +groupfeed_element_start_thread = "شروع موضوع جدید" +groupfeed_element_subject = "موضوع" +groupfeed_element_post = "پست" groupfeed_element_feedplaces = "خوراک مکان" groupfeed_element_mygroups = "همه تغذیه" groupfeed_element_userplaces = "مکان کاربر" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s گروه" groupfeed_element_wiki_name = "%s ویکی" groupfeed_element_recent_threads = "موضوعات اخیر" groupfeed_element_recent_groupfeeds = "اخیر تغذیه" -groupfeed_element_drag_textarea = "کشیدن آیتم ها به ناحیه ی متن به آنها اضافه..." -groupfeed_element_click_textarea = "و یا کلیک کنید تا آنها را انتخاب کنید." -groupfeed_element_add_comment = "اضافه کردن نظر" -groupfeed_element_save = "صرفه جویی در" -groupfeed_element_subject = "موضوع" -groupfeed_element_post = "پست" groupfeed_element_edit_post = "ویرایش پست" groupfeed_element_no_longer_update = "گروه تغذیه و دیگر به روز رسانی!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "صرفه جویی در" searchmenu_element_wiki_pages = "صفحات ویکی" searchmenu_element_suggest = "نشان می دهد یک آدرس" searchmenu_element_tools = "ابزار" -searchmenu_install_plugin = "Yioop جستجو پلاگین" ; ; ManagerolesElement.php manageroles_element_roles = "نقش" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "ردیف %s %s %s" pagingtable_helper_search = "جستجو" pagingtable_helper_add = "اضافه کردن" ; +; OptionsHelper.php +option_helper_go = "برو" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "کشیدن آیتم ها به ناحیه ی متن به آنها اضافه..." fileupload_helper_click_textarea = "و یا کلیک کنید تا آنها را انتخاب کنید." diff --git a/src/locale/fa/statistics.txt b/src/locale/fa/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/fa/statistics.txt +++ b/src/locale/fa/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 38a0f935f..5832cae33 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Compte pas créé - nom d ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Machine Statuts" +machinestatus_view_manage_crawls = "Gérer Les Analyses" machinestatus_view_media_updater = "Mise à jour des médias processeur" machinestatus_view_configure_media_jobs = "Configurer Les Métiers Des Médias" machinestatus_view_nameserver = "Serveur De Nom" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Renvoyer l'e-mail d'activation" signin_view_return = "Retour" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Analyse Du Statut" crawlstatus_view_manage_machines = "Gérer les machines" crawlstatus_view_crawls = "Les analyses" crawlstatus_view_query_stats = "Statistiques sur les requêtes" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Les commentaires des utilisateurs" wiki_element_locale_name = "Paramètres régionaux: %s" wiki_element_page = "Page: %s" wiki_element_resource_name = "Ressources: %s" -configure_element_toggle_page_settings = "Paramètres" +wiki_element_toggle_page_settings = "Paramètres" wiki_element_page_type = "Type de page:" wiki_element_page_alias = "Alias de page:" wiki_element_page_border = "Bordure de page:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s octets)." wiki_element_revert = "Revenir" wiki_element_history = "L'histoire" wiki_element_discuss = "Discuter" -wiki_element_toggle_page_settings = "Paramètres" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Modifier les paramètres régionaux: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Enregistrer" ; GroupfeedElement.php groupfeed_element_add_group = "Ajouter un groupe" groupfeed_element_request_add = "Demande d'ajouter un groupe" -groupfeed_element_comment = "Commentaire" +groupfeed_element_add_comment = "Ajouter un commentaire" +groupfeed_element_drag_textarea = "Faites glisser les éléments dans le textarea pour les ajouter..." +groupfeed_element_click_textarea = "ou cliquez sur pour sélectionner." +groupfeed_element_save = "Enregistrer" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s postes, %s fils" groupfeed_element_last_post = "Dernier post:" -groupfeed_element_start_thread = "Commencer à Nouveau Thread" groupfeed_element_no_posts_yet = "Pas de postes encore!" groupfeed_element_thread_no_exist = "Thread n'existe pas! Peut-être qu'il a été supprimé?" +groupfeed_element_comment = "Commentaire" groupfeed_element_edit = "Modifier" groupfeed_element_delete = "Supprimer" groupfeed_element_usericon = "Icône d'utilisateur" groupfeed_element_num_posts = "%s messages" groupfeed_element_num_views = "%s vues" -groupfeed_element_start_thread_in_group = "Commencer à nouveau thread dans %s" -groupfeed_element_new_thread_icon = "Nouveau thread icône" groupfeed_element_last_edited = "Dernière édition: %s" groupfeed_element_post_vote = "Vote:" groupfeed_element_last_post_info = "Dernier post:" +groupfeed_element_start_thread = "Commencer à Nouveau Thread" +groupfeed_element_subject = "Sujet" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Lieux de flux" groupfeed_element_mygroups = "Tous les flux" groupfeed_element_userplaces = "L'utilisateur place" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s groupe lieux" groupfeed_element_wiki_name = "%s wiki" groupfeed_element_recent_threads = "Récente fils" groupfeed_element_recent_groupfeeds = "Les récents flux" -groupfeed_element_drag_textarea = "Faites glisser les éléments dans le textarea pour les ajouter..." -groupfeed_element_click_textarea = "ou cliquez sur pour sélectionner." -groupfeed_element_add_comment = "Ajouter un commentaire" -groupfeed_element_save = "Enregistrer" -groupfeed_element_subject = "Sujet" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Modifier post" groupfeed_element_no_longer_update = "Le groupe se nourrit plus de la mise à Jour!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Enregistrer" searchmenu_element_wiki_pages = "Les pages du wiki" searchmenu_element_suggest = "Suggérer une URL" searchmenu_element_tools = "Outils" -searchmenu_install_plugin = "Yioop le plugin de recherche" ; ; ManagerolesElement.php manageroles_element_roles = "Les rôles" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Ligne %s %s %s" pagingtable_helper_search = "Recherche" pagingtable_helper_add = "Ajouter" ; +; OptionsHelper.php +option_helper_go = "Aller" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Faites glisser les éléments dans le textarea pour les ajouter..." fileupload_helper_click_textarea = "ou cliquez sur pour sélectionner." diff --git a/src/locale/fr_FR/statistics.txt b/src/locale/fr_FR/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/fr_FR/statistics.txt +++ b/src/locale/fr_FR/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index 79faa59e3..e6bbfe1d8 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "החשבון לא יצר - שם המ ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "מכונת סטטוסים" +machinestatus_view_manage_crawls = "ניהול זוחל" machinestatus_view_media_updater = "מדיה Updater" machinestatus_view_configure_media_jobs = "להגדיר מדיה עבודות" machinestatus_view_nameserver = "שם שרת" @@ -815,7 +815,7 @@ signin_view_resend_activation = "את הודעת ההפעלה דוא " ל" signin_view_return = "להחזיר" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "לזחול מצב" crawlstatus_view_manage_machines = "ניהול מכונות" crawlstatus_view_crawls = "זוחל" crawlstatus_view_query_stats = "שאילתה סטטיסטיקה" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "משוב משתמש" wiki_element_locale_name = "אזור: %s" wiki_element_page = "עמוד: %s" wiki_element_resource_name = "משאב: %s" -configure_element_toggle_page_settings = "הגדרות" +wiki_element_toggle_page_settings = "הגדרות" wiki_element_page_type = "סוג הדף:" wiki_element_page_alias = "כינוי לדף:" wiki_element_page_border = "דף הגבול:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s בתים)." wiki_element_revert = "לחזור" wiki_element_history = "היסטוריה" wiki_element_discuss = "לדון" -wiki_element_toggle_page_settings = "הגדרות" ; ; EditlocalesElement.php editlocales_element_edit_locale = "עריכת אזור: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "להציל" ; GroupfeedElement.php groupfeed_element_add_group = "הוספת קבוצה" groupfeed_element_request_add = "בקשה להוסיף קבוצה" -groupfeed_element_comment = "תגובה" +groupfeed_element_add_comment = "הוסף תגובה" +groupfeed_element_drag_textarea = "גרור פריטים לתוך אזור טקסט. כדי להוסיף אותם..." +groupfeed_element_click_textarea = "או לחץ על כדי לבחור אותם." +groupfeed_element_save = "להציל" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s פוסטים, %s חוטים" groupfeed_element_last_post = "הודעה אחרונה:" -groupfeed_element_start_thread = "התחל שרשור חדש" groupfeed_element_no_posts_yet = "לא הודעות עדיין!" groupfeed_element_thread_no_exist = "חוט לא קיים! אולי זה נמחק?" +groupfeed_element_comment = "תגובה" groupfeed_element_edit = "עריכה" groupfeed_element_delete = "למחוק" groupfeed_element_usericon = "סמל משתמש" groupfeed_element_num_posts = "%s הודעות" groupfeed_element_num_views = "%s צפיות" -groupfeed_element_start_thread_in_group = "התחל שרשור חדש ב-%s" -groupfeed_element_new_thread_icon = "שרשור חדש סמל" groupfeed_element_last_edited = "אתמול נערך: %s" groupfeed_element_post_vote = "הצבעה:" groupfeed_element_last_post_info = "הודעה אחרונה:" +groupfeed_element_start_thread = "התחל שרשור חדש" +groupfeed_element_subject = "הנושא" +groupfeed_element_post = "פוסט" groupfeed_element_feedplaces = "להאכיל מקומות" groupfeed_element_mygroups = "כל הזנות" groupfeed_element_userplaces = "המשתמש מקומות" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s קבוצה מקומות" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "לאחרונה אשכולות" groupfeed_element_recent_groupfeeds = "לאחרונה הזנות" -groupfeed_element_drag_textarea = "גרור פריטים לתוך אזור טקסט. כדי להוסיף אותם..." -groupfeed_element_click_textarea = "או לחץ על כדי לבחור אותם." -groupfeed_element_add_comment = "הוסף תגובה" -groupfeed_element_save = "להציל" -groupfeed_element_subject = "הנושא" -groupfeed_element_post = "פוסט" groupfeed_element_edit_post = "עריכת פוסט" groupfeed_element_no_longer_update = "קבוצת הזנות כבר לא מעדכן!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "להציל" searchmenu_element_wiki_pages = "דפי Wiki" searchmenu_element_suggest = "מציע Url" searchmenu_element_tools = "כלים" -searchmenu_install_plugin = "Yioop תוסף חיפוש" ; ; ManagerolesElement.php manageroles_element_roles = "תפקידים" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "שורה %s %s %s" pagingtable_helper_search = "חיפוש" pagingtable_helper_add = "להוסיף" ; +; OptionsHelper.php +option_helper_go = "ללכת" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "גרור פריטים לתוך אזור טקסט. כדי להוסיף אותם..." fileupload_helper_click_textarea = "או לחץ על כדי לבחור אותם." diff --git a/src/locale/he/statistics.txt b/src/locale/he/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/he/statistics.txt +++ b/src/locale/he/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 07d44f5f3..1243eda9f 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "खाता नहीं बना ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "मशीन स्थितियां" +machinestatus_view_manage_crawls = "प्रबंधन क्रॉल" machinestatus_view_media_updater = "मीडिया Updater" machinestatus_view_configure_media_jobs = "कॉन्फ़िगर मीडिया नौकरियां" machinestatus_view_nameserver = "नाम सर्वर" @@ -815,7 +815,7 @@ signin_view_resend_activation = "पुन: भेजें सक्रिय signin_view_return = "वापसी" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "क्रॉल स्थिति" crawlstatus_view_manage_machines = "मशीनों का प्रबंधन" crawlstatus_view_crawls = "क्रॉल" crawlstatus_view_query_stats = "क्वेरी आँकड़े" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "उपयोगकर्ता प्रतिक wiki_element_locale_name = "वातावरण: %s" wiki_element_page = "पेज: %s" wiki_element_resource_name = "संसाधन: %s" -configure_element_toggle_page_settings = "सेटिंग्स" +wiki_element_toggle_page_settings = "सेटिंग्स" wiki_element_page_type = "पृष्ठ प्रकार:" wiki_element_page_alias = "उपनाम पृष्ठ करने के लिए:" wiki_element_page_border = "पृष्ठ बॉर्डर:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s बाइट्स)." wiki_element_revert = "वापस लौटने" wiki_element_history = "इतिहास" wiki_element_discuss = "चर्चा" -wiki_element_toggle_page_settings = "सेटिंग्स" ; ; EditlocalesElement.php editlocales_element_edit_locale = "संपादित करें वातावरण: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "बचाने के लिए" ; GroupfeedElement.php groupfeed_element_add_group = "समूह जोड़ें" groupfeed_element_request_add = "अनुरोध समूह जोड़ें" -groupfeed_element_comment = "टिप्पणी" +groupfeed_element_add_comment = "एक टिप्पणी जोड़ें" +groupfeed_element_drag_textarea = "खींचें आइटम में textarea के लिए उन्हें जोड़ने..." +groupfeed_element_click_textarea = "या करने के लिए क्लिक करें उन्हें चुनें." +groupfeed_element_save = "बचाने के लिए" groupfeed_element_group_wiki = "विकी" groupfeed_element_group_stats = "%s पदों, %s सूत्र" groupfeed_element_last_post = "पिछले पोस्ट:" -groupfeed_element_start_thread = "नया धागा शुरू" groupfeed_element_no_posts_yet = "कोई पोस्ट नहीं अभी तक!" groupfeed_element_thread_no_exist = "धागा मौजूद नहीं है! हो सकता है कि यह हटा दिया गया था?" +groupfeed_element_comment = "टिप्पणी" groupfeed_element_edit = "संपादित करें" groupfeed_element_delete = "हटाना" groupfeed_element_usericon = "उपयोगकर्ता आइकन" groupfeed_element_num_posts = "%s पद" groupfeed_element_num_views = "%s दर्शनों की संख्या" -groupfeed_element_start_thread_in_group = "शुरू में नया धागा %s" -groupfeed_element_new_thread_icon = "नया धागा आइकन" groupfeed_element_last_edited = "अंतिम संपादित: %s" groupfeed_element_post_vote = "मतदान:" groupfeed_element_last_post_info = "पिछले पोस्ट:" +groupfeed_element_start_thread = "नया धागा शुरू" +groupfeed_element_subject = "विषय" +groupfeed_element_post = "पोस्ट" groupfeed_element_feedplaces = "फ़ीड स्थानों" groupfeed_element_mygroups = "सभी फ़ीड" groupfeed_element_userplaces = "उपयोगकर्ता स्थानों" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s समूह स्थानों" groupfeed_element_wiki_name = "%s विकी" groupfeed_element_recent_threads = "हाल के धागे" groupfeed_element_recent_groupfeeds = "हाल ही में फ़ीड" -groupfeed_element_drag_textarea = "खींचें आइटम में textarea के लिए उन्हें जोड़ने..." -groupfeed_element_click_textarea = "या करने के लिए क्लिक करें उन्हें चुनें." -groupfeed_element_add_comment = "एक टिप्पणी जोड़ें" -groupfeed_element_save = "बचाने के लिए" -groupfeed_element_subject = "विषय" -groupfeed_element_post = "पोस्ट" groupfeed_element_edit_post = "पोस्ट को संपादित" groupfeed_element_no_longer_update = "समूह फ़ीड नहीं रह अद्यतन!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "बचाने के लिए" searchmenu_element_wiki_pages = "विकी पृष्ठों" searchmenu_element_suggest = "सुझाव है कि एक यूआरएल है" searchmenu_element_tools = "उपकरण" -searchmenu_install_plugin = "Yioop खोज प्लगइन" ; ; ManagerolesElement.php manageroles_element_roles = "भूमिकाओं" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "पंक्ति के लिए %s %s के pagingtable_helper_search = "खोज" pagingtable_helper_add = "जोड़ें" ; +; OptionsHelper.php +option_helper_go = "जाने" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "खींचें आइटम में textarea के लिए उन्हें जोड़ने..." fileupload_helper_click_textarea = "या करने के लिए क्लिक करें उन्हें चुनें." diff --git a/src/locale/hi/statistics.txt b/src/locale/hi/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/hi/statistics.txt +++ b/src/locale/hi/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index e4d734b4e..95ab05493 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Akun tidak dibuat - Username sudah di ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Mesin Status" +machinestatus_view_manage_crawls = "Mengelola Merangkak" machinestatus_view_media_updater = "Media Updater" machinestatus_view_configure_media_jobs = "Mengkonfigurasi Media Lowongan" machinestatus_view_nameserver = "Nama Server" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Kirim Ulang Email Aktivasi" signin_view_return = "Kembali" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Merangkak Status" crawlstatus_view_manage_machines = "Mengelola Mesin" crawlstatus_view_crawls = "Merangkak" crawlstatus_view_query_stats = "Statistik Query" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Umpan Balik Pengguna" wiki_element_locale_name = "Lokal: %s" wiki_element_page = "Halaman: %s" wiki_element_resource_name = "Sumber: %s" -configure_element_toggle_page_settings = "Pengaturan" +wiki_element_toggle_page_settings = "Pengaturan" wiki_element_page_type = "Jenis Halaman:" wiki_element_page_alias = "Alias Halaman Untuk:" wiki_element_page_border = "Halaman Perbatasan:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s byte)." wiki_element_revert = "Kembali" wiki_element_history = "Sejarah" wiki_element_discuss = "Membahas" -wiki_element_toggle_page_settings = "Pengaturan" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Edit Lokal: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Simpan" ; GroupfeedElement.php groupfeed_element_add_group = "Tambahkan Group" groupfeed_element_request_add = "Permintaan Tambahkan Group" -groupfeed_element_comment = "Komentar" +groupfeed_element_add_comment = "Tambahkan Komentar" +groupfeed_element_drag_textarea = "Drag item ke dalam textarea untuk menambahkan mereka..." +groupfeed_element_click_textarea = "atau klik untuk memilih mereka." +groupfeed_element_save = "Simpan" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posting, %s benang" groupfeed_element_last_post = "Posting Terakhir:" -groupfeed_element_start_thread = "Mulai Thread Baru" groupfeed_element_no_posts_yet = "Tidak ada posting yang belum!" groupfeed_element_thread_no_exist = "Thread tidak ada! Mungkin itu dihapus?" +groupfeed_element_comment = "Komentar" groupfeed_element_edit = "Edit" groupfeed_element_delete = "Menghapus" groupfeed_element_usericon = "Pengguna Ikon" groupfeed_element_num_posts = "%s posting" groupfeed_element_num_views = "%s views" -groupfeed_element_start_thread_in_group = "Memulai Thread Baru di %s" -groupfeed_element_new_thread_icon = "Thread Baru Icon" groupfeed_element_last_edited = "Terakhir Diedit: %s" groupfeed_element_post_vote = "Suara:" groupfeed_element_last_post_info = "Posting Terakhir:" +groupfeed_element_start_thread = "Mulai Thread Baru" +groupfeed_element_subject = "Subjek" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Makan Tempat" groupfeed_element_mygroups = "Semua Feed" groupfeed_element_userplaces = "Pengguna Tempat" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Kelompok Tempat" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Baru-Baru Ini Thread" groupfeed_element_recent_groupfeeds = "Feed Baru-Baru Ini" -groupfeed_element_drag_textarea = "Drag item ke dalam textarea untuk menambahkan mereka..." -groupfeed_element_click_textarea = "atau klik untuk memilih mereka." -groupfeed_element_add_comment = "Tambahkan Komentar" -groupfeed_element_save = "Simpan" -groupfeed_element_subject = "Subjek" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Kelompok Feed Tidak Lagi Memperbarui!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Simpan" searchmenu_element_wiki_pages = "Halaman Wiki" searchmenu_element_suggest = "Sarankan Url" searchmenu_element_tools = "Alat" -searchmenu_install_plugin = "Yioop Pencarian Plugin" ; ; ManagerolesElement.php manageroles_element_roles = "Peran" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Turut %s %s %s" pagingtable_helper_search = "Pencarian" pagingtable_helper_add = "Tambahkan" ; +; OptionsHelper.php +option_helper_go = "Pergi" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Drag item ke dalam textarea untuk menambahkan mereka..." fileupload_helper_click_textarea = "atau klik untuk memilih mereka." diff --git a/src/locale/id/statistics.txt b/src/locale/id/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/id/statistics.txt +++ b/src/locale/id/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index bb06da8bf..00f241af0 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Account non è stato creato - n ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Stati Di Macchina" +machinestatus_view_manage_crawls = "Gestire Le Ricerche Per Indicizzazione" machinestatus_view_media_updater = "Media Updater" machinestatus_view_configure_media_jobs = "Configurare La Media Di Posti Di Lavoro" machinestatus_view_nameserver = "Nome Server" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Reinvia Email Di Attivazione" signin_view_return = "Ritorno" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Ricerca Per Indicizzazione Di Stato" crawlstatus_view_manage_machines = "La Gestione Delle Macchine" crawlstatus_view_crawls = "Le ricerche per indicizzazione" crawlstatus_view_query_stats = "Le Statistiche Delle Query" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Il Feedback Degli Utenti" wiki_element_locale_name = "Impostazioni locali: %s" wiki_element_page = "Pagina: %s" wiki_element_resource_name = "Risorsa: %s" -configure_element_toggle_page_settings = "Impostazioni" +wiki_element_toggle_page_settings = "Impostazioni" wiki_element_page_type = "Pagina Tipo:" wiki_element_page_alias = "Alias Pagina:" wiki_element_page_border = "Bordo Pagina:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s byte)." wiki_element_revert = "Ripristinare" wiki_element_history = "Storia" wiki_element_discuss = "Discutere" -wiki_element_toggle_page_settings = "Impostazioni" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Modifica Lingua: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Salva" ; GroupfeedElement.php groupfeed_element_add_group = "Aggiungi Gruppo" groupfeed_element_request_add = "Richiesta Aggiungi Gruppo" -groupfeed_element_comment = "Commento" +groupfeed_element_add_comment = "Aggiungi un Commento" +groupfeed_element_drag_textarea = "Trascinare gli elementi nella textarea per aggiungerli..." +groupfeed_element_click_textarea = "o fare clic per selezionarlo." +groupfeed_element_save = "Salva" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posti, %s thread" groupfeed_element_last_post = "Ultimo Post:" -groupfeed_element_start_thread = "Avviare Una Nuova Discussione" groupfeed_element_no_posts_yet = "Ancora posts!" groupfeed_element_thread_no_exist = "Il Thread non esiste! Forse è stato eliminato?" +groupfeed_element_comment = "Commento" groupfeed_element_edit = "Modifica" groupfeed_element_delete = "Eliminare" groupfeed_element_usericon = "Icona Utente" groupfeed_element_num_posts = "%s posti" groupfeed_element_num_views = "%s visualizzazioni" -groupfeed_element_start_thread_in_group = "Avviare una Nuova discussione nel %s" -groupfeed_element_new_thread_icon = "Nuovo Thread Icona" groupfeed_element_last_edited = "Ultima Modifica: %s" groupfeed_element_post_vote = "Voto:" groupfeed_element_last_post_info = "Ultimo Post:" +groupfeed_element_start_thread = "Avviare Una Nuova Discussione" +groupfeed_element_subject = "Soggetto" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Feed Luoghi" groupfeed_element_mygroups = "Tutti I Feed" groupfeed_element_userplaces = "Utente Posti" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Gruppo" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Ultimi Thread" groupfeed_element_recent_groupfeeds = "Recenti Feed" -groupfeed_element_drag_textarea = "Trascinare gli elementi nella textarea per aggiungerli..." -groupfeed_element_click_textarea = "o fare clic per selezionarlo." -groupfeed_element_add_comment = "Aggiungi un Commento" -groupfeed_element_save = "Salva" -groupfeed_element_subject = "Soggetto" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Modifica Post" groupfeed_element_no_longer_update = "Gruppo Di Feed Non È Più L'Aggiornamento!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Salva" searchmenu_element_wiki_pages = "Le Pagine Del Wiki" searchmenu_element_suggest = "Suggerire un Url" searchmenu_element_tools = "Strumenti" -searchmenu_install_plugin = "Yioop Plugin Di Ricerca" ; ; ManagerolesElement.php manageroles_element_roles = "Ruoli" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Riga %s %s %s" pagingtable_helper_search = "Ricerca" pagingtable_helper_add = "Aggiungere" ; +; OptionsHelper.php +option_helper_go = "Andare" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Trascinare gli elementi nella textarea per aggiungerli..." fileupload_helper_click_textarea = "o fare clic per selezionarlo." diff --git a/src/locale/it/statistics.txt b/src/locale/it/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/it/statistics.txt +++ b/src/locale/it/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index f7178d140..3029cb6a8 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "口座を作成ユーザ名はすで ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "機械の状態" +machinestatus_view_manage_crawls = "管理に役立" machinestatus_view_media_updater = "メディアアップデータ" machinestatus_view_configure_media_jobs = "設定メディアの仕事" machinestatus_view_nameserver = "サーバー名" @@ -815,7 +815,7 @@ signin_view_resend_activation = "再送信メールを活性化" signin_view_return = "戻り" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "這状況" crawlstatus_view_manage_machines = "管理機" crawlstatus_view_crawls = "ゆっくり流" crawlstatus_view_query_stats = "クエリの統計" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "ユーザからのフィードバック" wiki_element_locale_name = "ロケール:%s" wiki_element_page = "ページ:%s" wiki_element_resource_name = "資源%s" -configure_element_toggle_page_settings = "設定" +wiki_element_toggle_page_settings = "設定" wiki_element_page_type = "ページ種別:" wiki_element_page_alias = "エイリアスのページ:" wiki_element_page_border = "ページボーダー:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%sバイト単位)。" wiki_element_revert = "に戻すには" wiki_element_history = "歴史" wiki_element_discuss = "議" -wiki_element_toggle_page_settings = "設定" ; ; EditlocalesElement.php editlocales_element_edit_locale = "ローケルの編集：%s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "保存" ; GroupfeedElement.php groupfeed_element_add_group = "グループの追加" groupfeed_element_request_add = "請求グループの追加" -groupfeed_element_comment = "コメント" +groupfeed_element_add_comment = "必要に応じて、コメントを追加" +groupfeed_element_drag_textarea = "ドラッグ項目のtextareaとして追加しようとすると..." +groupfeed_element_click_textarea = "またはをクリックし選択します。" +groupfeed_element_save = "保存" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s、スレッド%s" groupfeed_element_last_post = "前回の投稿:" -groupfeed_element_start_thread = "新規スレッド" groupfeed_element_no_posts_yet = "ない投稿してない！" groupfeed_element_thread_no_exist = "スレッドが存在しない! のものですごく喜んでくれた。" +groupfeed_element_comment = "コメント" groupfeed_element_edit = "編集" groupfeed_element_delete = "削除" groupfeed_element_usericon = "ユーザーのアイコン" groupfeed_element_num_posts = "ポス%s" groupfeed_element_num_views = "%sの景色" -groupfeed_element_start_thread_in_group = "新規スレッド%s" -groupfeed_element_new_thread_icon = "新しいスレッドのアイコン" groupfeed_element_last_edited = "最終編集:%s" groupfeed_element_post_vote = "投票:" groupfeed_element_last_post_info = "前回の投稿:" +groupfeed_element_start_thread = "新規スレッド" +groupfeed_element_subject = "対象" +groupfeed_element_post = "ポスト" groupfeed_element_feedplaces = "送りの場所" groupfeed_element_mygroups = "すべてのフィード" groupfeed_element_userplaces = "ユーザーの場所" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%sグループ" groupfeed_element_wiki_name = "%sWiki" groupfeed_element_recent_threads = "最近のスレッド" groupfeed_element_recent_groupfeeds = "最近のフィード" -groupfeed_element_drag_textarea = "ドラッグ項目のtextareaとして追加しようとすると..." -groupfeed_element_click_textarea = "またはをクリックし選択します。" -groupfeed_element_add_comment = "必要に応じて、コメントを追加" -groupfeed_element_save = "保存" -groupfeed_element_subject = "対象" -groupfeed_element_post = "ポスト" groupfeed_element_edit_post = "編集後" groupfeed_element_no_longer_update = "グループフィードな更新!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "保存" searchmenu_element_wiki_pages = "Wikiページ" searchmenu_element_suggest = "このUrl" searchmenu_element_tools = "ツール" -searchmenu_install_plugin = "Yioop検索プラグイン" ; ; ManagerolesElement.php manageroles_element_roles = "役割" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "行%s %s %s" pagingtable_helper_search = "検索" pagingtable_helper_add = "追加" ; +; OptionsHelper.php +option_helper_go = "碁" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "ドラッグ項目のtextareaとして追加しようとすると..." fileupload_helper_click_textarea = "またはをクリックし選択します。" diff --git a/src/locale/ja/statistics.txt b/src/locale/ja/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/ja/statistics.txt +++ b/src/locale/ja/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 38acd6997..9d5196ea1 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "ಖಾತೆ ಅಲ್ಲ ದಾಖ ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "ಯಂತ್ರ ಸ್ಥಿತಿತ್ವಗಳನ್ನು" +machinestatus_view_manage_crawls = "ನಿರ್ವಹಿಸಿ ಕ್ರಾಲ್" machinestatus_view_media_updater = "ಮಾಧ್ಯಮ ಅಪ್ಡೇಟ್" machinestatus_view_configure_media_jobs = "ಸಂರಚಿಸಲು ಮಾಧ್ಯಮ ಉದ್ಯೋಗಗಳು" machinestatus_view_nameserver = "ಹೆಸರು ಸರ್ವರ್" @@ -815,7 +815,7 @@ signin_view_resend_activation = "ಸಕ್ರಿಯಗೊಳಿಸುವ ಇಮ signin_view_return = "ರಿಟರ್ನ್" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "ಕ್ರಾಲ್ ಸ್ಥಿತಿ" crawlstatus_view_manage_machines = "ನಿರ್ವಹಿಸಿ ಯಂತ್ರಗಳು" crawlstatus_view_crawls = "ಕ್ರಾಲ್" crawlstatus_view_query_stats = "ಪ್ರಶ್ನೆಗೆ ಅಂಕಿಅಂಶ" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "ಬಳಕೆದಾರರ ಪ್ರತಿಕ್ರ wiki_element_locale_name = "ಲೊಕೇಲ್: %s" wiki_element_page = "ಪುಟ: %s" wiki_element_resource_name = "ಸಂಪನ್ಮೂಲ: %s" -configure_element_toggle_page_settings = "ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು" +wiki_element_toggle_page_settings = "ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು" wiki_element_page_type = "ಪುಟ ಕೌಟುಂಬಿಕತೆ:" wiki_element_page_alias = "ಅಲಿಯಾಸ್ ಪುಟ:" wiki_element_page_border = "ಪುಟ ಗಡಿ:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s ಬೈಟ್ಗಳು)." wiki_element_revert = "ಹಿಂದಿರುಗುತ್ತವೆ" wiki_element_history = "ಇತಿಹಾಸ" wiki_element_discuss = "ಚರ್ಚಿಸಲು" -wiki_element_toggle_page_settings = "ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು" ; ; EditlocalesElement.php editlocales_element_edit_locale = "ಸಂಪಾದಿಸಿ ಲೊಕೇಲ್: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "ಉಳಿಸಲು" ; GroupfeedElement.php groupfeed_element_add_group = "ಗುಂಪು ಸೇರಿಸಿ" groupfeed_element_request_add = "ವಿನಂತಿಯನ್ನು ಗುಂಪು ಸೇರಿಸಿ" -groupfeed_element_comment = "ಕಾಮೆಂಟ್" +groupfeed_element_add_comment = "ಒಂದು ಕಾಮೆಂಟ್ ಸೇರಿಸಿ" +groupfeed_element_drag_textarea = "ಡ್ರ್ಯಾಗ್ ಐಟಂಗಳನ್ನು ಒಳಗೆ textarea to add them..." +groupfeed_element_click_textarea = "ಅಥವಾ ಕ್ಲಿಕ್ ಮಾಡಿ ಅವುಗಳನ್ನು ಆಯ್ಕೆ." +groupfeed_element_save = "ಉಳಿಸಲು" groupfeed_element_group_wiki = "ವಿಕಿ" groupfeed_element_group_stats = "%s ಪೋಸ್ಟ್ಗಳನ್ನು, %s ಎಳೆಗಳನ್ನು" groupfeed_element_last_post = "ಕೊನೆಯ ಪೋಸ್ಟ್:" -groupfeed_element_start_thread = "ಹೊಸ ಥ್ರೆಡ್ ಆರಂಭಿಸಲು" groupfeed_element_no_posts_yet = "ಯಾವುದೇ ಪೋಸ್ಟ್ಗಳು ಇನ್ನೂ!" groupfeed_element_thread_no_exist = "ಥ್ರೆಡ್ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ! ಬಹುಶಃ ಇದು ಅಳಿಸಲಾಗಿದೆ?" +groupfeed_element_comment = "ಕಾಮೆಂಟ್" groupfeed_element_edit = "ಸಂಪಾದಿಸಿ" groupfeed_element_delete = "ಅಳಿಸಿ" groupfeed_element_usericon = "ಬಳಕೆದಾರ ಐಕಾನ್" groupfeed_element_num_posts = "%s ಪೋಸ್ಟ್ಗಳು" groupfeed_element_num_views = "%s ವೀಕ್ಷಣೆಗಳು" -groupfeed_element_start_thread_in_group = "ಪ್ರಾರಂಭಿಸಿ ಹೊಸ ಥ್ರೆಡ್ %s" -groupfeed_element_new_thread_icon = "ಹೊಸ ಥ್ರೆಡ್ ಐಕಾನ್" groupfeed_element_last_edited = "ಕೊನೆಯ ಸಂಪಾದನೆ: %s" groupfeed_element_post_vote = "ಮತ:" groupfeed_element_last_post_info = "ಕೊನೆಯ ಪೋಸ್ಟ್:" +groupfeed_element_start_thread = "ಹೊಸ ಥ್ರೆಡ್ ಆರಂಭಿಸಲು" +groupfeed_element_subject = "ವಿಷಯ" +groupfeed_element_post = "ಪೋಸ್ಟ್" groupfeed_element_feedplaces = "ಆಹಾರ ಸ್ಥಳಗಳು" groupfeed_element_mygroups = "ಎಲ್ಲಾ ಫೀಡ್ಸ್" groupfeed_element_userplaces = "ಬಳಕೆದಾರ ಸ್ಥಳಗಳು" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s ಗುಂಪು ಸ್ಥಳಗಳು" groupfeed_element_wiki_name = "%s ವಿಕಿ" groupfeed_element_recent_threads = "ಇತ್ತೀಚಿನ ಎಳೆಗಳನ್ನು" groupfeed_element_recent_groupfeeds = "ಇತ್ತೀಚಿನ ಫೀಡ್ಗಳನ್ನು" -groupfeed_element_drag_textarea = "ಡ್ರ್ಯಾಗ್ ಐಟಂಗಳನ್ನು ಒಳಗೆ textarea to add them..." -groupfeed_element_click_textarea = "ಅಥವಾ ಕ್ಲಿಕ್ ಮಾಡಿ ಅವುಗಳನ್ನು ಆಯ್ಕೆ." -groupfeed_element_add_comment = "ಒಂದು ಕಾಮೆಂಟ್ ಸೇರಿಸಿ" -groupfeed_element_save = "ಉಳಿಸಲು" -groupfeed_element_subject = "ವಿಷಯ" -groupfeed_element_post = "ಪೋಸ್ಟ್" groupfeed_element_edit_post = "ಸಂಪಾದಿಸಿ ಪೋಸ್ಟ್" groupfeed_element_no_longer_update = "ಗುಂಪು ಫೀಡ್ಸ್ ಇನ್ನು ಮುಂದೆ ಅಪ್ಡೇಟ್!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "ಉಳಿಸಲು" searchmenu_element_wiki_pages = "ವಿಕಿ ಪುಟಗಳು" searchmenu_element_suggest = "ಸಲಹೆ ಒಂದು Url" searchmenu_element_tools = "ಪರಿಕರಗಳು" -searchmenu_install_plugin = "Yioop ಹುಡುಕಾಟ ಪ್ಲಗಿನ್" ; ; ManagerolesElement.php manageroles_element_roles = "ಪಾತ್ರಗಳನ್ನು" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "ಸಾಲು %s %s %s" pagingtable_helper_search = "ಹುಡುಕಾಟ" pagingtable_helper_add = "ಸೇರಿಸಿ" ; +; OptionsHelper.php +option_helper_go = "ಹೋಗಿ" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "ಡ್ರ್ಯಾಗ್ ಐಟಂಗಳನ್ನು ಒಳಗೆ textarea to add them..." fileupload_helper_click_textarea = "ಅಥವಾ ಕ್ಲಿಕ್ ಮಾಡಿ ಅವುಗಳನ್ನು ಆಯ್ಕೆ." diff --git a/src/locale/kn/statistics.txt b/src/locale/kn/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/kn/statistics.txt +++ b/src/locale/kn/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 2540e4e20..d06443f7c 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "계정 만들어지지 않습-사용 ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "기계 상태" +machinestatus_view_manage_crawls = "관리롤" machinestatus_view_media_updater = "미디어 Updater" machinestatus_view_configure_media_jobs = "구성 미디어 작업" machinestatus_view_nameserver = "이름 서버" @@ -815,7 +815,7 @@ signin_view_resend_activation = "인증메일 재발송" signin_view_return = "Return" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "크롤 상태" crawlstatus_view_manage_machines = "관리 시스템" crawlstatus_view_crawls = "크롤" crawlstatus_view_query_stats = "쿼리 통계" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "사용자 의견" wiki_element_locale_name = "로캘:%s" wiki_element_page = "페이지:%s" wiki_element_resource_name = "리소스:%s" -configure_element_toggle_page_settings = "설정" +wiki_element_toggle_page_settings = "설정" wiki_element_page_type = "페이지 유형:" wiki_element_page_alias = "Alias 페이지:" wiki_element_page_border = "페이지 테두리:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s 바이트)." wiki_element_revert = "되돌리기" wiki_element_history = "역사" wiki_element_discuss = "토론" -wiki_element_toggle_page_settings = "설정" ; ; EditlocalesElement.php editlocales_element_edit_locale = "로케일 편집: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "저장" ; GroupfeedElement.php groupfeed_element_add_group = "그룹 추가" groupfeed_element_request_add = "요청을 그룹 추가" -groupfeed_element_comment = "Comment" +groupfeed_element_add_comment = "추가 코멘트" +groupfeed_element_drag_textarea = "드래그는 항목으로 텍스트 영역을 추가한다." +groupfeed_element_click_textarea = "거나 클릭하여 선택합니다." +groupfeed_element_save = "저장" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s 게시물,%s 스레드" groupfeed_element_last_post = "마지막 게시물:" -groupfeed_element_start_thread = "시작하는 새로운 실" groupfeed_element_no_posts_yet = "게시물이 없다." groupfeed_element_thread_no_exist = "스레드가 존재하지 않습니다! 어쩌면 그것은 삭제됩니까?" +groupfeed_element_comment = "Comment" groupfeed_element_edit = "편집" groupfeed_element_delete = "삭제" groupfeed_element_usericon = "사용자 아이콘" groupfeed_element_num_posts = "%s 게시물" groupfeed_element_num_views = "%s 보기" -groupfeed_element_start_thread_in_group = "새로운 시작에서 스레드 %s" -groupfeed_element_new_thread_icon = "새로운 아이콘 스레드" groupfeed_element_last_edited = "마지막 수정:%s" groupfeed_element_post_vote = "투표:" groupfeed_element_last_post_info = "마지막 게시물:" +groupfeed_element_start_thread = "시작하는 새로운 실" +groupfeed_element_subject = "주제" +groupfeed_element_post = "게시" groupfeed_element_feedplaces = "피드 명소" groupfeed_element_mygroups = "모든 피드" groupfeed_element_userplaces = "용 장소" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s 그룹소" groupfeed_element_wiki_name = "%sWiki" groupfeed_element_recent_threads = "최근 스레드" groupfeed_element_recent_groupfeeds = "최근 피드" -groupfeed_element_drag_textarea = "드래그는 항목으로 텍스트 영역을 추가한다." -groupfeed_element_click_textarea = "거나 클릭하여 선택합니다." -groupfeed_element_add_comment = "추가 코멘트" -groupfeed_element_save = "저장" -groupfeed_element_subject = "주제" -groupfeed_element_post = "게시" groupfeed_element_edit_post = "후 편집" groupfeed_element_no_longer_update = "그룹 피드 더 이상 업데이트!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "저장" searchmenu_element_wiki_pages = "Wiki 페이지" searchmenu_element_suggest = "건 Url" searchmenu_element_tools = "도구" -searchmenu_install_plugin = "Yioop 검색 플러그인" ; ; ManagerolesElement.php manageroles_element_roles = "역할" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "행 %s %s %s" pagingtable_helper_search = "검색" pagingtable_helper_add = "추가" ; +; OptionsHelper.php +option_helper_go = "가" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "드래그는 항목으로 텍스트 영역을 추가한다." fileupload_helper_click_textarea = "거나 클릭하여 선택합니다." diff --git a/src/locale/ko/statistics.txt b/src/locale/ko/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/ko/statistics.txt +++ b/src/locale/ko/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 90bb2c0e6..d52cef184 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Geen account aangemaakt - Gebruikersn ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Machine Statussen" +machinestatus_view_manage_crawls = "Beheren Kruipt" machinestatus_view_media_updater = "media Updater" machinestatus_view_configure_media_jobs = "Configureren Media Banen" machinestatus_view_nameserver = "Naam Server" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Activering Opnieuw Verzenden Van E-Mail" signin_view_return = "Terug" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Kruipen Status" crawlstatus_view_manage_machines = "Beheren Van Machines" crawlstatus_view_crawls = "Kruipt" crawlstatus_view_query_stats = "Query Statistieken" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Feedback Van Gebruikers" wiki_element_locale_name = "Locale: %s" wiki_element_page = "Pagina: %s" wiki_element_resource_name = "Bron: %s" -configure_element_toggle_page_settings = "instellingen" +wiki_element_toggle_page_settings = "Instellingen" wiki_element_page_type = "Pagina Type:" wiki_element_page_alias = "Alias pagina Aan:" wiki_element_page_border = "Pagina Border:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "Terug" wiki_element_history = "geschiedenis" wiki_element_discuss = "bespreken" -wiki_element_toggle_page_settings = "Instellingen" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Bewerken Landinstelling: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Opslaan" ; GroupfeedElement.php groupfeed_element_add_group = "Groep toevoegen" groupfeed_element_request_add = "Verzoek Groep toevoegen" -groupfeed_element_comment = "commentaar" +groupfeed_element_add_comment = "Voeg een reactie toe" +groupfeed_element_drag_textarea = "Sleep items in de textarea om ze toe te voegen..." +groupfeed_element_click_textarea = "of klik op om ze te selecteren." +groupfeed_element_save = "Opslaan" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s berichten, %s threads" groupfeed_element_last_post = "Laatste Post:" -groupfeed_element_start_thread = "Start nieuw onderwerp" groupfeed_element_no_posts_yet = "Deze groep heeft nog geen berichten!" groupfeed_element_thread_no_exist = "Draad bestaat niet! Misschien was verwijderd?" +groupfeed_element_comment = "commentaar" groupfeed_element_edit = "uitgeven" groupfeed_element_delete = "verwijderen" groupfeed_element_usericon = "Pictogram Gebruiker" groupfeed_element_num_posts = " %s berichten" groupfeed_element_num_views = "uitzicht %s" -groupfeed_element_start_thread_in_group = "Start nieuw onderwerp in %s" -groupfeed_element_new_thread_icon = "Nieuwe Thread Pictogram" groupfeed_element_last_edited = "Laatst gewijzigd: %s" groupfeed_element_post_vote = "stem:" groupfeed_element_last_post_info = "Laatste bericht:" +groupfeed_element_start_thread = "Start nieuw onderwerp" +groupfeed_element_subject = "onderwerp" +groupfeed_element_post = "post" groupfeed_element_feedplaces = "Invoer Plaatsen" groupfeed_element_mygroups = "Alle Feeds" groupfeed_element_userplaces = "Gebruiker" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Groep Plaatsen" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Recente Threads" groupfeed_element_recent_groupfeeds = "Recente Feeds" -groupfeed_element_drag_textarea = "Sleep items in de textarea om ze toe te voegen..." -groupfeed_element_click_textarea = "of klik op om ze te selecteren." -groupfeed_element_add_comment = "Voeg een reactie toe" -groupfeed_element_save = "Opslaan" -groupfeed_element_subject = "onderwerp" -groupfeed_element_post = "post" groupfeed_element_edit_post = "Bericht wijzigen" groupfeed_element_no_longer_update = "Groep feeds niet meer updaten!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Opslaan" searchmenu_element_wiki_pages = "Wiki Pagina ' S" searchmenu_element_suggest = "Stel een Url" searchmenu_element_tools = "Hulpmiddelen" -searchmenu_install_plugin = "Yioop Search Plugin" ; ; ManagerolesElement.php manageroles_element_roles = "rol Lijst" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Rij %s naar %s van %s" pagingtable_helper_search = "zoeken" pagingtable_helper_add = "Toevoegen" ; +; OptionsHelper.php +option_helper_go = "Ga" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Sleep items in het tekstveld om ze toe te voegen ..." fileupload_helper_click_textarea = "of klik om ze te selecteren." diff --git a/src/locale/nl/statistics.txt b/src/locale/nl/statistics.txt index b6bef56f0..5a165df53 100644 --- a/src/locale/nl/statistics.txt +++ b/src/locale/nl/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index bd5f17957..7bcba611c 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Nie jest tworzone konto - nazwa użyt ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Maszyna Stanów" +machinestatus_view_manage_crawls = "Zarządzanie Skrada" machinestatus_view_media_updater = "MEDIA Апдейтер" machinestatus_view_configure_media_jobs = "Dostosować Pracę MEDIÓW " machinestatus_view_nameserver = "Nazwa Serwera " @@ -815,7 +815,7 @@ signin_view_resend_activation = "Wyślij Ponownie E-Mail Aktywacyjny " signin_view_return = "Powrót" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Stan Indeksowania " crawlstatus_view_manage_machines = "Sterowanie Maszyny" crawlstatus_view_crawls = "Уползает" crawlstatus_view_query_stats = "Statystyki Zapytań " @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Opinie Użytkowników " wiki_element_locale_name = "Język: %s" wiki_element_page = "Stron: %s" wiki_element_resource_name = "Źródło: %s" -configure_element_toggle_page_settings = "Parametry" +wiki_element_toggle_page_settings = "Parametry" wiki_element_page_type = "Typ Strony:" wiki_element_page_alias = "Alias Strony:" wiki_element_page_border = "Granice Strony:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bajtów)." wiki_element_revert = "Powrót" wiki_element_history = "Historia" wiki_element_discuss = "Omówić" -wiki_element_toggle_page_settings = "Parametry" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Edycja Język: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Zapisz" ; GroupfeedElement.php groupfeed_element_add_group = "Dodaj Grupę" groupfeed_element_request_add = "Należy Dodać Grupę" -groupfeed_element_comment = "Komentarz" +groupfeed_element_add_comment = "Dodaj komentarz" +groupfeed_element_drag_textarea = "Przeciągnij elementy w textarea, aby dodać im..." +groupfeed_element_click_textarea = "lub naciśnij przycisk, aby je wybrać." +groupfeed_element_save = "Zapisz" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s stanowisk, %s wątków" groupfeed_element_last_post = "Ostatni Post:" -groupfeed_element_start_thread = "Rozpocząć Nowy Temat" groupfeed_element_no_posts_yet = "Odpowiedzi na razie nie ma!" groupfeed_element_thread_no_exist = "Wątek nie istnieje! Możliwe, że został usunięty?" +groupfeed_element_comment = "Komentarz" groupfeed_element_edit = "Edytuj" groupfeed_element_delete = "Usunąć" groupfeed_element_usericon = "Ikona Użytkownika " groupfeed_element_num_posts = "%s wiadomości" groupfeed_element_num_views = "%s wyświetleń" -groupfeed_element_start_thread_in_group = "Start nowego wątku w %s" -groupfeed_element_new_thread_icon = "Nowa Ikona Wątku " groupfeed_element_last_edited = "Ostatnio Edytowane: %s" groupfeed_element_post_vote = "Głosy:" groupfeed_element_last_post_info = "Ostatni Post:" +groupfeed_element_start_thread = "Rozpocząć Nowy Temat" +groupfeed_element_subject = "Temat" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Откормочных Miejsc" groupfeed_element_mygroups = "Wszystkich Karmi" groupfeed_element_userplaces = "Użytkownik" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Grupa" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Najnowsze Tematy" groupfeed_element_recent_groupfeeds = "Ostatnie Karmi" -groupfeed_element_drag_textarea = "Przeciągnij elementy w textarea, aby dodać im..." -groupfeed_element_click_textarea = "lub naciśnij przycisk, aby je wybrać." -groupfeed_element_add_comment = "Dodaj komentarz" -groupfeed_element_save = "Zapisz" -groupfeed_element_subject = "Temat" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Edytuj Post" groupfeed_element_no_longer_update = "Grupa Nie Aktualizacja!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Zapisz" searchmenu_element_wiki_pages = "Strony Wiki " searchmenu_element_suggest = "Proponuję URL" searchmenu_element_tools = "Narzędzia" -searchmenu_install_plugin = "Yioop Wyszukiwania Wtyczki " ; ; ManagerolesElement.php manageroles_element_roles = "Roli" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Linia %s %s %s" pagingtable_helper_search = "Wyszukiwanie" pagingtable_helper_add = "Dodać" ; +; OptionsHelper.php +option_helper_go = "Przejść" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Przeciągnij elementy w textarea, aby dodać im..." fileupload_helper_click_textarea = "lub naciśnij przycisk, aby je wybrać." diff --git a/src/locale/pl/statistics.txt b/src/locale/pl/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/pl/statistics.txt +++ b/src/locale/pl/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 1d4b2def5..42a9d8aaa 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Conta não criado - nome de usu ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "A Máquina De Estados" +machinestatus_view_manage_crawls = "Gerenciar Rastreamentos" machinestatus_view_media_updater = "Mídia Updater" machinestatus_view_configure_media_jobs = "Configurar Trabalhos De Mídia" machinestatus_view_nameserver = "Nome Do Servidor" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Reenviar E-Mail De Ativação" signin_view_return = "Retorno" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Status De Rastreamento De" crawlstatus_view_manage_machines = "Gerenciar As Máquinas" crawlstatus_view_crawls = "Rastreamentos" crawlstatus_view_query_stats = "Consulta De Estatísticas" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Comentários Do Usuário" wiki_element_locale_name = "Localidade: %s" wiki_element_page = "Página: %s" wiki_element_resource_name = "Recurso: %s" -configure_element_toggle_page_settings = "Definições" +wiki_element_toggle_page_settings = "Definições" wiki_element_page_type = "Tipo De Página:" wiki_element_page_alias = "Alias Página:" wiki_element_page_border = "Borda De Página:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "Reverter" wiki_element_history = "História" wiki_element_discuss = "Discutir" -wiki_element_toggle_page_settings = "Definições" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Editar Região: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Salvar" ; GroupfeedElement.php groupfeed_element_add_group = "Adicionar Grupo" groupfeed_element_request_add = "Pedido Adicionar Grupo" -groupfeed_element_comment = "Comentário" +groupfeed_element_add_comment = "Adicionar um Comentário" +groupfeed_element_drag_textarea = "Arraste os itens em textarea para adicioná-los..." +groupfeed_element_click_textarea = "ou clique para selecioná-los." +groupfeed_element_save = "Salvar" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posts, %s threads" groupfeed_element_last_post = "Último Post:" -groupfeed_element_start_thread = "Iniciar Novo Segmento" groupfeed_element_no_posts_yet = "Não há posts ainda!" groupfeed_element_thread_no_exist = "Thread não existe! Talvez por isso, foi excluído?" +groupfeed_element_comment = "Comentário" groupfeed_element_edit = "Editar" groupfeed_element_delete = "Apagar" groupfeed_element_usericon = "Ícone De Usuário" groupfeed_element_num_posts = "%s posts" groupfeed_element_num_views = "%s pontos de vista" -groupfeed_element_start_thread_in_group = "Iniciar Novo Segmento no %s" -groupfeed_element_new_thread_icon = "Novo Thread Ícone" groupfeed_element_last_edited = "Editado Pela Última Vez: %s" groupfeed_element_post_vote = "Votar:" groupfeed_element_last_post_info = "Último Post:" +groupfeed_element_start_thread = "Iniciar Novo Segmento" +groupfeed_element_subject = "Assunto" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Alimentação Lugares" groupfeed_element_mygroups = "Todos Os Feeds" groupfeed_element_userplaces = "Usuário Lugares" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Grupo Lugares" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Mensagens Recentes" groupfeed_element_recent_groupfeeds = "Últimos Feeds" -groupfeed_element_drag_textarea = "Arraste os itens em textarea para adicioná-los..." -groupfeed_element_click_textarea = "ou clique para selecioná-los." -groupfeed_element_add_comment = "Adicionar um Comentário" -groupfeed_element_save = "Salvar" -groupfeed_element_subject = "Assunto" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Editar Post" groupfeed_element_no_longer_update = "Grupo De Feeds Não Atualizar!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Salvar" searchmenu_element_wiki_pages = "Páginas Wiki" searchmenu_element_suggest = "Submeta uma Url" searchmenu_element_tools = "Ferramentas" -searchmenu_install_plugin = "Yioop Plug-In De Pesquisa" ; ; ManagerolesElement.php manageroles_element_roles = "Funções" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Linha %s %s %s" pagingtable_helper_search = "Procura" pagingtable_helper_add = "Adicionar" ; +; OptionsHelper.php +option_helper_go = "Ir" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Arraste os itens em textarea para adicioná-los..." fileupload_helper_click_textarea = "ou clique para selecioná-los." diff --git a/src/locale/pt/statistics.txt b/src/locale/pt/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/pt/statistics.txt +++ b/src/locale/pt/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index e1f69bfad..3a49dc73e 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Не создается учетна ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Машина Статусов" +machinestatus_view_manage_crawls = "Управление Ползает" machinestatus_view_media_updater = "СМИ Апдейтер" machinestatus_view_configure_media_jobs = "Настроить Работу СМИ " machinestatus_view_nameserver = "Имя Сервера " @@ -815,7 +815,7 @@ signin_view_resend_activation = "Повторно Отправить Письм signin_view_return = "Вернуться" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Статус Ползать " crawlstatus_view_manage_machines = "Управление Машины" crawlstatus_view_crawls = "Уползает" crawlstatus_view_query_stats = "Статистика Запросов " @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Отзывы Пользователей " wiki_element_locale_name = "Язык: %s" wiki_element_page = "Страницы: %s" wiki_element_resource_name = "Ресурс: %s" -configure_element_toggle_page_settings = "Параметры" +wiki_element_toggle_page_settings = "Параметры" wiki_element_page_type = "Тип Страницы:" wiki_element_page_alias = "Псевдоним Страницы:" wiki_element_page_border = "Границы Страницы:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s байт)." wiki_element_revert = "Вернуться" wiki_element_history = "История" wiki_element_discuss = "Обсудить" -wiki_element_toggle_page_settings = "Параметры" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Редактировать Язык: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Сохранить" ; GroupfeedElement.php groupfeed_element_add_group = "Добавить Группу" groupfeed_element_request_add = "Просьба Добавить Группу" -groupfeed_element_comment = "Комментарий" +groupfeed_element_add_comment = "Добавить комментарий" +groupfeed_element_drag_textarea = "Перетащите элементы в textarea, чтобы добавить им..." +groupfeed_element_click_textarea = "или нажмите кнопку, чтобы выбрать их." +groupfeed_element_save = "Сохранить" groupfeed_element_group_wiki = "Вики" groupfeed_element_group_stats = "%s должностей, %s потоков" groupfeed_element_last_post = "Последний Пост:" -groupfeed_element_start_thread = "Начать Новую Тему" groupfeed_element_no_posts_yet = "Ответов пока нет!" groupfeed_element_thread_no_exist = "Поток не существует! Возможно, он был удален?" +groupfeed_element_comment = "Комментарий" groupfeed_element_edit = "Редактировать" groupfeed_element_delete = "Удалить" groupfeed_element_usericon = "Значок Пользователя " groupfeed_element_num_posts = "%s сообщений" groupfeed_element_num_views = "%s просмотров" -groupfeed_element_start_thread_in_group = "Старт нового потока в %s" -groupfeed_element_new_thread_icon = "Новый Значок-Нить " groupfeed_element_last_edited = "Последний Раз Редактировалось: %s" groupfeed_element_post_vote = "Голоса:" groupfeed_element_last_post_info = "Последний Пост:" +groupfeed_element_start_thread = "Начать Новую Тему" +groupfeed_element_subject = "Тема" +groupfeed_element_post = "Пост" groupfeed_element_feedplaces = "Откормочных Мест" groupfeed_element_mygroups = "Всех Кормит" groupfeed_element_userplaces = "Пользователь" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Группа" groupfeed_element_wiki_name = "%s Вики" groupfeed_element_recent_threads = "Последние Темы" groupfeed_element_recent_groupfeeds = "Последние Кормит" -groupfeed_element_drag_textarea = "Перетащите элементы в textarea, чтобы добавить им..." -groupfeed_element_click_textarea = "или нажмите кнопку, чтобы выбрать их." -groupfeed_element_add_comment = "Добавить комментарий" -groupfeed_element_save = "Сохранить" -groupfeed_element_subject = "Тема" -groupfeed_element_post = "Пост" groupfeed_element_edit_post = "Редактировать Пост" groupfeed_element_no_longer_update = "Группа Для Не Обновление!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Сохранить" searchmenu_element_wiki_pages = "Страницы Wiki " searchmenu_element_suggest = "Предлагаю URL-адрес" searchmenu_element_tools = "Инструменты" -searchmenu_install_plugin = "Yioop Поисковый Плагин " ; ; ManagerolesElement.php manageroles_element_roles = "Роли" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Строка %s по %s из %s" pagingtable_helper_search = "Поиск" pagingtable_helper_add = "Добавить" ; +; OptionsHelper.php +option_helper_go = "Перейти" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Перетащите элементы в textarea, чтобы добавить им..." fileupload_helper_click_textarea = "или нажмите кнопку, чтобы выбрать их." diff --git a/src/locale/ru/statistics.txt b/src/locale/ru/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/ru/statistics.txt +++ b/src/locale/ru/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 984a4dd3d..55de2c904 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "ఖాతా సృస్టించ ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "యంత్రం హోదాలు" +machinestatus_view_manage_crawls = "నిర్వహించండి Crawls" machinestatus_view_media_updater = "మీడియా నవీకరణ" machinestatus_view_configure_media_jobs = "ఆకృతీకరించుటకు మీడియా ఉద్యోగాలు" machinestatus_view_nameserver = "పేరు సర్వర్" @@ -815,7 +815,7 @@ signin_view_resend_activation = "యాక్టివేషన్ ఇమెయ signin_view_return = "తిరిగి" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "లోని స్థితి" crawlstatus_view_manage_machines = "నిర్వహించండి యంత్రాలు" crawlstatus_view_crawls = "Crawls" crawlstatus_view_query_stats = "ప్రశ్న గణాంకాలు" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "యూజర్ చూడు" wiki_element_locale_name = "లొకేల్: %s" wiki_element_page = "పేజ్: %s" wiki_element_resource_name = "వనరు: %s" -configure_element_toggle_page_settings = "సెట్టింగ్స్" +wiki_element_toggle_page_settings = "సెట్టింగులు" wiki_element_page_type = "పేజ్ టైపు:" wiki_element_page_alias = "అలియాస్ పేజీ:" wiki_element_page_border = "పేజీ సరిహద్దు:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "తిరిగి" wiki_element_history = "చరిత్ర" wiki_element_discuss = "చర్చించడానికి" -wiki_element_toggle_page_settings = "సెట్టింగులు" ; ; EditlocalesElement.php editlocales_element_edit_locale = "ఎడిట్ లొకేల్: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "సేవ్" ; GroupfeedElement.php groupfeed_element_add_group = "ఆడ్ గ్రూప్" groupfeed_element_request_add = "రిక్వెస్ట్ ఆడ్ గ్రూప్" -groupfeed_element_comment = "వ్యాఖ్య" +groupfeed_element_add_comment = "వ్యాఖ్యను జోడించండి" +groupfeed_element_drag_textarea = "డ్రాగ్ అంశాలను లోకి టెక్స్ట్ఏరియా వాటిని జోడించడానికి..." +groupfeed_element_click_textarea = "లేదా క్లిక్ ఎంచుకోండి them." +groupfeed_element_save = "సేవ్" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s పోస్ట్లు, %s థ్రెడ్లు" groupfeed_element_last_post = "ఆఖరి పోస్ట్:" -groupfeed_element_start_thread = "క్రొత్త థ్రెడ్ మొదలుపెట్టండి" groupfeed_element_no_posts_yet = "ఈ గ్రూప్ లో ఇంకా పోస్ట్లు లేవు!" groupfeed_element_thread_no_exist = "థ్రెడ్ ఉనికిలో లేదు! ఇది తొలగించబడి ఉండవచ్చు?" +groupfeed_element_comment = "వ్యాఖ్య" groupfeed_element_edit = "ఎడిట్" groupfeed_element_delete = "డిలీట్" groupfeed_element_usericon = "యూజర్ చిహ్నం" groupfeed_element_num_posts = "%s పోస్ట్లు" groupfeed_element_num_views = "%s వ్యూస్" -groupfeed_element_start_thread_in_group = "క్రొత్త థ్రెడ్ %s" -groupfeed_element_new_thread_icon = "కొత్త థ్రెడ్ చిహ్నం" groupfeed_element_last_edited = "చివరిగా సవరించబడింది: %s" groupfeed_element_post_vote = "వోట్:" groupfeed_element_last_post_info = "ఆఖరి పోస్ట్:" +groupfeed_element_start_thread = "క్రొత్త థ్రెడ్ మొదలుపెట్టండి" +groupfeed_element_subject = "విషయం" +groupfeed_element_post = "పోస్ట్" groupfeed_element_feedplaces = "Feed ప్రదేశాలు" groupfeed_element_mygroups = "అన్ని ఫీడ్లు" groupfeed_element_userplaces = "యూజర్ ప్రదేశాలు" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s గ్రూప్ ప్రదేశాల groupfeed_element_wiki_name = "%s వికీ" groupfeed_element_recent_threads = "ఇటీవలి థ్రెడ్లు" groupfeed_element_recent_groupfeeds = "ఇటీవల ఫీడ్లు" -groupfeed_element_drag_textarea = "డ్రాగ్ అంశాలను లోకి టెక్స్ట్ఏరియా వాటిని జోడించడానికి..." -groupfeed_element_click_textarea = "లేదా క్లిక్ ఎంచుకోండి them." -groupfeed_element_add_comment = "వ్యాఖ్యను జోడించండి" -groupfeed_element_save = "సేవ్" -groupfeed_element_subject = "విషయం" -groupfeed_element_post = "పోస్ట్" groupfeed_element_edit_post = "పోస్ట్ లను సవరించు" groupfeed_element_no_longer_update = "గ్రూప్ ఫీడ్స్ అప్డేట్ అవడంలేదు!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "సేవ్" searchmenu_element_wiki_pages = "వికీ పేజీలు" searchmenu_element_suggest = "ఒక సూచిస్తున్నాయి Url" searchmenu_element_tools = "ఉపకరణాలు" -searchmenu_install_plugin = "Yioop శోధన ప్లగ్ఇన్" ; ; ManagerolesElement.php manageroles_element_roles = "రోల్ జాబితా" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "వరుస %s %s %s" pagingtable_helper_search = "శోధన" pagingtable_helper_add = "జోడించండి" ; +; OptionsHelper.php +option_helper_go = "Go" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "డ్రాగ్ అంశాలను లోకి టెక్స్ట్ఏరియా వాటిని జోడించడానికి..." fileupload_helper_click_textarea = "లేదా క్లిక్ ఎంచుకోండి them." diff --git a/src/locale/te/statistics.txt b/src/locale/te/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/te/statistics.txt +++ b/src/locale/te/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 310eb39d5..7711f2717 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "บัญชีผู้ใช้ไ ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "เครื่อง Statuses" +machinestatus_view_manage_crawls = "จัดการคลานขึ้น" machinestatus_view_media_updater = "สื่อ Updater" machinestatus_view_configure_media_jobs = "ปรับแต่งงานสื่อ" machinestatus_view_nameserver = "ชื่อเซิร์ฟเวอร์" @@ -815,7 +815,7 @@ signin_view_resend_activation = "ส่งอีกครั้งการก signin_view_return = "กลับมา" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "คลาสถานะ" crawlstatus_view_manage_machines = "จัดการเครื่องจักร" crawlstatus_view_crawls = "คลานขึ้น" crawlstatus_view_query_stats = "Query สถิติ" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "การแจ้งเตือนการเ wiki_element_locale_name = "ค่าท้องถิ่น:ทั้งหมด %s" wiki_element_page = "หน้า:ทั้งหมด %s" wiki_element_resource_name = "ทรัพยากร:ทั้งหมด %s" -configure_element_toggle_page_settings = "การตั้งค่า" +wiki_element_toggle_page_settings = "การตั้งค่า" wiki_element_page_type = "หน้าประเภท:" wiki_element_page_alias = "นามแฝงหน้าไปยัง:" wiki_element_page_border = "ขอบกระดาษ:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(ทั้งหมด %s ไบต์)." wiki_element_revert = "กลับเป็นตรงกันข้าม@action" wiki_element_history = "ประวัติศาสตร์" wiki_element_discuss = "คุยเรื่อง" -wiki_element_toggle_page_settings = "การตั้งค่า" ; ; EditlocalesElement.php editlocales_element_edit_locale = "แก้ไขค่าท้องถิ่น:ทั้งหมด %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "บันทึก" ; GroupfeedElement.php groupfeed_element_add_group = "เพิ่มกลุ่ม" groupfeed_element_request_add = "การร้องขอเพิ่มกลุ่ม" -groupfeed_element_comment = "ความคิดเห็น" +groupfeed_element_add_comment = "เพิ่มความคิดเห็น" +groupfeed_element_drag_textarea = "ลากรายการเข้าไปใน textarea เพื่อเพิ่มพวกเขา..." +groupfeed_element_click_textarea = "หรือคลิกเพื่อเลือกพวกเขา" +groupfeed_element_save = "บันทึก" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "ทั้งหมด %s กัปตัน..เสาทางนี้,เธรดข่าวทั้งหมด %s" groupfeed_element_last_post = "คือการโพสครั้งสุดท้าย:" -groupfeed_element_start_thread = "เริ่มต้นใหม่เธรด" groupfeed_element_no_posts_yet = "ไม่มีกัปตัน..เสาทางนี้รึยัง!" groupfeed_element_thread_no_exist = "เธรดยังไม่มีอยู่! บางทีมันอาจจะถูกลบออก?" +groupfeed_element_comment = "ความคิดเห็น" groupfeed_element_edit = "แก้ไข" groupfeed_element_delete = "ลบ" groupfeed_element_usericon = "ของผู้ใช้ภาพไอคอน" groupfeed_element_num_posts = "ทั้งหมด %s กัปตัน..เสาทางนี้" groupfeed_element_num_views = "มุมมองทั้งหมด %s" -groupfeed_element_start_thread_in_group = "เริ่มต้นใหม่ด้านในทั้งหมด %s" -groupfeed_element_new_thread_icon = "คนใหม่เธรดภาพไอคอน" groupfeed_element_last_edited = "เมื่อแก้ไข:ทั้งหมด %s" groupfeed_element_post_vote = "ลงคะแนน:" groupfeed_element_last_post_info = "คือการโพสครั้งสุดท้าย:" +groupfeed_element_start_thread = "เริ่มต้นใหม่เธรด" +groupfeed_element_subject = "เรื่อง" +groupfeed_element_post = "โพสต์" groupfeed_element_feedplaces = "แหล่งป้อนสถานที่" groupfeed_element_mygroups = "แหล่งป้อนทั้งหมด" groupfeed_element_userplaces = "สถานที่ของผู้ใช้" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s องกลุ่มที่" groupfeed_element_wiki_name = "ทั้งหมด %s Wiki" groupfeed_element_recent_threads = "ล่าสุดเธรดข่าว" groupfeed_element_recent_groupfeeds = "ล่าสุดแหล่งป้อน" -groupfeed_element_drag_textarea = "ลากรายการเข้าไปใน textarea เพื่อเพิ่มพวกเขา..." -groupfeed_element_click_textarea = "หรือคลิกเพื่อเลือกพวกเขา" -groupfeed_element_add_comment = "เพิ่มความคิดเห็น" -groupfeed_element_save = "บันทึก" -groupfeed_element_subject = "เรื่อง" -groupfeed_element_post = "โพสต์" groupfeed_element_edit_post = "แก้ไขโพสต์" groupfeed_element_no_longer_update = "กลุ่มแหล่งป้อนไม่ได้กำลังปรับปรุง!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "บันทึก" searchmenu_element_wiki_pages = "Wiki หน้า" searchmenu_element_suggest = "ขอแนะนำให้เป็นที่อยู่ Url" searchmenu_element_tools = "เครื่องมือ" -searchmenu_install_plugin = "Yioop การค้นหาโปรแกรมเสริม" ; ; ManagerolesElement.php manageroles_element_roles = "บทบาท" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "แถวทั้งหมด %s ต้อง % pagingtable_helper_search = "การค้นหา" pagingtable_helper_add = "เพิ่ม" ; +; OptionsHelper.php +option_helper_go = "อไป" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "ลากรายการเข้าไปใน textarea เพื่อเพิ่มพวกเขา..." fileupload_helper_click_textarea = "หรือคลิกเพื่อเลือกพวกเขา" diff --git a/src/locale/th/statistics.txt b/src/locale/th/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/th/statistics.txt +++ b/src/locale/th/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index 473987312..2c7a57929 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Account ay hindi nilikha - ang Userna ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Machine Katayuan" +machinestatus_view_manage_crawls = "Pamahalaan Ang Mga Pag-Crawl" machinestatus_view_media_updater = "Media Updater" machinestatus_view_configure_media_jobs = "I-Configure Ang Mga Media Trabaho" machinestatus_view_nameserver = "Pangalan Ng Server" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Muling Ipadala Ang Activation Email" signin_view_return = "Bumalik" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "I-Crawl Katayuan" crawlstatus_view_manage_machines = "Pamahalaan Ang Machine" crawlstatus_view_crawls = "Pag-crawl" crawlstatus_view_query_stats = "Istatistika Ng Mga Query" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Feedback Ng User" wiki_element_locale_name = "Locale: %s" wiki_element_page = "Pahina: %s" wiki_element_resource_name = "Mapagkukunan: %s" -configure_element_toggle_page_settings = "Mga setting" +wiki_element_toggle_page_settings = "Mga setting" wiki_element_page_type = "Uri Ng Pahina:" wiki_element_page_alias = "Alias Ng Pahina Upang:" wiki_element_page_border = "Pahina Ng Mga Hangganan:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s bytes)." wiki_element_revert = "Ibalik sa dati" wiki_element_history = "Kasaysayan" wiki_element_discuss = "Talakayin" -wiki_element_toggle_page_settings = "Mga setting" ; ; EditlocalesElement.php editlocales_element_edit_locale = "I-Edit Ang Mga Locale: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "I-Save ang" ; GroupfeedElement.php groupfeed_element_add_group = "Magdagdag Ng Mga Grupo" groupfeed_element_request_add = "Kahilingan Magdagdag Ng Mga Grupo" -groupfeed_element_comment = "Komento" +groupfeed_element_add_comment = "Magdagdag ng isang Komento" +groupfeed_element_drag_textarea = "I-Drag ang mga item sa textarea upang idagdag ang mga ito..." +groupfeed_element_click_textarea = "o i-click upang piliin ang mga ito." +groupfeed_element_save = "I-Save ang" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s post, %s thread" groupfeed_element_last_post = "Huling Post:" -groupfeed_element_start_thread = "Magsimula Ng Bagong Thread" groupfeed_element_no_posts_yet = "Walang mga post pa!" groupfeed_element_thread_no_exist = "Thread na ito ay hindi umiiral! Siguro ito ay tinanggal?" +groupfeed_element_comment = "Komento" groupfeed_element_edit = "I-Edit" groupfeed_element_delete = "Tanggalin ang" groupfeed_element_usericon = "Gumagamit Ng Mga Icon" groupfeed_element_num_posts = "%s post" groupfeed_element_num_views = "%s mga tanawin" -groupfeed_element_start_thread_in_group = "Simulan ang Bagong Thread sa %s" -groupfeed_element_new_thread_icon = "Bagong Thread Icon" groupfeed_element_last_edited = "Huling Edit: %s" groupfeed_element_post_vote = "Bumoto:" groupfeed_element_last_post_info = "Huling Post:" +groupfeed_element_start_thread = "Magsimula Ng Bagong Thread" +groupfeed_element_subject = "Paksa" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Feed Lugar" groupfeed_element_mygroups = "Ang Lahat Ng Mga Feed" groupfeed_element_userplaces = "Gumagamit Ng Mga Lugar" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Grupo Na Lugar" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Kamakailang Mga Thread" groupfeed_element_recent_groupfeeds = "Kamakailang Mga Feed" -groupfeed_element_drag_textarea = "I-Drag ang mga item sa textarea upang idagdag ang mga ito..." -groupfeed_element_click_textarea = "o i-click upang piliin ang mga ito." -groupfeed_element_add_comment = "Magdagdag ng isang Komento" -groupfeed_element_save = "I-Save ang" -groupfeed_element_subject = "Paksa" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "I-Edit Ang Post Na Ito" groupfeed_element_no_longer_update = "Grupo Ng Mga Feed Ay Hindi Na-Update!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "I-Save ang" searchmenu_element_wiki_pages = "Mga Pahina Ng Wiki" searchmenu_element_suggest = "Magmungkahi ng isang Url" searchmenu_element_tools = "Mga tool" -searchmenu_install_plugin = "Yioop Paghahanap Plugin" ; ; ManagerolesElement.php manageroles_element_roles = "Tungkulin" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Hilera %s sa %s ng %s" pagingtable_helper_search = "Paghahanap" pagingtable_helper_add = "Magdagdag ng" ; +; OptionsHelper.php +option_helper_go = "Pumunta" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "I-Drag ang mga item sa textarea upang idagdag ang mga ito..." fileupload_helper_click_textarea = "o i-click upang piliin ang mga ito." diff --git a/src/locale/tl/statistics.txt b/src/locale/tl/statistics.txt index b6bef56f0..5a165df53 100644 --- a/src/locale/tl/statistics.txt +++ b/src/locale/tl/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index 5381ec35f..fbae9402f 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "- Kullanıcı adı zaten kullanımda ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Makine Durumları" +machinestatus_view_manage_crawls = "Yönetmek Gezinme" machinestatus_view_media_updater = "Medya Güncelleme" machinestatus_view_configure_media_jobs = "Yapılandırmak Medya İşleri" machinestatus_view_nameserver = "Adı Server" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Yeniden Etkinleştirme E-Posta" signin_view_return = "Dönüş" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Gezinme Durumu" crawlstatus_view_manage_machines = "Yönetmek Makineleri" crawlstatus_view_crawls = "Gezinme" crawlstatus_view_query_stats = "Sorgu İstatistikleri" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Kullanıcı Yorumu" wiki_element_locale_name = "Yerel ayar: %s" wiki_element_page = "Sayfa: %s" wiki_element_resource_name = "Kaynak: %s" -configure_element_toggle_page_settings = "Ayarları" +wiki_element_toggle_page_settings = "Ayarları" wiki_element_page_type = "Sayfa Türü:" wiki_element_page_alias = "Diğer Sayfa İçin:" wiki_element_page_border = "Sayfa Kenarlığı:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s byte)." wiki_element_revert = "Döner" wiki_element_history = "Tarih" wiki_element_discuss = "Tartışmak" -wiki_element_toggle_page_settings = "Ayarları" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Yerel Düzenleme: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Kaydet" ; GroupfeedElement.php groupfeed_element_add_group = "Grup Ekle " groupfeed_element_request_add = "İstek Grup Ekle " -groupfeed_element_comment = "Yorum" +groupfeed_element_add_comment = "Bir Yorum ekle " +groupfeed_element_drag_textarea = "Sürükle button içine eklemek için öğeleri..." +groupfeed_element_click_textarea = "ya da onları seçmek için tıklayın." +groupfeed_element_save = "Kaydet" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s mesajlar, %s konuları" groupfeed_element_last_post = "Son Mesaj:" -groupfeed_element_start_thread = "Yeni Bir Konu Başlatmak" groupfeed_element_no_posts_yet = "Henüz hiçbir mesaj!" groupfeed_element_thread_no_exist = "İş parçacığı yok. Belki de silindi mi?" +groupfeed_element_comment = "Yorum" groupfeed_element_edit = "Edit" groupfeed_element_delete = "Sil" groupfeed_element_usericon = "Kullanıcı Simgesi" groupfeed_element_num_posts = "%s mesaj" groupfeed_element_num_views = "%s manzaralı" -groupfeed_element_start_thread_in_group = "%s Yeni bir konu başlatmak " -groupfeed_element_new_thread_icon = "Yeni Konu Simgesi" groupfeed_element_last_edited = "Son Düzenleyen: %s" groupfeed_element_post_vote = "Oylama:" groupfeed_element_last_post_info = "Son Mesaj:" +groupfeed_element_start_thread = "Yeni Bir Konu Başlatmak" +groupfeed_element_subject = "Konu" +groupfeed_element_post = "Post" groupfeed_element_feedplaces = "Yem Yerler" groupfeed_element_mygroups = "Tüm Yayınları" groupfeed_element_userplaces = "Kullanım Yerleri" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Grup Yerler" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Son Konuları" groupfeed_element_recent_groupfeeds = "Son Beslemeleri" -groupfeed_element_drag_textarea = "Sürükle button içine eklemek için öğeleri..." -groupfeed_element_click_textarea = "ya da onları seçmek için tıklayın." -groupfeed_element_add_comment = "Bir Yorum ekle " -groupfeed_element_save = "Kaydet" -groupfeed_element_subject = "Konu" -groupfeed_element_post = "Post" groupfeed_element_edit_post = "Edit Post" groupfeed_element_no_longer_update = "Grup Artık Güncelleme Beslemeleri!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Kaydet" searchmenu_element_wiki_pages = "Wiki Sayfaları" searchmenu_element_suggest = "Bir Url öneririz " searchmenu_element_tools = "Araçlar" -searchmenu_install_plugin = "Arama Eklentisi Yioop " ; ; ManagerolesElement.php manageroles_element_roles = "Roller" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "%s satır %s %s " pagingtable_helper_search = "Arama" pagingtable_helper_add = "Ekle" ; +; OptionsHelper.php +option_helper_go = "Git" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Sürükle button içine eklemek için öğeleri..." fileupload_helper_click_textarea = "ya da onları seçmek için tıklayın." diff --git a/src/locale/tr/statistics.txt b/src/locale/tr/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/tr/statistics.txt +++ b/src/locale/tr/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index b48da2d27..a36c5cf17 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "Tài khoản không phải được t ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "Máy Tình Trạng" +machinestatus_view_manage_crawls = "Quản Lý Bò" machinestatus_view_media_updater = "Phương Tiện Truyền Thông Cập" machinestatus_view_configure_media_jobs = "Cấu Hình Công Việc Truyền Thông" machinestatus_view_nameserver = "Tên Chủ" @@ -815,7 +815,7 @@ signin_view_resend_activation = "Gửi Email Kích Hoạt" signin_view_return = "Trở lại" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "Thu Thập Thông Tin Tình Trạng" crawlstatus_view_manage_machines = "Quản Lý Máy" crawlstatus_view_crawls = "Bò" crawlstatus_view_query_stats = "Vấn Thống Kê" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "Dùng Hồi" wiki_element_locale_name = "Địa: %s" wiki_element_page = "Trang: %s" wiki_element_resource_name = "Tài nguyên: %s" -configure_element_toggle_page_settings = "Cài đặt" +wiki_element_toggle_page_settings = "Cài đặt" wiki_element_page_type = "Loại Trang:" wiki_element_page_alias = "Bí Danh Trang Để:" wiki_element_page_border = "Trang Biên Giới:" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s nội)." wiki_element_revert = "Trở lại" wiki_element_history = "Lịch sử" wiki_element_discuss = "Thảo luận" -wiki_element_toggle_page_settings = "Cài đặt" ; ; EditlocalesElement.php editlocales_element_edit_locale = "Chỉnh Sửa Địa: %s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "Tiết kiệm" ; GroupfeedElement.php groupfeed_element_add_group = "Thêm Nhóm" groupfeed_element_request_add = "Yêu Cầu Thêm Nhóm" -groupfeed_element_comment = "Bình luận" +groupfeed_element_add_comment = "Thêm một nhận Xét" +groupfeed_element_drag_textarea = "Kéo mục vào các vùng văn thêm họ..." +groupfeed_element_click_textarea = "hoặc nhấp để chọn họ." +groupfeed_element_save = "Tiết kiệm" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s bài, %s chủ đề" groupfeed_element_last_post = "Bài Cuối:" -groupfeed_element_start_thread = "Bắt Đầu Mới Chủ Đề" groupfeed_element_no_posts_yet = "Chưa có bài nào chưa!" groupfeed_element_thread_no_exist = "Chủ đề không tồn tại! Có thể nó đã bị xóa?" +groupfeed_element_comment = "Bình luận" groupfeed_element_edit = "Chỉnh sửa" groupfeed_element_delete = "Xóa" groupfeed_element_usericon = "Sử Dụng Biểu Tượng" groupfeed_element_num_posts = "%s bài" groupfeed_element_num_views = "%s xem" -groupfeed_element_start_thread_in_group = "Bắt đầu chủ Đề Mới trong %s" -groupfeed_element_new_thread_icon = "Chủ Đề Mới Biểu Tượng" groupfeed_element_last_edited = "Cuối Cùng Biên Tập: %s" groupfeed_element_post_vote = "Bỏ phiếu:" groupfeed_element_last_post_info = "Bài Cuối:" +groupfeed_element_start_thread = "Bắt Đầu Mới Chủ Đề" +groupfeed_element_subject = "Chủ đề" +groupfeed_element_post = "Bài" groupfeed_element_feedplaces = "Thức Ăn Nơi" groupfeed_element_mygroups = "Tất Cả Thức Ăn" groupfeed_element_userplaces = "Dùng Nơi" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s Nhóm Nơi" groupfeed_element_wiki_name = "%s Wiki" groupfeed_element_recent_threads = "Gần Đây Đề" groupfeed_element_recent_groupfeeds = "Ăn Gần Đây" -groupfeed_element_drag_textarea = "Kéo mục vào các vùng văn thêm họ..." -groupfeed_element_click_textarea = "hoặc nhấp để chọn họ." -groupfeed_element_add_comment = "Thêm một nhận Xét" -groupfeed_element_save = "Tiết kiệm" -groupfeed_element_subject = "Chủ đề" -groupfeed_element_post = "Bài" groupfeed_element_edit_post = "Chỉnh Sửa Bài" groupfeed_element_no_longer_update = "Nhóm Thức Ăn Không Còn Cập Nhật!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "Tiết kiệm" searchmenu_element_wiki_pages = "Wiki" searchmenu_element_suggest = "Đề nghị một địa chỉ" searchmenu_element_tools = "Công cụ" -searchmenu_install_plugin = "Yioop Tìm Kiếm Cắm" ; ; ManagerolesElement.php manageroles_element_roles = "Vai trò" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "Hàng %s đến %s của %s" pagingtable_helper_search = "Tìm kiếm" pagingtable_helper_add = "Thêm" ; +; OptionsHelper.php +option_helper_go = "Đi" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "Kéo mục vào các vùng văn thêm họ..." fileupload_helper_click_textarea = "hoặc nhấp để chọn họ." diff --git a/src/locale/vi_VN/statistics.txt b/src/locale/vi_VN/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/vi_VN/statistics.txt +++ b/src/locale/vi_VN/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index fffeaac86..7a39e7af1 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -717,8 +717,8 @@ register_controller_user_already_exists = "帐户未建立用户名已经在使 ; /src/views ; ; MachinestatusView.php -machinestatus_view_machine_statuses = "" -machinestatus_view_manage_crawls = "" +machinestatus_view_machine_statuses = "机状态" +machinestatus_view_manage_crawls = "管理爬" machinestatus_view_media_updater = "媒体更新" machinestatus_view_configure_media_jobs = "配置媒体的工作" machinestatus_view_nameserver = "服务器名称" @@ -815,7 +815,7 @@ signin_view_resend_activation = "重新激活电子邮件" signin_view_return = "返回" ; ; CrawlstatusView.php -crawlstatus_view_crawl_status = "" +crawlstatus_view_crawl_status = "爬状态" crawlstatus_view_manage_machines = "管理机" crawlstatus_view_crawls = "爬" crawlstatus_view_query_stats = "查询的统计数据" @@ -1075,7 +1075,7 @@ wiki_element_user_feedback = "用户反馈" wiki_element_locale_name = "区域设置：%s" wiki_element_page = "页：%s" wiki_element_resource_name = "资源：%s" -configure_element_toggle_page_settings = "设置" +wiki_element_toggle_page_settings = "设置" wiki_element_page_type = "页类型：" wiki_element_page_alias = "别网页为：" wiki_element_page_border = "页边境：" @@ -1132,7 +1132,6 @@ wiki_element_page_len = "(%s字节)。" wiki_element_revert = "恢复" wiki_element_history = "历史" wiki_element_discuss = "讨论" -wiki_element_toggle_page_settings = "设置" ; ; EditlocalesElement.php editlocales_element_edit_locale = "编辑的区域设置：%s" @@ -1344,23 +1343,27 @@ serversettings_element_save = "保存" ; GroupfeedElement.php groupfeed_element_add_group = "添加组" groupfeed_element_request_add = "请求增加组" -groupfeed_element_comment = "评论" +groupfeed_element_add_comment = "添加评论" +groupfeed_element_drag_textarea = "将项目成textarea增加他们..." +groupfeed_element_click_textarea = "或者点击选择。" +groupfeed_element_save = "保存" groupfeed_element_group_wiki = "维基" groupfeed_element_group_stats = "%s个员额中，有%s线" groupfeed_element_last_post = "最后一个员额：" -groupfeed_element_start_thread = "开始新的螺纹" groupfeed_element_no_posts_yet = "没有职位。" groupfeed_element_thread_no_exist = "线不存在！ 也许这是删除?" +groupfeed_element_comment = "评论" groupfeed_element_edit = "编辑" groupfeed_element_delete = "删除" groupfeed_element_usericon = "用户的图标" groupfeed_element_num_posts = "%s个员额" groupfeed_element_num_views = "%s景" -groupfeed_element_start_thread_in_group = "开始新的在线%s" -groupfeed_element_new_thread_icon = "新的线图标" groupfeed_element_last_edited = "最后编辑：%s" groupfeed_element_post_vote = "投票：" groupfeed_element_last_post_info = "最后一个员额：" +groupfeed_element_start_thread = "开始新的螺纹" +groupfeed_element_subject = "受" +groupfeed_element_post = "后" groupfeed_element_feedplaces = "饲料的地方" groupfeed_element_mygroups = "所有的饲料" groupfeed_element_userplaces = "用户的地方" @@ -1368,12 +1371,6 @@ groupfeed_element_groupplaces = "%s团的地方" groupfeed_element_wiki_name = "%sWiki" groupfeed_element_recent_threads = "最近线" groupfeed_element_recent_groupfeeds = "最近的饲料" -groupfeed_element_drag_textarea = "将项目成textarea增加他们..." -groupfeed_element_click_textarea = "或者点击选择。" -groupfeed_element_add_comment = "添加评论" -groupfeed_element_save = "保存" -groupfeed_element_subject = "受" -groupfeed_element_post = "后" groupfeed_element_edit_post = "编辑后" groupfeed_element_no_longer_update = "小组摘要不再更新!" ; @@ -1719,7 +1716,6 @@ searchmenu_element_save = "保存" searchmenu_element_wiki_pages = "Wiki网页" searchmenu_element_suggest = "建议a Url" searchmenu_element_tools = "工具" -searchmenu_install_plugin = "Yioop搜索插件" ; ; ManagerolesElement.php manageroles_element_roles = "角色" @@ -1795,6 +1791,9 @@ pagingtable_helper_row_range = "行%s至%s %s" pagingtable_helper_search = "搜索" pagingtable_helper_add = "添加" ; +; OptionsHelper.php +option_helper_go = "去" +; ; FileuploadHelper.php fileupload_helper_drag_textarea = "将项目成textarea增加他们..." fileupload_helper_click_textarea = "或者点击选择。" diff --git a/src/locale/zh_CN/statistics.txt b/src/locale/zh_CN/statistics.txt index b6bef56f0..5a165df53 100755 --- a/src/locale/zh_CN/statistics.txt +++ b/src/locale/zh_CN/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/src/views/AdminView.php b/src/views/AdminView.php index c4d53dd01..9d5b9ae48 100755 --- a/src/views/AdminView.php +++ b/src/views/AdminView.php @@ -42,15 +42,17 @@ class AdminView extends ComponentView */ public $layout = "web"; /** - * constructor stores a reference to the view this element will reside on - * - * @param object $view object this element will reside on + * Add to the component view the elemnets necessary to draw the + * list of admin activities and the current activity forr a logged in user + * @param object $controller_object that is using this view */ public function __construct($view = null) { parent::__construct($view); $this->addContainer("top", "adminbar"); + $this->addContainer("top", "<div class='nav-container'>"); $this->addContainer("top", "adminmenu"); + $this->addContainer("top", "</div>"); $this->addContainer("sub-top", "header"); if ($_SERVER["MOBILE"]) { $this->addContainer("center", "help"); diff --git a/src/views/ComponentView.php b/src/views/ComponentView.php index 185097677..b7a9640ef 100755 --- a/src/views/ComponentView.php +++ b/src/views/ComponentView.php @@ -87,11 +87,15 @@ class ComponentView extends View if (!isset($this->containers[$label])) { $this->containers[$label] = []; } - $element = $this->element($element_name); - if ($element instanceof Element) { - $this->containers[$label][] = $element; - } else { - throw new InvalidArgumentException("not valid element name"); + if (!empty($element_name[0]) && $element_name[0] == "<") { + $this->containers[$label][] = $element_name; + } else { + $element = $this->element($element_name); + if ($element instanceof Element) { + $this->containers[$label][] = $element; + } else { + throw new InvalidArgumentException("not valid element name"); + } } } /** @@ -117,7 +121,11 @@ class ComponentView extends View if (!$this->emptyContainer($label)) { foreach($this->containers[$label] as $element) { $data['CONTAINER_LABEL'] = $label; - $element->render($data); + if (is_string($element)) { + echo $element; + } else { + $element->render($data); + } } } } diff --git a/src/views/CrawlstatusView.php b/src/views/CrawlstatusView.php index c80e44b07..4e3286354 100755 --- a/src/views/CrawlstatusView.php +++ b/src/views/CrawlstatusView.php @@ -40,6 +40,21 @@ use seekquarry\yioop\configs as C; */ class CrawlstatusView extends View { + /** + * Instantiates a view for drawing the current status of crawls in the + * Yioop system + * @param object $controller_object that is using this view + */ + public function __construct($controller_object = null) + { + if (!empty($_REQUEST['noscript'])) { + $this->layout = "web"; /* + want whole rather than partial page if no Javascript + calling context + */ + } + parent::__construct($controller_object); + } /** * An Ajax call from the Manage Crawl Element in Admin View triggers * this view to be instantiated. The renderView method then draws statistics @@ -57,9 +72,11 @@ class CrawlstatusView extends View "&filter=" . $data['FILTER']; $query_stats_url = "{$base_url}querystats$filter"; $statistics_url = "{$base_url}statistics&"; + $target = (empty($_REQUEST['noscript'])) ? "" : " target='_parent' "; + $none = (empty($_REQUEST['noscript'])) ? "none" : ""; ?> <h1 class="slim"><?= tl('crawlstatus_view_crawl_status')?></h1> - <div class="no-margin"> [<a href='<?=$admin_url . + <div class="no-margin"> [<a <?=$target?> href='<?=$admin_url . $csrf_string ?>&a=manageMachines'><?= tl('crawlstatus_view_manage_machines') ?></a>]</div> <?php @@ -67,7 +84,7 @@ class CrawlstatusView extends View $data['TABLE_TITLE'] = tl('crawlstatus_view_crawls'); if (C\SEARCH_ANALYTICS_MODE && C\SEARCH_ANALYTICS_MODE != "0") { $data['TABLE_TITLE'] .= " <span class='no-bold medium-large'>" . - "[<a href='$query_stats_url'>" . + "[<a $target href='$query_stats_url'>" . tl('crawlstatus_view_query_stats') . "</a>]</span>"; } $data['ACTIVITY'] = 'manageCrawls'; @@ -80,7 +97,7 @@ class CrawlstatusView extends View <tr><td class="no-border" colspan="<?= $num_columns ?>"><?php $this->helper( "pagingtable")->render($data); ?> - <div id='admin-form-row' class='admin-form-row none'><?php + <div id='admin-form-row' class='admin-form-row <?=$none ?>'><?php if ($data['FORM_TYPE'] == "search") { $this->renderSearchForm($data); } else { @@ -104,7 +121,7 @@ class CrawlstatusView extends View 10, "<br />\n", true) : $crawl['DESCRIPTION']; ?> <tr><td><b><?php e($description); ?></b><br /> - [<a href="<?= $statistics_url . + [<a <?=$target?> href="<?= $statistics_url . C\CSRF_TOKEN."=" . $data[C\CSRF_TOKEN] ?>&its=<?= $crawl['CRAWL_TIME'] ?>"><?= tl('crawlstatus_view_statistics') ?></a>]</td><?php @@ -124,12 +141,12 @@ class CrawlstatusView extends View $crawl['COUNT'] : 0) : $crawl["QUERY_COUNT"]; ?> - <td> <?= $visited_urls_count ."/". + <td> <?= $visited_urls_count . "/". $query_count ?></td><?php } ?> <td><?php if ($crawl['RESUMABLE']) { ?> - <a href="<?= $base_url + <a <?=$target?> href="<?= $base_url ?>resume&timestamp=<?= $crawl['CRAWL_TIME'] ?>"><?= tl('crawlstatus_view_resume') ?></a> @@ -139,7 +156,8 @@ class CrawlstatusView extends View <td> <?php if ( $crawl['CRAWL_TIME'] != $data['CURRENT_INDEX']) { ?> - <a href="<?= $base_url ?>index&timestamp=<?= + <a <?=$target + ?> href="<?= $base_url ?>index&timestamp=<?= $crawl['CRAWL_TIME'] ?>"><?= tl('crawlstatus_view_set_index') ?></a> <?php @@ -149,7 +167,7 @@ class CrawlstatusView extends View } ?> </td> - <td><a href="<?= $base_url + <td><a <?=$target?> href="<?= $base_url ?>delete×tamp=<?= $crawl['CRAWL_TIME'] ?>"><?= tl('crawlstatus_view_delete') ?></a></td> </tr><?php @@ -172,6 +190,7 @@ class CrawlstatusView extends View $base_url = "{$admin_url}a=manageCrawls&". C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]."&arg="; $statistics_url = "{$base_url}statistics&"; + $target = (empty($_REQUEST['noscript'])) ? "" : " target='_parent' "; if (empty($data["ACTIVE_CRAWLS"])) { ?><p class="red"><b><?= tl('crawlstatus_view_no_active_crawls') ?></b> <?php @@ -221,17 +240,16 @@ class CrawlstatusView extends View } ?><?php if ($draw_button) { ?> - <button class="button-box" type="button" - onclick="javascript:document.location = '<?= - $base_url ?>stop&channel=<?=$channel ?>'" ><?= - tl('crawlstatus_view_stop_crawl') ?></button><?php + <a <?=$target?> class='anchor-button' href="<?= + $base_url ?>stop&channel=<?=$channel ?>" ><?= + tl('crawlstatus_view_stop_crawl') ?></a><?php } ?> </div> <div id='active-crawl-<?=$i ?>' <?=$class_none ?> > <?php if ( $crawl['CRAWL_TIME'] != $data['CURRENT_INDEX']) { ?> - [<a href="<?=$base_url ?>index&timestamp=<?= + [<a <?=$target?> href="<?=$base_url ?>index&timestamp=<?= $crawl['CRAWL_TIME'] ?>"><?= tl('crawlstatus_view_set_index') ?></a>] <?php @@ -240,7 +258,7 @@ class CrawlstatusView extends View <?php } ?> - [<a href="<?=$admin_url + [<a <?=$target?> href="<?=$admin_url ?>a=manageCrawls&arg=options&<?= C\CSRF_TOKEN."=" . $data[C\CSRF_TOKEN] ?>&ts=<?= $crawl['CRAWL_TIME'] ?>"><?= @@ -356,9 +374,11 @@ class CrawlstatusView extends View * to draw this form */ public function renderCrawlForm($data) - {?> + { + $target = (empty($_REQUEST['noscript'])) ? "" : " target='_parent' "; + ?> <h2><?= tl('managecrawls_element_new_crawl') ?></h2> - <form id="crawlStartForm" method="get"> + <form id="crawlStartForm" method="get" <?=$target?> > <input type="hidden" name="c" value="admin" /> <input type="hidden" name="<?= C\CSRF_TOKEN ?>" value="<?= $data[C\CSRF_TOKEN] ?>" /> @@ -368,13 +388,13 @@ class CrawlstatusView extends View <p><label for="description-name"><?= tl('crawlstatus_view_description') ?></label> <input type="text" id="description-name" name="description" - value="<?php if (isset($data['DESCRIPTION'])) { - e($data['DESCRIPTION']); } ?>" maxlength="<?= - C\TITLE_LEN ?>" - class="wide-field"/> + value="<?php + if (isset($data['DESCRIPTION'])) { + e($data['DESCRIPTION']); + } ?>" maxlength="<?=C\TITLE_LEN ?>" class="wide-field" /> <button class="button-box" type="submit"><?= tl('crawlstatus_view_start') ?></button> - <a href="?c=admin&a=manageCrawls<?php + <a <?=$target ?> href="?c=admin&a=manageCrawls<?php ?>&arg=options&<?= C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] ?>"><?= tl('crawlstatus_view_options') ?></a><?= diff --git a/src/views/GroupView.php b/src/views/GroupView.php index d1ed55def..5d54d4b56 100644 --- a/src/views/GroupView.php +++ b/src/views/GroupView.php @@ -56,8 +56,10 @@ class GroupView extends ComponentView implements CrawlConstants { parent::__construct($view); $this->addContainer("top", "groupbar"); + $this->addContainer("top", "<div class='nav-container'>"); $this->addContainer("top", "groupmenu"); $this->addContainer("top", "adminmenu"); + $this->addContainer("top", "</div>"); $this->addContainer("sub-top", "header"); $this->addContainer("center", "group"); $this->addContainer("center", "footer"); diff --git a/src/views/MachinestatusView.php b/src/views/MachinestatusView.php index 6f9d51f55..3fa3db378 100644 --- a/src/views/MachinestatusView.php +++ b/src/views/MachinestatusView.php @@ -42,6 +42,21 @@ use seekquarry\yioop\configs as C; */ class MachinestatusView extends View { + /** + * Instantiates a view for drawing the current status of media updater, + * queue server, and fetchers in the Yioop system + * @param object $controller_object that is using this view + */ + public function __construct($controller_object = null) + { + if (!empty($_REQUEST['noscript'])) { + $this->layout = "web"; /* + want whole rather than partial page if no Javascript + calling context + */ + } + parent::__construct($controller_object); + } /** * Draws the ManagestatusView to the output buffer * @@ -63,15 +78,17 @@ class MachinestatusView extends View $update_mode_url = $base_url . "updatemode"; $caution = !isset($data['MACHINES']['NAME_SERVER']["MediaUpdater"]) || $data['MACHINES']['NAME_SERVER']["MediaUpdater"] == 0; + $target = (empty($_REQUEST['noscript'])) ? "" : " target='_parent' "; ?> <h1 class="slim"><?=tl('machinestatus_view_machine_statuses')?></h1> - <div class="no-margin"> [<a href='<?= $admin_url . + <div class="no-margin"> [<a <?=$target?> href='<?= $admin_url . $csrf_token?>&a=manageCrawls'><?= tl('machinestatus_view_manage_crawls') ?></a>]</div> <h2><?=tl('machinestatus_view_media_updater'). " " . $this->helper("helpbutton")->render( "Media Updater", $data[C\CSRF_TOKEN]) ?></h2> - <div class="no-margin"> [<a href="<?=$base_url . 'mediajobs' + <div class="no-margin"> [<a <?=$target + ?> href="<?=$base_url . 'mediajobs' ?>"><?= tl('machinestatus_view_configure_media_jobs'); ?>]</a></div> <div class="box"> <h3 class="no-margin"><?=tl('machinestatus_view_nameserver') ?></h3> @@ -83,7 +100,7 @@ class MachinestatusView extends View <input type="hidden" name="arg" value="mediamode" /> <table class="machine-table"><tr> <th><?= tl('machinestatus_view_media_updater') ?></th> - <td>[<a href="<?= $log_url ?>"><?= + <td>[<a <?=$target?> href="<?= $log_url ?>"><?= tl('machinestatus_view_log') ?></a>]</td> <td><?php $this->helper("toggle")->render( @@ -111,7 +128,7 @@ class MachinestatusView extends View <h2><?= tl('machinestatus_view_add_machine') . " " . $this->helper("helpbutton")->render( "Manage Machines", $data[C\CSRF_TOKEN]) ?></h2> - <form id="name-form" method="post"> + <form <?=$target ?> id="name-form" method="post"> <input type="hidden" name="c" value="admin" /> <input type="hidden" name="<?= C\CSRF_TOKEN ?>" value="<?= $data[C\CSRF_TOKEN] ?>" /> @@ -156,7 +173,7 @@ class MachinestatusView extends View } ?> <div class="box"> - <div class="float-opposite" >[<a href='<?= + <div class="float-opposite" >[<a <?=$target?> href='<?= $base_url . "deletemachine&name={$m['NAME']}" ?>' onclick='javascript:return confirm("<?= tl('machinestatus_view_confirm') ?>");' ><?= @@ -206,7 +223,8 @@ class MachinestatusView extends View <tr> <th><?= tl('machinestatus_view_mirror', $m['PARENT']) ?> </th> - <td><table><tr><td>#00[<a href="<?php e($log_url);?>"><?= + <td><table><tr><td>#00[<a <?=$target + ?> href="<?php e($log_url);?>"><?= tl('machinestatus_view_log') ?>]</td></tr><tr><td><?php $caution = isset($m['STATUSES']['Mirror']) && ( !isset($m['STATUSES']['Mirror'][-1]) || @@ -224,7 +242,7 @@ class MachinestatusView extends View "&channel={$m['CHANNEL']}"; ?> <tr><th><?= tl('machinestatus_view_queue_server') ?> - </th><td><table><tr><td>#00[<a href="<?= $log_url . + </th><td><table><tr><td>#00[<a <?=$target?> href="<?= $log_url . "&type=QueueServer&id=0" ?>"><?= tl('machinestatus_view_log') ?>]</a> </td></tr><tr><td><?php @@ -252,7 +270,7 @@ class MachinestatusView extends View } ?> <th <?=$colspan ?>><?=tl('machinestatus_view_media_updater') ?> - </th><td><table><tr><td>#00[<a href="<?= $log_url . + </th><td><table><tr><td>#00[<a <?=$target?> href="<?= $log_url . "&type=MediaUpdater&id=0" ?>"><?= tl('machinestatus_view_log')?>]</a> </td></tr><tr><td><?php @@ -297,7 +315,7 @@ class MachinestatusView extends View "log&name={$m['NAME']}&type=Fetcher&id=$i" . "&channel={$m['CHANNEL']}"; if ($i < 10){e("0");} e($i); - ?>[<a href="<?= $log_url ?>"><?= + ?>[<a <?=$target?> href="<?= $log_url ?>"><?= tl('machinestatus_view_log') ?></a>]</td> </tr><tr><td><?php $toggle = false; diff --git a/src/views/SearchView.php b/src/views/SearchView.php index 4dd99b29d..72752024e 100755 --- a/src/views/SearchView.php +++ b/src/views/SearchView.php @@ -44,16 +44,18 @@ class SearchView extends ComponentView */ public $layout = "web"; /** - * constructor stores a reference to the view this element will reside on - * - * @param object $view object this element will reside on + * The constructor adds to its container all the objects needed to + * draw a search landing or result page + * @param object $controller_object that is using this view */ - public function __construct($view = null) + public function __construct($controller_object = null) { - parent::__construct($view); + parent::__construct($controller_object); $this->addContainer("top", "searchbar"); + $this->addContainer("top", "<div class='nav-container'>"); $this->addContainer("top", "searchmenu"); $this->addContainer("top", "adminmenu"); + $this->addContainer("top", "</div>"); $this->addContainer("sub-top", "header"); if (!$_SERVER["MOBILE"]) { $this->addContainer("opposite", "searchcallout"); diff --git a/src/views/elements/AdminbarElement.php b/src/views/elements/AdminbarElement.php index 3abb6d97e..dc9ee2efd 100644 --- a/src/views/elements/AdminbarElement.php +++ b/src/views/elements/AdminbarElement.php @@ -92,7 +92,8 @@ class AdminbarElement extends Element public function renderSettingsToggle($logged_in) { ?> <div class="settings" id="settings-toggle" - onclick="javascript:toggleOptions()"><?php + onclick="javascript:toggleOptions()"> + <div class='noscript-hide'><?php if ($logged_in) { $user_name = $_SESSION['USER_NAME']; if (mb_strlen($user_name) > 6) { @@ -104,6 +105,6 @@ class AdminbarElement extends Element <?php } else { e('≡'); - }?></div><?php + }?></div></div><?php } } diff --git a/src/views/elements/AdminmenuElement.php b/src/views/elements/AdminmenuElement.php index 430ed319b..f763bf4b5 100644 --- a/src/views/elements/AdminmenuElement.php +++ b/src/views/elements/AdminmenuElement.php @@ -89,8 +89,9 @@ class AdminmenuElement extends Element if ($is_submenu) {?> <div class="align-opposite medium-font slight-pad reduce-top"><a class="gray-link" - href="javascript:setDisplay('admin-menu-options', false); - setDisplay('menu-options', true);"><?= + onclick="javascript:setDisplay('admin-menu-options', false); + setDisplay('menu-options', true);" + href="#menu-options"><?= $data['MENU_NAME']?>≫</a></div><?php } $first = true; diff --git a/src/views/elements/GroupbarElement.php b/src/views/elements/GroupbarElement.php index a908c92be..da0151ba6 100644 --- a/src/views/elements/GroupbarElement.php +++ b/src/views/elements/GroupbarElement.php @@ -153,7 +153,8 @@ class GroupbarElement extends Element public function renderSettingsToggle($logged_in) { ?> <div class="settings" id="settings-toggle" - onclick="javascript:toggleOptions()"><?php + onclick="javascript:toggleOptions()"> + <div class='noscript-hide'><?php if ($logged_in) { $user_name = $_SESSION['USER_NAME']; if (mb_strlen($user_name) > 6) { @@ -165,6 +166,6 @@ class GroupbarElement extends Element <?php } else { e('≡'); - }?></div><?php + }?></div></div><?php } } diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php index 9a4936670..4bdaa8288 100644 --- a/src/views/elements/GroupfeedElement.php +++ b/src/views/elements/GroupfeedElement.php @@ -109,21 +109,70 @@ class GroupfeedElement extends Element implements CrawlConstants isset($data['GROUP_STATUS']) && $data['GROUP_STATUS'] == C\ACTIVE_STATUS) { $data['FRAGMENT'] = '#result-'.$page['ID']; + $just_fields = ["LIMIT" => "limit", "RESULTS_PER_PAGE" => "num", + "JUST_THREAD" => 'just_thread']; + $hidden_form = "\n"; + foreach ($just_fields as $field => $form_field) { + if (isset($data[$field])) { + $hidden_form .= "<input type=\"hidden\" ". + "name=\"$form_field\" value=\"{$data[$field]}\" />\n"; + } + } ?> <div class='small-margin-current-activity button-group-result'> - <button - class="button-box group-comment" onclick='commentForm(<?= - "\"add-comment\", ". - "{$data['PAGES'][0]['PARENT_ID']},". - "{$data['PAGES'][0]['GROUP_ID']}" ?>)'><?= - tl('groupfeed_element_comment') ?></button> - <?php + <form action="./<?= $data['FRAGMENT'] + ?>" method="post" ><?= $hidden_form ?> + <input type="hidden" name="c" value="<?= + $data['CONTROLLER'] ?>" /> + <input type="hidden" name="a" value="groupFeeds" /> + <input type="hidden" name="arg" value="addcomment" /> + <input type="hidden" name="parent_id" value="<?= + $data['PAGES'][0]['PARENT_ID']; ?>" /> + <input type="hidden" name="group_id" value="<?= + $data['PAGES'][0]['GROUP_ID']?>" /> + <input type="hidden" name="<?= C\CSRF_TOKEN ?>" + value="<?= $data[C\CSRF_TOKEN] ?>" /> + <h2><b><label for="comment-add-comment" ><?= + tl("groupfeed_element_add_comment") + ?></label></b></h2> + <textarea class="short-text-area" + id="comment-add-comment" name="description" + data-buttons="all,!wikibtn-search,!wikibtn-heading, + !wikibtn-slide" ></textarea> + <script> + document.write('<div class="upload-gray-box center black">' + + '<input type="file" id="file-add-comment" ' + + 'name="file_add-comment" class="none" multiple="multiple" />' + + '<?= tl('groupfeed_element_drag_textarea') ?>' + + '<a href="javascript:elt(\'file-add-comment\').click()"><?= + tl('groupfeed_element_click_textarea') ?></a></div>'); + </script> + <button class="button-box float-opposite" + type="submit"><?= tl("groupfeed_element_save") ?> + </button><div> <br /><br /></div> + </form><?php if ($data['ELEMENT'] != 'wiki') { ?> <div id='add-comment'></div> <?php }?> - </div><?php + </div> + <script> + if (typeof yioop_post_scripts !== 'object' ) { + yioop_post_scripts = {}; + } + yioop_post_scripts['comment-add-comment'] = function() + { + var comment_id = 'comment-add-comment'; + initializeFileHandler(comment_id, "file-add-comment", + <?= min(L\metricToInt(ini_get('upload_max_filesize')), + L\metricToInt(ini_get('post_max_size'))) + ?>, "textarea", null, true); + editorize(comment_id); + elt(comment_id).focus(); + } + </script> + <?php } if (!$is_status) { $this->renderScripts($data); @@ -208,45 +257,15 @@ class GroupfeedElement extends Element implements CrawlConstants (empty($data['PAGES'][0]["GROUP_ID"])) ? -1 : $data['PAGES'][0]["GROUP_ID"]); if (in_array($member_access, $can_comment)) { - if (isset($data['JUST_THREAD'])) { - ?> - <div class='button-group-result'> - <button class="button-box" onclick='commentForm(<?= - "\"add-comment\", {$parent_id},". - "{$group_id}" ?>)'><?= - tl('groupfeed_element_comment') ?></button><?php - if ($is_wiki_page_with_feedback) { - ?> - <div id='add-comment'></div> - <?php - } else {?> - <div></div> - <?php - } ?> - </div><?php - } else if (isset($data['JUST_GROUP_ID']) && + if (isset($data['JUST_GROUP_ID']) && in_array($member_access, $start_thread)) { - ?> - <div class='button-group-result'> - <button class="button-box" onclick='startThreadForm(<?= - "\"add-comment\", {$data['PAGES'][0]['GROUP_ID']}" ?>)'><?= - tl('groupfeed_element_start_thread') ?></button> - <div id='add-comment'></div> - </div> - <?php + $this->drawStartThreadForm($data['JUST_GROUP_ID'], $data); } } if (isset($data['NO_POSTS_YET'])) { if (isset($data['NO_POSTS_START_THREAD'])) { //no read case where no posts yet - ?> - <div class='button-group-result'> - <button class="button-box" onclick='startThreadForm(<?= - "\"add-comment\", {$data['JUST_GROUP_ID']}" ?>)'><?= - tl('groupfeed_element_start_thread') ?></button> - <div id='add-comment'></div> - </div> - <?php + $this->drawStartThreadForm($data['JUST_GROUP_ID'], $data); } ?> <p class="red"><?= tl('groupfeed_element_no_posts_yet') ?></p> @@ -290,9 +309,24 @@ class GroupfeedElement extends Element implements CrawlConstants isset($page['TYPE']) && $page['TYPE'] != C\WIKI_GROUP_ITEM) { ?> <div class="float-opposite"><?php + if (!isset($data['JUST_GROUP_ID']) && + in_array($page["MEMBER_ACCESS"], $can_comment) && + !isset($data['JUST_THREAD'])){?> + <script> + document.write("[<a href='javascript:commentForm(" + '<?= + "{$page['ID']}, {$page['PARENT_ID']}, " . + "{$page['GROUP_ID']}" ?>)' + "'" + '><?= + tl('groupfeed_element_comment') ?></a>]'); + </script><?php + } if (!isset($page['NO_EDIT'])) { - ?>[<a href="javascript:updatePostForm(<?=$page['ID'] - ?>)"><?=tl('groupfeed_element_edit') ?></a>]<?php + ?> + <script> + document.write('[<a href="javascript:updatePostForm(<?= + $page['ID']?>)"><?=tl('groupfeed_element_edit') + ?></a>]'); + </script> + <?php } ?> [<a href="<?=$paging_query.'&arg=deletepost&'. @@ -355,21 +389,6 @@ class GroupfeedElement extends Element implements CrawlConstants $data['CONTROLLER']). $token_string) ?>" ><?php e($page[self::SOURCE_NAME]."</a></b>"); } - if (!isset($data['JUST_GROUP_ID']) && - in_array($page["MEMBER_ACCESS"], $start_thread) && - !$is_wiki_page_with_feedback) { - ?> - <a class='gray-link' href='javascript:startThreadForm(<?= - "{$page['ID']}, {$page['GROUP_ID']},\"". - tl('groupfeed_element_start_thread_in_group', - $page[self::SOURCE_NAME]) ?>")' title='<?= - tl('groupfeed_element_start_thread_in_group', - $page[self::SOURCE_NAME]) ?>'><img - alt="<?=tl('groupfeed_element_new_thread_icon') - ?>" class="new-thread-icon" src='<?=C\SHORT_BASE_URL - ?>resources/new_thread.png' /></a> - <?php - } ?> </h2> <?php @@ -403,15 +422,13 @@ class GroupfeedElement extends Element implements CrawlConstants "&arg=downvote&group_id=".$page['GROUP_ID']; if ($page["VOTE_ACCESS"] == C\UP_DOWN_VOTING_GROUP) { ?> - <button onclick='window.location="<?= - $up_vote ?>"'>+</button><button - onclick='window.location="<?= - $down_vote ?>"'>-</button> + <a class='anchor-button' href='<?= $up_vote ?>'>+</a> + <a class='anchor-button' href='<?= + $down_vote ?>"'>-</a> <?php } else if ($page["VOTE_ACCESS"] == C\UP_VOTING_GROUP) { ?> - <button onclick='window.location="<?= - $up_vote ?>"'>+</button> + <a class='anchor-button' href='<?=$up_vote ?>'>+</a> <?php } ?> @@ -432,17 +449,6 @@ class GroupfeedElement extends Element implements CrawlConstants <?php } ?> - <div class="float-opposite"> - <?php if (!isset($data['JUST_GROUP_ID']) && - in_array($page["MEMBER_ACCESS"], $can_comment) && - !isset($data['JUST_THREAD'])){?> - <a href='javascript:commentForm(<?= - "{$page['ID']}, {$page['PARENT_ID']}, ". - "{$page['GROUP_ID']}" ?>)'><?= - tl('groupfeed_element_comment') ?></a>.<?php - } - ?> - </div> </div> </div> <div id='<?= $page["ID"] ?>'></div> @@ -454,6 +460,92 @@ class GroupfeedElement extends Element implements CrawlConstants } //end foreach return $page; } + /** + * Used to draw the form to start a new thread in a group + * @param int $group_id of group to draw form forr + * @param array $data containing other field needed to draw the form + */ + private function drawStartThreadForm($group_id, $data) + { + $just_fields = ["LIMIT" => "limit", "RESULTS_PER_PAGE" => "num", + "JUST_GROUP_ID" => "just_group_id"]; + $hidden_form = "\n"; + foreach ($just_fields as $field => $form_field) { + if (isset($data[$field])) { + $hidden_form .= "<input type=\"hidden\" " . + "name=\"$form_field\" value=\"{$data[$field]}\" ". + "/>\n"; + } + } + ?> + <div class='button-group-result'> + <script> + document.write('<button class="button-box" onclick=' + "'" + + "toggleDisplay(\"start-thread\")'><?= + tl('groupfeed_element_start_thread') ?></button>"); + </script> + <noscript> + <h2><b><?= tl('groupfeed_element_start_thread') ?></b></h2> + </noscript> + <div id='start-thread' class="light-gray-box top-bottom-margin"> + <br /> + <form action="./<?= $data['FRAGMENT'] + ?>" method="post" ><?= $hidden_form ?> + <input type="hidden" name="c" value="<?= + $data['CONTROLLER'] ?>" /> + <input type="hidden" name="a" value="groupFeeds" /> + <input type="hidden" name="arg" value="newthread" /> + <input type="hidden" name="group_id" value="<?= + $group_id ?>" /> + <input type="hidden" name="<?= C\CSRF_TOKEN ?>" + value="<?= $data[C\CSRF_TOKEN] ?>" /> + <p><b><label for="title-start-thread" ><?= + tl("groupfeed_element_subject") + ?></label></b></p> + <p><input type="text" id="title-start-thread" + name="title" value="" maxlength="<? C\TITLE_LEN ?>" + class="wide-field"/></p> + <p><b><label for="description-start-thread" ><?= + tl("groupfeed_element_post") + ?></label></b></p> + <textarea class="short-text-area" + id="description-start-thread" name="description" + data-buttons="all,!wikibtn-search,!wikibtn-heading,<?= + ""?>!wikibtn-slide" ></textarea> + <div class="upload-gray-box center black"> + <input type="file" id="file-start-thread" + name="file_start-thread" + class="none" multiple="multiple" /><?= + tl('groupfeed_element_drag_textarea'); ?> + <a href="javascript:elt('file-start-thread').click()"> + <?= tl('groupfeed_element_click_textarea'); ?></a> + </div> + <div> + <button class="button-box float-opposite" type="submit"><?= + tl("groupfeed_element_save") + ?></button> + <br><br> + </div> + </form> + <script> + if (typeof yioop_post_scripts !== 'object' ) { + yioop_post_scripts = {}; + } + yioop_post_scripts['start-thread'] = function() + { + initializeFileHandler('description-start-thread', + "file-start-thread", + <?= min(L\metricToInt(ini_get('upload_max_filesize')), + L\metricToInt(ini_get('post_max_size'))) + ?>, "textarea", null, true); + editorize('description-start-thread'); + setDisplay('start-thread', false); + } + </script> + </div> + </div> + <?php + } /** * Used to slightly clean up hypertext links before drawing them * (get rid of empty queries, avoid double encoding) @@ -627,66 +719,6 @@ class GroupfeedElement extends Element implements CrawlConstants elt(id).innerHTML = ""; } } - function startThreadForm(id, group_id, group_name) - { - clearInterval(feed_update_id); - tmp = '<div class="post<?=$clear ?>"></div>'; - start_elt = elt(id).innerHTML.substr(0, tmp.length) - if (start_elt != tmp) { - var group_header = ""; - if (typeof(group_name) !== 'undefined') { - group_header = '<h2><b>' + group_name + '</b></h2>'; - } - elt(id).innerHTML = - tmp + - '<br />' - + '<form action="./<?= $data['FRAGMENT'] - ?>" method="post" >' + <?= $hidden_form ?> - '<input type="hidden" name="c" value="<?= - $data['CONTROLLER'] ?>" />' + - '<input type="hidden" name="a" value="groupFeeds" />' + - '<input type="hidden" name="arg" value="newthread" />' + - '<input type="hidden" name="group_id" value="' + - group_id + '" />' + - '<input type="hidden" name="<?= C\CSRF_TOKEN ?>" '+ - 'value="<?= $data[C\CSRF_TOKEN] ?>" />' + - group_header+ - '<p><b><label for="title-'+ id +'" ><?= - tl("groupfeed_element_subject") - ?></label></b></p>' + - '<p><input type="text" id="title-'+ id +'" '+ - 'name="title" value="" '+ - ' maxlength="<? C\TITLE_LEN ?>" '+ - 'class="wide-field"/></p>' + - '<p><b><label for="description-'+ id +'" ><?= - tl("groupfeed_element_post") - ?></label></b></p>' + - '<textarea class="short-text-area" '+ - 'id="description-'+ id +'" name="description" '+ - 'data-buttons="all,!wikibtn-search,!wikibtn-heading,' + - '!wikibtn-slide" ></textarea>' + - '<div class="upload-gray-box center black">' + - '<input type="file" id="file-' + id + '" name="file_' + id + - '" class="none" multiple="multiple" />' + - '<?= $drag_above_text ?>' + - '<a href="javascript:elt(\'file-' + id + '\').click()">'+ - '<?= $click_link_text ?></a></div>' + - '<button class="button-box float-opposite" ' + - 'type="submit"><?= tl("groupfeed_element_save") - ?></button>' + - '<div> </div>'+ - '</form>'; - var description_id = 'description-' + id; - initializeFileHandler(description_id , "file-" + id, - <?= min(L\metricToInt(ini_get('upload_max_filesize')), - L\metricToInt(ini_get('post_max_size'))) - ?>, "textarea", null, true); - editorize(description_id); - } else { - elt(id).innerHTML = ""; - doUpdate(); - } - } function updatePostForm(id) { clearInterval(feed_update_id); diff --git a/src/views/elements/GroupmenuElement.php b/src/views/elements/GroupmenuElement.php index ad77a2646..594b9076d 100644 --- a/src/views/elements/GroupmenuElement.php +++ b/src/views/elements/GroupmenuElement.php @@ -84,8 +84,9 @@ class GroupmenuElement extends Element implements CrawlConstants if ($logged_in) { ?> <div class="medium-font slight-pad reduce-top"><a class="gray-link" - href="javascript:setDisplay('admin-menu-options', true); - setDisplay('menu-options', false);">≪<?= + onclick="javascript:setDisplay('admin-menu-options', true); + setDisplay('menu-options', false);" + href="#admin-menu-options" >≪<?= tl('groupmenu_element_admin_menu'); ?></a></div><?php } if ((!$logged_in) && diff --git a/src/views/elements/HelpElement.php b/src/views/elements/HelpElement.php index 5327098ef..b24b45b0f 100644 --- a/src/views/elements/HelpElement.php +++ b/src/views/elements/HelpElement.php @@ -47,51 +47,26 @@ class HelpElement extends Element */ public function render($data) { + $mobile = !empty($_SERVER['MOBILE']); + $help_class_add = ($mobile) ? "" : "small-margin-help-pane"; + $help_id = ($mobile) ? "mobile-help" : "small-margin-help"; + $str_mobile = ($mobile) ? "true" : "false"; ?> - <?php - if ($_SERVER["MOBILE"]) { - ?> - <div id="mobile-help"> - <div id="help-frame" class="frame help-pane"> - <div id="help-close" class="float-opposite"> - [<a class="close" onclick="toggleHelp('help-frame', - true,'<?php e($_REQUEST['c']);?>');return - false; ">X - </a>] - </div> - <div id="help-frame-head"> - <h2 id="page_name" class="help-title"> </h2> - </div> - <div id="help-frame-body" class="wordwrap"> - </div> - <div id="help-frame-editor" class="wordwrap"> - </div> + <div id="<?= $help_id ?>"> + <div id="help-frame" class="frame help-pane <?=$help_class_add ?>"> + <div id="help-close" class="float-opposite"> + [<a class="close" onclick="toggleHelp('help-frame', + <?=$str_mobile; ?>,'<?= $_REQUEST['c'] + ?>');return false; ">X </a>] </div> - </div> - <?php - } else { - $help_class_add = "small-margin-help-pane"; - $help_id = "small-margin-help"; - ?> - <div id="<?php e($help_id); ?>"> - <div id="help-frame" class="frame help-pane <?php - e($help_class_add); ?>"> - <div id="help-close" class="float-opposite"> - [<a class="close" onclick="toggleHelp('help-frame', - false,'<?php e($_REQUEST['c']);?>');return - false; ">X - </a>] - </div> - <div id="help-frame-head"> - <h2 id="page_name" class="help-title"> </h2> - </div> - <div id="help-frame-body" class="wordwrap"> - </div> - <div id="help-frame-editor" class="wordwrap"> - </div> + <div id="help-frame-head"> + <h2 id="page_name" class="help-title"> </h2> + </div> + <div id="help-frame-body" class="wordwrap"> + </div> + <div id="help-frame-editor" class="wordwrap"> </div> </div> - <?php - } + </div><?php } } diff --git a/src/views/elements/ManagecrawlsElement.php b/src/views/elements/ManagecrawlsElement.php index e76bab605..490bf29f6 100755 --- a/src/views/elements/ManagecrawlsElement.php +++ b/src/views/elements/ManagecrawlsElement.php @@ -30,6 +30,7 @@ */ namespace seekquarry\yioop\views\elements; +use seekquarry\yioop as B; use seekquarry\yioop\configs as C; /** @@ -47,10 +48,24 @@ class ManagecrawlsElement extends Element * @param array $data information about a crawl such as its description */ public function render($data) - {?> + { + $admin_url = B\controllerUrl('admin', true); + $status_url = $admin_url . + C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] . "&a=crawlStatus" . + '&num_show=' . $data['NUM_SHOW'] . "&start_row=". + $data['START_ROW'] . "&end_row=" . $data['END_ROW']; + ?> <div class="current-activity"> <div id="crawlstatus" > - <h2><?=tl('managecrawls_element_awaiting_status')?></h2> + <script> + document.write('<h2 class="red"><?= + tl('managecrawls_element_awaiting_status') ?></h2>'); + </script> + <noscript> + <iframe src="<?=str_replace("&", "&", $status_url . + "&noscript=true")?>" style="width:100%; height: 800px;"> + </iframe> + </noscript> </div> <script> var updateId; @@ -61,10 +76,7 @@ class ManagecrawlsElement extends Element admin_form_object.style.display == 'block') { return; } - var start_url = "?c=admin&<?= - C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN] ?>&a=crawlStatus<?= - '&num_show='.$data['NUM_SHOW']."&start_row=". - $data['START_ROW']."&end_row=".$data['END_ROW'] ?>"; + var start_url = '<?=$status_url ?>'; start_url += "&crawl_toggle="; var crawl_tag = elt('crawlstatus'); var i = 0; diff --git a/src/views/elements/ManagegroupsElement.php b/src/views/elements/ManagegroupsElement.php index 692a23a79..7452854bf 100755 --- a/src/views/elements/ManagegroupsElement.php +++ b/src/views/elements/ManagegroupsElement.php @@ -417,8 +417,8 @@ class ManagegroupsElement extends Element public function renderGroupsForm($data) { $admin_url = htmlentities(B\controllerUrl('admin', true)); - $base_url = $admin_url . C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]. - "&a=manageGroups&visible_users=".$data['visible_users']; + $base_url = $admin_url . C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN]. + "&a=manageGroups&visible_users=" . $data['visible_users']; $browse_url = $base_url . '&arg=search&browse=true'; $editgroup = ($data['FORM_TYPE'] == "editgroup") ? true : false; $creategroup = ($data['FORM_TYPE'] == "addgroup") ? true : false; @@ -516,10 +516,17 @@ class ManagegroupsElement extends Element tl('managegroups_element_feed') ?>:</th> <td><div class='light-gray-box'> <div class="center"> - [<a href="javascript:toggleDisplay('upload-toggle')" - ><?=tl('managegroups_element_import_discussions')?></a>] + <script> + document.write('[<a href="javascript:toggleDisplay('+ + "'upload-toggle'" + + ')" ><?=tl('managegroups_element_import_discussions') + ?></a>]'); + </script> + <noscript> + [<?=tl('managegroups_element_import_discussions')?>] + </noscript> </div> - <div id='upload-toggle' class='none' > + <div id='upload-toggle' > <div id='discussion-upload' class="media-upload-box" > </div> <?php @@ -530,7 +537,11 @@ class ManagegroupsElement extends Element L\metricToInt(ini_get('post_max_size'))), 'text', []); ?> - </div></div></td> + </div></div> + <script> + document.getElementById('upload-toggle').style.display = "none"; + </script> + </td> </tr> <tr><th class="table-label" style="vertical-align:top; padding-top:9px;"><?= @@ -541,9 +552,12 @@ class ManagegroupsElement extends Element $user_cols = " colspan='2' "; }?><td <?=$user_cols;?> ><div class='light-gray-box'> <div class="center"> - [<a href="javascript:toggleUserCollection('visible-users')" - ><?=tl('managegroups_element_num_users', - $data['NUM_USERS_GROUP'])?></a>]<?php + [<button class="button-anchor" form="admin-form" + type='submit' name='visible_users' + value='<?= ($data['visible_users'] == 'true') ? + "false" : "true" ?>'><?= + tl('managegroups_element_num_users', + $data['NUM_USERS_GROUP'])?></button>]<?php if ($data['visible_users'] == 'true') { $context = ""; if (!empty($data['context'])) { @@ -749,13 +763,6 @@ class ManagegroupsElement extends Element </table> </form> <script> - function toggleUserCollection(collection_name) - { - var collection = elt(collection_name); - collection.value = (collection.value == 'true') - ? 'false' : 'true'; - elt('admin-form').submit(); - } var user_ids = []; function arrayIntoFormVariable(arr, form_var) { diff --git a/src/views/elements/ManagemachinesElement.php b/src/views/elements/ManagemachinesElement.php index 1050053c9..e7bd74b20 100644 --- a/src/views/elements/ManagemachinesElement.php +++ b/src/views/elements/ManagemachinesElement.php @@ -52,10 +52,22 @@ class ManagemachinesElement extends Element public function render($data) { $admin_url = B\controllerUrl('admin', true); + $status_url = $admin_url . + C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN] . "&a=machineStatus" . + '&num_show=' . $data['NUM_SHOW'] . "&start_row=". + $data['START_ROW'] . "&end_row=" . $data['END_ROW']; ?> <div class="current-activity"> <div id="machinestatus" > - <p class="red"><?= tl('managemachines_element_awaiting_status') ?></p> + <script> + document.write('<h2 class="red"><?= + tl('managemachines_element_awaiting_status') ?></h2>'); + </script> + <noscript> + <iframe src="<?=str_replace('&', '&', $status_url . + '&noscript=true') ?>" style="width:100%; height: 800px"> + </iframe> + </noscript> </div> <script> var updateId; @@ -67,10 +79,7 @@ class ManagemachinesElement extends Element admin_form_object.style.display == 'block') { return; } - var startUrl = "<?= $admin_url . - C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN] ?>&a=machineStatus<?= - '&num_show='.$data['NUM_SHOW']."&start_row=". - $data['START_ROW']."&end_row=".$data['END_ROW'] ?>"; + var startUrl = "<?= $status_url ?>"; var machineTag = elt('machinestatus'); first_update = false; getPage(machineTag, startUrl, initAddMachineForm); diff --git a/src/views/elements/ManageusersElement.php b/src/views/elements/ManageusersElement.php index eb867cba0..5d87c8df3 100644 --- a/src/views/elements/ManageusersElement.php +++ b/src/views/elements/ManageusersElement.php @@ -304,9 +304,12 @@ class ManageusersElement extends Element tl('manageusers_element_roles') ?>:</th> <td><div class='light-gray-box'> <div class="center"> - [<a href="javascript:toggleUserCollection('visible-roles');" - ><?= tl('manageusers_element_num_roles', - $data['NUM_USER_ROLES'])?></a>]<?php + [<button class="button-anchor" + form="admin-form" type='submit' name='visible_roles' + value='<?= ($data['visible_roles'] == 'true') ? + "false" : "true" ?>'><?= + tl('manageusers_element_num_roles', + $data['NUM_USER_ROLES'])?></button>]<?php if ($data['visible_roles'] == 'true') { $context = ""; if (!empty($data['context'])) { @@ -449,9 +452,13 @@ class ManageusersElement extends Element tl('manageusers_element_groups') ?>:</th> <td><div class='light-gray-box'> <div class="center"> - [<a href="javascript:toggleUserCollection('visible-groups')" - ><?= tl('manageusers_element_num_groups', - $data['NUM_USER_GROUPS'])?></a>]<?php + [<button class="button-anchor" + form="admin-form" type='submit' + name='visible_groups' + value='<?= ($data['visible_groups'] == 'true') ? + "false" : "true" ?>'><?= + tl('manageusers_element_num_groups', + $data['NUM_USER_GROUPS'])?></button>]<?php if ($data['visible_groups'] == 'true') { $context = ""; if (!empty($data['context'])) { @@ -612,13 +619,6 @@ class ManageusersElement extends Element </table> </form> <script> - function toggleUserCollection(collection_name) - { - var collection = elt(collection_name); - collection.value = (collection.value =='true') - ? 'false' : 'true'; - elt('admin-form').submit(); - } var role_ids = []; var group_ids = []; function arrayIntoFormVariable(arr, form_var) diff --git a/src/views/elements/MediajobsElement.php b/src/views/elements/MediajobsElement.php index 2084ce8e7..f3e6c4645 100644 --- a/src/views/elements/MediajobsElement.php +++ b/src/views/elements/MediajobsElement.php @@ -83,15 +83,15 @@ class MediajobsElement extends Element <tr><th><?=tl('mediajobs_element_job_name')?></th> <th><?=tl('mediajobs_element_run_status') ?></th></tr><?php foreach ($data["JOBS_LIST"] as $job_name => $enabled) { - $selected = ($enabled) ? "enablejob&job_name=$job_name" : - "disablejob&job_name=$job_name"; + $selected = ($enabled) ? "enablejob&job_name=$job_name" : + "disablejob&job_name=$job_name"; $options = [ - "enablejob&job_name=$job_name" => + "enablejob&job_name=$job_name" => tl('mediajobs_element_on'), - "disablejob&job_name=$job_name" => + "disablejob&job_name=$job_name" => tl('mediajobs_element_off'), ]; ?> - <tr><td><?=$job_name ?></td><td><?= + <tr><td ><?=$job_name ?></td><td><?= $this->view->helper('options')->renderLinkDropDown( "job-toggle-" . $job_name, $options, $selected, $base_url ); diff --git a/src/views/elements/PageoptionsElement.php b/src/views/elements/PageoptionsElement.php index de754d8a9..22755ecea 100644 --- a/src/views/elements/PageoptionsElement.php +++ b/src/views/elements/PageoptionsElement.php @@ -53,21 +53,43 @@ class PageOptionsElement extends Element <div class="current-activity"> <form id="pageoptionsForm" method="post" enctype='multipart/form-data'> <ul class='tab-menu-list'> - <li><a href="javascript: - switchTab('crawltimetab', 'searchtimetab', 'testoptionstab');" - id='crawltimetabitem' - class="<?=$data['crawl_time_active'] ?>"><?= - tl('pageoptions_element_crawl_time')?></a></li> - <li><a href="javascript: - switchTab('searchtimetab', 'crawltimetab','testoptionstab');" - id='searchtimetabitem' - class="<?=$data['search_time_active'] ?>"><?= - tl('pageoptions_element_search_time')?></a></li> - <li><a href="javascript: - switchTab('testoptionstab', 'crawltimetab', 'searchtimetab');" - id='testoptionstabitem' - class="<?=$data['test_options_active'] ?>"><?= - tl('pageoptions_element_test_options') ?></a></li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'crawltimetab', 'searchtimetab', 'testoptionstab'" + ');" ' + + "id='crawltimetabitem' " + + 'class="<?=$data['crawl_time_active'] ?>"><?= + tl('pageoptions_element_crawl_time')?></a>'); + </script> + <noscript> + <a href="#crawltimetab" + id='crawltimetabitem'><?= + tl('pageoptions_element_crawl_time')?></a> + </noscript> + </li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'searchtimetab', 'crawltimetab','testoptionstab'" + ');" ' + + "id='searchtimetabitem' " + + 'class="<?=$data['search_time_active'] ?>"><?= + tl('pageoptions_element_search_time')?></a>'); + </script> + <noscript> + <a href="#searchtimetab" id='searchtimetabitem'><?= + tl('pageoptions_element_search_time')?></a> + </noscript> + </li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'testoptionstab', 'crawltimetab', 'searchtimetab'" + ');" ' + + "id='testoptionstabitem' " + + 'class="<?=$data['test_options_active'] ?>"><?= + tl('pageoptions_element_test_options') ?></a>'); + </script> + <noscript> + <a href="#testoptionstab" id='testoptionstabitem' ><?= + tl('pageoptions_element_test_options') ?></a> + </noscript> + </li> </ul> <div class='tab-menu-content'> <input type="hidden" name="c" value="admin" /> @@ -78,17 +100,37 @@ class PageOptionsElement extends Element $data[C\CSRF_TOKEN] ?>" /> <input type="hidden" name="a" value="pageOptions" /> <?php - $this->renderCrawlTimeTab($data); - $this->renderSearchTimeTab($data); + $this->renderCrawlTimeTab($data); ?> + <noscript> + <div class="center slight-pad"> + <button class="button-box" type="submit"><?= + tl('pageoptions_element_save_options')?></button> + </div> + </noscript> + <?php + $this->renderSearchTimeTab($data); ?> + <noscript> + <div class="center slight-pad"> + <button class="button-box" type="submit"><?= + tl('pageoptions_element_save_options')?></button> + </div> + </noscript> + <?php $this->renderTestTab($data); ?> <div class="center slight-pad"> - <button class="button-box" id="page-button" - type="submit"><?php if ($data['test_options_active'] == "") { - e(tl('pageoptions_element_save_options')); - } else { - e(tl('pageoptions_element_run_tests')); - } - ?></button> + <script> + document.write('<button class="button-box" id="page-button" '+ + 'type="submit"><?php if ($data['test_options_active'] == "") { + e(tl('pageoptions_element_save_options')); + } else { + e(tl('pageoptions_element_run_tests')); + } + ?></button>'); + </script> + <noscript> + <button class="button-box" type="submit"><?= + tl('pageoptions_element_run_tests')?></button> + </noscript> </div> </div> </form> diff --git a/src/views/elements/ResultseditorElement.php b/src/views/elements/ResultseditorElement.php index f274514b9..e3ac573c0 100644 --- a/src/views/elements/ResultseditorElement.php +++ b/src/views/elements/ResultseditorElement.php @@ -58,18 +58,42 @@ class ResultsEditorElement extends Element ?> <div class="current-activity"> <ul class='tab-menu-list'> - <li><a href="javascript:switchTab('editresulttab', - ['querymaptab', 'knowledgetab']);" id='editresulttabitem' - class="<?=$data['edit_result_active'] ?>"><?= - tl('resultseditor_element_edit_results')?></a></li> - <li><a href="javascript:switchTab('querymaptab', ['editresulttab', - 'knowledgetab']);" id='querymaptabitem' - class="<?=$data['query_map_active'] ?>"><?= - tl('resultseditor_element_query_map')?></a></li> - <li><a href="javascript:switchTab('knowledgetab', - ['querymaptab', 'editresulttab']);" id='knowledgetabitem' - class="<?=$data['knowledge_wiki_active'] ?>"><?= - tl('resultseditor_element_knowledge_wiki')?></a></li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'editresulttab', ['querymaptab', 'knowledgetab']);" +'" ' + + "id='editresulttabitem' " + + 'class="<?=$data['edit_result_active'] ?>"><?= + tl('resultseditor_element_edit_results')?></a>'); + </script> + <noscript> + <a href="#editresulttab" id='editresulttabitem'><?= + tl('resultseditor_element_edit_results')?></a> + </noscript> + </li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'querymaptab', ['editresulttab','knowledgetab']);" +'" ' + + "id='querymaptabitem' " + + 'class="<?=$data['query_map_active'] ?>"><?= + tl('resultseditor_element_query_map')?></a>'); + </script> + <noscript> + <a href="#querymaptab" id='querymaptabitem'><?= + tl('resultseditor_element_query_map')?></a> + </noscript> + </li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'knowledgetab', ['querymaptab', 'editresulttab']);" +'" ' + + "id='knowledgetabitem' " + + 'class="<?=$data['knowledge_wiki_active'] ?>"><?= + tl('resultseditor_element_knowledge_wiki')?></a>'); + </script> + <noscript> + <a href="#knowledgetab" id='knowledgetabitem'><?= + tl('resultseditor_element_knowledge_wiki')?></a> + </noscript> + </li> </ul> <div class='tab-menu-content'> <div id="editresulttab"> diff --git a/src/views/elements/ScrapersElement.php b/src/views/elements/ScrapersElement.php index d5a094311..0c118ade3 100644 --- a/src/views/elements/ScrapersElement.php +++ b/src/views/elements/ScrapersElement.php @@ -68,6 +68,13 @@ class ScrapersElement extends Element if (in_array($data['FORM_TYPE'], ['edit', 'search'])) { $data['DISABLE_ADD_TOGGLE'] = true; } + if ($data['FORM_TYPE'] == 'edit') {?> + <div class="float-opposite">[<a href="<?=$base_url . + $arg_context?>">X</a>]</div> + <?php + $this->renderScraperForm($data); + return; + } ?> <table class="admin-table scrapers-table" > <tr><td class="no-border" colspan="<?= @@ -92,40 +99,23 @@ class ScrapersElement extends Element $td_style = ($data['FORM_TYPE'] == 'edit' && $data['CURRENT_SCRAPER']['name'] == $scraper['NAME']) ? "class='admin-edit-box'" : ""; ?> - <tr><?php - if ($data['FORM_TYPE'] == 'edit' && - $data['CURRENT_SCRAPER']['name'] == $scraper['NAME']) { - ?><td class='admin-edit-box'><?php - $this->renderScraperForm($data); ?> - </td><?php - } else { ?> - <td> - <b><?= $scraper['NAME'] ?></b><br /> - <b><?=tl('scrapers_element_signature') ?></b> - <pre><?=$scraper['SIGNATURE'] ?></pre> - <b><?=tl('scrapers_element_priority') ?></b> - <pre><?=$scraper['PRIORITY'] ?></pre> - <b><?=tl('scrapers_element_text_path') ?></b> - <pre><?=$scraper['TEXT_PATH'] ?></pre> - <b><?=tl('scrapers_element_delete_paths') ?></b> - <pre><?=$scraper['DELETE_PATHS'] ?></pre> - <b><?=tl('scrapers_element_extract_fields') ?></b> - <pre><?=$scraper['EXTRACT_FIELDS'] ?></pre> - </td><?php - } - if ($data['FORM_TYPE'] != 'edit' || - $data['CURRENT_SCRAPER']['name'] != - $scraper['NAME']) { - ?> - <td><a href="<?=$base_url."&arg=edit&id=". - $scraper['ID']. $paging ?>"><?= - tl('scrapers_element_edit') ?></a></td><?php - } else { ?> - <td class='admin-edit-row-field'> - <a href="<?= $base_url; ?>"><b><?= - tl('scrapers_element_edit') ?></b></a></td><?php - } - ?> + <tr> + <td> + <b><?= $scraper['NAME'] ?></b><br /> + <b><?=tl('scrapers_element_signature') ?></b> + <pre><?=$scraper['SIGNATURE'] ?></pre> + <b><?=tl('scrapers_element_priority') ?></b> + <pre><?=$scraper['PRIORITY'] ?></pre> + <b><?=tl('scrapers_element_text_path') ?></b> + <pre><?=$scraper['TEXT_PATH'] ?></pre> + <b><?=tl('scrapers_element_delete_paths') ?></b> + <pre><?=$scraper['DELETE_PATHS'] ?></pre> + <b><?=tl('scrapers_element_extract_fields') ?></b> + <pre><?=$scraper['EXTRACT_FIELDS'] ?></pre> + </td> + <td><a href="<?=$base_url."&arg=edit&id=". + $scraper['ID']. $paging ?>"><?= + tl('scrapers_element_edit') ?></a></td> <td <?=$td_style ?>><a onclick='javascript:return confirm("<?= tl('scrapers_element_confirm_delete') ?>");' href="<?= $base_url . "&arg=delete&id=". @@ -137,9 +127,10 @@ class ScrapersElement extends Element </div><?php } /** - * Used to draw the formm for adding a new scraper or editing an existing one + * Used to draw the formm for adding a new scraper or editing an existing + * one * - * @param array $data containspotentially edit info for the current scraper + * @param array $data contains potentially edit info for the current scraper */ public function renderScraperForm($data) { diff --git a/src/views/elements/SearchElement.php b/src/views/elements/SearchElement.php index d92c8dbe4..4094930bd 100644 --- a/src/views/elements/SearchElement.php +++ b/src/views/elements/SearchElement.php @@ -412,7 +412,7 @@ class SearchElement extends Element implements CrawlConstants if ($logged_in) { e("?".http_build_query($query_parts)); } ?>"><img src="<?php e($logo); ?>" alt="<?= tl('search_element_title') - ?>" /></a> + ?>" ></a> </h1><?php $subsearch = ""; if (!empty($data['SUBSEARCH'])) { diff --git a/src/views/elements/SearchbarElement.php b/src/views/elements/SearchbarElement.php index a7248b312..74f56bd84 100644 --- a/src/views/elements/SearchbarElement.php +++ b/src/views/elements/SearchbarElement.php @@ -135,7 +135,8 @@ class SearchbarElement extends Element public function renderSettingsToggle($logged_in) { ?> <div class="settings" id="settings-toggle" - onclick="javascript:toggleOptions()"><?php + onclick="javascript:toggleOptions()"> + <div class='noscript-hide'><?php if ($logged_in) { $user_name = $_SESSION['USER_NAME']; if (mb_strlen($user_name) > 6) { @@ -147,6 +148,6 @@ class SearchbarElement extends Element <?php } else { e('≡'); - }?></div><?php + }?></div></div><?php } } diff --git a/src/views/elements/SearchmenuElement.php b/src/views/elements/SearchmenuElement.php index 17714ff95..2f5ddf5c5 100644 --- a/src/views/elements/SearchmenuElement.php +++ b/src/views/elements/SearchmenuElement.php @@ -77,8 +77,9 @@ class SearchmenuElement extends Element if ($logged_in) { ?> <div class="medium-font slight-pad reduce-top"><a class="gray-link" - href="javascript:setDisplay('admin-menu-options', true); - setDisplay('menu-options', false);">≪<?= + onclick="javascript:setDisplay('admin-menu-options', true); + setDisplay('menu-options', false);" + href="#admin-menu-options" >≪<?= tl('searchmenu_element_admin_menu'); ?></a></div><?php } ?> <h2 class="option-heading"><?php diff --git a/src/views/elements/SearchsourcesElement.php b/src/views/elements/SearchsourcesElement.php index 012c07e62..091d90c79 100644 --- a/src/views/elements/SearchsourcesElement.php +++ b/src/views/elements/SearchsourcesElement.php @@ -138,14 +138,30 @@ class SearchsourcesElement extends Element ?> <div class="current-activity"> <ul class='tab-menu-list'> - <li><a href="javascript:switchTab('mediasourcetab', 'subsearchestab');" - id='mediasourcetabitem' - class="<?=$data['media_source_active'] ?>"><?= - tl('searchsources_element_media_sources')?></a></li> - <li><a href="javascript:switchTab('subsearchestab', 'mediasourcetab');" - id='subsearchestabitem' - class="<?=$data['subsearches_active'] ?>"><?= - tl('searchsources_element_subsearches')?></a></li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'mediasourcetab', 'subsearchestab'" + ');" ' + + "id='mediasourcetabitem' " + + 'class="<?=$data['media_source_active'] ?>"><?= + tl('searchsources_element_media_sources')?></a>'); + </script> + <noscript> + <a href="#mediasourcetab" id='mediasourcetabitem'><?= + tl('searchsources_element_media_sources')?></a> + </noscript> + </li> + <li><script> + document.write('<a href="javascript:switchTab(' + + "'subsearchestab', 'mediasourcetab'" + ');" ' + + "id='subsearchestabitem' " + + 'class="<?=$data['subsearches_active'] ?>"><?= + tl('searchsources_element_subsearches')?></a>'); + </script> + <noscript> + <a href="#subsearchestab" id='subsearchestabitem'><?= + tl('searchsources_element_subsearches')?></a> + </noscript> + </li> </ul> <div class='tab-menu-content'> <div id="mediasourcetab"><?php diff --git a/src/views/elements/WikiElement.php b/src/views/elements/WikiElement.php index 082ab3fb9..cd4372b39 100644 --- a/src/views/elements/WikiElement.php +++ b/src/views/elements/WikiElement.php @@ -428,9 +428,10 @@ class WikiElement extends Element implements CrawlConstants } else { ?></b></label> <span id="toggle-settings" - >[<a href="javascript:toggleSettings()"><?= - tl('configure_element_toggle_page_settings') - ?></a>] [<a href="<?= htmlentities( + ><script> + document.write('[<a href="javascript:toggleSettings()"><?= + tl('wiki_element_toggle_page_settings') ?></a>]'); + </script> [<a href="<?= htmlentities( B\wikiUrl('Syntax', true, $data['CONTROLLER'], C\PUBLIC_GROUP_ID)) . C\CSRF_TOKEN .'='. $data[C\CSRF_TOKEN] . '&arg=read' ?>"><?= @@ -956,12 +957,15 @@ class WikiElement extends Element implements CrawlConstants if (!$disabled && empty($resource['is_dir']) && (!isset($data['page_type']) || $data['page_type'] != 'media_list')) { ?> - <button onclick='javascript:addToPage("<?= + <script> + document.write( + "<button onclick='javascript:addToPage(" + '"<?= urlencode($name); ?>", "wiki-page"<?= (empty($data['SUB_PATH'])) ? "" : ", \"{$data['SUB_PATH']}\"" - ?>)'><?=tl('wiki_element_add_to_page') - ?></button> <?php + ?>)' + "'><?=tl('wiki_element_add_to_page') + ?></button>"); + </script><?php } $append = ""; if (isset($data['OTHER_BACK_URL'])) { @@ -1516,8 +1520,10 @@ class WikiElement extends Element implements CrawlConstants $human_page_name = str_replace("_", " ", $data['PAGE_NAME']); e(tl('wiki_element_page', $human_page_name)); ?></b></label> <span id="toggle-settings" - >[<a href="javascript:toggleSettings()"><?= - tl('wiki_element_toggle_page_settings') ?></a>]</span> + ><script> + document.write('[<a href="javascript:toggleSettings()"><?= + tl('wiki_element_toggle_page_settings') ?></a>]'); + </script></span> </div> <div id='page-settings'> <div class="top-margin"> diff --git a/src/views/helpers/FileuploadHelper.php b/src/views/helpers/FileuploadHelper.php index acceed6db..83a0157d8 100644 --- a/src/views/helpers/FileuploadHelper.php +++ b/src/views/helpers/FileuploadHelper.php @@ -77,22 +77,21 @@ class FileUploadHelper extends Helper $click_link_text = tl('fileupload_helper_choose'); } ?> - <div class="upload-gray-box center black"> - <input type="file" id="<?= $elt_id ?>" - name="<?= $form_name ?>" class="none" - <?php + <script> + document.write('<div class="upload-gray-box center black">' + + '<input type="file" id="<?= $elt_id ?>" ' + + 'name="<?= $form_name ?>" class="none" ' + + '<?php if ($drop_kind == "image") { e(' accept="image/*" '); } else if ($multiple) { e(' multiple="multiple" '); - } ?> /> - <?= $drag_above_text ?> - <a href="javascript:elt('<?= $elt_id ?>').click()"><?= - $click_link_text ?></a> - <button type="submit"><?=tl('fileupload_helper_upload') - ?></button> - </div> - <script> + } ?> /> '+ + '<?= $drag_above_text ?>' + + '<a href="javascript:elt(' + "'<?= $elt_id ?>'" + ').click()"><?= + $click_link_text ?></a> ' + + '<button type="submit"><?=tl('fileupload_helper_upload') + ?></button></div>'); window.addEventListener("load", function(event) { initializeFileHandler('<?php e($drop_id); ?>', '<?= @@ -103,6 +102,11 @@ class FileUploadHelper extends Helper false ); </script> + <noscript> + <input type="file" id="<?= $elt_id ?>" name="<?= $form_name + ?>" /><button type="submit"><?= + tl('fileupload_helper_upload') ?></button> + </noscript> <?php } /** diff --git a/src/views/helpers/HelpbuttonHelper.php b/src/views/helpers/HelpbuttonHelper.php index 2293904d9..aa0d37b0a 100644 --- a/src/views/helpers/HelpbuttonHelper.php +++ b/src/views/helpers/HelpbuttonHelper.php @@ -91,19 +91,23 @@ class HelpbuttonHelper extends Helper $api_controller = "api"; $api_wiki_action = "wiki"; $api_wiki_mode = "read"; - return '<button type="button" - class="help-button default" - data-tl=\'' . $this->localization_data . '\' - data-back-params=\'' . $this->back_params . '\' - onclick="javascript:displayHelpForId(this,' - . $is_mobile . ',\'' - . $this->clean($_REQUEST['c']) . '\',\'' - . $this->clean($_REQUEST['a']) . '\',\'' - . C\CSRF_TOKEN . '\',\'' - . $csrf_token_value . "','$wiki_group_id','$api_controller'," - . "'$api_wiki_action','$api_wiki_mode" . '\')" ' - . 'data-pagename="' . $help_point_id . '"> ' - . tl('helpbutton_helper_question_mark') . '</button>'; + $button_string = '<button type="button" + class="help-button default" + data-tl=\'' . $this->localization_data . '\' + data-back-params=\'' . $this->back_params . '\' + onclick="javascript:displayHelpForId(this,' + . $is_mobile . ',\'' + . $this->clean($_REQUEST['c']) . '\',\'' + . $this->clean($_REQUEST['a']) . '\',\'' + . C\CSRF_TOKEN . '\',\'' + . $csrf_token_value . "','$wiki_group_id','$api_controller'," + . "'$api_wiki_action','$api_wiki_mode" . '\')" ' + . 'data-pagename="' . $help_point_id . '"> ' + . tl('helpbutton_helper_question_mark') . '</button>'; + $button_string = "<script>\n" . + "document.write(" .json_encode($button_string) .");\n" . + "</script>"; + return $button_string; } /** * Used to clean strings that might be tainted as originate from the user diff --git a/src/views/helpers/OptionsHelper.php b/src/views/helpers/OptionsHelper.php index b27069391..b87528d76 100755 --- a/src/views/helpers/OptionsHelper.php +++ b/src/views/helpers/OptionsHelper.php @@ -105,8 +105,13 @@ class OptionsHelper extends Helper ?></optgroup><?php } ?> - </select> - <?php + </select><?php + if ($onchange_action !== false) { ?> + <noscript> + <input type="submit" value="<?=tl('option_helper_go') ?>"> + </noscript> + <?php + } } /** * Creates a dropdown where selecting an item redirects to a given url. @@ -160,63 +165,33 @@ class OptionsHelper extends Helper $stretch = ($_SERVER["MOBILE"]) ? 4 : 6; $word_wrap_len = $stretch * C\NAME_TRUNCATE_LEN; $id_info = ($id != "") ? " id='$id' " : " "; - ?> - <select class='link-dropdown' <?= $id_info ?> <?php - e(' onchange="var next_loc = '. "'$url_prefix'" . - '; - var self = this; - var sel_option = this.options[this.selectedIndex]; - var sel_value = sel_option.value; - if (sel_option.epub_ref) { - sel_option.epub_ref.goto(sel_option.ref).then( - function () { - updateMediaLocationInfo(sel_option.epub_ref); - self.selectedIndex = self.num_doc_sections; - } - ); - } else if (sel_option.pdf_ref) { - sel_option.pdf_ref.getDestination(sel_option.ref).then( - function (destination) { - sel_option.pdf_ref.getPageIndex( - destination[0]).then( - function (page_index) { - renderPdfPage(sel_option.pdf_ref, - page_index + 1); - } - ); - } - ); - } else if (sel_value != -1) { - next_url = (sel_value.substring(0,4) == '."'http'". - ') ? sel_value : next_loc + sel_value; - window.location = next_url; - }" '); - ?> > - <?php - $open_optgroup = false; + $opt_group = ""; foreach ($options as $value => $text) { + if (empty($selected_text) || $value == $selected) { + $selected_text = $text; + } if (empty($text) && !empty($value)) { - if ($open_optgroup) { - ?></optgroup><?php - } - $open_optgroup = true; - ?><optgroup label='<?=$value ?>'><?php - continue; + $opt_group = " class='opt-group' "; } - ?> - <option value="<?= $value ?>" <?php - if ($value== $selected) { e('selected="selected"'); } - if (strlen($text) > $word_wrap_len + 3) { - $text = substr($text, 0, $word_wrap_len)."..."; - } - ?>><?= $text ?></option> - <?php - } - if ($open_optgroup) { - ?></optgroup><?php } ?> - </select> + <form class="dropdown-container" <?= $id_info ?>> + <ul class="link-dropdown"> + <li><b><input readonly="readonly" value='<?=$selected_text + ?>' /></b> + <ul><?php + foreach ($options as $value => $text) { + if (empty($text) && !empty($value)) {?> + <li><b><?=$value ?></b></li><?php + } else { ?> + <li><a <?=$opt_group?> href="<?=$url_prefix . $value + ?>" ><?= $text ?></a></li><?php + } + }?> + </ul> + </li> + </ul> + </form> <?php } } diff --git a/src/views/helpers/PagingtableHelper.php b/src/views/helpers/PagingtableHelper.php index a29a1a1f8..2d2241557 100644 --- a/src/views/helpers/PagingtableHelper.php +++ b/src/views/helpers/PagingtableHelper.php @@ -315,16 +315,27 @@ class PagingtableHelper extends Helper } else { e($data['TABLE_TITLE']); } - if (empty($data['NO_ADD_TOGGLE'])) { - if (empty($data['DISABLE_ADD_TOGGLE'])) {?> - <a class='admin-add-link' - title='<?=tl('pagingtable_helper_add') ?>' - href="javascript:toggleDisplay('<?= $toggle_id ?>')" - ><b>⊞</b></a><?php - } else { ?> - <b class='admin-add-link light-gray'>⊞</b><?php + $add_toggle = ""; + if (empty($_REQUEST['noscript']) && empty($data['NO_ADD_TOGGLE'])) { + if (empty($data['DISABLE_ADD_TOGGLE'])) { + $add_toggle = "<a class='admin-add-link' " . + "title='". tl('pagingtable_helper_add') . "' " . + "href=\"javascript:toggleDisplay('$toggle_id')\" >" . + "<b>⊞</b></a>"; + } else { + $add_toggle = "<b class='admin-add-link light-gray'>". + "⊞</b>"; } - }?> + } + if (empty($data['VIEW']->layout)) { + e($add_toggle); + } else {?> + <script> + document.write(<?=json_encode($add_toggle)?>); + </script> + <?php + } + ?> </h2><?php } } diff --git a/src/views/helpers/ToggleHelper.php b/src/views/helpers/ToggleHelper.php index 56116bbd9..d236d00b4 100644 --- a/src/views/helpers/ToggleHelper.php +++ b/src/views/helpers/ToggleHelper.php @@ -51,25 +51,25 @@ class ToggleHelper extends Helper */ public function render($state, $on_url, $off_url, $caution = false) { + $target = (empty($_REQUEST['noscript'])) ? "" : " target='_parent' "; if ($state) { $oncolor = ($caution) ? "back-yellow" : "back-green"; if ($caution) { ?> <table class="toggle-table"><tr><td class="<?= $oncolor - ?>"><a href="<?= $on_url ?>"><?= + ?>"><a <?=$target?> href="<?= $on_url ?>"><?= tl('toggle_helper_on') ?></a></td> - <td><a href="<?= $off_url ?>" + <td><a <?=$target?> href="<?= $off_url ?>" ><?= tl('toggle_helper_off') ?></a></td></tr></table> <?php } else { ?> - <table class="toggle-table"><tr><td - class="<?= $oncolor + <table class="toggle-table"><tr><td class="<?= $oncolor ?>"><b><?= tl('toggle_helper_on') ?></b></td> - <td><a href="<?= $off_url ?>" + <td><a <?=$target?> href="<?= $off_url ?>" ><?= tl('toggle_helper_off') ?></a></td></tr></table> <?php } ?> <?php } else {?> - <table class="toggle-table"><tr><td><a href="<?= $on_url ?>" - ><?= tl('toggle_helper_on') ?></a></td> + <table class="toggle-table"><tr><td><a <?=$target + ?> href="<?= $on_url ?>" ><?= tl('toggle_helper_on') ?></a></td> <td class="back-red"><b><?= tl('toggle_helper_off') ?></b></td> </tr></table> diff --git a/src/views/layouts/WebLayout.php b/src/views/layouts/WebLayout.php index 4d0439d89..76ded7ec3 100755 --- a/src/views/layouts/WebLayout.php +++ b/src/views/layouts/WebLayout.php @@ -221,7 +221,71 @@ class WebLayout extends Layout } <?php } ?> - </style> + </style><?php + if (empty($_REQUEST['noscript'])) { ?> + <noscript> + <style> + .noscript-hide + { + display: none; + } + .top-container + { + display: contents; + } + .center-container + { + margin-top: -65px; + } + .html-ltr .nav-container + { + height: 1000px; + left: 0px; + overflow-y: scroll; + position:fixed; + top: 0px; + } + .html-ltr .menu-options + { + left: 0px; + overflow-y:unset; + position:static; + } + .html-rtl .menu-options + { + position:static; + right: 0px; + } + .html-ltr .logo-subsearch + { + left: 370px; + } + .html-ltr .body-container + { + margin-left: 300px; + } + .html-rtl .nav-container + { + overflow-y:scroll; + position:fixed; + right: 0px; + top: 0px; + } + .html-rtl .body-container + { + margin-right: 300px; + } + .html-rtl .logo-subsearch + { + right: 370px; + } + #admin-menu-options + { + display: block; + } + </style> + </noscript><?php + } ?> </head><?php $data['MOBILE'] = ($_SERVER["MOBILE"]) ? 'mobile': ''; flush(); @@ -262,7 +326,7 @@ class WebLayout extends Layout <?=tl('web_layout_cookie_uses') ?> <a href="<?=B\directUrl('privacy') ?>"><?= tl('web_layout_privacy_policy') ?></a>. - <a href="<?=$consent_url; ?>" class='anchor-button'><?= + <a href="<?=$consent_url; ?>" class='anchor-button-consent'><?= tl('web_layout_allow_cookies') ?></a> </div><?php }