From: <gi...@ma...> - 2009-08-31 14:05:29
|
The branch, master-1.2.x has been updated via 931ad8be9054cf0ab72ee056dbb19b34f771f91d (commit) via 1fd31133bf1f617b45f381b15aaae2be3ebac50f (commit) from fbcf0c7bc9988579520e44f2a6b5dc3343480db7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 931ad8be9054cf0ab72ee056dbb19b34f771f91d Author: David Hicks <hic...@op...> Date: Mon Aug 31 23:52:12 2009 +1000 Fix #10890: Remove all references to advanced view/update/report pages With the refactoring of the view, print, update and report pages, the distinction between simple and advanced views was removed. This commit cleans up after the refactoring by removing the now useless user preferences that used to toggle simple/advanced modes. The database schema has been updated to drop the now unnessary columns related to simple/advanced view preferences. The event API has been updated to remove the "advanced" parameter where it once existed. Plugins will need to be modified after this commit to not use this parameter. Documentation has also been ammended to remove mention of simple/advanced views. commit 1fd31133bf1f617b45f381b15aaae2be3ebac50f Author: David Hicks <hic...@op...> Date: Mon Aug 31 22:00:36 2009 +1000 Fix #10829: Remove custom field 'advanced' flag from SOAP API This is a follow up to 779150cc5649915044bb3a715a2010d965ef4958 that removes the "advanced" field from the custom field API. This field is no longer used and therefore can be removed from the SOAP API as well. ----------------------------------------------------------------------- Summary of changes: account_prefs_update.php | 3 --- admin/schema.php | 3 +++ api/soap/mantisconnect.php | 1 - api/soap/mc_project_api.php | 1 - bug_report_page.php | 6 +++--- bug_view_inc.php | 6 +++--- config_defaults_inc.php | 18 ------------------ core/print_api.php | 2 +- core/user_pref_api.php | 6 ------ docbook/adminguide/en/configuration.sgml | 24 ------------------------ docbook/adminguide/en/customizing_mantis.sgml | 5 ----- docbook/adminguide/en/page_descriptions.sgml | 21 ++++++++++----------- docbook/developers/en/event-reference-bug.sgml | 4 ---- lang/strings_arabic.txt | 8 +++----- lang/strings_arabicegyptianspoken.txt | 8 +++----- lang/strings_bulgarian.txt | 8 +++----- lang/strings_catalan.txt | 8 +++----- lang/strings_chinese_simplified.txt | 8 +++----- lang/strings_chinese_traditional.txt | 8 +++----- lang/strings_croatian.txt | 8 +++----- lang/strings_czech.txt | 8 +++----- lang/strings_danish.txt | 8 +++----- lang/strings_dutch.txt | 9 ++++----- lang/strings_english.txt | 6 ------ lang/strings_estonian.txt | 8 +++----- lang/strings_finnish.txt | 8 +++----- lang/strings_french.txt | 9 ++++----- lang/strings_galician.txt | 9 ++++----- lang/strings_german.txt | 9 ++++----- lang/strings_german_eintrag.txt | 6 ------ lang/strings_greek.txt | 8 +++----- lang/strings_hebrew.txt | 8 +++----- lang/strings_hungarian.txt | 8 +++----- lang/strings_icelandic.txt | 8 +++----- lang/strings_italian.txt | 8 +++----- lang/strings_japanese.txt | 9 ++++----- lang/strings_korean.txt | 8 +++----- lang/strings_latvian.txt | 8 +++----- lang/strings_lithuanian.txt | 8 +++----- lang/strings_norwegian_bokmal.txt | 8 +++----- lang/strings_occitan.txt | 9 ++++----- lang/strings_polish.txt | 8 +++----- lang/strings_portuguese_brazil.txt | 8 +++----- lang/strings_portuguese_standard.txt | 8 +++----- lang/strings_romanian.txt | 8 +++----- lang/strings_russian.txt | 9 ++++----- lang/strings_serbian.txt | 8 +++----- lang/strings_slovak.txt | 8 +++----- lang/strings_slovene.txt | 8 +++----- lang/strings_spanish.txt | 8 +++----- lang/strings_swedish.txt | 9 ++++----- lang/strings_swissgerman.txt | 9 ++++----- lang/strings_tagalog.txt | 8 +++----- lang/strings_turkish.txt | 8 +++----- lang/strings_ukrainian.txt | 8 +++----- lang/strings_urdu.txt | 8 +++----- 56 files changed, 152 insertions(+), 297 deletions(-) ----------------------------------------------------------------------- commit 931ad8be9054cf0ab72ee056dbb19b34f771f91d Author: David Hicks <hic...@op...> Date: Mon Aug 31 23:52:12 2009 +1000 Fix #10890: Remove all references to advanced view/update/report pages With the refactoring of the view, print, update and report pages, the distinction between simple and advanced views was removed. This commit cleans up after the refactoring by removing the now useless user preferences that used to toggle simple/advanced modes. The database schema has been updated to drop the now unnessary columns related to simple/advanced view preferences. The event API has been updated to remove the "advanced" parameter where it once existed. Plugins will need to be modified after this commit to not use this parameter. Documentation has also been ammended to remove mention of simple/advanced views. diff --git a/account_prefs_update.php b/account_prefs_update.php index e816525..e77f0d0 100644 --- a/account_prefs_update.php +++ b/account_prefs_update.php @@ -60,9 +60,6 @@ $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 a15a732..b96021e 100644 --- a/admin/schema.php +++ b/admin/schema.php @@ -596,3 +596,6 @@ $upgrade[] = Array( 'AddColumnSQL', Array( db_get_table( 'mantis_project_file_ta $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 dc7e006..e1383ec 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_advanced_page.php' ); + print_header_redirect( 'login_select_proj_page.php?ref=bug_report_page.php' ); } if ( $f_master_bug_id > 0 ) { @@ -167,7 +167,7 @@ </td> </tr> <?php - event_signal( 'EVENT_REPORT_BUG_FORM_TOP', array( $t_project_id, true ) ); + event_signal( 'EVENT_REPORT_BUG_FORM_TOP', array( $t_project_id ) ); if ( $tpl_show_category ) { ?> @@ -395,7 +395,7 @@ </td> </tr> <?php } ?> -<?php event_signal( 'EVENT_REPORT_BUG_FORM', array( $t_project_id, true ) ); ?> +<?php event_signal( 'EVENT_REPORT_BUG_FORM', array( $t_project_id ) ) ?> <tr <?php echo helper_alternate_class() ?>> <td class="category"> <span class="required">*</span><?php print_documentation_link( 'summary' ) ?> diff --git a/bug_view_inc.php b/bug_view_inc.php index 4d6ac30..59cc693 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_advanced_page.php?bug_id='.$t_bugslist[$t_index-1], '<<' ); + print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index-1], '<<' ); } if ( isset( $t_bugslist[$t_index+1] ) ) { - print_bracket_link( 'bug_view_advanced_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' ); + print_bracket_link( 'bug_view_page.php?bug_id='.$t_bugslist[$t_index+1], '>>' ); } } echo '</span></td>'; @@ -577,7 +577,7 @@ # Bug Details Event Signal # - event_signal( 'EVENT_VIEW_BUG_DETAILS', array( $tpl_bug_id, true ) ); + event_signal( 'EVENT_VIEW_BUG_DETAILS', array( $tpl_bug_id ) ); # spacer echo '<tr class="spacer"><td colspan="6"></td></tr>'; diff --git a/config_defaults_inc.php b/config_defaults_inc.php index f45ee75..a0d276e 100644 --- a/config_defaults_inc.php +++ b/config_defaults_inc.php @@ -1220,24 +1220,6 @@ $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 a0bb366..149e466 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 and bug_view_advanced_page.php +# bug_view_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 5614502..987e076 100644 --- a/core/user_pref_api.php +++ b/core/user_pref_api.php @@ -31,9 +31,6 @@ 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; @@ -65,9 +62,6 @@ 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 982db52..09a35b2 100644 --- a/docbook/adminguide/en/configuration.sgml +++ b/docbook/adminguide/en/configuration.sgml @@ -1173,30 +1173,6 @@ </para> <variablelist> <varlistentry> - <term>$g_default_advanced_report</term> - <listitem> - <para>Default user preferences to use the advanced page for - reporting bugs. Default is OFF. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>$g_default_advanced_view</term> - <listitem> - <para>Default user preferences to use the advanced page for view - bugs. Default value is OFF. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>$g_default_advanced_update</term> - <listitem> - <para>Default user preferences to use the advanced page for - updating bugs. Default value is OFF. - </para> - </listitem> - </varlistentry> - <varlistentry> <term>$g_default_refresh_delay</term> <listitem> <para>Default page refresh delay (in minutes). This is for the bug diff --git a/docbook/adminguide/en/customizing_mantis.sgml b/docbook/adminguide/en/customizing_mantis.sgml index 2fe8d83..875a84f 100644 --- a/docbook/adminguide/en/customizing_mantis.sgml +++ b/docbook/adminguide/en/customizing_mantis.sgml @@ -124,11 +124,6 @@ </para> </listitem> <listitem> - <para>Display only on Advanced Page? - If set, then this - custom field will only show on the advanced pages. - </para> - </listitem> - <listitem> <para>Display when reporting issues? - If this custom field should be shown on the Report Issue page. </para> diff --git a/docbook/adminguide/en/page_descriptions.sgml b/docbook/adminguide/en/page_descriptions.sgml index 10a6714..8e8a9a8 100644 --- a/docbook/adminguide/en/page_descriptions.sgml +++ b/docbook/adminguide/en/page_descriptions.sgml @@ -71,17 +71,16 @@ 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. 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 + 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 <ulink url="manual.configuration.html">Configuration</ulink> .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 70e89d8..d56eef8 100644 --- a/docbook/developers/en/event-reference-bug.sgml +++ b/docbook/developers/en/event-reference-bug.sgml @@ -23,7 +23,6 @@ <itemizedlist> <title>Parameters</title> <listitem><para><Integer>: Bug ID</para></listitem> - <listitem><para><Boolean>: Advanced view (false for simple view)</para></listitem> </itemizedlist> </blockquote> </blockquote> @@ -46,7 +45,6 @@ <itemizedlist> <title>Parameters</title> <listitem><para><Integer>: Bug ID</para></listitem> - <listitem><para><Boolean>: Advanced view (false for simple view)</para></listitem> </itemizedlist> </blockquote> </blockquote> @@ -74,7 +72,6 @@ <itemizedlist> <title>Parameters</title> <listitem><para><Integer>: Project ID</para></listitem> - <listitem><para><Boolean>: Advanced view (false for simple view)</para></listitem> </itemizedlist> </blockquote> </blockquote> @@ -97,7 +94,6 @@ <itemizedlist> <title>Parameters</title> <listitem><para><Integer>: Project ID</para></listitem> - <listitem><para><Boolean>: Advanced view (false for simple view)</para></listitem> </itemizedlist> </blockquote> </blockquote> diff --git a/lang/strings_arabic.txt b/lang/strings_arabic.txt index 2d984db..e71ea4b 100644 --- a/lang/strings_arabic.txt +++ b/lang/strings_arabic.txt @@ -399,9 +399,6 @@ $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 = 'تØÙÙ٠اÙتأخÙر'; @@ -536,7 +533,6 @@ $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 = 'اÙ٠راجعة'; @@ -872,7 +868,6 @@ $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 = 'Ùجب أ٠تختار ٠شرÙعا صØÙØا'; @@ -976,8 +971,11 @@ $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 9981bef..679f106 100644 --- a/lang/strings_arabicegyptianspoken.txt +++ b/lang/strings_arabicegyptianspoken.txt @@ -397,9 +397,6 @@ $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 = 'تØÙÙ٠اÙتأخÙر'; @@ -534,7 +531,6 @@ $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 = 'اÙÙ ÙاØظة ت٠ت إضاÙتÙا...'; @@ -860,7 +856,6 @@ $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,8 +958,11 @@ $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 2191a39..860ec71 100644 --- a/lang/strings_bulgarian.txt +++ b/lang/strings_bulgarian.txt @@ -358,9 +358,6 @@ $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 = 'ÐвÑомаÑиÑно пÑенаÑоÑване'; @@ -491,7 +488,6 @@ $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 = 'Ðобавена е бележка...'; @@ -782,7 +778,6 @@ $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 = 'ÐзбеÑеÑе валиден пÑоекÑ'; @@ -877,8 +872,11 @@ $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 35613f2..a760857 100644 --- a/lang/strings_catalan.txt +++ b/lang/strings_catalan.txt @@ -399,9 +399,6 @@ $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ó'; @@ -537,7 +534,6 @@ $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ó'; @@ -873,7 +869,6 @@ $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'; @@ -977,8 +972,11 @@ $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 8f5f783..8cda996 100644 --- a/lang/strings_chinese_simplified.txt +++ b/lang/strings_chinese_simplified.txt @@ -360,9 +360,6 @@ $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 = 'éå®å延æ¶(ç§)'; @@ -497,7 +494,6 @@ $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 = '已添å é®é¢æ³¨é...'; @@ -785,7 +781,6 @@ $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 = 'å¿ é¡»éæ©ä¸ä¸ªææç项ç®'; @@ -881,8 +876,11 @@ $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 a4d3fab..496c22b 100644 --- a/lang/strings_chinese_traditional.txt +++ b/lang/strings_chinese_traditional.txt @@ -341,9 +341,6 @@ $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 = 'ç¶å´éæ§è¶ é'; @@ -471,7 +468,6 @@ $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 çè¨å·²æ°å¢...'; @@ -733,7 +729,6 @@ $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 = 'ä½ å¿ é é¸æä¸åæ£ç¢ºçå°æ¡'; @@ -825,8 +820,11 @@ $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 fd27bd2..763c397 100644 --- a/lang/strings_croatian.txt +++ b/lang/strings_croatian.txt @@ -98,9 +98,6 @@ $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'; @@ -182,7 +179,6 @@ $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...'; @@ -351,7 +347,6 @@ $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'; @@ -398,5 +393,8 @@ $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 8b4ad96..846ba47 100644 --- a/lang/strings_czech.txt +++ b/lang/strings_czech.txt @@ -405,9 +405,6 @@ $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Ã'; @@ -543,7 +540,6 @@ $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'; @@ -881,7 +877,6 @@ $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'; @@ -984,8 +979,11 @@ $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 0b1d862..a00e30e 100644 --- a/lang/strings_danish.txt +++ b/lang/strings_danish.txt @@ -327,9 +327,6 @@ $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'; @@ -438,7 +435,6 @@ $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...'; @@ -685,7 +681,6 @@ $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'; @@ -775,8 +770,11 @@ $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 ee27a13..4d9033a 100644 --- a/lang/strings_dutch.txt +++ b/lang/strings_dutch.txt @@ -406,9 +406,6 @@ $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'; @@ -546,7 +543,6 @@ $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'; @@ -887,7 +883,6 @@ $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'; @@ -991,8 +986,12 @@ $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 ae7081f..7aa19ac 100644 --- a/lang/strings_english.txt +++ b/lang/strings_english.txt @@ -449,9 +449,6 @@ $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'; @@ -653,7 +650,6 @@ $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* @@ -1147,7 +1143,6 @@ $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 @@ -1276,7 +1271,6 @@ $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 2d77da0..ba3cf22 100644 --- a/lang/strings_estonian.txt +++ b/lang/strings_estonian.txt @@ -342,9 +342,6 @@ $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'; @@ -473,7 +470,6 @@ $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...'; @@ -742,7 +738,6 @@ $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'; @@ -836,8 +831,11 @@ $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 2da7ce2..cf4f859 100644 --- a/lang/strings_finnish.txt +++ b/lang/strings_finnish.txt @@ -351,9 +351,6 @@ $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'; @@ -486,7 +483,6 @@ $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...'; @@ -769,7 +765,6 @@ $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'; @@ -866,8 +861,11 @@ $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 cf8b269..a93c9be 100644 --- a/lang/strings_french.txt +++ b/lang/strings_french.txt @@ -414,9 +414,6 @@ $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'; @@ -554,7 +551,6 @@ $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'; @@ -895,7 +891,6 @@ $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'; @@ -999,8 +994,12 @@ $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 54dacf0..6aa305a 100644 --- a/lang/strings_galician.txt +++ b/lang/strings_galician.txt @@ -400,9 +400,6 @@ $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'; @@ -540,7 +537,6 @@ $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'; @@ -880,7 +876,6 @@ $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.'; @@ -984,8 +979,12 @@ $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 f2e5cfe..36de213 100644 --- a/lang/strings_german.txt +++ b/lang/strings_german.txt @@ -415,9 +415,6 @@ $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'; @@ -555,7 +552,6 @@ $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'; @@ -896,7 +892,6 @@ $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'; @@ -999,8 +994,12 @@ $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 4d6a4b0..fa5a2d5 100644 --- a/lang/strings_german_eintrag.txt +++ b/lang/strings_german_eintrag.txt @@ -426,9 +426,6 @@ $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'; @@ -623,7 +620,6 @@ $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 @@ -1067,7 +1063,6 @@ $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 @@ -1194,7 +1189,6 @@ $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 e2b4fc0..492d271 100644 --- a/lang/strings_greek.txt +++ b/lang/strings_greek.txt @@ -181,9 +181,6 @@ $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 = 'Îε ÎλάÏιÏÏη ÎιαβάθμιÏη Ïε'; @@ -297,7 +294,6 @@ $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 = 'ΠΣημείÏÏη ÏÏοÏÏÎθηκε...'; @@ -536,7 +532,6 @@ $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 = 'Î ÏÎÏει να εÏιλÎξεÏε ιÏÏÏÎ¿Ï Ïα εÏαÏμογή'; @@ -625,8 +620,11 @@ $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 d41d84d..35b9e9f 100644 --- a/lang/strings_hebrew.txt +++ b/lang/strings_hebrew.txt @@ -401,9 +401,6 @@ $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 = '××× ×××¤× ××'; @@ -538,7 +535,6 @@ $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 = '××¢×¨× × ×ספ×'; @@ -865,7 +861,6 @@ $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 = '×××× ××××ר פר×××§× ×ª×§××.'; @@ -968,8 +963,11 @@ $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 20fea85..fdfea9d 100644 --- a/lang/strings_hungarian.txt +++ b/lang/strings_hungarian.txt @@ -369,9 +369,6 @@ $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:'; @@ -502,7 +499,6 @@ $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...'; @@ -780,7 +776,6 @@ $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'; @@ -879,8 +874,11 @@ $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_use... [truncated message content] |