diff --git a/account_prefs_update.php b/account_prefs_update.php index e77f0d0e38..e8165252ce 100644 --- a/account_prefs_update.php +++ b/account_prefs_update.php @@ -60,6 +60,9 @@ $t_prefs->language = $t_lang; } + $t_prefs->advanced_report = gpc_get_bool( 'advanced_report' ); + $t_prefs->advanced_view = gpc_get_bool( 'advanced_view' ); + $t_prefs->advanced_update = gpc_get_bool( 'advanced_update' ); $t_prefs->email_on_new = gpc_get_bool( 'email_on_new' ); $t_prefs->email_on_assigned = gpc_get_bool( 'email_on_assigned' ); $t_prefs->email_on_feedback = gpc_get_bool( 'email_on_feedback' ); diff --git a/admin/schema.php b/admin/schema.php index b96021e9e7..a15a732f72 100644 --- a/admin/schema.php +++ b/admin/schema.php @@ -596,6 +596,3 @@ function installer_db_now() { $upgrade[] = Array( 'AddColumnSQL', Array( db_get_table( 'mantis_bug_file_table' ), " user_id I UNSIGNED NOTNULL DEFAULT '0' " ) ); $upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_custom_field_table'), "advanced" ) ); -$upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_user_pref_table'), "advanced_report" ) ); -$upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_user_pref_table'), "advanced_view" ) ); -$upgrade[] = Array( 'DropColumnSQL', Array( db_get_table( 'mantis_user_pref_table'), "advanced_update" ) ); diff --git a/bug_report_page.php b/bug_report_page.php index e1383ec36c..dc7e006bf2 100644 --- a/bug_report_page.php +++ b/bug_report_page.php @@ -40,7 +40,7 @@ # this page is invalid for the 'All Project' selection except if this is a clone if ( ( ALL_PROJECTS == helper_get_current_project() ) && ( 0 == $f_master_bug_id ) ) { - print_header_redirect( 'login_select_proj_page.php?ref=bug_report_page.php' ); + print_header_redirect( 'login_select_proj_page.php?ref=bug_report_advanced_page.php' ); } if ( $f_master_bug_id > 0 ) { @@ -167,7 +167,7 @@ @@ -395,7 +395,7 @@ - + > * diff --git a/bug_view_inc.php b/bug_view_inc.php index 59cc69324f..4d6ac302c6 100644 --- a/bug_view_inc.php +++ b/bug_view_inc.php @@ -238,11 +238,11 @@ $t_index = array_search( $f_bug_id, $t_bugslist ); if ( false !== $t_index ) { if ( isset( $t_bugslist[$t_index-1] ) ) { - print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index-1], '<<' ); + print_bracket_link( 'bug_view_advanced_page.php?bug_id='.$t_bugslist[$t_index-1], '<<' ); } if ( isset( $t_bugslist[$t_index+1] ) ) { - print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' ); + print_bracket_link( 'bug_view_advanced_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' ); } } echo ''; @@ -577,7 +577,7 @@ # Bug Details Event Signal # - event_signal( 'EVENT_VIEW_BUG_DETAILS', array( $tpl_bug_id ) ); + event_signal( 'EVENT_VIEW_BUG_DETAILS', array( $tpl_bug_id, true ) ); # spacer echo ''; diff --git a/config_defaults_inc.php b/config_defaults_inc.php index a0d276ed36..f45ee75e76 100644 --- a/config_defaults_inc.php +++ b/config_defaults_inc.php @@ -1219,6 +1219,24 @@ */ $g_min_refresh_delay = 10; + /** + * + * @global int $g_default_advanced_report + */ + $g_default_advanced_report = OFF; + + /** + * + * @global int $g_default_advanced_view + */ + $g_default_advanced_view = OFF; + + /** + * + * @global int $g_default_advanced_update + */ + $g_default_advanced_update = OFF; + /** * in minutes * @global int $g_default_refresh_delay diff --git a/core/print_api.php b/core/print_api.php index 149e466e63..a0bb366bc9 100644 --- a/core/print_api.php +++ b/core/print_api.php @@ -1667,7 +1667,7 @@ function get_dropdown( $p_control_array, $p_control_name, $p_match = '', $p_add_ } # List the attachments belonging to the specified bug. This is used from within -# bug_view_page.php +# bug_view_page.php and bug_view_advanced_page.php function print_bug_attachments_list( $p_bug_id ) { $t_attachments = file_get_visible_attachments( $p_bug_id ); $t_attachments_count = count( $t_attachments ); diff --git a/core/user_pref_api.php b/core/user_pref_api.php index 987e076918..561450251b 100644 --- a/core/user_pref_api.php +++ b/core/user_pref_api.php @@ -31,6 +31,9 @@ class UserPreferences { protected $default_profile = NULL; protected $default_project = NULL; + protected $advanced_report = NULL; + protected $advanced_view = NULL; + protected $advanced_update = NULL; protected $refresh_delay = NULL; protected $redirect_delay = NULL; protected $bugnote_order = NULL; @@ -62,6 +65,9 @@ class UserPreferences { private static $default_mapping = array( 'default_profile' => 'default_profile', 'default_project' => 'default_project', + 'advanced_report' => 'default_advanced_report', + 'advanced_view' => 'default_advanced_view', + 'advanced_update' => 'default_advanced_update', 'refresh_delay' => 'default_refresh_delay', 'redirect_delay' => 'default_redirect_delay', 'bugnote_order' => 'default_bugnote_order', diff --git a/docbook/adminguide/en/configuration.sgml b/docbook/adminguide/en/configuration.sgml index 09a35b255a..982db52a6f 100644 --- a/docbook/adminguide/en/configuration.sgml +++ b/docbook/adminguide/en/configuration.sgml @@ -1172,6 +1172,30 @@ ($g_default_language). + + $g_default_advanced_report + + Default user preferences to use the advanced page for + reporting bugs. Default is OFF. + + + + + $g_default_advanced_view + + Default user preferences to use the advanced page for view + bugs. Default value is OFF. + + + + + $g_default_advanced_update + + Default user preferences to use the advanced page for + updating bugs. Default value is OFF. + + + $g_default_refresh_delay diff --git a/docbook/adminguide/en/customizing_mantis.sgml b/docbook/adminguide/en/customizing_mantis.sgml index 875a84f877..2fe8d8380c 100644 --- a/docbook/adminguide/en/customizing_mantis.sgml +++ b/docbook/adminguide/en/customizing_mantis.sgml @@ -123,6 +123,11 @@ able to edit the value of the custom field. + + Display only on Advanced Page? - If set, then this + custom field will only show on the advanced pages. + + Display when reporting issues? - If this custom field should be shown on the Report Issue page. diff --git a/docbook/adminguide/en/page_descriptions.sgml b/docbook/adminguide/en/page_descriptions.sgml index 8e8a9a87a0..10a67141ce 100644 --- a/docbook/adminguide/en/page_descriptions.sgml +++ b/docbook/adminguide/en/page_descriptions.sgml @@ -71,16 +71,17 @@ will reverse the direction of the sort. The default is to sort by last modification time, where the last modified issue appears at the top. The issue id is a link that leads to a more detailed report about - the issue. You can also add issue notes here. The number in the - issue note count column will be bold if an issue note has been - added in the specified time frame. The addition of an issue note - will make the issue note link of the issue appear in the unvisited - state. The text in the "Severity" column will be bold if the - severity is major, crash, or block and the issue not resolved. The - text in the "Updated" column will be bold if the issue has changed - in the last "Changed(hrs)" field which is specified in the viewing - filters. Each table row is color coded according to the issue - status. The colors can be customised through MantisBT + the issue. Depending on what you have set in your Account Preferences + you will be sent to the simple or advanced view. You can also add + issue notes here.The number in the issue note count column will be bold + if an issue note has been added in the specified time frame. The + addition of an issue note will make the issue note link of the issue appear + in the unvisited state.The text in the "Severity" column will be + bold if the severity is major, crash, or block and the issue not + resolved.The text in the "Updated" column will be bold if the issue + has changed in the last "Changed(hrs)" field which is specified in + the viewing filters.Each table row is color coded according to the + issue status. The colors can be customised through MantisBT Configuration .Severitiesblock - prevents further work/progress from being made diff --git a/docbook/developers/en/event-reference-bug.sgml b/docbook/developers/en/event-reference-bug.sgml index d56eef8cac..70e89d8304 100644 --- a/docbook/developers/en/event-reference-bug.sgml +++ b/docbook/developers/en/event-reference-bug.sgml @@ -23,6 +23,7 @@ Parameters <Integer>: Bug ID + <Boolean>: Advanced view (false for simple view) @@ -45,6 +46,7 @@ Parameters <Integer>: Bug ID + <Boolean>: Advanced view (false for simple view) @@ -72,6 +74,7 @@ Parameters <Integer>: Project ID + <Boolean>: Advanced view (false for simple view) @@ -94,6 +97,7 @@ Parameters <Integer>: Project ID + <Boolean>: Advanced view (false for simple view) diff --git a/lang/strings_arabic.txt b/lang/strings_arabic.txt index e71ea4bd9d..2d984dbd7c 100644 --- a/lang/strings_arabic.txt +++ b/lang/strings_arabic.txt @@ -399,6 +399,9 @@ $s_verify_warning = 'معلومات حسابك تم تأكيدها. رسالة $s_verify_change_password = 'يجب أن تضبط كلمة سر هنا ليسمح لك بتسجيل الدخول مرة ثانية.'; $s_default_account_preferences_title = 'تفضيلات الحساب'; $s_default_project = 'المشروع الافتراضي'; +$s_advanced_report = 'تقرير متقدم'; +$s_advanced_view = 'عرض متقدم'; +$s_advanced_update = 'تحديث متقدم'; $s_refresh_delay = 'تحديث التأخير'; $s_minutes = 'دقائق'; $s_redirect_delay = 'تحويل التأخير'; @@ -533,6 +536,7 @@ $s_steps_to_reproduce = 'الخطوات لإعادة الإنتاج'; $s_update_information_button = 'تحديث المعلومات'; $s_sticky_issue = 'قضية لاصقة'; $s_profile = 'ملف'; +$s_update_advanced_link = 'تحديث متقدم'; $s_updating_bug_simple_title = 'تحديث معلومات القضية'; $s_view_revisions = 'رؤية المراجعات'; $s_revision = 'المراجعة'; @@ -868,6 +872,7 @@ $s_assign_to = 'موكولة إلى'; $s_additional_information = 'معلومات إضافية'; $s_submit_report_button = 'إرسال التقرير'; $s_check_report_more_bugs = 'اختر للإبلاغ عن مزيد من القضايا'; +$s_advanced_report_link = 'تقرير متقدم'; $s_report_stay = 'التقرير يبقى'; $s_selected_project = 'المشروع المختار'; $s_valid_project_msg = 'يجب أن تختار مشروعا صحيحا'; @@ -971,11 +976,8 @@ $s_attached_files = 'الملفات الملحقة'; $s_publish = 'نشر'; $s_cached = 'مخزن'; $s_add_user_to_monitor = 'أضف'; -<<<<<<< HEAD $s_view_advanced_link = 'عرض متقدم'; $s_viewing_bug_simple_details_title = 'عرض تفاصيل القضية البسيطة'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'لا يوجد مستخدمون يراقبون هذه القضية.'; $s_users_monitoring_bug = 'المستخدمون الذين يراقبون هذه القضية'; $s_monitoring_user_list = 'قائمة المستخدمين'; diff --git a/lang/strings_arabicegyptianspoken.txt b/lang/strings_arabicegyptianspoken.txt index 679f106938..9981befeda 100644 --- a/lang/strings_arabicegyptianspoken.txt +++ b/lang/strings_arabicegyptianspoken.txt @@ -397,6 +397,9 @@ $s_verify_warning = 'معلومات حسابك تم تأكيدها. رسالة $s_verify_change_password = 'يجب أن تضبط كلمة سر هنا ليسمح لك بتسجيل الدخول مرة ثانية.'; $s_default_account_preferences_title = 'تفضيلات الحساب'; $s_default_project = 'المشروع الافتراضي'; +$s_advanced_report = 'تقرير متقدم'; +$s_advanced_view = 'عرض متقدم'; +$s_advanced_update = 'تحديث متقدم'; $s_refresh_delay = 'تحديث التأخير'; $s_minutes = 'دقائق'; $s_redirect_delay = 'تحويل التأخير'; @@ -531,6 +534,7 @@ $s_steps_to_reproduce = 'الخطوات لإعادة الإنتاج'; $s_update_information_button = 'تحديث المعلومات'; $s_sticky_issue = 'قضية لاصقة'; $s_profile = 'ملف'; +$s_update_advanced_link = 'تحديث متقدم'; $s_updating_bug_simple_title = 'تحديث معلومات القضية'; $s_vote_added_msg = 'التصويت تمت إضافته...'; $s_bugnote_added_msg = 'الملاحظة تمت إضافتها...'; @@ -856,6 +860,7 @@ $s_assign_to = 'موكولة إلى'; $s_additional_information = 'معلومات إضافية'; $s_submit_report_button = 'إرسال التقرير'; $s_check_report_more_bugs = 'اختر للإبلاغ عن مزيد من القضايا'; +$s_advanced_report_link = 'تقرير متقدم'; $s_report_stay = 'التقرير يبقى'; $s_selected_project = 'المشروع المختار'; $s_valid_project_msg = 'يجب أن تختار مشروعا صحيحا'; @@ -958,11 +963,8 @@ $s_attached_files = 'الملفات الملحقة'; $s_publish = 'نشر'; $s_cached = 'مخزن'; $s_add_user_to_monitor = 'أضف'; -<<<<<<< HEAD $s_view_advanced_link = 'عرض متقدم'; $s_viewing_bug_simple_details_title = 'عرض تفاصيل القضية البسيطة'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'لا يوجد مستخدمون يراقبون هذه القضية.'; $s_users_monitoring_bug = 'المستخدمون الذين يراقبون هذه القضية'; $s_monitoring_user_list = 'قائمة المستخدمين'; diff --git a/lang/strings_bulgarian.txt b/lang/strings_bulgarian.txt index 860ec718e7..2191a39e1b 100644 --- a/lang/strings_bulgarian.txt +++ b/lang/strings_bulgarian.txt @@ -358,6 +358,9 @@ $s_verify_warning = 'Данните от профила са проверени. $s_verify_change_password = 'Изисква се въвеждането на парола за обратен достъп до системата.'; $s_default_account_preferences_title = 'Настройки на профил'; $s_default_project = 'Проект'; +$s_advanced_report = 'Разширена информация'; +$s_advanced_view = 'Разширен изглед'; +$s_advanced_update = 'Разширено обновяване'; $s_refresh_delay = 'Автоматично опресняване'; $s_minutes = 'минути'; $s_redirect_delay = 'Автоматично пренасочване'; @@ -488,6 +491,7 @@ $s_steps_to_reproduce = 'Стъпки за възпроизвеждане'; $s_update_information_button = 'Обновяване на информацията'; $s_sticky_issue = 'Проблематичен'; $s_profile = 'Профил'; +$s_update_advanced_link = 'Обновяване с разширен формуляр'; $s_updating_bug_simple_title = 'Обновяване на информацията за проблем'; $s_all_revisions = 'Всички версии'; $s_vote_added_msg = 'Добавена е бележка...'; @@ -778,6 +782,7 @@ $s_assign_to = 'Назначаване на'; $s_additional_information = 'Допълнителна информация'; $s_submit_report_button = 'Изпращане'; $s_check_report_more_bugs = 'Маркирайте, ако искате да съобщите за повече грешки'; +$s_advanced_report_link = 'Разширен формуляр'; $s_report_stay = 'Още грешки'; $s_selected_project = 'Избран проект'; $s_valid_project_msg = 'Изберете валиден проект'; @@ -872,11 +877,8 @@ $s_attached_files = 'Прикрепени файлове'; $s_publish = 'Публикуване'; $s_cached = 'Кеширан'; $s_add_user_to_monitor = 'Добавяне'; -<<<<<<< HEAD $s_view_advanced_link = 'Разширен изглед'; $s_viewing_bug_simple_details_title = 'Опростен изглед на проблем'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Няма потребители, наблюдаващи този проблем.'; $s_users_monitoring_bug = 'Потребители, наблюдаващи този проблем'; $s_monitoring_user_list = 'Списък с потребители'; diff --git a/lang/strings_catalan.txt b/lang/strings_catalan.txt index a760857320..35613f26aa 100644 --- a/lang/strings_catalan.txt +++ b/lang/strings_catalan.txt @@ -399,6 +399,9 @@ $s_verify_warning = 'La informació del seu compte ha estat verificada. El missa $s_verify_change_password = 'Ha d\'establir una contrasenya per poder entrar una altra vegada'; $s_default_account_preferences_title = 'Preferències del compte'; $s_default_project = 'Projecte per defecte'; +$s_advanced_report = 'Informe Avançat'; +$s_advanced_view = 'Vista Avançada'; +$s_advanced_update = 'Actualització Avançada'; $s_refresh_delay = 'Demora de Refresc'; $s_minutes = 'minuts'; $s_redirect_delay = 'Demora de Redirecció'; @@ -534,6 +537,7 @@ $s_steps_to_reproduce = 'Passos per reproduir-lo'; $s_update_information_button = 'Actualitzar Informació'; $s_sticky_issue = 'Comanda marcada'; $s_profile = 'Perfil'; +$s_update_advanced_link = 'Canvia a format d\'Actualització Avançada'; $s_updating_bug_simple_title = 'Actualitzant informació de la Comanda'; $s_view_revisions = 'Veure revisions'; $s_revision = 'Revisió'; @@ -869,6 +873,7 @@ $s_assign_to = 'Assignar a'; $s_additional_information = 'Informació Addicional'; $s_submit_report_button = 'Envia comanda'; $s_check_report_more_bugs = 'Seleccioni per a informar més comandes'; +$s_advanced_report_link = 'Comanda Avançada'; $s_report_stay = 'Continua informant'; $s_selected_project = 'Projecte Seleccionat'; $s_valid_project_msg = 'Ha de seleccionar un projecte vàlid'; @@ -972,11 +977,8 @@ $s_attached_files = 'Arxius Adjunts'; $s_publish = 'Publica'; $s_cached = 'En Memòria Cau'; $s_add_user_to_monitor = 'Afegeix'; -<<<<<<< HEAD $s_view_advanced_link = 'Vista Avançada'; $s_viewing_bug_simple_details_title = 'Vista Simple.'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'No hi ha usuaris monitoritzant aquesta comanda.'; $s_users_monitoring_bug = 'Usuaris monitorizant aquesta comanda.'; $s_monitoring_user_list = 'Llista d\'Usuaris'; diff --git a/lang/strings_chinese_simplified.txt b/lang/strings_chinese_simplified.txt index 8cda996e05..8f5f783437 100644 --- a/lang/strings_chinese_simplified.txt +++ b/lang/strings_chinese_simplified.txt @@ -360,6 +360,9 @@ $s_verify_warning = '你的账号信息已经进行了检验，你所收到的 $s_verify_change_password = '你必须在这里设置密码，否则将无法登录。'; $s_default_account_preferences_title = '缺省帐号设置'; $s_default_project = '缺省项目'; +$s_advanced_report = '高级报告'; +$s_advanced_view = '高级查看'; +$s_advanced_update = '高级更新'; $s_refresh_delay = '刷新延迟'; $s_minutes = '分'; $s_redirect_delay = '重定向延时(秒)'; @@ -494,6 +497,7 @@ $s_steps_to_reproduce = '问题重现步骤说明'; $s_update_information_button = '更新信息'; $s_sticky_issue = '置顶问题'; $s_profile = '配置'; +$s_update_advanced_link = '高级更新'; $s_updating_bug_simple_title = '正在更新问题信息'; $s_vote_added_msg = '投票已添加...'; $s_bugnote_added_msg = '已添加问题注释...'; @@ -781,6 +785,7 @@ $s_assign_to = '分派给'; $s_additional_information = '附加信息'; $s_submit_report_button = '提交报告'; $s_check_report_more_bugs = '报告更多的问题'; +$s_advanced_report_link = '高级报告'; $s_report_stay = '继续报告'; $s_selected_project = '选择项目'; $s_valid_project_msg = '必须选择一个有效的项目'; @@ -876,11 +881,8 @@ $s_move_bug_button = '移动问题'; $s_attached_files = '附件'; $s_publish = '发布'; $s_cached = '已缓存'; -<<<<<<< HEAD $s_view_advanced_link = '高级查看'; $s_viewing_bug_simple_details_title = '查看问题详细资料(简易)'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = '当前没有用户在监视这个问题。'; $s_users_monitoring_bug = '正在监视这个问题的用户'; $s_monitoring_user_list = '用户列表'; diff --git a/lang/strings_chinese_traditional.txt b/lang/strings_chinese_traditional.txt index 496c22be26..a4d3fab177 100644 --- a/lang/strings_chinese_traditional.txt +++ b/lang/strings_chinese_traditional.txt @@ -341,6 +341,9 @@ $s_verify_warning = '你的帳號資訊已經驗證無誤. 你所收到的帳號 $s_verify_change_password = '你必須在此設定密碼才可重新登入.'; $s_default_account_preferences_title = '預設帳號喜好設定'; $s_default_project = '預設專案'; +$s_advanced_report = '進階報告'; +$s_advanced_view = '進階檢視'; +$s_advanced_update = '進階更新'; $s_refresh_delay = '等幾秒畫面自動更新'; $s_redirect_delay = '等幾秒自動轉址'; $s_with_minimum_severity = '當嚴重性超過'; @@ -468,6 +471,7 @@ $s_steps_to_reproduce = 'Bug 發生的步驟說明'; $s_update_information_button = '更新資訊'; $s_sticky_issue = '棘手問題'; $s_profile = '個人設定'; +$s_update_advanced_link = '進階更新'; $s_updating_bug_simple_title = '正在更新 Bug 資訊'; $s_vote_added_msg = '投票已新增...'; $s_bugnote_added_msg = 'Bug 筆記已新增...'; @@ -729,6 +733,7 @@ $s_assign_to = '指派給'; $s_additional_information = '額外資訊'; $s_submit_report_button = '送出回報'; $s_check_report_more_bugs = '勾選可繼續回報其他的 Bug'; +$s_advanced_report_link = '進階報告'; $s_report_stay = '回報狀態'; $s_selected_project = '已選擇專案'; $s_valid_project_msg = '你必須選擇一個正確的專案'; @@ -820,11 +825,8 @@ $s_move_bug_button = '搬移問題'; $s_attached_files = '附件檔案'; $s_publish = '發表'; $s_cached = '快取'; -<<<<<<< HEAD $s_view_advanced_link = '進階檢視'; $s_viewing_bug_simple_details_title = '檢視 Bug 詳細資料(簡式)'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = '沒有使用者監控這 bug.'; $s_users_monitoring_bug = '使用者監控這 bug'; $s_monitoring_user_list = '使用者清單'; diff --git a/lang/strings_croatian.txt b/lang/strings_croatian.txt index 763c397302..fd27bd2489 100644 --- a/lang/strings_croatian.txt +++ b/lang/strings_croatian.txt @@ -98,6 +98,9 @@ $s_access_level = 'Razina pristupa'; $s_update_user_button = 'Ažuriraj korisnika'; $s_default_account_preferences_title = 'Korisničke preference'; $s_default_project = 'Polazni Projekt'; +$s_advanced_report = 'Napredno izvješće'; +$s_advanced_view = 'Napredni pregled'; +$s_advanced_update = 'Napredno ažuriranje'; $s_refresh_delay = 'Vrijeme između obnavljanja'; $s_redirect_delay = 'Vrijeme prije redirekcije'; $s_bugnote_order = 'Bugnotes Sort Order'; @@ -179,6 +182,7 @@ $s_summary = 'Sažetak'; $s_description = 'Opis'; $s_steps_to_reproduce = 'Koraci za reproduciranje'; $s_update_information_button = 'Ažuriraj informaciju'; +$s_update_advanced_link = 'Ažuriraj napredno'; $s_updating_bug_simple_title = 'Ažuriram informacije o bugu'; $s_vote_added_msg = 'Glas je dodan...'; $s_bugnote_added_msg = 'Bilješka dodana...'; @@ -347,6 +351,7 @@ $s_assign_to = 'Dodijeli'; $s_additional_information = 'Dodatna infomacija'; $s_submit_report_button = 'Podnesi izvješće'; $s_check_report_more_bugs = 'označi za prijavu više bugova'; +$s_advanced_report_link = 'Napredno izvješće'; $s_report_stay = 'Izvješće ostaje'; $s_selected_project = 'Odabrani projekt'; $s_valid_project_msg = 'Morate odabrati valjan projekt'; @@ -393,8 +398,5 @@ $s_system_profile = 'Opis sustava'; $s_update_bug_button = 'Ažuriraj bug'; $s_reopen_bug_button = 'Ponovno otvori bug'; $s_attached_files = 'Pridružene datoteke'; -<<<<<<< HEAD $s_view_advanced_link = 'Vidi napredno'; $s_viewing_bug_simple_details_title = 'Pregled jednostavnih detalja buga'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages diff --git a/lang/strings_czech.txt b/lang/strings_czech.txt index 846ba47631..8b4ad96bb6 100644 --- a/lang/strings_czech.txt +++ b/lang/strings_czech.txt @@ -405,6 +405,9 @@ $s_verify_warning = 'Informace o vašem účtu byla ověřena. Potvrzující dop $s_verify_change_password = 'Musíte zde zadat svoje heslo pro obnovení přihlášení.'; $s_default_account_preferences_title = 'Nastavení účtu'; $s_default_project = 'Výchozí projekt'; +$s_advanced_report = 'Rozšířený report'; +$s_advanced_view = 'Rozšířený pohled'; +$s_advanced_update = 'Rozšířená aktualizace'; $s_refresh_delay = 'Interval obnovy'; $s_minutes = 'minut'; $s_redirect_delay = 'Prodleva přesměrování'; @@ -540,6 +543,7 @@ $s_steps_to_reproduce = 'Postup na reprodukci problému'; $s_update_information_button = 'Upravit'; $s_sticky_issue = '"Sticky" problém'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Úprava pokročilých údajů'; $s_updating_bug_simple_title = 'Úprava problému'; $s_view_revisions = 'Zobrazit revize'; $s_revision = 'Revize'; @@ -877,6 +881,7 @@ $s_assign_to = 'Přiřazen'; $s_additional_information = 'Další informace'; $s_submit_report_button = 'Uložit'; $s_check_report_more_bugs = 'zaškrtněte pro vložení více problémů'; +$s_advanced_report_link = 'Rozšířený report'; $s_report_stay = 'Zůstat v reportu'; $s_selected_project = 'Vyber projekt'; $s_valid_project_msg = 'Musíte vybrat platný projekt'; @@ -979,11 +984,8 @@ $s_attached_files = 'Přiložené soubory'; $s_publish = 'Publikovat'; $s_cached = 'V mezipaměti'; $s_add_user_to_monitor = 'Přidat'; -<<<<<<< HEAD $s_view_advanced_link = 'Rozšířený pohled'; $s_viewing_bug_simple_details_title = 'Základní detaily problému'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Žádný uživatel nesleduje tento problém.'; $s_users_monitoring_bug = 'Uživatelé sledující tento problém'; $s_monitoring_user_list = 'Uživatelé'; diff --git a/lang/strings_danish.txt b/lang/strings_danish.txt index a00e30e034..0b1d8624f7 100644 --- a/lang/strings_danish.txt +++ b/lang/strings_danish.txt @@ -327,6 +327,9 @@ $s_access_level = 'Rettigheder'; $s_update_user_button = 'Opdater bruger'; $s_default_account_preferences_title = 'Satadardpræferencer for konto'; $s_default_project = 'Standardprojekt'; +$s_advanced_report = 'Avanceret rapport'; +$s_advanced_view = 'Avanceret oversigt'; +$s_advanced_update = 'Avanceret opdatering'; $s_refresh_delay = 'Forsinkelse ved opdatering'; $s_redirect_delay = 'Forsinkelse ved omadressering'; $s_with_minimum_severity = 'Med mindst værdien'; @@ -435,6 +438,7 @@ $s_summary = 'Opsummering'; $s_description = 'Beskrivelse'; $s_steps_to_reproduce = 'Handlinger for at genfrembringe'; $s_update_information_button = 'Opdater information'; +$s_update_advanced_link = 'Opdater avanceret'; $s_updating_bug_simple_title = 'Opdater fejl-information'; $s_vote_added_msg = 'Stemme er blevet tilføjet...'; $s_bugnote_added_msg = 'Fejlnote tilføjet...'; @@ -681,6 +685,7 @@ $s_assign_to = 'Tildelt'; $s_additional_information = 'Yderligere information'; $s_submit_report_button = 'Send rapport'; $s_check_report_more_bugs = 'afmærk for at rapporterer flere fejl'; +$s_advanced_report_link = 'Avanceret rapport'; $s_report_stay = 'Rapport-opsætning'; $s_selected_project = 'Projekt valgt'; $s_valid_project_msg = 'Du skal vælge et gyldigt projekt'; @@ -770,11 +775,8 @@ $s_move_bug_button = 'Flyt fejl'; $s_attached_files = 'Vedhæftede filer'; $s_publish = 'Udgivet'; $s_cached = 'Lagret'; -<<<<<<< HEAD $s_view_advanced_link = 'Vis avanceret'; $s_viewing_bug_simple_details_title = 'Enkel oversigt over fejl i dette projekt'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Denne fejl bliver ikke overvåget af nogen bruger.'; $s_users_monitoring_bug = 'Brugere overvåger denne fejl'; $s_monitoring_user_list = 'Brugerliste'; diff --git a/lang/strings_dutch.txt b/lang/strings_dutch.txt index 4d9033a0fe..ee27a13a06 100644 --- a/lang/strings_dutch.txt +++ b/lang/strings_dutch.txt @@ -406,6 +406,9 @@ $s_verify_warning = 'Uw gebruiker is gecontroleerd. Het bevestigingsbericht dat $s_verify_change_password = 'Geeft een wachtwoord in zodat u opnieuw kunt aanmelden.'; $s_default_account_preferences_title = 'Gebruikersinstellingen'; $s_default_project = 'Standaardproject'; +$s_advanced_report = 'Uitgebreide melding'; +$s_advanced_view = 'Uitgebreide informatie'; +$s_advanced_update = 'Uitgebreid aanpassen'; $s_refresh_delay = 'Verversingssnelheid'; $s_minutes = 'minuten'; $s_redirect_delay = 'Doorloopsnelheid berichten'; @@ -543,6 +546,7 @@ $s_steps_to_reproduce = 'Stappen om te reproduceren'; $s_update_information_button = 'Informatie aanpassen'; $s_sticky_issue = 'Sticky melding'; $s_profile = 'Profiel'; +$s_update_advanced_link = 'Uitgebreid aanpassen'; $s_updating_bug_simple_title = 'Bezig met het bijwerken van de melding'; $s_view_revisions = 'Versies bekijken'; $s_revision = 'Versie'; @@ -883,6 +887,7 @@ $s_assign_to = 'Toewijzen aan'; $s_additional_information = 'Additionele informatie'; $s_submit_report_button = 'Melding toevoegen'; $s_check_report_more_bugs = 'vink aan om meer meldingen in te voeren'; +$s_advanced_report_link = 'Uitgebreid rapport'; $s_report_stay = 'Doorgaan met aanmelden'; $s_selected_project = 'Geselecteerd project'; $s_valid_project_msg = 'U moet een geldig project kiezen'; @@ -986,12 +991,8 @@ $s_attached_files = 'Bijgevoegde bestanden'; $s_publish = 'Publiceren'; $s_cached = 'In cache'; $s_add_user_to_monitor = 'Toevoegen'; -<<<<<<< HEAD $s_view_advanced_link = 'Uitgebreid overzicht'; $s_viewing_bug_simple_details_title = 'Details melding bekijken'; -======= -$s_bug_view_title = 'Details melding bekijken'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Niemand volgt deze melding.'; $s_users_monitoring_bug = 'Gebruikers die deze melding volgen'; $s_monitoring_user_list = 'Gebruikers'; diff --git a/lang/strings_english.txt b/lang/strings_english.txt index 7aa19ac36a..ae7081f1df 100644 --- a/lang/strings_english.txt +++ b/lang/strings_english.txt @@ -449,6 +449,9 @@ $s_verify_change_password = 'You must set a password here to allow you to log in # account_prefs_page.php $s_default_account_preferences_title = 'Account Preferences'; $s_default_project = 'Default Project'; +$s_advanced_report = 'Advanced Report'; +$s_advanced_view = 'Advanced View'; +$s_advanced_update = 'Advanced Update'; $s_refresh_delay = 'Refresh Delay'; $s_minutes = 'minutes'; $s_redirect_delay = 'Redirect Delay'; @@ -650,6 +653,7 @@ $s_sticky_issue = 'Sticky Issue'; $s_profile = 'Profile'; # bug_update_page.php +$s_update_advanced_link = 'Update Advanced'; $s_updating_bug_simple_title = 'Updating Issue Information'; # bug_view* @@ -1143,6 +1147,7 @@ $s_submit_report_button = 'Submit Report'; $s_check_report_more_bugs = 'check to report more issues'; # report_bug_page.php +$s_advanced_report_link = 'Advanced Report'; $s_report_stay = 'Report Stay'; # set_project.php @@ -1271,6 +1276,7 @@ $s_add_user_to_monitor = 'Add'; # view_bug_inc.php # view_bug_page.php +$s_view_advanced_link = 'View Advanced'; $s_bug_view_title = 'View Issue Details'; # bug_monitor_list_view_inc.php diff --git a/lang/strings_estonian.txt b/lang/strings_estonian.txt index ba3cf22a5d..2d77da057d 100644 --- a/lang/strings_estonian.txt +++ b/lang/strings_estonian.txt @@ -342,6 +342,9 @@ $s_verify_warning = 'Sinu kasutajakonto info on kontrollitud. Kasutajakonto kinn $s_verify_change_password = 'Sa pead vahetama siin parooli, et uuesti sisse meldida.'; $s_default_account_preferences_title = 'Kasutajakonto eelistused'; $s_default_project = 'Vaikimisi Projekt'; +$s_advanced_report = 'Näita detailsed teated'; +$s_advanced_view = 'Näita kannete detaile'; +$s_advanced_update = 'Näita kannete detailset uuendust'; $s_refresh_delay = 'uuenduse viivitus'; $s_redirect_delay = 'ümbersuunamise viivitus'; $s_with_minimum_severity = 'Väiksem raskusaste sellest'; @@ -470,6 +473,7 @@ $s_steps_to_reproduce = 'Kordamise sammud'; $s_update_information_button = 'Uuenda info'; $s_sticky_issue = 'Kleepuv kanne'; $s_profile = 'Profiil'; +$s_update_advanced_link = 'Spetsiaalne uuendus'; $s_updating_bug_simple_title = 'Kande andmete uuendus'; $s_vote_added_msg = 'Hääl lisatud...'; $s_bugnote_added_msg = 'Märkus lisatud...'; @@ -738,6 +742,7 @@ $s_assign_to = 'Määra'; $s_additional_information = 'Lisainfo'; $s_submit_report_button = 'Saada teade'; $s_check_report_more_bugs = 'Märgi lisakannetest teatamiseks'; +$s_advanced_report_link = 'Detailne teade'; $s_report_stay = 'Teade jääb mällu'; $s_selected_project = 'Valitud projekt'; $s_valid_project_msg = 'Vali kehtiv projekt'; @@ -831,11 +836,8 @@ $s_move_bug_button = 'Liiguta kanne'; $s_attached_files = 'Lisatud failid'; $s_publish = 'Avalda'; $s_cached = 'Vahemälus'; -<<<<<<< HEAD $s_view_advanced_link = 'Detailide vaatamine'; $s_viewing_bug_simple_details_title = 'Kande tavaandmete vaatamine'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'ükski kasutaja ei tegele selle kandega.'; $s_users_monitoring_bug = 'Selle kandega tegelevad kasutajad'; $s_monitoring_user_list = 'Kasutajate loend'; diff --git a/lang/strings_finnish.txt b/lang/strings_finnish.txt index cf4f8597d0..2da7ce2ba4 100644 --- a/lang/strings_finnish.txt +++ b/lang/strings_finnish.txt @@ -351,6 +351,9 @@ $s_verify_warning = 'Käyttäjätilitietosi on vahvistettu. Sähköpostina vasta $s_verify_change_password = 'Sinun pitää syöttää salasana sisäänkirjautumista varten.'; $s_default_account_preferences_title = 'Käyttäjätilin asetukset'; $s_default_project = 'Oletusprojekti'; +$s_advanced_report = 'Näytä yksityiskohtaiset tapahtumaraportit'; +$s_advanced_view = 'Näytä tapahtumien yksityiskohdat'; +$s_advanced_update = 'Näytä yksityiskohtainen tapahtumapäivitys'; $s_refresh_delay = 'Virkistyksen viive'; $s_minutes = 'minuuttia'; $s_redirect_delay = 'Edelleenohjauksen viive'; @@ -483,6 +486,7 @@ $s_steps_to_reproduce = 'Toisto-ohjeet'; $s_update_information_button = 'Päivitä tiedot'; $s_sticky_issue = 'Päällimmäisenä pysyvä tapahtuma'; $s_profile = 'Profiili'; +$s_update_advanced_link = 'Päivitä yksityiskohtaiset tiedot'; $s_updating_bug_simple_title = 'Päivitetään tapahtuman tietoja'; $s_vote_added_msg = 'Ääni lisätty...'; $s_bugnote_added_msg = 'Muistiinpano lisätty...'; @@ -765,6 +769,7 @@ $s_assign_to = 'Osoita käyttäjälle'; $s_additional_information = 'Lisätietoja'; $s_submit_report_button = 'Lähetä raportti'; $s_check_report_more_bugs = 'rastita raportoidaksesi lisää tapahtumia'; +$s_advanced_report_link = 'Yksityiskohtainen raportti'; $s_report_stay = 'Raportoi useita tapahtumia'; $s_selected_project = 'Valittu projekti'; $s_valid_project_msg = 'Sinun täytyy valita voimassaoleva projekti'; @@ -861,11 +866,8 @@ $s_attached_files = 'Liitetiedostot'; $s_publish = 'Julkaise'; $s_cached = 'Välimuistissa'; $s_add_user_to_monitor = 'Lisää'; -<<<<<<< HEAD $s_view_advanced_link = 'Näytä yksityiskohdat'; $s_viewing_bug_simple_details_title = 'Näytetään tapahtuman yksinkertaiset tiedot'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Yksikään käyttäjä ei seuraa tätä tapahtumaa.'; $s_users_monitoring_bug = 'Käyttäjät jotka seuraavat tätä tapahtumaa'; $s_monitoring_user_list = 'Käyttäjälistaus'; diff --git a/lang/strings_french.txt b/lang/strings_french.txt index a93c9beaac..cf8b269750 100644 --- a/lang/strings_french.txt +++ b/lang/strings_french.txt @@ -414,6 +414,9 @@ $s_verify_warning = 'L\'information relative à votre compte a été vérifiée. $s_verify_change_password = 'Vous devez fixer un mot de passe pour vous permettre de vous brancher de nouveau.'; $s_default_account_preferences_title = 'Préférences du compte'; $s_default_project = 'Projet par défaut'; +$s_advanced_report = 'Rapport détaillé'; +$s_advanced_view = 'Vue détaillée'; +$s_advanced_update = 'Mise à jour avancée'; $s_refresh_delay = 'Délai de rafraichissement'; $s_minutes = 'minutes'; $s_redirect_delay = 'Délai de redirection'; @@ -551,6 +554,7 @@ $s_steps_to_reproduce = 'Étapes pour reproduire'; $s_update_information_button = 'Mettre à jour l\'information'; $s_sticky_issue = 'Bogue récurrent'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Mise à jour détaillée'; $s_updating_bug_simple_title = 'Mise à jour de l\'information d\'un bogue'; $s_view_revisions = 'Voir les révisions'; $s_revision = 'Révision'; @@ -891,6 +895,7 @@ $s_assign_to = 'Assigné à'; $s_additional_information = 'Informations complémentaires'; $s_submit_report_button = 'Soumettre le rapport'; $s_check_report_more_bugs = 'Cocher pour saisir d\'autres bogues'; +$s_advanced_report_link = 'Rapport détaillé'; $s_report_stay = 'Garder le rapport'; $s_selected_project = 'Projet en cours'; $s_valid_project_msg = 'Vous devez choisir un projet valide'; @@ -994,12 +999,8 @@ $s_attached_files = 'Pièces jointes'; $s_publish = 'Publié'; $s_cached = 'Mis en cache'; $s_add_user_to_monitor = 'Ajouter'; -<<<<<<< HEAD $s_view_advanced_link = 'Rapport détaillé'; $s_viewing_bug_simple_details_title = 'Afficher le rapport simplifié'; -======= -$s_bug_view_title = 'Visualiser les détails du résultat'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Aucun utilisateur surveillant ce bogue.'; $s_users_monitoring_bug = 'Utilisateurs surveillant ce bogue'; $s_monitoring_user_list = 'Liste d\'utilisateurs'; diff --git a/lang/strings_galician.txt b/lang/strings_galician.txt index 6aa305a051..54dacf0844 100644 --- a/lang/strings_galician.txt +++ b/lang/strings_galician.txt @@ -400,6 +400,9 @@ $s_verify_warning = 'A información da súa conta foi verificada. A mensaxe que $s_verify_change_password = 'Debe fixar un contrasinal aquí para permitir acceder ao sistema de novo.'; $s_default_account_preferences_title = 'Preferencias da conta'; $s_default_project = 'Proxecto por defecto'; +$s_advanced_report = 'Informe avanzado'; +$s_advanced_view = 'Vista avanzada'; +$s_advanced_update = 'Actualización avanzada'; $s_refresh_delay = 'Atraso no refrescamento'; $s_minutes = 'minutos'; $s_redirect_delay = 'Atraso na redirección'; @@ -537,6 +540,7 @@ $s_steps_to_reproduce = 'Pasos a seguir'; $s_update_information_button = 'Actualizar a información'; $s_sticky_issue = 'Problema recurrente'; $s_profile = 'Perfil'; +$s_update_advanced_link = 'Actualización avanzada'; $s_updating_bug_simple_title = 'Actualizando a información do problema'; $s_view_revisions = 'Ver as revisións'; $s_revision = 'Revisión'; @@ -876,6 +880,7 @@ $s_assign_to = 'Asignar a'; $s_additional_information = 'Información adicional'; $s_submit_report_button = 'Enviar o informe'; $s_check_report_more_bugs = 'verificar para informar de máis problemas'; +$s_advanced_report_link = 'Informe avanzado'; $s_report_stay = 'Continuar o informe'; $s_selected_project = 'Proxecto seleccionado'; $s_valid_project_msg = 'Debe seleccionar un proxecto válido.'; @@ -979,12 +984,8 @@ $s_attached_files = 'Ficheiros adxuntos'; $s_publish = 'Publicar'; $s_cached = 'Na caché'; $s_add_user_to_monitor = 'Engadir'; -<<<<<<< HEAD $s_view_advanced_link = 'Vista avanzada'; $s_viewing_bug_simple_details_title = 'Ver os detalles sinxelos do problema'; -======= -$s_bug_view_title = 'Ver os detalles do problema'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Non hai usuarios que estean vixiando este problema.'; $s_users_monitoring_bug = 'Usuarios que vixían este problema'; $s_monitoring_user_list = 'Lista de usuarios'; diff --git a/lang/strings_german.txt b/lang/strings_german.txt index 36de213871..f2e5cfe67c 100644 --- a/lang/strings_german.txt +++ b/lang/strings_german.txt @@ -415,6 +415,9 @@ $s_verify_warning = 'Ihre Kontoinformationen wurden überprüft. Die von Ihnen e $s_verify_change_password = 'Sie müssen hier ein Passwort vergeben, um sich wieder anmelden zu können.'; $s_default_account_preferences_title = 'Kontoeinstellungen'; $s_default_project = 'Standard-Projekt'; +$s_advanced_report = 'Erweiterter Bericht'; +$s_advanced_view = 'Erweiterte Darstellung'; +$s_advanced_update = 'Erweitertes Update'; $s_refresh_delay = 'Aktualisierungsverzögerung'; $s_minutes = 'Minuten'; $s_redirect_delay = 'Verzögerung für Weiterleitung'; @@ -552,6 +555,7 @@ $s_steps_to_reproduce = 'Schritte zur Reproduktion'; $s_update_information_button = 'Information aktualisieren'; $s_sticky_issue = 'Fixiertes Problem'; $s_profile = 'Profil'; +$s_update_advanced_link = 'erweiterte Aktualisierung'; $s_updating_bug_simple_title = 'Probleminformation aktualisieren'; $s_view_revisions = 'Überarbeitungen anzeigen'; $s_revision = 'Überarbeitung'; @@ -892,6 +896,7 @@ $s_assign_to = 'Zuordnung an'; $s_additional_information = 'Zusätzliche Information'; $s_submit_report_button = 'Bericht absenden'; $s_check_report_more_bugs = 'auswählen, um weitere Probleme zu melden'; +$s_advanced_report_link = 'Erweiterter Bericht'; $s_report_stay = 'Im Eingabemodus bleiben'; $s_selected_project = 'Gewähltes Projekt'; $s_valid_project_msg = 'Es muss ein Projekt ausgewählt werden'; @@ -994,12 +999,8 @@ $s_attached_files = 'Angehängte Dateien'; $s_publish = 'Veröffentlichen'; $s_cached = 'Zwischengespeichert'; $s_add_user_to_monitor = 'Hinzufügen'; -<<<<<<< HEAD $s_view_advanced_link = 'erweiterte Anzeige'; $s_viewing_bug_simple_details_title = 'Einfache Problemansicht anzeigen'; -======= -$s_bug_view_title = 'Problemdetails ansehen'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Keine Benutzer beobachten dieses Problem.'; $s_users_monitoring_bug = 'Benutzer, die dieses Problem beobachten'; $s_monitoring_user_list = 'Benutzer'; diff --git a/lang/strings_german_eintrag.txt b/lang/strings_german_eintrag.txt index fa5a2d5a06..4d6a4b0b07 100644 --- a/lang/strings_german_eintrag.txt +++ b/lang/strings_german_eintrag.txt @@ -426,6 +426,9 @@ $s_verify_change_password = 'Sie müssen hier ein Passwort vergeben, um sich wie # account_prefs_page.php $s_default_account_preferences_title = 'Kontoeinstellungen'; $s_default_project = 'Standard-Projekt'; +$s_advanced_report = 'Erweiterter Bericht'; +$s_advanced_view = 'Erweiterte Darstellung'; +$s_advanced_update = 'Erweitertes Update'; $s_refresh_delay = 'Aktualisierungsverzögerung'; $s_redirect_delay = 'Verzögerung für Weiterleitung'; $s_with_minimum_severity = 'mit mindestens Schweregrad'; @@ -620,6 +623,7 @@ $s_sticky_issue = 'Fixierter Eintrag'; $s_profile = 'Profil'; # bug_update_page.php +$s_update_advanced_link = 'erweiterte Aktualisierung'; $s_updating_bug_simple_title = 'Eintragsinformation aktualisieren'; # bug_vote_add.php @@ -1063,6 +1067,7 @@ $s_submit_report_button = 'Bericht absenden'; $s_check_report_more_bugs = 'auswählen, um weitere Einträge zu melden'; # report_bug_page.php +$s_advanced_report_link = 'Erweiterter Bericht'; $s_report_stay = 'Im Eingabemodus bleiben'; # set_project.php @@ -1189,6 +1194,7 @@ $s_cached = 'Zwischengespeichert'; # view_bug_inc.php # view_bug_page.php +$s_view_advanced_link = 'erweiterte Anzeige'; $s_viewing_bug_simple_details_title = 'einfache Eintragsansicht'; # bug_monitor_list_view_inc.php diff --git a/lang/strings_greek.txt b/lang/strings_greek.txt index 492d271ca1..e2b4fc00b8 100644 --- a/lang/strings_greek.txt +++ b/lang/strings_greek.txt @@ -181,6 +181,9 @@ $s_verify_warning = 'Οι πληροφορίες του λογαριασμού $s_verify_change_password = 'Είναι απαραίτητο να ορίσετε κωδικό εδώ, για να μπορείτε να συνδεθείτε ξανά.'; $s_default_account_preferences_title = 'Επιλογές λογαριασμού'; $s_default_project = 'Προεπιλεγμένη Εφαρμογή'; +$s_advanced_report = 'Σύνθετη Αναφορά'; +$s_advanced_view = 'Σύνθετη Προβολή'; +$s_advanced_update = 'Σύνθετη Ενημέρωση'; $s_refresh_delay = 'Συχνότητα Ανανέωσης'; $s_redirect_delay = 'Συχνότητα Αναδρομολόγησης'; $s_with_minimum_severity = 'Με Ελάχιστη Διαβάθμιση σε'; @@ -294,6 +297,7 @@ $s_steps_to_reproduce = 'Βήματα για Αναπαραγωγή'; $s_update_information_button = 'Ενήμερωση Πληροφοριών'; $s_sticky_issue = 'Θέμα Στο Προσκήνιο'; $s_profile = 'Προφίλ'; +$s_update_advanced_link = 'Ανανέωση Σύνθετου'; $s_updating_bug_simple_title = 'Ενημέρωση Πληροφοριών Θέματος'; $s_vote_added_msg = 'Η Ψήφος προστέθηκε...'; $s_bugnote_added_msg = 'Η Σημείωση προστέθηκε...'; @@ -532,6 +536,7 @@ $s_assign_to = 'Ανάθεση σε'; $s_additional_information = 'Πρόσθετες Πληροφορίες'; $s_submit_report_button = 'Αποστολή Αναφοράς'; $s_check_report_more_bugs = 'επιλέξτε για περισσότερες αναφορές'; +$s_advanced_report_link = 'Σύνθετη Αναφορά'; $s_report_stay = 'Παραμονή στις Αναφορές'; $s_selected_project = 'Επιλεγμένη Εφαρμογή'; $s_valid_project_msg = 'Πρέπει να επιλέξετε ισχύουσα εφαρμογή'; @@ -620,11 +625,8 @@ $s_reopen_bug_button = 'Επανεξέταση Θέματος'; $s_move_bug_button = 'Μετακίνηση Θέματος'; $s_attached_files = 'Συννημένα Αρχεία'; $s_publish = 'Δημοσίευση'; -<<<<<<< HEAD $s_view_advanced_link = 'Προβολή Σύνθετης'; $s_viewing_bug_simple_details_title = 'Προβολή Θεμάτων σε Απλή Αναφορά'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Δεν υπάρχουν χρήστες να παρακολουθούν το Θέμα.'; $s_users_monitoring_bug = 'Χρήστες που παρακολουθούν το Θέμα'; $s_monitoring_user_list = 'Λίστα Χρηστών'; diff --git a/lang/strings_hebrew.txt b/lang/strings_hebrew.txt index 35b9e9fb40..d41d84d570 100644 --- a/lang/strings_hebrew.txt +++ b/lang/strings_hebrew.txt @@ -401,6 +401,9 @@ $s_verify_warning = 'פרטי החשבון נמצאו תקינים. הודעת $s_verify_change_password = 'חובה לקבוע ססמה כדי להיכנס למערכת.'; $s_default_account_preferences_title = 'העדפות'; $s_default_project = 'פרויקט ברירת מחדל'; +$s_advanced_report = 'דו"ח מפורט'; +$s_advanced_view = 'הצגה מפורטת'; +$s_advanced_update = 'עריכה מפורטת'; $s_refresh_delay = 'זמן לרענון'; $s_minutes = 'דקות'; $s_redirect_delay = 'זמן להפניה'; @@ -535,6 +538,7 @@ $s_steps_to_reproduce = 'צעדים לשחזור'; $s_update_information_button = 'שמירה'; $s_sticky_issue = 'באג "דביק"'; $s_profile = 'פרופיל'; +$s_update_advanced_link = 'טופס עדכון מפורט'; $s_updating_bug_simple_title = 'עדכון באג מקוצר'; $s_vote_added_msg = 'הצבעה נוספה'; $s_bugnote_added_msg = 'הערה נוספה'; @@ -861,6 +865,7 @@ $s_assign_to = 'שיוך ל'; $s_additional_information = 'מידע נוסף'; $s_submit_report_button = 'שמירה'; $s_check_report_more_bugs = 'נא לסמן כדי לקלוט באג נוסף'; +$s_advanced_report_link = 'טופס מפורט'; $s_report_stay = 'המשך קליטה'; $s_selected_project = 'פרויקט נבחר'; $s_valid_project_msg = 'חובה לבחור פרויקט תקין.'; @@ -963,11 +968,8 @@ $s_attached_files = 'קבצים מצורפים'; $s_publish = 'לפרסם'; $s_cached = 'במטמון'; $s_add_user_to_monitor = 'להוסיף'; -<<<<<<< HEAD $s_view_advanced_link = 'הצגה מפורטת'; $s_viewing_bug_simple_details_title = 'הצגת באג מקוצרת'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'אין משתמשים העוקבים אחר הבאג.'; $s_users_monitoring_bug = 'משתמשים העוקבים אחר הבאג'; $s_monitoring_user_list = 'רשימת משתמשים'; diff --git a/lang/strings_hungarian.txt b/lang/strings_hungarian.txt index fdfea9d662..20fea85205 100644 --- a/lang/strings_hungarian.txt +++ b/lang/strings_hungarian.txt @@ -369,6 +369,9 @@ $s_verify_warning = 'Felhasználói információit ellenőriztük. Az elküldöt $s_verify_change_password = 'Meg kell adnia egy jelszót, hogy újra be tudjon lépni.'; $s_default_account_preferences_title = 'Felhasználói beállítások'; $s_default_project = 'Alapértelmezett projekt'; +$s_advanced_report = 'Haladó jelentés'; +$s_advanced_view = 'Haladó nézet'; +$s_advanced_update = 'Haladó frissítés'; $s_refresh_delay = 'Frissítési időköz'; $s_redirect_delay = 'Átirányítási időköz'; $s_with_minimum_severity = 'Legalább a következő súlyossággal:'; @@ -499,6 +502,7 @@ $s_steps_to_reproduce = 'Reprodukálás lépései'; $s_update_information_button = 'Információk frissítése'; $s_sticky_issue = 'Ragadós ügy'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Haladó frissítés'; $s_updating_bug_simple_title = 'Ügy információinak frissítése'; $s_vote_added_msg = 'Szavazat hozzáadva...'; $s_bugnote_added_msg = 'Megjegyzés hozzáadva...'; @@ -776,6 +780,7 @@ $s_assign_to = 'Hozzárendelés a következőhöz'; $s_additional_information = 'További információk'; $s_submit_report_button = 'Bejelentés elküldése'; $s_check_report_more_bugs = 'kapcsolja be további ügyek bejelentéséhez'; +$s_advanced_report_link = 'Haladó bejelentés'; $s_report_stay = 'További bejelentés'; $s_selected_project = 'Kiválasztott projekt'; $s_valid_project_msg = 'Egy érvényes projektet kell választania'; @@ -874,11 +879,8 @@ $s_move_bug_button = 'Ügy mozgatása'; $s_attached_files = 'Csatolt fájlok'; $s_publish = 'Publikálás'; $s_cached = 'Gyorsítótárazva'; -<<<<<<< HEAD $s_view_advanced_link = 'Haladó nézet'; $s_viewing_bug_simple_details_title = 'Ügy részletei (egyszerű nézet)'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Senki sem ellenőrzi ezt az ügyet.'; $s_users_monitoring_bug = 'Ezen ügy ellenőrzői'; $s_monitoring_user_list = 'Felhasználók listája'; diff --git a/lang/strings_icelandic.txt b/lang/strings_icelandic.txt index e1953d6aab..a07ccc5fff 100644 --- a/lang/strings_icelandic.txt +++ b/lang/strings_icelandic.txt @@ -331,6 +331,9 @@ $s_verify_warning = 'Upplýsingar þínar um aðgang hafa verið staðfestar. St $s_verify_change_password = 'Þú verður að setja lykilorðið hér til þess að geta skráð þig inn aftur.'; $s_default_account_preferences_title = 'Aðgangsstillingar'; $s_default_project = 'Sjálfgefið verkefni'; +$s_advanced_report = 'Ítarleg skýrsla'; +$s_advanced_view = 'Ítarleg skoðun'; +$s_advanced_update = 'Ítarleg uppfærsla'; $s_refresh_delay = 'Endurglæða bið'; $s_redirect_delay = 'Framsenda bið'; $s_with_minimum_severity = 'Með lágmarks mikilvægi'; @@ -445,6 +448,7 @@ $s_steps_to_reproduce = 'Skref til endursköpunar'; $s_update_information_button = 'Uppfæra upplýsingar'; $s_sticky_issue = 'Límd verkbeiðni'; $s_profile = 'Snið'; +$s_update_advanced_link = 'Hærri uppfærsla'; $s_updating_bug_simple_title = 'Uppfæri upplýsingar um beiðni'; $s_vote_added_msg = 'Atkvæði hefur bæst við...'; $s_bugnote_added_msg = 'Bætt við athugasemd...'; @@ -715,6 +719,7 @@ $s_assign_to = 'Úthlutað til'; $s_additional_information = 'Viðbótar upplýsingar'; $s_submit_report_button = 'Senda skýrslu'; $s_check_report_more_bugs = 'fara yfir til að tilkynna fleiri atriði'; +$s_advanced_report_link = 'Ítarleg skýrsla'; $s_report_stay = 'Uppsetning skýrslu'; $s_selected_project = 'Veldu verkefni'; $s_valid_project_msg = 'Þú verður að velja gilt verkefni'; @@ -809,11 +814,8 @@ $s_move_bug_button = 'Færa beiðni'; $s_attached_files = 'Viðhengdar skrár'; $s_publish = 'Útgefið'; $s_cached = 'Falið'; -<<<<<<< HEAD $s_view_advanced_link = 'Ítarleg skoðun'; $s_viewing_bug_simple_details_title = 'Einföld skoðun yfir verkbeiðnir í þessu verkefni'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Það er enginn notandi að vakta þessa beiðni.'; $s_users_monitoring_bug = 'Notendur sem vakta þessa beiðni'; $s_monitoring_user_list = 'Notenda listi'; diff --git a/lang/strings_italian.txt b/lang/strings_italian.txt index 4ce3e009fb..3c122d2dce 100644 --- a/lang/strings_italian.txt +++ b/lang/strings_italian.txt @@ -388,6 +388,9 @@ $s_verify_warning = 'Le informazioni sul tuo account sono state verificate. Il $s_verify_change_password = 'Devi impostare una password per poter accedere di nuovo.'; $s_default_account_preferences_title = 'Preferenze utente'; $s_default_project = 'Progetto di default'; +$s_advanced_report = 'Report dettagliato'; +$s_advanced_view = 'Scheda dettagliata'; +$s_advanced_update = 'Aggiornamento dettagliato'; $s_refresh_delay = 'Ritardo di refresh'; $s_minutes = 'minuti'; $s_redirect_delay = 'Ritardo di reindirizzamento'; @@ -522,6 +525,7 @@ $s_steps_to_reproduce = 'Passaggi per riprodurre l\'anomalia'; $s_update_information_button = 'Aggiorna informazione'; $s_sticky_issue = 'Anomalia in primo piano'; $s_profile = 'Profilo'; +$s_update_advanced_link = 'Aggiornamento dettagliato'; $s_updating_bug_simple_title = 'Aggiorna le informazioni sull\'anomalia'; $s_revision = 'Revisione'; $s_revision_by = '%1$s di %2$s'; @@ -830,6 +834,7 @@ $s_assign_to = 'Assegna a'; $s_additional_information = 'Informazioni addizionali'; $s_submit_report_button = 'Invia la segnalazione'; $s_check_report_more_bugs = 'attiva per notificare più anomalie'; +$s_advanced_report_link = 'Modulo dettagliato'; $s_report_stay = 'Rimani sul report'; $s_selected_project = 'Progetto selezionato'; $s_valid_project_msg = 'Selezionare un progetto valido'; @@ -925,11 +930,8 @@ $s_reopen_bug_button = 'Riapri'; $s_move_bug_button = 'Sposta'; $s_attached_files = 'File allegati'; $s_publish = 'Pubblica'; -<<<<<<< HEAD $s_view_advanced_link = 'Scheda dettagliata'; $s_viewing_bug_simple_details_title = 'Scheda anomalia'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Nessuno ha chiesto di essere notificato su questa anomalia.'; $s_users_monitoring_bug = 'Utenti che tengono sotto controllo questa anomalia'; $s_monitoring_user_list = 'Elenco utenti'; diff --git a/lang/strings_japanese.txt b/lang/strings_japanese.txt index d44bdd890f..39bd576f64 100644 --- a/lang/strings_japanese.txt +++ b/lang/strings_japanese.txt @@ -406,6 +406,9 @@ $s_verify_warning = 'パスワード変更要求をチェックしました。 $s_verify_change_password = 'ログインできるようにパスワードを設定してください。'; $s_default_account_preferences_title = '選択'; $s_default_project = 'デフォルトプロジェクト'; +$s_advanced_report = '登録(詳細)画面を表示'; +$s_advanced_view = '表示(詳細)画面を表示'; +$s_advanced_update = '更新(詳細)画面を表示'; $s_refresh_delay = '再表示時間'; $s_minutes = '分'; $s_redirect_delay = 'リダイレクト時間'; @@ -543,6 +546,7 @@ $s_steps_to_reproduce = '再現方法'; $s_update_information_button = '更新'; $s_sticky_issue = '注目チケット'; $s_profile = 'プロフィール'; +$s_update_advanced_link = '詳細'; $s_updating_bug_simple_title = 'チケットの変更(簡易)'; $s_view_revisions = 'リビジョンを表示'; $s_revision = 'リビジョン'; @@ -883,6 +887,7 @@ $s_assign_to = '担当者'; $s_additional_information = '追加情報'; $s_submit_report_button = '登録'; $s_check_report_more_bugs = '続けて登録する場合にはチェックしてください。'; +$s_advanced_report_link = '詳細'; $s_report_stay = '次のチケット'; $s_selected_project = '選択したプロジェクト'; $s_valid_project_msg = 'プロジェクトを正しく選択してください。'; @@ -985,12 +990,8 @@ $s_attached_files = '添付ファイル'; $s_publish = '公開'; $s_cached = 'キャッシュ'; $s_add_user_to_monitor = '追加'; -<<<<<<< HEAD $s_view_advanced_link = '詳細'; $s_viewing_bug_simple_details_title = 'チケットの内容(簡易)'; -======= -$s_bug_view_title = 'チケットの詳細を見る'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'このチケットを監視しているユーザーはいません。'; $s_users_monitoring_bug = 'チケットを監視しているユーザー'; $s_monitoring_user_list = 'ユーザー一覧'; diff --git a/lang/strings_korean.txt b/lang/strings_korean.txt index cd74895bc6..4fd86b117d 100644 --- a/lang/strings_korean.txt +++ b/lang/strings_korean.txt @@ -341,6 +341,9 @@ $s_access_level = '접근 레벨'; $s_update_user_button = '정보 갱신'; $s_default_account_preferences_title = '기본 계정 설정상태'; $s_default_project = '기본 프로젝트'; +$s_advanced_report = '상세 보고'; +$s_advanced_view = '자세히 보기'; +$s_advanced_update = '상세한 업데이트'; $s_refresh_delay = '새로 고침 간격'; $s_redirect_delay = '리다이렉트 간격'; $s_with_minimum_severity = '최소한 다음의 경우에 :'; @@ -454,6 +457,7 @@ $s_summary = '요약'; $s_description = '설 명'; $s_steps_to_reproduce = '재발생 단계'; $s_update_information_button = '정보사항 변경'; +$s_update_advanced_link = '상세정보 갱신화면'; $s_updating_bug_simple_title = '벌레 정보 갱신'; $s_vote_added_msg = '투표수 추가...'; $s_bugnote_added_msg = '이슈노트 추가...'; @@ -702,6 +706,7 @@ $s_assign_to = '할당하기'; $s_additional_information = '추가 정보 사항'; $s_submit_report_button = '보고서 제출'; $s_check_report_more_bugs = '이슈 보고를 계속 하려면 선택'; +$s_advanced_report_link = '상세 보고'; $s_report_stay = '계속 보고'; $s_selected_project = '현재 프로젝트'; $s_valid_project_msg = '올바른 프로젝트를 선택해야 합니다.'; @@ -793,11 +798,8 @@ $s_move_bug_button = '이슈 이동'; $s_attached_files = '첨부 파일'; $s_publish = '출판'; $s_cached = '캐시됨'; -<<<<<<< HEAD $s_view_advanced_link = '자세히 보기'; $s_viewing_bug_simple_details_title = '간략히 보기'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = '이 이슈를 감시하는 사용자가 없습니다.'; $s_users_monitoring_bug = '이 이슈를 감시하는 사용자들'; $s_monitoring_user_list = '사용자 목록'; diff --git a/lang/strings_latvian.txt b/lang/strings_latvian.txt index 04cfac8c1a..250c38f4c4 100644 --- a/lang/strings_latvian.txt +++ b/lang/strings_latvian.txt @@ -191,6 +191,9 @@ $s_access_level = 'Pieejas līmenis'; $s_update_user_button = 'Saglabāt izmaiņas'; $s_default_account_preferences_title = 'Lietotāja opcijas'; $s_default_project = 'Noklusētais projekts'; +$s_advanced_report = 'Paplašināts ziņojums'; +$s_advanced_view = 'Paplašināta apskate'; +$s_advanced_update = 'Paplašināta labošana'; $s_refresh_delay = 'Ekrāna atjaunināšnas aizture'; $s_redirect_delay = 'Aizture veicot noteiktas darbības'; $s_bugnote_order = 'Bugnotes Sort Order'; @@ -280,6 +283,7 @@ $s_summary = 'Īss apraksts'; $s_description = 'Apraksts'; $s_steps_to_reproduce = 'Darbības, kas jāveic, lai atkārtotu kļūdu'; $s_update_information_button = 'Saglabāt'; +$s_update_advanced_link = 'Paplašinātā labošana'; $s_updating_bug_simple_title = 'Kļūdas datu labošana'; $s_vote_added_msg = 'Balsojums pievienots...'; $s_bugnote_added_msg = 'Komentārs pievienots...'; @@ -458,6 +462,7 @@ $s_assign_to = 'Noteikt atbildīgo'; $s_additional_information = 'Papildinformācija'; $s_submit_report_button = 'Reģistrēt kļūdu'; $s_check_report_more_bugs = 'atzīmējiet, ja vēlaties ievadīt vairākus ziņojumus'; +$s_advanced_report_link = 'Paplašinātā forma'; $s_report_stay = 'Turpināt kļūdu ievadi'; $s_selected_project = 'Izvēlētais projekts'; $s_valid_project_msg = 'Jums jāizvēlās pareizs projekts'; @@ -518,11 +523,8 @@ $s_reopen_bug_button = 'Atkārtoti atvērt'; $s_attached_files = 'Failu pievienošana'; $s_publish = 'Publicēt'; $s_cached = 'Kešots'; -<<<<<<< HEAD $s_view_advanced_link = 'Apskatīt paplašinātāto informāciju'; $s_viewing_bug_simple_details_title = 'Apskatīt informācijau'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Neviens lietotājs neveic šī buga monitoringu.'; $s_users_monitoring_bug = 'Lietotāji, kas veic monitoringu'; $s_monitoring_user_list = 'Lietotāju saraksts'; diff --git a/lang/strings_lithuanian.txt b/lang/strings_lithuanian.txt index 48292a92cb..8f1469d095 100644 --- a/lang/strings_lithuanian.txt +++ b/lang/strings_lithuanian.txt @@ -368,6 +368,9 @@ $s_access_level = 'Priėjimo lygis'; $s_update_user_button = 'Atnaujinti vartotojo vardą'; $s_default_account_preferences_title = 'Nustatymai'; $s_default_project = 'Pagrindinis projektas'; +$s_advanced_report = 'Detalus pranešimas'; +$s_advanced_view = 'Detali peržiūra'; +$s_advanced_update = 'Detalus atnaujinimas'; $s_refresh_delay = 'Atnaujinimo dažnumas (minutėmis)'; $s_redirect_delay = 'Nukreipimas po'; $s_with_minimum_severity = 'kai mažiausia svarba'; @@ -499,6 +502,7 @@ $s_steps_to_reproduce = 'Žingsniai atkartojimui'; $s_update_information_button = 'Atnaujinti duomenis'; $s_sticky_issue = 'Paklausi klaida'; $s_profile = 'Profilis'; +$s_update_advanced_link = 'Atnaujinti detalią informaciją'; $s_updating_bug_simple_title = 'Klaidos duomenų keitimas'; $s_vote_added_msg = 'Balsas įskaičiuotas...'; $s_bugnote_added_msg = 'Komentaras įrašytas...'; @@ -727,6 +731,7 @@ $s_assign_to = 'Kam priskirti'; $s_additional_information = 'Papildoma informacija'; $s_submit_report_button = 'Įrašyti pranešimą'; $s_check_report_more_bugs = 'pažymėkite, jei norite pranešti apie daugiau klaidų'; +$s_advanced_report_link = 'Detalus pranešimas'; $s_report_stay = 'Pasilikti pranešimo langą'; $s_selected_project = 'Pasirinktas projektas'; $s_valid_project_msg = 'Jūs turite pasirinkti esamą projektą'; @@ -825,11 +830,8 @@ $s_move_bug_button = 'Perkelti klaidą'; $s_attached_files = 'Prikabinti failai'; $s_publish = 'Publikuoti'; $s_cached = 'Kešuota'; -<<<<<<< HEAD $s_view_advanced_link = 'Detali peržiūra'; $s_viewing_bug_simple_details_title = 'Klaidos duomenų peržiūra'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Vartotojų, stebinčių šią klaidą, nėra.'; $s_users_monitoring_bug = 'Vartotojai stebintys šią klaidą'; $s_monitoring_user_list = 'Stebinčių vartotojų sąrašas'; diff --git a/lang/strings_norwegian_bokmal.txt b/lang/strings_norwegian_bokmal.txt index fe9e389aa8..a9518d10a1 100644 --- a/lang/strings_norwegian_bokmal.txt +++ b/lang/strings_norwegian_bokmal.txt @@ -408,6 +408,9 @@ $s_verify_warning = 'Kontoinformasjonen har blitt verifisert. Meldingen du har f $s_verify_change_password = 'Du må angi et passord for at du skal kunne logge deg inn igjen.'; $s_default_account_preferences_title = 'Standard kontoinnstillinger'; $s_default_project = 'Standardprosjekt'; +$s_advanced_report = 'Avansert rapport'; +$s_advanced_view = 'Avansert visning'; +$s_advanced_update = 'Avansert oppdatering'; $s_refresh_delay = 'Forsinkelse på oppfriskning'; $s_minutes = 'minutter'; $s_redirect_delay = 'Forsinkelse på redirigering'; @@ -543,6 +546,7 @@ $s_steps_to_reproduce = 'Steg for å reprodusere'; $s_update_information_button = 'Oppdater informasjon'; $s_sticky_issue = 'Fastlåst sak'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Oppdater avansert'; $s_updating_bug_simple_title = 'Oppdaterer saksinformasjon'; $s_view_revisions = 'Vis Revisjoner'; $s_revision = 'Revisjon'; @@ -880,6 +884,7 @@ $s_assign_to = 'Deleger til'; $s_additional_information = 'Tilleggsinformasjon'; $s_submit_report_button = 'Legg inn rapport'; $s_check_report_more_bugs = 'Kryss av for å legge inn flere saker fortløpende'; +$s_advanced_report_link = 'Avansert rapport'; $s_report_stay = 'Rapportere flere saker'; $s_selected_project = 'Valgt prosjekt'; $s_valid_project_msg = 'Du må velge et gyldig prosjekt'; @@ -982,11 +987,8 @@ $s_attached_files = 'Filvedlegg'; $s_publish = 'Publisere'; $s_cached = 'Midlertidig lagret'; $s_add_user_to_monitor = 'Legge til'; -<<<<<<< HEAD $s_view_advanced_link = 'Vis avansert'; $s_viewing_bug_simple_details_title = 'Oversikt over saker - enkel'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Ingen brukere overvåker denne saken.'; $s_users_monitoring_bug = 'Brukere som overvåker denne saken'; $s_monitoring_user_list = 'Brukerliste'; diff --git a/lang/strings_occitan.txt b/lang/strings_occitan.txt index 26b0c8ab7c..3d72caca5a 100644 --- a/lang/strings_occitan.txt +++ b/lang/strings_occitan.txt @@ -400,6 +400,9 @@ $s_verify_warning = 'L\'informacion relativa a vòstre compte es estada verifica $s_verify_change_password = 'Vos cal fixar un senhal per vos permetre de vos connectar tornamai.'; $s_default_account_preferences_title = 'Preferéncias del compte'; $s_default_project = 'Projècte per defaut'; +$s_advanced_report = 'Rapòrt detalhat'; +$s_advanced_view = 'Vista detalhada'; +$s_advanced_update = 'Mesa a jorn avançada'; $s_refresh_delay = 'Relambi de refresquiment'; $s_minutes = 'minutas'; $s_redirect_delay = 'Relambi de redireccion'; @@ -537,6 +540,7 @@ $s_steps_to_reproduce = 'Etapas per reproduire'; $s_update_information_button = 'Metre a jorn l\'informacion'; $s_sticky_issue = 'Bòg recurrent'; $s_profile = 'Perfil'; +$s_update_advanced_link = 'Mesa a jorn detalhada'; $s_updating_bug_simple_title = 'Mesa a jorn de l\'informacion d\'un bòg'; $s_view_revisions = 'Veire las revisions'; $s_revision = 'Revision'; @@ -877,6 +881,7 @@ $s_assign_to = 'Assignat a'; $s_additional_information = 'Informacions complementàrias'; $s_submit_report_button = 'Sometre lo rapòrt'; $s_check_report_more_bugs = 'Marcar per picar d\'autres bògues'; +$s_advanced_report_link = 'Rapòrt detalhat'; $s_report_stay = 'Gardar lo rapòrt'; $s_selected_project = 'Projècte en cors'; $s_valid_project_msg = 'Vos cal causir un projècte valid'; @@ -980,12 +985,8 @@ $s_attached_files = 'Pèças juntas'; $s_publish = 'Publicat'; $s_cached = 'Mes en amagatal'; $s_add_user_to_monitor = 'Apondre'; -<<<<<<< HEAD $s_view_advanced_link = 'Rapòrt detalhat'; $s_viewing_bug_simple_details_title = 'Afichar lo rapòrt simplificat'; -======= -$s_bug_view_title = 'Visualizar los detalhs del resultat'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Cap d\'utilizaire susvelha pas aqueste bòg.'; $s_users_monitoring_bug = 'Utilizaires que susvelhan aqueste bòg'; $s_monitoring_user_list = 'Lista d\'utilizaires'; diff --git a/lang/strings_polish.txt b/lang/strings_polish.txt index 7feed9d447..f4503f5206 100644 --- a/lang/strings_polish.txt +++ b/lang/strings_polish.txt @@ -406,6 +406,9 @@ $s_verify_warning = 'Informacja o Twoim koncie została zweryfikowana. Wiadomoś $s_verify_change_password = 'Musisz ustawić swoje hasło tutaj, aby móc się zalogować ponownie.'; $s_default_account_preferences_title = 'Preferencje konta'; $s_default_project = 'Domyślny projekt'; +$s_advanced_report = 'Zgłoszenie zaawansowane'; +$s_advanced_view = 'Widok zaawansowany'; +$s_advanced_update = 'Aktualizacja zaawansowana'; $s_refresh_delay = 'Opóźnienie odświeżania'; $s_minutes = 'minut'; $s_redirect_delay = 'Opóźnienie przekierowania'; @@ -540,6 +543,7 @@ $s_steps_to_reproduce = 'Kroki, by powtórzyć'; $s_update_information_button = 'Aktualizuj informację'; $s_sticky_issue = 'Zgłoszenie przyklejone'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Edycja Zaawansowana'; $s_updating_bug_simple_title = 'Aktualizacja informacji o zgłoszeniu'; $s_view_revisions = 'Wyświetl wersje'; $s_revision = 'Wersja'; @@ -875,6 +879,7 @@ $s_assign_to = 'Przypisz do'; $s_additional_information = 'Dodatkowe informacje'; $s_submit_report_button = 'Wyślij zgłoszenie'; $s_check_report_more_bugs = 'Kontynuuj zgłaszanie'; +$s_advanced_report_link = 'Zgłoszenie zaawansowane'; $s_report_stay = 'Pozostań w zgłoszeniu'; $s_selected_project = 'Wybrany projekt'; $s_valid_project_msg = 'Musisz wybrać prawidłowy projekt'; @@ -978,11 +983,8 @@ $s_attached_files = 'Dołączone pliki'; $s_publish = 'Opublikuj'; $s_cached = 'Przechowywany'; $s_add_user_to_monitor = 'Dodaj'; -<<<<<<< HEAD $s_view_advanced_link = 'Widok zaawansowany'; $s_viewing_bug_simple_details_title = 'Widok prosty'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Nikt nie monitoruje tego zgłoszenia.'; $s_users_monitoring_bug = 'Użytkownicy monitorujący to zgłoszenie'; $s_monitoring_user_list = 'Lista użytkowników'; diff --git a/lang/strings_portuguese_brazil.txt b/lang/strings_portuguese_brazil.txt index bedc9ba32f..e206d1b686 100644 --- a/lang/strings_portuguese_brazil.txt +++ b/lang/strings_portuguese_brazil.txt @@ -403,6 +403,9 @@ $s_verify_warning = 'As informações da sua conta foram verificadas. A mensagem $s_verify_change_password = 'Você deve ajustar uma senha aqui para que lhe seja permitido acessar novamente.'; $s_default_account_preferences_title = 'Preferências da Conta'; $s_default_project = 'Projeto Padrão'; +$s_advanced_report = 'Relatório Avançado'; +$s_advanced_view = 'Visualização Avançada'; +$s_advanced_update = 'Atualização Avançada'; $s_refresh_delay = 'Tempo de Renovação'; $s_minutes = 'minutos'; $s_redirect_delay = 'Tempo de Redirecionamento'; @@ -538,6 +541,7 @@ $s_steps_to_reproduce = 'Passos para Reproduzir'; $s_update_information_button = 'Atualizar Informação'; $s_sticky_issue = 'Caso "Pegajoso"'; $s_profile = 'Perfil'; +$s_update_advanced_link = 'Atualização Avançada'; $s_updating_bug_simple_title = 'Atualizar Informações do Caso'; $s_view_revisions = 'Ver Revisões'; $s_revision = 'Revisão'; @@ -872,6 +876,7 @@ $s_assign_to = 'Atribuir a'; $s_additional_information = 'Informações Adicionais'; $s_submit_report_button = 'Enviar Relatório'; $s_check_report_more_bugs = 'selecione para relatar mais casos'; +$s_advanced_report_link = 'Relatório Avançado'; $s_report_stay = 'Continuar Relatando'; $s_selected_project = 'Projeto selecionado'; $s_valid_project_msg = 'Você deve escolher um projeto válido'; @@ -974,11 +979,8 @@ $s_attached_files = 'Arquivos Anexados'; $s_publish = 'Publicar'; $s_cached = 'Em cache'; $s_add_user_to_monitor = 'Adicionar'; -<<<<<<< HEAD $s_view_advanced_link = 'Visualização Avançada'; $s_viewing_bug_simple_details_title = 'Visualização Simples do Caso'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Não há usuários monitorando este caso.'; $s_users_monitoring_bug = 'Usuários monitorando este caso'; $s_monitoring_user_list = 'Lista de Usuários'; diff --git a/lang/strings_portuguese_standard.txt b/lang/strings_portuguese_standard.txt index b3698a59d1..67f652364d 100644 --- a/lang/strings_portuguese_standard.txt +++ b/lang/strings_portuguese_standard.txt @@ -319,6 +319,9 @@ $s_verify_warning = 'A informação da sua conta foi confirmada. A mensagem de c $s_verify_change_password = 'Você tem que definir uma palavra-chave aqui para que você possa entrar novamente.'; $s_default_account_preferences_title = 'Preferências da sua Conta'; $s_default_project = 'Projecto Padrão'; +$s_advanced_report = 'Relatório Avançado'; +$s_advanced_view = 'Visualização Avançada'; +$s_advanced_update = 'Actualização Avançada'; $s_refresh_delay = 'Tempo de Actualização (em min.)'; $s_minutes = 'minutos'; $s_redirect_delay = 'Tempo de Espera de Redireccionamento de Página (em seg.)'; @@ -416,6 +419,7 @@ $s_summary = 'Sumário'; $s_description = 'Descrição'; $s_steps_to_reproduce = 'Passos Para Reprodução'; $s_update_information_button = 'Actualizar Informação'; +$s_update_advanced_link = 'Actualização Avançada'; $s_updating_bug_simple_title = 'Actualizando Informações do Bug'; $s_vote_added_msg = 'Voto foi adicionado...'; $s_bugnote_added_msg = 'Nota Adicionada...'; @@ -588,6 +592,7 @@ $s_assign_to = 'Atribuido a'; $s_additional_information = 'Informações adicionais'; $s_submit_report_button = 'Enviar Relatório'; $s_check_report_more_bugs = 'Marque para Adicionar Mais Bugs'; +$s_advanced_report_link = 'Relatório Avançado'; $s_report_stay = 'Mais Bugs ?'; $s_selected_project = 'Seleccionar Projecto'; $s_valid_project_msg = 'Deve Selecionar um Projecto Válido'; @@ -635,11 +640,8 @@ $s_system_profile = 'Descrição do Sistema'; $s_update_bug_button = 'Actualizar'; $s_reopen_bug_button = 'Reabrir Bug'; $s_attached_files = 'Ficheiros anexos'; -<<<<<<< HEAD $s_view_advanced_link = 'Visualização Avançada'; $s_viewing_bug_simple_details_title = 'Detalhes Simplificados do Bug'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Não há Utilizadores a Monitorar este Bug.'; $s_users_monitoring_bug = 'Utilizadores a Monitorar este Bug'; $s_monitoring_user_list = 'Lista de Utilizadores'; diff --git a/lang/strings_romanian.txt b/lang/strings_romanian.txt index 7132496818..281af602ea 100644 --- a/lang/strings_romanian.txt +++ b/lang/strings_romanian.txt @@ -339,6 +339,9 @@ $s_verify_warning = 'Informaţiile contului tău au fost verificate. Mesajul de $s_verify_change_password = 'Trebuie să introduceţi o parolă aici pentru a vă putea identifica din nou.'; $s_default_account_preferences_title = 'Preferinţe implicite'; $s_default_project = 'Proiect implicit'; +$s_advanced_report = 'Afişare complexă raport'; +$s_advanced_view = 'Vizualizare complexă'; +$s_advanced_update = 'Modificare complexă'; $s_refresh_delay = 'Interval de reîmprospătare'; $s_redirect_delay = 'Interval de redirecţionare'; $s_with_minimum_severity = 'cu severitatea minimă'; @@ -463,6 +466,7 @@ $s_steps_to_reproduce = 'Paşi de reprodus'; $s_update_information_button = 'Modifică informaţia'; $s_sticky_issue = 'Problemă sticky'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Modificare complexă'; $s_updating_bug_simple_title = 'Modificarea problemei'; $s_vote_added_msg = 'Votul a fost adăugat...'; $s_bugnote_added_msg = 'Comentariu adăugat...'; @@ -729,6 +733,7 @@ $s_assign_to = 'Atribuie lui'; $s_additional_information = 'Informatie aditionala'; $s_submit_report_button = 'Semnalează'; $s_check_report_more_bugs = 'bifaţi pentru a semnala probleme în continuare'; +$s_advanced_report_link = 'Mod complex'; $s_report_stay = 'Staţionare'; $s_selected_project = 'Proiect selectat'; $s_valid_project_msg = 'Trebuie să alegeţi un proiect valid'; @@ -821,11 +826,8 @@ $s_move_bug_button = 'Mută problemă'; $s_attached_files = 'Fişiere ataşate'; $s_publish = 'Publică'; $s_cached = 'Ascuns'; -<<<<<<< HEAD $s_view_advanced_link = 'Vedere complexă'; $s_viewing_bug_simple_details_title = 'Vizualizare problemă cu detalii simple'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Nu există utilizatori care monitorizează această problemă.'; $s_users_monitoring_bug = 'Utilizatori care monitorizează acestă problemă'; $s_monitoring_user_list = 'Listă utilizatori'; diff --git a/lang/strings_russian.txt b/lang/strings_russian.txt index 70925936b1..bad4d59518 100644 --- a/lang/strings_russian.txt +++ b/lang/strings_russian.txt @@ -408,6 +408,9 @@ $s_verify_warning = 'Сведения вашей учетной записи п $s_verify_change_password = 'Чтобы вы смогли снова войти в систему, здесь необходимо установить пароль.'; $s_default_account_preferences_title = 'Настройки учетной записи'; $s_default_project = 'Проект по умолчанию'; +$s_advanced_report = 'Расширенный режим создания'; +$s_advanced_view = 'Расширенный режим просмотра'; +$s_advanced_update = 'Расширенный режим изменения'; $s_refresh_delay = 'Интервал обновления, с'; $s_minutes = 'минут'; $s_redirect_delay = 'Задержка перед перенаправлением, с'; @@ -545,6 +548,7 @@ $s_steps_to_reproduce = 'Шаги по воспроизведению'; $s_update_information_button = 'Изменить данные'; $s_sticky_issue = 'Прикрепленный инцидент'; $s_profile = 'Профиль'; +$s_update_advanced_link = 'расширенное изменение'; $s_updating_bug_simple_title = 'Изменение сведений о инциденте'; $s_view_revisions = 'просмотр ревизий'; $s_revision = 'ревизия'; @@ -885,6 +889,7 @@ $s_assign_to = 'Назначить'; $s_additional_information = 'Дополнительные сведения'; $s_submit_report_button = 'Создать инцидент'; $s_check_report_more_bugs = 'отметьте, если собираетесь вводить несколько инцидентов'; +$s_advanced_report_link = 'Расширенная форма'; $s_report_stay = 'Продолжить создание инцидентов'; $s_selected_project = 'Выбранный проект'; $s_valid_project_msg = 'Нужно выбрать допустимый проект.'; @@ -988,12 +993,8 @@ $s_attached_files = 'Вложенные файлы'; $s_publish = 'Опубликовать'; $s_cached = 'Запомнен'; $s_add_user_to_monitor = 'Добавить'; -<<<<<<< HEAD $s_view_advanced_link = 'Расширенный вид'; $s_viewing_bug_simple_details_title = 'Простой вид'; -======= -$s_bug_view_title = 'Просмотр подробностей проблемы'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Никто из пользователей не отслеживает инцидент.'; $s_users_monitoring_bug = 'Пользователи, отслеживающие инцидент'; $s_monitoring_user_list = 'Пользователи'; diff --git a/lang/strings_serbian.txt b/lang/strings_serbian.txt index eeeb9d49e6..75c2bffd23 100644 --- a/lang/strings_serbian.txt +++ b/lang/strings_serbian.txt @@ -283,6 +283,9 @@ $s_access_level = 'Pristupni nivo'; $s_update_user_button = 'ažuriranje naloga'; $s_default_account_preferences_title = 'Podešavanja naloga'; $s_default_project = 'Podrazumevani projekat'; +$s_advanced_report = 'Napredni izvestaj'; +$s_advanced_view = 'Napredni pogled'; +$s_advanced_update = 'Napredno ažuriranje'; $s_refresh_delay = 'Interval osvežavanja'; $s_redirect_delay = 'Interval redirekcije'; $s_with_minimum_severity = 'Sa maximalnom tezinom od'; @@ -384,6 +387,7 @@ $s_summary = 'Sažetak'; $s_description = 'Opis'; $s_steps_to_reproduce = 'Koraci za reprodukciju'; $s_update_information_button = 'ažuriranje informacija'; +$s_update_advanced_link = 'Napredno ažuriranje'; $s_updating_bug_simple_title = 'ažuriranje infomacija o gresci'; $s_vote_added_msg = 'Glas je dodat...'; $s_bugnote_added_msg = 'Komentar uz grešku je dodat...'; @@ -577,6 +581,7 @@ $s_assign_to = 'Dodeljivanje'; $s_additional_information = 'Dodatne informacije'; $s_submit_report_button = 'Slanje izvestaja'; $s_check_report_more_bugs = 'Ukljucite za prijavu dodatnih gresaka'; +$s_advanced_report_link = 'Napredni izvestaj'; $s_report_stay = 'Prijava dodatnih'; $s_selected_project = 'Izabrani projekat'; $s_valid_project_msg = 'Morate izabrati projekat'; @@ -662,11 +667,8 @@ $s_move_bug_button = 'Premesti gresku'; $s_attached_files = 'Prikaceni fajlovi'; $s_publish = 'Publikuj'; $s_cached = 'Keširano'; -<<<<<<< HEAD $s_view_advanced_link = 'Napredni pregled'; $s_viewing_bug_simple_details_title = 'Osnovni pregled grešaka'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Nema korisnika koji prate ovu gresku.'; $s_users_monitoring_bug = 'Korisnici koji prate ovu grešku'; $s_monitoring_user_list = 'Lista korisnika'; diff --git a/lang/strings_slovak.txt b/lang/strings_slovak.txt index 809d1af6ed..9173358880 100644 --- a/lang/strings_slovak.txt +++ b/lang/strings_slovak.txt @@ -323,6 +323,9 @@ $s_access_level = 'Úroveň prístupu'; $s_update_user_button = 'Aktualizovať používateľa'; $s_default_account_preferences_title = 'Nastavenia účtu'; $s_default_project = 'Defaultný projekt'; +$s_advanced_report = 'Rozšírený report'; +$s_advanced_view = 'Rozšírený pohľad'; +$s_advanced_update = 'Rozšírená aktualizácia'; $s_refresh_delay = 'Interval pre refresh'; $s_minutes = 'minúty'; $s_redirect_delay = 'Pauza pre presmerovanie'; @@ -435,6 +438,7 @@ $s_summary = 'Zhrnutie'; $s_description = 'Popis'; $s_steps_to_reproduce = 'Kroky k vyvolaniu'; $s_update_information_button = 'Uložit'; +$s_update_advanced_link = 'Rozšírená aktualizácia'; $s_updating_bug_simple_title = 'Aktualizácia problému'; $s_vote_added_msg = 'Hlas bol pridaný...'; $s_bugnote_added_msg = 'Poznámka k problému bola pridaná...'; @@ -623,6 +627,7 @@ $s_assign_to = 'Priradený'; $s_additional_information = 'Dalšie informácie'; $s_submit_report_button = 'Uložiť'; $s_check_report_more_bugs = 'zaškrtnutím vložíte viacero problémov'; +$s_advanced_report_link = 'Rozšírený report'; $s_report_stay = 'Zostať v reporte'; $s_selected_project = 'Vyber projekt'; $s_valid_project_msg = 'Musíte vybrať platný projekt'; @@ -710,11 +715,8 @@ $s_move_bug_button = 'Presunúť problém'; $s_attached_files = 'Pripojené súbory'; $s_publish = 'Poblikovať'; $s_cached = 'V medzipamäti'; -<<<<<<< HEAD $s_view_advanced_link = 'Rozšírené'; $s_viewing_bug_simple_details_title = 'Základné podrobnosti problému'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'žiadny užívateľ nesleduje tento problém.'; $s_users_monitoring_bug = 'Uživatelia sledujú tento problém'; $s_monitoring_user_list = 'Uživatelia'; diff --git a/lang/strings_slovene.txt b/lang/strings_slovene.txt index c048f393dc..d0e03e6e35 100644 --- a/lang/strings_slovene.txt +++ b/lang/strings_slovene.txt @@ -266,6 +266,9 @@ $s_access_level = 'Nivo dostopa'; $s_update_user_button = 'Posodobi uporabnika'; $s_default_account_preferences_title = 'Nastavitve računa'; $s_default_project = 'Privzeti projekt'; +$s_advanced_report = 'Napredno poročilo'; +$s_advanced_view = 'Napredni pogled'; +$s_advanced_update = 'Napredna posodobitev'; $s_refresh_delay = 'Osvežitev čez'; $s_redirect_delay = 'Preusmeritev čez'; $s_with_minimum_severity = 'z najmanjšo resnostjo'; @@ -356,6 +359,7 @@ $s_summary = 'Povzetek'; $s_description = 'Opis'; $s_steps_to_reproduce = 'Koraki za ponovitev'; $s_update_information_button = 'Posodobi informacije'; +$s_update_advanced_link = 'Napredno posodabljanje'; $s_updating_bug_simple_title = 'Posodabljam zadevo'; $s_vote_added_msg = 'Glas je bil dodan...'; $s_bugnote_added_msg = 'Beležka dodana...'; @@ -543,6 +547,7 @@ $s_assign_to = 'Dodeli'; $s_additional_information = 'Dodatne informacije'; $s_submit_report_button = 'Sporoči zadevo'; $s_check_report_more_bugs = 'odkljukajte, če želite sporočiti še več zadev'; +$s_advanced_report_link = 'Napredno poročilo'; $s_report_stay = 'Ostani na poročilu'; $s_selected_project = 'Izbran projekt'; $s_valid_project_msg = 'Izbrati morate veljaven projekt'; @@ -621,11 +626,8 @@ $s_move_bug_button = 'Premakni'; $s_attached_files = 'Dodane datoteke'; $s_publish = 'Objavi'; $s_cached = 'Predpomnjen'; -<<<<<<< HEAD $s_view_advanced_link = 'Napreden pogled'; $s_viewing_bug_simple_details_title = 'Podrobnosti zahteve'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Noben uporabnik ne opazuje te zadeve.'; $s_users_monitoring_bug = 'To zadevo opazujejo uporabniki'; $s_monitoring_user_list = 'Seznam uporabnikov'; diff --git a/lang/strings_spanish.txt b/lang/strings_spanish.txt index 38fb31da94..fbdb1b8292 100644 --- a/lang/strings_spanish.txt +++ b/lang/strings_spanish.txt @@ -407,6 +407,9 @@ $s_verify_warning = 'La información de su cuenta ha sido verificada. El mensaje $s_verify_change_password = 'Ud. debe establecer una contraseña aquí para permitirle ingresar nuevamente.'; $s_default_account_preferences_title = 'Preferencias de Cuenta'; $s_default_project = 'Proyecto por defecto'; +$s_advanced_report = 'Informe Avanzado'; +$s_advanced_view = 'Vista Avanzada'; +$s_advanced_update = 'Actualización Avanzada'; $s_refresh_delay = 'Retardo de Refresco de Pantalla'; $s_minutes = 'minutos'; $s_redirect_delay = 'Retardo de Redirección'; @@ -542,6 +545,7 @@ $s_steps_to_reproduce = 'Pasos para reproducirlo'; $s_update_information_button = 'Actualizar Información'; $s_sticky_issue = 'Incidencia Fijada'; $s_profile = 'Perfil'; +$s_update_advanced_link = 'Cambiar a forma de Actualización Avanzada'; $s_updating_bug_simple_title = 'Actualizando información de la Incidencia'; $s_view_revisions = 'Ver revisiones'; $s_revision = 'Revisión'; @@ -879,6 +883,7 @@ $s_assign_to = 'Asignar a'; $s_additional_information = 'Información Adicional'; $s_submit_report_button = 'Enviar Reporte'; $s_check_report_more_bugs = 'Marque para reportar más incidencias'; +$s_advanced_report_link = 'Informe Avanzado'; $s_report_stay = 'Continuar reportando'; $s_selected_project = 'Proyecto Seleccionado'; $s_valid_project_msg = 'Debe seleccionar un proyecto válido'; @@ -982,11 +987,8 @@ $s_attached_files = 'Archivos Adjuntos'; $s_publish = 'Publicar'; $s_cached = 'En Caché'; $s_add_user_to_monitor = 'Agregar'; -<<<<<<< HEAD $s_view_advanced_link = 'Cambiar a Vista Avanzada'; $s_viewing_bug_simple_details_title = 'Vista Simple de la Incidencia.'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'No hay usuarios monitorizando esta Incidencia.'; $s_users_monitoring_bug = 'Usuarios monitorizando esta Incidencia.'; $s_monitoring_user_list = 'Lista de Usuarios'; diff --git a/lang/strings_swedish.txt b/lang/strings_swedish.txt index 9f3904cc16..d6b43884d4 100644 --- a/lang/strings_swedish.txt +++ b/lang/strings_swedish.txt @@ -393,6 +393,9 @@ $s_verify_warning = 'Din kontoinformation har verifierats. Kontobekräftelsen du $s_verify_change_password = 'Du måste sätta ett lösenord här för att kunna logga in igen.'; $s_default_account_preferences_title = 'Kontoinställningar'; $s_default_project = 'Förvalt projekt'; +$s_advanced_report = 'Avancerad rapport'; +$s_advanced_view = 'Avancerad visning'; +$s_advanced_update = 'Avancerad uppdatering'; $s_refresh_delay = 'Uppdateringsfördröjning'; $s_redirect_delay = 'Omdirigeringsfördröjning'; $s_with_minimum_severity = 'Med lägsta allvarlighetsgrad'; @@ -525,6 +528,7 @@ $s_steps_to_reproduce = 'Steg för att upprepa'; $s_update_information_button = 'Uppdatera information'; $s_sticky_issue = 'Klistrat ärende'; $s_profile = 'Profil'; +$s_update_advanced_link = 'Uppdatera advancerad'; $s_updating_bug_simple_title = 'Uppdaterar ärendeinformation'; $s_vote_added_msg = 'Röst har lagts till...'; $s_bugnote_added_msg = 'Lade till meddelande...'; @@ -847,6 +851,7 @@ $s_assign_to = 'Tilldela till'; $s_additional_information = 'Ytterligare information'; $s_submit_report_button = 'Skicka rapport'; $s_check_report_more_bugs = 'kryssa i för att rapportera fler ärenden'; +$s_advanced_report_link = 'Avancerad rapport'; $s_report_stay = 'Fortsätt rapportera'; $s_selected_project = 'Valt projekt'; $s_valid_project_msg = 'Du måste välja ett giltigt projekt'; @@ -948,12 +953,8 @@ $s_move_bug_button = 'Flytta ärende'; $s_attached_files = 'Associerade filer'; $s_publish = 'Publicera'; $s_cached = 'Cachad'; -<<<<<<< HEAD $s_view_advanced_link = 'Visa avancerad'; $s_viewing_bug_simple_details_title = 'Visar ärende, enkel'; -======= -$s_add_user_to_monitor = 'Lägg till'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Inga användare bevakar detta ärende.'; $s_users_monitoring_bug = 'Användare som bevakar detta ärende'; $s_monitoring_user_list = 'Användarlista'; diff --git a/lang/strings_swissgerman.txt b/lang/strings_swissgerman.txt index ef2bc7035d..07e0cf9a22 100644 --- a/lang/strings_swissgerman.txt +++ b/lang/strings_swissgerman.txt @@ -400,6 +400,9 @@ $s_verify_warning = 'Dyyni Kontoinformatione sin iberprieft wore. D Kontobstetig $s_verify_change_password = 'Du muesch do ne Passwort vergee go di wider aamälde chenne.'; $s_default_account_preferences_title = 'Kontoyystellige'; $s_default_project = 'Standard-Projäkt'; +$s_advanced_report = 'Erwyterete Bericht'; +$s_advanced_view = 'Erwytereti Darstellig'; +$s_advanced_update = 'Erwyteret Update'; $s_refresh_delay = 'Aktualisierigsverzegerig'; $s_minutes = 'Minute'; $s_redirect_delay = 'Verzegerig fir d Wyterleitig'; @@ -537,6 +540,7 @@ $s_steps_to_reproduce = 'Schritt zue dr Reproduktion'; $s_update_information_button = 'Information aktualisiere'; $s_sticky_issue = 'Fixiert Probläm'; $s_profile = 'Profil'; +$s_update_advanced_link = 'erwytereti Aktualisierig'; $s_updating_bug_simple_title = 'Probläminformation aktualisiere'; $s_view_revisions = 'Versione aaluege'; $s_revision = 'Version'; @@ -876,6 +880,7 @@ $s_assign_to = 'Zueornig an'; $s_additional_information = 'Zuesätzligi Information'; $s_submit_report_button = 'Bericht abschicke'; $s_check_report_more_bugs = 'uuswehle go wyteri Probläm go mälde'; +$s_advanced_report_link = 'Erwyterete Bericht'; $s_report_stay = 'Im Yygabmodus blybe'; $s_selected_project = 'Gwehlt Projäkt'; $s_valid_project_msg = 'Du muesch e giltig Projäkt uuswehle.'; @@ -978,12 +983,8 @@ $s_attached_files = 'Aaghängti Dateie'; $s_publish = 'Vereffetlige'; $s_cached = 'Zwischegspycheret'; $s_add_user_to_monitor = 'Zuefiege'; -<<<<<<< HEAD $s_view_advanced_link = 'erwytereti Aazeig'; $s_viewing_bug_simple_details_title = 'Eifachi Problämaasicht aazeige'; -======= -$s_bug_view_title = 'Einzelheite vu dr Uusgab aaluege'; ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Kei Benutzer beobachte des Probläm.'; $s_users_monitoring_bug = 'Benutzer, wu des Probläm beobachte'; $s_monitoring_user_list = 'Benutzer'; diff --git a/lang/strings_tagalog.txt b/lang/strings_tagalog.txt index e3bab51e80..a143a62251 100644 --- a/lang/strings_tagalog.txt +++ b/lang/strings_tagalog.txt @@ -397,6 +397,9 @@ $s_verify_warning = 'Napatotohanan na ang kabatiran hinggil sa iyong kuwenta. Hi $s_verify_change_password = 'Dapat kang magtakda ng isang hudyat dito upang mapahintulutan kang makalagdang muli.'; $s_default_account_preferences_title = 'Mga Kagustuhan para sa Kuwenta/Akawnt'; $s_default_project = 'Likas na Nakatakdang Proyekto'; +$s_advanced_report = 'Ulat na may Mas Mataas na Antas'; +$s_advanced_view = 'Tanawing may Mas Mataas na Antas'; +$s_advanced_update = 'Pagsasapanahong may Mas Mataas na Antas'; $s_refresh_delay = 'Nabalam na Pagsasariwa'; $s_minutes = 'mga minuto'; $s_redirect_delay = 'Pagturo/Pagpapanutong Nabinbin'; @@ -531,6 +534,7 @@ $s_steps_to_reproduce = 'Mga Hakbang Upang Muling Malikha'; $s_update_information_button = 'Isapanahon ang Kabatiran'; $s_sticky_issue = 'Madikit na Labas'; $s_profile = 'Talaan ng Katangian'; +$s_update_advanced_link = 'Mas Masulong na Pagsasapanahon'; $s_updating_bug_simple_title = 'Isinasapanahon ang Kabatiran hinggil sa Labas'; $s_view_revisions = 'Tingnan ang mga Pagbabago'; $s_revision = 'Pagbabago'; @@ -864,6 +868,7 @@ $s_assign_to = 'Italaga Kay'; $s_additional_information = 'Karagdagang Kabatiran'; $s_submit_report_button = 'Ipasa ang Ulat'; $s_check_report_more_bugs = 'magsuri upang makapag-ulat ng mas marami pang mga labas'; +$s_advanced_report_link = 'Mas Masulong na Pag-uulat'; $s_report_stay = 'Pagpapanatili ng Ulat'; $s_selected_project = 'Napiling proyekto'; $s_valid_project_msg = 'Dapat kang pumili ng isang tanggap na proyekto.'; @@ -966,11 +971,8 @@ $s_attached_files = 'Nakalakip na mga Talaksan'; $s_publish = 'Ilathala'; $s_cached = 'Iniligpit na'; $s_add_user_to_monitor = 'Idagdag'; -<<<<<<< HEAD $s_view_advanced_link = 'Tingnan na Mas Masulong'; $s_viewing_bug_simple_details_title = 'Tinitingnan ang Payak na mga Detalye ng Labas'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'Walang mga tagagamit na nagmamatyag sa labas na ito.'; $s_users_monitoring_bug = 'Mga tagagamit na nagmamatyag sa labas na ito'; $s_monitoring_user_list = 'Talaa ng Tagagamit'; diff --git a/lang/strings_turkish.txt b/lang/strings_turkish.txt index 938227cef7..d1828e0784 100644 --- a/lang/strings_turkish.txt +++ b/lang/strings_turkish.txt @@ -103,6 +103,9 @@ $s_access_level = 'Erişim Seviyesi'; $s_update_user_button = 'Kullanıcıyı Güncelle'; $s_default_account_preferences_title = 'Varsayılan Kullanıcı Hesabı Tercihleri'; $s_default_project = 'Varsayılan Proje'; +$s_advanced_report = 'Detaylı Rapor'; +$s_advanced_view = 'Detaylı İzle'; +$s_advanced_update = 'Detaylı Güncelleme'; $s_refresh_delay = 'Yeniden Yükleme Gecikmesi'; $s_redirect_delay = 'Yönlendirme Gecikmesi'; $s_email_on_new = 'Yenileri Emaille'; @@ -186,6 +189,7 @@ $s_summary = 'Özet'; $s_description = 'Açıklama'; $s_steps_to_reproduce = 'Tekrarlamaya Yönelik Adımlar'; $s_update_information_button = 'Bilgi Güncelle'; +$s_update_advanced_link = 'Detaylı Güncelleme'; $s_updating_bug_simple_title = 'Bug bilgileri güncelleniyor'; $s_vote_added_msg = 'Oy eklendi...'; $s_bugnote_added_msg = 'Bug Notu eklendi...'; @@ -352,6 +356,7 @@ $s_assign_to = 'Ata (Tahsis Et)'; $s_additional_information = 'Ek Bilgi'; $s_submit_report_button = 'Bildir'; $s_check_report_more_bugs = 'daha başka bug bildirmek için seçiniz'; +$s_advanced_report_link = 'Detaylı Rapor'; $s_report_stay = 'Bildirmeye Devam'; $s_selected_project = 'Seçilen Proje'; $s_valid_project_msg = 'Geçerli bir proje seçmelisiniz'; @@ -398,9 +403,6 @@ $s_system_profile = 'Sistem Özellikleri'; $s_update_bug_button = 'Bug Güncelle'; $s_reopen_bug_button = 'Bug Yeniden Aç'; $s_attached_files = 'Eklenen Dosyalar'; -<<<<<<< HEAD $s_view_advanced_link = 'Detaylı Link'; $s_viewing_bug_simple_details_title = 'Basit Bug Detayları İzleniyor'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_phpmailer_language = 'tr'; diff --git a/lang/strings_ukrainian.txt b/lang/strings_ukrainian.txt index 2c5b54fc2a..e61d930f53 100644 --- a/lang/strings_ukrainian.txt +++ b/lang/strings_ukrainian.txt @@ -319,6 +319,9 @@ $s_access_level = 'Рівень доступу'; $s_update_user_button = 'Зберегти'; $s_default_account_preferences_title = 'Параметри запису'; $s_default_project = 'Основний проект'; +$s_advanced_report = 'Розширена форма'; +$s_advanced_view = 'Розширений перегляд'; +$s_advanced_update = 'Розширене редагування'; $s_refresh_delay = 'Інтервал оновлення'; $s_redirect_delay = 'Затримка перед перенапрямленням'; $s_with_minimum_severity = 'З мінімальною серйозністю:'; @@ -432,6 +435,7 @@ $s_summary = 'Статистика'; $s_description = 'Опис'; $s_steps_to_reproduce = 'Кроки для відтворення'; $s_update_information_button = 'Зберегти інформацію'; +$s_update_advanced_link = 'Розширене редагування'; $s_updating_bug_simple_title = 'Спрощене редагування проблеми'; $s_vote_added_msg = 'Голос був доданий...'; $s_bugnote_added_msg = 'Коментар був доданий...'; @@ -628,6 +632,7 @@ $s_assign_to = 'Кому призначити'; $s_additional_information = 'Додаткова інформація'; $s_submit_report_button = 'Відправити звіт'; $s_check_report_more_bugs = 'увімкніть, якщо оформляєте декілька проблем'; +$s_advanced_report_link = 'Розширена форма'; $s_report_stay = 'Продовжити оформлення звітів'; $s_selected_project = 'Вибраний проект'; $s_valid_project_msg = 'Ви повинні вибрати правильний проект'; @@ -717,11 +722,8 @@ $s_move_bug_button = 'Перенести проблему'; $s_attached_files = 'Прикріплені файли'; $s_publish = 'Опублікувати'; $s_cached = 'В кеші'; -<<<<<<< HEAD $s_view_advanced_link = 'Розширений перегляд'; $s_viewing_bug_simple_details_title = 'Спрощений перегляд проблеми'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = 'За цією проблемою ніхто не стежить.'; $s_users_monitoring_bug = 'За цією проблемою стежать наступні користувачі'; $s_monitoring_user_list = 'Список користувачів'; diff --git a/lang/strings_urdu.txt b/lang/strings_urdu.txt index 68d6d3dde0..e9d520548b 100644 --- a/lang/strings_urdu.txt +++ b/lang/strings_urdu.txt @@ -354,6 +354,9 @@ $s_verify_warning = 'آپ کے کھاتے کی معلومات کو چیک کیا $s_verify_change_password = 'آپ کو دوبارہ لاگن ھونے کے لیے راز والہ لفظ ضرور سیٹ کرنا پڑے گا.'; $s_default_account_preferences_title = 'کھاتے کے پسند'; $s_default_project = ' سسٹم کا دیا ھوا منصو بے'; +$s_advanced_report = 'اڈوانس اطلاع'; +$s_advanced_view = ' اڈوانس ویو'; +$s_advanced_update = ' اڈوانس نیا بننا'; $s_refresh_delay = 'وقفے کو تازہ دم کرنا'; $s_redirect_delay = 'وقفہ آگے بیجنا'; $s_with_minimum_severity = 'تھوڈی سی شدت کے ساتھ'; @@ -486,6 +489,7 @@ $s_steps_to_reproduce = 'دوبارہ بنانے کے سٹیپ'; $s_update_information_button = ' معلومات تبديل ھو کر ني ھو گي ھے'; $s_sticky_issue = 'مشکل ایشوذ'; $s_profile = 'جایزہ'; +$s_update_advanced_link = 'پہلے کو تبديل کر کے ني ھو گي ھے'; $s_updating_bug_simple_title = ' ایشوذ کی معلومات تبديل ھو کر ني ھو گي ھے'; $s_vote_added_msg = 'ووٹ جمہع ھو چکا ھے...'; $s_bugnote_added_msg = ' معلومات جمہع ھو چکی ھیں ...'; @@ -760,6 +764,7 @@ $s_assign_to = 'اس کے سپرد کرو'; $s_additional_information = 'اضافی معلومات'; $s_submit_report_button = 'رپورٹ حوالے کرو'; $s_check_report_more_bugs = 'رپورٹ سے اور ایشوذ چیک کرو'; +$s_advanced_report_link = 'ايڑونس'; $s_report_stay = 'رپورٹ انتظار'; $s_selected_project = 'منصوبہ جو منتخب کیا گیا'; $s_valid_project_msg = 'منصوبہ منتخب کرنا ھو گا آپ کو ضرور ٹھیک'; @@ -855,11 +860,8 @@ $s_move_bug_button = ' ایشوذ کو حرکت میں لاو'; $s_attached_files = 'فایلز کو باندو'; $s_publish = 'پبلش'; $s_cached = 'کیشڈ'; -<<<<<<< HEAD $s_view_advanced_link = ' ايڑونس ویو کرو'; $s_viewing_bug_simple_details_title = 'ایشوذ کی سسادہ ڈیٹیل ویو کرو'; -======= ->>>>>>> 7c89108... Fix #10890: Remove all references to advanced view/update/report pages $s_no_users_monitoring_bug = ' کوی اور استعمال کر نے والہ اس ایشوذ کو نہی ھے.'; $s_users_monitoring_bug = ' استعمال کر نے والہ اس ایشوذ کو مانیٹر کر رھا ھے'; $s_monitoring_user_list = ' استعمال کر نے والوں کی لسٹ';