From 981621614d60736e8f1ea3816f396988adfdac76 Mon Sep 17 00:00:00 2001 From: David Hicks Date: Wed, 23 Jun 2010 13:22:11 +1000 Subject: [PATCH] Fix #12085: Remove $g_allow_close_immediately This option is superseded by both $g_set_status_threshold and $g_allow_reporter_close and is therefore no longer necessary. --- bug_change_status_page.php | 23 -------------------- config_defaults_inc.php | 7 ------ core/obsolete.php | 1 + docbook/adminguide/en/configuration.sgml | 16 -------------- docbook/adminguide/en/page_descriptions.sgml | 5 ----- lang/strings_arabic.txt | 1 - lang/strings_arabicegyptianspoken.txt | 1 - lang/strings_breton.txt | 1 - lang/strings_bulgarian.txt | 1 - lang/strings_catalan.txt | 1 - lang/strings_chinese_simplified.txt | 1 - lang/strings_chinese_traditional.txt | 1 - lang/strings_czech.txt | 1 - lang/strings_danish.txt | 1 - lang/strings_dutch.txt | 1 - lang/strings_english.txt | 1 - lang/strings_estonian.txt | 1 - lang/strings_finnish.txt | 1 - lang/strings_french.txt | 1 - lang/strings_galician.txt | 1 - lang/strings_german.txt | 1 - lang/strings_greek.txt | 1 - lang/strings_hebrew.txt | 1 - lang/strings_hungarian.txt | 1 - lang/strings_icelandic.txt | 1 - lang/strings_italian.txt | 1 - lang/strings_japanese.txt | 1 - lang/strings_korean.txt | 1 - lang/strings_macedonian.txt | 1 - lang/strings_norwegian_bokmal.txt | 1 - lang/strings_occitan.txt | 1 - lang/strings_polish.txt | 1 - lang/strings_portuguese_brazil.txt | 1 - lang/strings_romanian.txt | 1 - lang/strings_russian.txt | 1 - lang/strings_slovak.txt | 1 - lang/strings_spanish.txt | 1 - lang/strings_swedish.txt | 1 - lang/strings_swissgerman.txt | 1 - lang/strings_tagalog.txt | 1 - lang/strings_urdu.txt | 1 - manage_config_work_threshold_page.php | 1 - manage_config_work_threshold_set.php | 1 - 43 files changed, 1 insertion(+), 89 deletions(-) diff --git a/bug_change_status_page.php b/bug_change_status_page.php index b2a6bebfe3..d3c85e528b 100644 --- a/bug_change_status_page.php +++ b/bug_change_status_page.php @@ -314,29 +314,6 @@ - - - -> - - - - - - - - - - -\n", config_get( 'bug_reopen_resolution' ) ); - } -?> - > diff --git a/config_defaults_inc.php b/config_defaults_inc.php index 6921d89cea..fd146acfe2 100644 --- a/config_defaults_inc.php +++ b/config_defaults_inc.php @@ -2646,13 +2646,6 @@ */ $g_limit_reporters = OFF; -/** - * close immediately - * Allow developers and above to close bugs immediately when resolving bugs - * @global int $g_allow_close_immediately - */ -$g_allow_close_immediately = OFF; - /** * reporter can close. Allow reporters to close the bugs they reported, after * they are marked resolved. diff --git a/core/obsolete.php b/core/obsolete.php index 5b8fe5ff9e..d9db5c15c6 100644 --- a/core/obsolete.php +++ b/core/obsolete.php @@ -150,3 +150,4 @@ config_obsolete( 'source_control_set_resolution_to' ); config_obsolete( 'source_control_regexp' ); config_obsolete( 'source_control_fixed_regexp' ); +config_obsolete( 'allow_close_immediately' ); diff --git a/docbook/adminguide/en/configuration.sgml b/docbook/adminguide/en/configuration.sgml index f25d323da9..ec8d13fa12 100644 --- a/docbook/adminguide/en/configuration.sgml +++ b/docbook/adminguide/en/configuration.sgml @@ -2014,14 +2014,6 @@ - - $g_allow_close_immediately - - If set, bugs are allowed to be resolved and closed in one - action. The default is OFF. - - - $g_allow_reporter_close @@ -2182,14 +2174,6 @@ Allow reporters to close the bugs they reported. - - $g_allow_close_immediately - - Allow developers and above to close bugs immediately when - resolving bugs. - - - $g_allow_bug_delete_access_level diff --git a/docbook/adminguide/en/page_descriptions.sgml b/docbook/adminguide/en/page_descriptions.sgml index 571fdef868..bee09bed28 100644 --- a/docbook/adminguide/en/page_descriptions.sgml +++ b/docbook/adminguide/en/page_descriptions.sgml @@ -659,11 +659,6 @@ $g_update_bug_threshold threshold to update an issue - - Allow Issue to be closed on Resolve - $g_allow_close_immediately - allow close immediately on resolve - Allow Reporter to close an issue $g_allow_reporter_close diff --git a/lang/strings_arabic.txt b/lang/strings_arabic.txt index b8105b078c..421df2e285 100644 --- a/lang/strings_arabic.txt +++ b/lang/strings_arabic.txt @@ -666,7 +666,6 @@ $s_desc_bug_resolved_status_threshold = 'الحالة حيث يتم اعتبار $s_desc_bug_closed_status_threshold = 'الحالة حيث قضية ما تعتبر مغلقة'; $s_default_not_in_flow = 'الحالة الافتراضية ل%1$s لم يتم اختيارها في الحالات القادمة ل%2$s. سيتم تجاهلها.'; $s_assign_issue = 'إيكال قضية'; -$s_allow_close_immediate = 'يسمح للقضايا بأن يتم إغلاقها عند الحل'; $s_allow_reporter_close = 'يسمح للمبلغ بإغلاق القضية'; $s_allow_reporter_reopen = 'يسمح للمبلغ بإعادة فتح القضية'; $s_set_status_assigned = 'ضبط الحالة عند تكليف المعالج'; diff --git a/lang/strings_arabicegyptianspoken.txt b/lang/strings_arabicegyptianspoken.txt index 33d8ab5498..32c3d83c30 100644 --- a/lang/strings_arabicegyptianspoken.txt +++ b/lang/strings_arabicegyptianspoken.txt @@ -666,7 +666,6 @@ $s_desc_bug_resolved_status_threshold = 'الحاله حيث يتم اعتبار $s_desc_bug_closed_status_threshold = 'الحاله حيث قضيه ما تعتبر مغلقة'; $s_default_not_in_flow = 'الحاله الافتراضيه ل%1$s لم يتم اختيارها فى الحالات القادمه ل%2$s. سيتم تجاهلها.'; $s_assign_issue = 'إيكال قضية'; -$s_allow_close_immediate = 'يسمح للقضايا بأن يتم إغلاقها عند الحل'; $s_allow_reporter_close = 'يسمح للمبلغ بإغلاق القضية'; $s_allow_reporter_reopen = 'يسمح للمبلغ بإعاده فتح القضية'; $s_set_status_assigned = 'ضبط الحاله عند تكليف المعالج'; diff --git a/lang/strings_breton.txt b/lang/strings_breton.txt index 6ea8827f4e..aa1d2c71c1 100644 --- a/lang/strings_breton.txt +++ b/lang/strings_breton.txt @@ -676,7 +676,6 @@ $s_workflow_change_access_label = 'Piv a c\'hall cheñch hent al labour :'; $s_access_change_access_label = 'Piv a c\'hall cheñch al liveoù moned :'; $s_default_not_in_flow = 'Statud dre ziouer %1$s n\'eo ket diuzet er statudoù da zont evit %2$s. Dianavezet e vo.'; $s_assign_issue = 'Deverkañ un draen'; -$s_allow_close_immediate = 'Lezel an draen da vezañ serret pa vez diskoulmet'; $s_allow_reporter_close = 'Aotren an titourer da serriñ an draen'; $s_allow_reporter_reopen = 'Aotren an titourer da addigeriñ an draen'; $s_set_status_assigned = 'Cheñch ar statud pa vez deverket'; diff --git a/lang/strings_bulgarian.txt b/lang/strings_bulgarian.txt index 53ac2a463b..a2ce2854b9 100644 --- a/lang/strings_bulgarian.txt +++ b/lang/strings_bulgarian.txt @@ -581,7 +581,6 @@ $s_desc_bug_reopen_status = 'Статус, назначаван на отвор $s_desc_bug_resolved_status_threshold = 'Статус, при който проблема се счита за решен'; $s_default_not_in_flow = 'Първоначално-зададеният статус на %1$s не е избиран в следващите статуси на %2$s. Ще бъде игнориран.'; $s_assign_issue = 'Назначаване на проблем'; -$s_allow_close_immediate = 'Разрешение проблемът да бъде приключен при статус Решен'; $s_allow_reporter_close = 'Разрешение за приключване на проблема'; $s_allow_reporter_reopen = 'Разрешение за повторно отваряне на проблема'; $s_set_status_assigned = 'Статус на назначаване на служителя, избран за закриване на проблема'; diff --git a/lang/strings_catalan.txt b/lang/strings_catalan.txt index 2c950f7e4d..a8b215b9f3 100644 --- a/lang/strings_catalan.txt +++ b/lang/strings_catalan.txt @@ -678,7 +678,6 @@ $s_workflow_change_access_label = 'Qui pot canviar els fluxes de treball:'; $s_access_change_access_label = 'Qui pot canviar els nivells d\'accés:'; $s_default_not_in_flow = 'L\'estat per defecte %1$s no està seleccionat en els següents estats per %2$s. Serà ignorat'; $s_assign_issue = 'Assigna una incidència'; -$s_allow_close_immediate = 'Permetre que una incidència sigui tancada al resoldre\'s'; $s_allow_reporter_close = 'Permetre al Informador tancar la incidència'; $s_allow_reporter_reopen = 'Permetre al Informador reobrir una incidència'; $s_set_status_assigned = 'Definir l\'Estat al realitzar l\'assignació'; diff --git a/lang/strings_chinese_simplified.txt b/lang/strings_chinese_simplified.txt index 5e4d6b2581..9588cf9dd8 100644 --- a/lang/strings_chinese_simplified.txt +++ b/lang/strings_chinese_simplified.txt @@ -569,7 +569,6 @@ $s_desc_bug_reopen_status = '重新打开的问题的状态'; $s_desc_bug_resolved_status_threshold = '被设置为已解决的问题的状态'; $s_default_not_in_flow = '%1$s 的默认状态没有被选定为 %2$s 的下一个状态，它将被忽略'; $s_assign_issue = '分派问题'; -$s_allow_close_immediate = '允许关闭解决状态问题'; $s_allow_reporter_close = '允许报告人关闭问题'; $s_allow_reporter_reopen = '允许报告人重新打开问题'; $s_set_status_assigned = '管理人分配时设置的状态'; diff --git a/lang/strings_chinese_traditional.txt b/lang/strings_chinese_traditional.txt index a9009325c7..77908f5084 100644 --- a/lang/strings_chinese_traditional.txt +++ b/lang/strings_chinese_traditional.txt @@ -565,7 +565,6 @@ $s_desc_bug_reopen_status = '狀態已被重設為未結案的問題'; $s_desc_bug_resolved_status_threshold = '狀態已被設為已解決問題'; $s_default_not_in_flow = '%1$s 的預設狀態沒被選擇 %2$s 的下個狀態. 這個會被忽略的'; $s_assign_issue = '分派問題'; -$s_allow_close_immediate = '允許問題在解決後就結案'; $s_allow_reporter_close = '允許回報人能結案'; $s_allow_reporter_reopen = '允許回報人能重設未結案'; $s_set_status_assigned = '設定處理者分派的狀態'; diff --git a/lang/strings_czech.txt b/lang/strings_czech.txt index ec39f150a2..33f480819d 100644 --- a/lang/strings_czech.txt +++ b/lang/strings_czech.txt @@ -650,7 +650,6 @@ $s_desc_bug_resolved_status_threshold = 'Stav ve kterém je problém považovan $s_desc_bug_closed_status_threshold = 'Stav ve kterém je problém považovaný za uzavřený'; $s_default_not_in_flow = 'Výchozí stav %1$s není přítomen v dalších stavech pro %2$s a bude ignorován.'; $s_assign_issue = 'Přiřadit problém'; -$s_allow_close_immediate = 'Povol uzavření problému při jeho vyřešení'; $s_allow_reporter_close = 'Dovol reportérovi uzavřít problém.'; $s_allow_reporter_reopen = 'Dovol reportérovi znovuotevřít problém.'; $s_set_status_assigned = 'Nastav stav při přiřazení operátorovi.'; diff --git a/lang/strings_danish.txt b/lang/strings_danish.txt index 681b7571d4..7d4ee65d5a 100644 --- a/lang/strings_danish.txt +++ b/lang/strings_danish.txt @@ -496,7 +496,6 @@ $s_desc_bug_submit_status = 'Status som tildeles en ny fejl'; $s_desc_bug_reopen_status = 'Status som genåbnede fejl får'; $s_desc_bug_resolved_status_threshold = 'Status hvor en fejl betragtes som løse'; $s_assign_issue = 'Tildel en fejl'; -$s_allow_close_immediate = 'Tillad at fejlen markeres som lukket eller løst'; $s_allow_reporter_close = 'Tillad at raportøren lukker fejlen'; $s_allow_reporter_reopen = 'Tillad at raportøren genåbner fejlen'; $s_set_status_assigned = 'Sæt status på tildeling af behandler'; diff --git a/lang/strings_dutch.txt b/lang/strings_dutch.txt index 4688ca539e..71c7140836 100644 --- a/lang/strings_dutch.txt +++ b/lang/strings_dutch.txt @@ -687,7 +687,6 @@ $s_workflow_change_access_label = 'Wie kan de workflow wijzigen:'; $s_access_change_access_label = 'Wie kan de toegangsniveaus wijzigen:'; $s_default_not_in_flow = 'De standaardstatus %1$s is niet geselecteerd in de volgende statussen voor %2$s. Die wordt genegeerd.'; $s_assign_issue = 'Melding toewijzen'; -$s_allow_close_immediate = 'Afsluiten van een melding bij afgehandeld toestaan'; $s_allow_reporter_close = 'Aanmelder toestaan een melding te sluiten'; $s_allow_reporter_reopen = 'Aanmelder toestaan een melding te heropenen'; $s_set_status_assigned = 'Status wijzigen bij toewijzen van behandelaar'; diff --git a/lang/strings_english.txt b/lang/strings_english.txt index bc5d862172..038c1787d9 100644 --- a/lang/strings_english.txt +++ b/lang/strings_english.txt @@ -852,7 +852,6 @@ $s_default_not_in_flow = 'The default status of %1$s is not selected in the next # manage_config_work_threshold_page $s_assign_issue = 'Assign an issue'; -$s_allow_close_immediate = 'Allow issue to be closed on Resolve'; $s_allow_reporter_close = 'Allow Reporter to close Issue'; $s_allow_reporter_reopen = 'Allow Reporter to re-open Issue'; $s_set_status_assigned = 'Set status on assignment of Handler'; diff --git a/lang/strings_estonian.txt b/lang/strings_estonian.txt index 9c2c0fbdb1..9b7cba23e4 100644 --- a/lang/strings_estonian.txt +++ b/lang/strings_estonian.txt @@ -678,7 +678,6 @@ $s_workflow_change_access_label = 'Kes saab muuta töövoogu:'; $s_access_change_access_label = 'Kes saab muuta pöördumistasemeid:'; $s_default_not_in_flow = 'Vaikimisi olek %1$s pole valitud järgmises olekus kandele %2$s. Seda ignoreeritakse'; $s_assign_issue = 'Määra kanne'; -$s_allow_close_immediate = 'Luba kanne sulgeda või lahendada'; $s_allow_reporter_close = 'Luba teavitajal sulgeda kanne'; $s_allow_reporter_reopen = 'Luba teavitajal taasavada kanne'; $s_set_status_assigned = 'Olek, mis käsitleja määramisel antakse'; diff --git a/lang/strings_finnish.txt b/lang/strings_finnish.txt index 0b6406d2cb..5343f37cb0 100644 --- a/lang/strings_finnish.txt +++ b/lang/strings_finnish.txt @@ -667,7 +667,6 @@ $s_desc_bug_resolved_status_threshold = 'Tapahtuman tila, jolla tapahtumaa pidet $s_desc_bug_closed_status_threshold = 'Tila, joka kertoo tapahtuman olevan suljettu'; $s_default_not_in_flow = '%1$s:n oletustilaa ei ole valittu %2$s:n seuraavissa tiloissa ja se ohitetaan.'; $s_assign_issue = 'Osoita tapahtuma'; -$s_allow_close_immediate = 'Salli tapahtuman sulkeminen ratkaisun jälkeen'; $s_allow_reporter_close = 'Salli raportoijien sulkea tapahtuma'; $s_allow_reporter_reopen = 'Salli raportoijien uudelleenavata tapahtuma'; $s_set_status_assigned = 'Salli tapahtuman tilan muokkaus, kun tapahtuma osoitetaan'; diff --git a/lang/strings_french.txt b/lang/strings_french.txt index a69e465fb4..fcf76732c6 100644 --- a/lang/strings_french.txt +++ b/lang/strings_french.txt @@ -698,7 +698,6 @@ $s_workflow_change_access_label = 'Utilisateurs habilités à modifier le flux d $s_access_change_access_label = 'Utilisateurs habilités à changer les niveaux d\'accès :'; $s_default_not_in_flow = 'La phase par défaut de %1$s n\'est pas définie pour %2$s dans les phases suivantes. Elle sera ignorée.'; $s_assign_issue = 'Assigner un bogue'; -$s_allow_close_immediate = 'Permettre la fermeture d\'un bogue à sa résolution'; $s_allow_reporter_close = 'Permettre aux demandeurs de fermer un bogue'; $s_allow_reporter_reopen = 'Permettre aux demandeurs de rouvrir un bogue'; $s_set_status_assigned = 'Changer l\'état à l\'assignement'; diff --git a/lang/strings_galician.txt b/lang/strings_galician.txt index b71c3b0172..ebc7992ea4 100644 --- a/lang/strings_galician.txt +++ b/lang/strings_galician.txt @@ -680,7 +680,6 @@ $s_workflow_change_access_label = 'Quen pode cambiar o fluxo de traballo:'; $s_access_change_access_label = 'Quen pode cambiar os niveis de acceso:'; $s_default_not_in_flow = 'O estado por defecto de %1$s non está seleccionado nos próximos estados de %2$s. Este será ignorado.'; $s_assign_issue = 'Asignar un problema'; -$s_allow_close_immediate = 'Permitir o peche dun problema ao ser resolto'; $s_allow_reporter_close = 'Permitir ao informador pechar o problema'; $s_allow_reporter_reopen = 'Permitir ao informador reabrir o problema'; $s_set_status_assigned = 'Establecer o estado na asignación do manipulador'; diff --git a/lang/strings_german.txt b/lang/strings_german.txt index 69bc624c8c..15c739e99a 100644 --- a/lang/strings_german.txt +++ b/lang/strings_german.txt @@ -698,7 +698,6 @@ $s_workflow_change_access_label = 'Wer darf den Arbeitsablauf ändern:'; $s_access_change_access_label = 'Wer darf Zugriffsberechtigungen ändern:'; $s_default_not_in_flow = 'Der Vorgabestatus von %1$s ist nicht in den nächsten zulässigen Statuswerten von %2$s enthalten. Er wird ignoriert.'; $s_assign_issue = 'Einen Eintrag zuweisen'; -$s_allow_close_immediate = 'Erlaubt erledigte Einträge zu schließen'; $s_allow_reporter_close = 'Erlaubt Reportern Einträge zu schließen'; $s_allow_reporter_reopen = 'Erlaubt Reportern Einträge wiederzueröffnen'; $s_set_status_assigned = 'Setze Status bei Zuweisung eines Bearbeiters'; diff --git a/lang/strings_greek.txt b/lang/strings_greek.txt index 81617983ab..ca851e2139 100644 --- a/lang/strings_greek.txt +++ b/lang/strings_greek.txt @@ -401,7 +401,6 @@ $s_desc_bug_submit_status = 'Κατάσταση στην οποία ένα νέ $s_desc_bug_reopen_status = 'Κατάσταση στην οποία επανεξεταζόμενα θέματα ορίζονται'; $s_desc_bug_resolved_status_threshold = 'Κατάσταση στην οποία ένα θέμα θεωρείται επιλυμένο'; $s_assign_issue = 'Ορίσμος θέματος'; -$s_allow_close_immediate = 'Επιτρέπεται το θέμα να κλείνει στην Επίλυση'; $s_allow_reporter_close = 'Επιτρέπεται ο Reporter να κλείνει το Θέμα'; $s_allow_reporter_reopen = 'Επιτρέπεται ο Reporter να επανεξετάζει το Θέμα'; $s_set_status_assigned = 'Όρισε κατάσταση στον καθορισμό Υπευθύνου'; diff --git a/lang/strings_hebrew.txt b/lang/strings_hebrew.txt index 5bc5a0e7da..d12b62eb21 100644 --- a/lang/strings_hebrew.txt +++ b/lang/strings_hebrew.txt @@ -628,7 +628,6 @@ $s_desc_bug_resolved_status_threshold = 'הסטטוס שבו הבאג נחשב $s_desc_bug_closed_status_threshold = 'הסטטוס שבו הבאג נחשב סגור'; $s_default_not_in_flow = 'הסטטוס ברירת המחדל עבור %1$s לא נבחר בסטטוסים הבאים עבור %2$s. המערכת תתעלם ממנו.'; $s_assign_issue = 'לשייך באג'; -$s_allow_close_immediate = 'לאפשר לבאג להיות סגור כאשר הוא מסומן כפתור'; $s_allow_reporter_close = 'לאפשר למדווח לסגור את הבאג'; $s_allow_reporter_reopen = 'לאפשר למדווח לפתוח מחדש את הבאג'; $s_set_status_assigned = 'הגדר סטטוס לשיוך מטפל'; diff --git a/lang/strings_hungarian.txt b/lang/strings_hungarian.txt index 7178e630ff..57a6104bae 100644 --- a/lang/strings_hungarian.txt +++ b/lang/strings_hungarian.txt @@ -654,7 +654,6 @@ $s_desc_bug_resolved_status_threshold = 'A megoldottnak tekinthető ügy státus $s_desc_bug_closed_status_threshold = 'Állapot, ahol egy ügy lezártnak tekinthető'; $s_default_not_in_flow = 'A(z) %1$s alapértelmezett státusza nem lett kiválasztva a(z) %2$s utáni státuszok közül; figyelmen kívül hagyjuk'; $s_assign_issue = 'Egy ügy hozzárendelése'; -$s_allow_close_immediate = 'Ügy lezárásának engedélyezése annak megoldásakor'; $s_allow_reporter_close = 'A bejelentő lezárhatja-e az ügyet'; $s_allow_reporter_reopen = 'A bejelentő újranyithatja-e az ügyet'; $s_set_status_assigned = 'A kezelő hozzárendelésekor beállítandó státusz'; diff --git a/lang/strings_icelandic.txt b/lang/strings_icelandic.txt index 244c7fde5c..dc8fb7ffc5 100644 --- a/lang/strings_icelandic.txt +++ b/lang/strings_icelandic.txt @@ -513,7 +513,6 @@ $s_desc_bug_reopen_status = 'Staða sem enduropnaðar beiðnir fá'; $s_desc_bug_resolved_status_threshold = 'Staða þar sem beiðnin er álitin leyst'; $s_default_not_in_flow = 'Sjálfgefin staða %1$s er ekki valinn fyrir næstu stöðu %2$s. Því verður hafnað'; $s_assign_issue = 'Úthluta verkbeiðni'; -$s_allow_close_immediate = 'Heimila að Leystri beiðni sé lokað'; $s_allow_reporter_close = 'Heimila tilkynnanda að loka beiðni'; $s_allow_reporter_reopen = 'Heimila tilkynnanda að opna aftur beiðni'; $s_set_status_assigned = 'Setja úthlutunarstöðu á höndlara atriðis'; diff --git a/lang/strings_italian.txt b/lang/strings_italian.txt index 422df08a88..183087b61c 100644 --- a/lang/strings_italian.txt +++ b/lang/strings_italian.txt @@ -605,7 +605,6 @@ $s_desc_bug_reopen_status = 'Stato assegnato ad anomalia riaperta'; $s_desc_bug_resolved_status_threshold = 'Stato in cui una anomalia si considera risolta'; $s_default_not_in_flow = 'Lo stato di default di %1$s non è previsto nello stato seguente ad %2$s. Sarà ignorato.'; $s_assign_issue = 'Assegna anomalia'; -$s_allow_close_immediate = 'Permette ad una anomalia di essere chiusa non appena risolta'; $s_allow_reporter_close = 'Permette all\'utente che ha segnalato anomalia di chiuderla'; $s_allow_reporter_reopen = 'Permette all\'utente che ha segnalato anomalia di riaprirla'; $s_set_status_assigned = 'Stato assegnato quando anomalia viene assegnata'; diff --git a/lang/strings_japanese.txt b/lang/strings_japanese.txt index 70a7dcbf4e..14f55762d2 100644 --- a/lang/strings_japanese.txt +++ b/lang/strings_japanese.txt @@ -683,7 +683,6 @@ $s_workflow_change_access_label = 'ワークフローの変更が可能な利用 $s_access_change_access_label = 'アクセスレベルの変更が可能な利用者:'; $s_default_not_in_flow = '%1$s のデフォルトステータスは、%2$s の次のステータスでは選択されていませんので、無視します。'; $s_assign_issue = 'チケットの割当て'; -$s_allow_close_immediate = '解決済時に完了への変更を許可する'; $s_allow_reporter_close = '報告者に完了への変更を許可する'; $s_allow_reporter_reopen = '報告者に差し戻しを許可する'; $s_set_status_assigned = '担当者割り当て時にステータスを設定する'; diff --git a/lang/strings_korean.txt b/lang/strings_korean.txt index bdb2fd66b1..9235a323c8 100644 --- a/lang/strings_korean.txt +++ b/lang/strings_korean.txt @@ -514,7 +514,6 @@ $s_desc_bug_submit_status = '새로운 이슈가 설정되어 있는 상태'; $s_desc_bug_reopen_status = '재오픈된 이슈가 설정되어 있는 상태'; $s_desc_bug_resolved_status_threshold = '이슈가 해결된 것으로 간주되는 상태'; $s_assign_issue = '이슈 할당'; -$s_allow_close_immediate = '[해결]상태의 이슈를 [폐쇄]할 수 있도록 합'; $s_allow_reporter_close = '[보고자]에게 이슈를 [폐쇄]할 수 있도록 함'; $s_allow_reporter_reopen = '[보고자]에게 이슈를 [재오픈]할 수 있도록 함'; $s_set_status_assigned = '핸들러 할당에 대한 상태를 설정 함'; diff --git a/lang/strings_macedonian.txt b/lang/strings_macedonian.txt index 16d524ae83..fe6ffc7ff1 100644 --- a/lang/strings_macedonian.txt +++ b/lang/strings_macedonian.txt @@ -680,7 +680,6 @@ $s_workflow_change_access_label = 'Кој може да го менува раб $s_access_change_access_label = 'Кој може да ги менува нивоата на пристап:'; $s_default_not_in_flow = 'Матичниот статус на %1$s не е избран во следните статуси на %2$s. Затоа ќе биде занемарен.'; $s_assign_issue = 'Додели проблем'; -$s_allow_close_immediate = 'Дозволи затворање на проблемот при добивање на статус Решен'; $s_allow_reporter_close = 'Дозволи пријавувачот да може да го затвора проблемот'; $s_allow_reporter_reopen = 'Дозволи пријавувачот да може повторно да го отвора проблемот'; $s_set_status_assigned = 'Постави го статусот при доделувањето на проблем на одговорно лице'; diff --git a/lang/strings_norwegian_bokmal.txt b/lang/strings_norwegian_bokmal.txt index 9d4a91cf18..dd8f6ef797 100644 --- a/lang/strings_norwegian_bokmal.txt +++ b/lang/strings_norwegian_bokmal.txt @@ -686,7 +686,6 @@ $s_workflow_change_access_label = 'Som kan endre arbeidsflyt:'; $s_access_change_access_label = 'Som kan endre tilgangsnivå:'; $s_default_not_in_flow = 'Standardstatus til %1$s er ikke valgt i de neste statusene for %2$s. Status vil bli ignorert'; $s_assign_issue = 'Delegere en sak'; -$s_allow_close_immediate = 'Tillate å lukke en sak ved \'Løse sak\''; $s_allow_reporter_close = 'Tillate rapporter å lukke sak'; $s_allow_reporter_reopen = 'Tillate rapportør å gjenåpne sak'; $s_set_status_assigned = 'Sette status ved tildeling av behandler'; diff --git a/lang/strings_occitan.txt b/lang/strings_occitan.txt index 592bf0ffd0..26ee1a92ee 100644 --- a/lang/strings_occitan.txt +++ b/lang/strings_occitan.txt @@ -645,7 +645,6 @@ $s_desc_bug_resolved_status_threshold = 'Fasa a laquina un bòg es considerat co $s_desc_bug_closed_status_threshold = 'Estatuts pels quals un bòg es considerat coma tampat'; $s_default_not_in_flow = 'La fasa per defaut de %1$s es pas definida per %2$s dins las fasas seguentas. Serà ignorada.'; $s_assign_issue = 'Assignar un bòg'; -$s_allow_close_immediate = 'Permetre la tampadura d\'un bòg a sa resolucion'; $s_allow_reporter_close = 'Permetre als demandaires de tampar un bòg'; $s_allow_reporter_reopen = 'Permetre als demandaires de tornar dobrir un bòg'; $s_set_status_assigned = 'Cambiar l\'estat de l\'assignament'; diff --git a/lang/strings_polish.txt b/lang/strings_polish.txt index dfcaee45a8..710ac5a870 100644 --- a/lang/strings_polish.txt +++ b/lang/strings_polish.txt @@ -651,7 +651,6 @@ $s_desc_bug_resolved_status_threshold = 'Status który oznacza, że zgłoszenie $s_desc_bug_closed_status_threshold = 'Status gdy problem jest uznawany za zamknięty'; $s_default_not_in_flow = 'Domyślna wartość „%1$s” nie została wybrana wśród następnych statusów dla „%2$s”. To ustawienie zostanie zignorowanie.'; $s_assign_issue = 'Przypisz zgłoszenie'; -$s_allow_close_immediate = 'Zezwól na zamknięcie zgłoszenia przy rozwiązywaniu'; $s_allow_reporter_close = 'Zezwól zgłaszającemu na zamknięcie zgłoszenia'; $s_allow_reporter_reopen = 'Zezwól zgłaszającemu na ponowne otwarcie zgłoszenia'; $s_set_status_assigned = 'Ustaw status przy przypisaniu obsługującego zgłoszenie'; diff --git a/lang/strings_portuguese_brazil.txt b/lang/strings_portuguese_brazil.txt index 8d6e0f76a1..3a0bd6ea46 100644 --- a/lang/strings_portuguese_brazil.txt +++ b/lang/strings_portuguese_brazil.txt @@ -682,7 +682,6 @@ $s_workflow_change_access_label = 'Quem pode alterar o fluxo de trabalho:'; $s_access_change_access_label = 'Quem pode alterar os níveis de acesso:'; $s_default_not_in_flow = 'O status padrão de %1$s não está selecionado nos próximos status de %2$s. Este será ignorado'; $s_assign_issue = 'Atribuir um caso'; -$s_allow_close_immediate = 'Permitir que o caso seja fechado ao ser Resolvido'; $s_allow_reporter_close = 'Permitir ao relator fechar o caso'; $s_allow_reporter_reopen = 'Permitir ao relator reabrir o caso'; $s_set_status_assigned = 'Ajustar status na atribuição'; diff --git a/lang/strings_romanian.txt b/lang/strings_romanian.txt index cf09a79437..317d1a65da 100644 --- a/lang/strings_romanian.txt +++ b/lang/strings_romanian.txt @@ -568,7 +568,6 @@ $s_desc_bug_reopen_status = 'Starea atribuită unei probleme redeschise'; $s_desc_bug_resolved_status_threshold = 'Starea în care o problemă este considerată rezolvată'; $s_default_not_in_flow = 'Starea implicită a %1$s nu este selectată în următoarele stări pentru %2$s. Va fi ignorată.'; $s_assign_issue = 'Atribuie o problemă'; -$s_allow_close_immediate = 'Permite închiderea problemei odată cu rezolvarea'; $s_allow_reporter_close = 'Permite raportorului să închidă problema'; $s_allow_reporter_reopen = 'Permite raportorului să redeschidă problema'; $s_set_status_assigned = 'Modifică starea când se procesează o atribuire'; diff --git a/lang/strings_russian.txt b/lang/strings_russian.txt index 39050becc1..cc461e602c 100644 --- a/lang/strings_russian.txt +++ b/lang/strings_russian.txt @@ -691,7 +691,6 @@ $s_workflow_change_access_label = 'Пользователи, имеющие во $s_access_change_access_label = 'Пользователи, имеющие возможность изменять уровни доступа:'; $s_default_not_in_flow = 'Состояние по умолчанию для %1$s не указано среди последующих состояний %2$s. Оно будет игнорироваться.'; $s_assign_issue = 'Назначить инцидент'; -$s_allow_close_immediate = 'Разрешить закрытие инцидента при отработке'; $s_allow_reporter_close = 'Разрешить инициатору закрывать инцидент'; $s_allow_reporter_reopen = 'Разрешить инициатору повторно открывать инцидент'; $s_set_status_assigned = 'Устанавливать состояние при назначении ответственного'; diff --git a/lang/strings_slovak.txt b/lang/strings_slovak.txt index c2807f057d..7296d28d8b 100644 --- a/lang/strings_slovak.txt +++ b/lang/strings_slovak.txt @@ -642,7 +642,6 @@ $s_desc_bug_resolved_status_threshold = 'Stav v ktorom je problém považovaný $s_desc_bug_closed_status_threshold = 'Stav pri ktorom je problém považovaný za uzavretý'; $s_default_not_in_flow = 'Predvolený stav %1$s nie je prítomný v ďalších stavoch pre %2$s a bude ignorovaný.'; $s_assign_issue = 'Priradiť nejaký problém'; -$s_allow_close_immediate = 'Povoľ uzavretie problému pri jeho Vyriešení'; $s_allow_reporter_close = 'Dovoľ Reportérovi uzavrieť Problém'; $s_allow_reporter_reopen = 'Dovoľ Reportérovi znovuotvoriť Problém'; $s_set_status_assigned = 'Nastav stav pri priradení Operátorovi'; diff --git a/lang/strings_spanish.txt b/lang/strings_spanish.txt index 2b478560de..ebb7ba4016 100644 --- a/lang/strings_spanish.txt +++ b/lang/strings_spanish.txt @@ -686,7 +686,6 @@ $s_workflow_change_access_label = 'Quién puede cambiar el flujo de trabajo:'; $s_access_change_access_label = 'Quién puede cambiar niveles de acceso:'; $s_default_not_in_flow = 'El Estado por defecto de %1$s no está seleccionado en los siguientes Estados para %2$s. Será ignorado'; $s_assign_issue = 'Asignar una Incidencia'; -$s_allow_close_immediate = 'Permitir que la incidencia sea cerrada al resolverla'; $s_allow_reporter_close = 'Permitir al Informador Cerrar la Incidencia'; $s_allow_reporter_reopen = 'Permitir al Informador Reabrir la Incidencia'; $s_set_status_assigned = 'Definir Estado al realizar la asignación'; diff --git a/lang/strings_swedish.txt b/lang/strings_swedish.txt index c47c2a941a..e4a61507ba 100644 --- a/lang/strings_swedish.txt +++ b/lang/strings_swedish.txt @@ -641,7 +641,6 @@ $s_desc_bug_resolved_status_threshold = 'Status när ett ärende betraktas som l $s_desc_bug_closed_status_threshold = 'Status när ett ärende ska anses stängt'; $s_default_not_in_flow = 'Angivet förval för status för %1$s är inte valt bland nästkommande statusvärden för %2$s. Det kommer att ignoreras'; $s_assign_issue = 'Tilldela ett ärende'; -$s_allow_close_immediate = 'Tillåt ärendet att stängas när det löses'; $s_allow_reporter_close = 'Tillåt rapporterare att stänga ärendet'; $s_allow_reporter_reopen = 'Tillåt rapporterare att återöppna ärendet'; $s_set_status_assigned = 'Sätt status vid tilldelning'; diff --git a/lang/strings_swissgerman.txt b/lang/strings_swissgerman.txt index fe327cc8a3..4509ab923f 100644 --- a/lang/strings_swissgerman.txt +++ b/lang/strings_swissgerman.txt @@ -680,7 +680,6 @@ $s_workflow_change_access_label = 'Wär derf dr Arbestablauf ändere:'; $s_access_change_access_label = 'Wär derf d Zuegangsebene ändere:'; $s_default_not_in_flow = 'Dr Vorgabstatus vu %1$s isch nit in dr negschte zuelässige Statuswärt vu %2$s din. Är wird ignoriert.'; $s_assign_issue = 'E Probläm zuewyse'; -$s_allow_close_immediate = 'Erlaube, ass erledigti Probläm zuegmacht wäre'; $s_allow_reporter_close = 'Erlaube, ass Reporter chenne Probläm zuemache'; $s_allow_reporter_reopen = 'Erlaube, ass Reporter chenne Probläm wider ufmache'; $s_set_status_assigned = 'Setz Status bi dr Zuewysig vun eme Bearbeiter'; diff --git a/lang/strings_tagalog.txt b/lang/strings_tagalog.txt index 785df4edc4..65a8696254 100644 --- a/lang/strings_tagalog.txt +++ b/lang/strings_tagalog.txt @@ -631,7 +631,6 @@ $s_desc_bug_resolved_status_threshold = 'Kalagayan kung saan itinuturing na nalu $s_desc_bug_closed_status_threshold = 'Kalagayan kung saan ang isang labas ay itinuturing na nakasara'; $s_default_not_in_flow = 'Ang likas na nakatakdang kalagayan ng %1$s ay hindi pinili sa loob ng susunod na mga kalagayan para sa %2$s. Hindi ito papansinin.'; $s_assign_issue = 'Magtalaga ng isang labas'; -$s_allow_close_immediate = 'Pahintulutang maisara ang labas kapag Nalutas na'; $s_allow_reporter_close = 'Pahintulutan ang Tagapag-ulat na maisara ang labas'; $s_allow_reporter_reopen = 'Pahintulutan ang Tagapag-ulat na muling buksan ang Labas'; $s_set_status_assigned = 'Itakda ang kalagayan kapag nakapagtalaga ng Tagahawak'; diff --git a/lang/strings_urdu.txt b/lang/strings_urdu.txt index 49c7de2fb6..a98e5cb3ba 100644 --- a/lang/strings_urdu.txt +++ b/lang/strings_urdu.txt @@ -557,7 +557,6 @@ $s_desc_bug_reopen_status = 'مقام جہاں دوبارہ کھلنے والہ $s_desc_bug_resolved_status_threshold = ' مقام جہاں پر ایشوذ حل نظر آے'; $s_default_not_in_flow = ' کا ڈیفالٹ مقام منتخب نہی کیا گیا اگلے مقام ٪ ایس کیلیے اس کو نہی دیکھا جاے گا %s'; $s_assign_issue = 'ایک ایشوذ سپرد کرو'; -$s_allow_close_immediate = ' ایشوذ کو اجاذت دو کے وہ حل ھونے پر بند ھو جاے'; $s_allow_reporter_close = 'رپوٹ کرنے والے کو اجاذت دو کہ وہ ایشوذ کو بند کر سکے'; $s_allow_reporter_reopen = 'رپوٹ کرنے والے کو اجاذت دو کہ وہ ایشوذ کو دوبارہ کھول سکے'; $s_set_status_assigned = 'مقام کو سہٹ کرو ھہنڈلر کی سپردگی پر'; diff --git a/manage_config_work_threshold_page.php b/manage_config_work_threshold_page.php index 40120271d9..232c501bec 100644 --- a/manage_config_work_threshold_page.php +++ b/manage_config_work_threshold_page.php @@ -295,7 +295,6 @@ function get_section_end() { get_capability_row( lang_get( 'report_issue' ), 'report_bug_threshold' ); get_capability_enum( lang_get( 'submit_status' ), 'bug_submit_status', 'status' ); get_capability_row( lang_get( 'update_issue' ), 'update_bug_threshold' ); -get_capability_boolean( lang_get( 'allow_close_immediate' ), 'allow_close_immediately' ); get_capability_boolean( lang_get( 'allow_reporter_close' ), 'allow_reporter_close' ); get_capability_row( lang_get( 'monitor_issue' ), 'monitor_bug_threshold' ); get_capability_row( lang_get( 'handle_issue' ), 'handle_bug_threshold' ); diff --git a/manage_config_work_threshold_set.php b/manage_config_work_threshold_set.php index 38d34476dd..d3ff352117 100644 --- a/manage_config_work_threshold_set.php +++ b/manage_config_work_threshold_set.php @@ -136,7 +136,6 @@ function set_capability_enum( $p_threshold, $p_all_projects_only=false ) { set_capability_row( 'report_bug_threshold' ); set_capability_enum( 'bug_submit_status' ); set_capability_row( 'update_bug_threshold' ); -set_capability_boolean( 'allow_close_immediately' ); set_capability_boolean( 'allow_reporter_close' ); set_capability_row( 'monitor_bug_threshold' ); set_capability_row( 'handle_bug_threshold' );