Author: kmachalkova Date: Fri Apr 11 11:12:00 2008 New Revision: 46389 URL: http://svn.opensuse.org/viewcvs/yast?rev=46389&view=rev Log: Removing translator's nightmare: use labels from Label module from yast base package (thanks, msvec) Modified: trunk/apparmor/src/clients/GenProf.ycp trunk/apparmor/src/clients/LogProf.ycp trunk/apparmor/src/clients/SD_AddProfile.ycp trunk/apparmor/src/clients/SD_DeleteProfile.ycp trunk/apparmor/src/clients/SD_EditProfile.ycp trunk/apparmor/src/clients/SD_Report.ycp trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp trunk/apparmor/src/include/subdomain/config_complain.ycp trunk/apparmor/src/include/subdomain/profile_dialogs.ycp trunk/apparmor/src/include/subdomain/reporting_archived_dialogs.ycp trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp trunk/apparmor/src/include/subdomain/reporting_utils.ycp trunk/apparmor/src/include/subdomain/sd-config.ycp Modified: trunk/apparmor/src/clients/GenProf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/GenProf.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/clients/GenProf.ycp (original) +++ trunk/apparmor/src/clients/GenProf.ycp Fri Apr 11 11:12:00 2008 @@ -354,7 +354,7 @@ } map answers = $[ ]; - if(Popup::AnyQuestion(Popup::NoHeadline(), question, _("&Yes"), _("&No"), focus)) { + if(Popup::AnyQuestion(Popup::NoHeadline(), question, Label::YesButton(), Label::NoButton(), focus)) { answers["answer"] = "y"; } else { answers["answer"] = "n"; @@ -371,9 +371,9 @@ term dialog = `VBox( `TextEntry(`id (`stringfield), label, default_value), `HBox( - `HWeight(1, `PushButton(`id(`okay), `opt(`default, `key_F10), _("&Okay"))), + `HWeight(1, `PushButton(`id(`okay), `opt(`default, `key_F10), Label::OKButton())), `HSpacing(2), - `HWeight(1, `PushButton(`id(`cancel), `opt(`key_F9), _("&Cancel"))) + `HWeight(1, `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton())) ) ); Modified: trunk/apparmor/src/clients/LogProf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/LogProf.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/clients/LogProf.ycp (original) +++ trunk/apparmor/src/clients/LogProf.ycp Fri Apr 11 11:12:00 2008 @@ -352,7 +352,7 @@ } map answers = $[ ]; - if(Popup::AnyQuestion(Popup::NoHeadline(), question, _("&Yes"), _("&No"), focus)) { + if(Popup::AnyQuestion(Popup::NoHeadline(), question, Label::YesButton(), Label::NoButton(), focus)) { answers["answer"] = "y"; } else { answers["answer"] = "n"; @@ -369,9 +369,9 @@ term dialog = `VBox( `TextEntry(`id (`stringfield), label, default_value), `HBox( - `HWeight(1, `PushButton(`id(`okay), `opt(`default, `key_F10), _("&Okay"))), + `HWeight(1, `PushButton(`id(`okay), `opt(`default, `key_F10), Label::OKButton())), `HSpacing(2), - `HWeight(1, `PushButton(`id(`cancel), `opt(`key_F9), _("&Cancel"))) + `HWeight(1, `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton())) ) ); Modified: trunk/apparmor/src/clients/SD_AddProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/SD_AddProfile.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/clients/SD_AddProfile.ycp (original) +++ trunk/apparmor/src/clients/SD_AddProfile.ycp Fri Apr 11 11:12:00 2008 @@ -10,6 +10,7 @@ { import "Wizard"; import "Popup"; +import "Label"; import "Sequencer"; include "subdomain/apparmor_packages.ycp"; include "subdomain/apparmor_profile_check.ycp"; Modified: trunk/apparmor/src/clients/SD_DeleteProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/SD_DeleteProfile.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/clients/SD_DeleteProfile.ycp (original) +++ trunk/apparmor/src/clients/SD_DeleteProfile.ycp Fri Apr 11 11:12:00 2008 @@ -9,6 +9,7 @@ ------------------------------------------------------------------*/ { import "Wizard"; +import "Label"; import "Popup"; import "Sequencer"; include "subdomain/apparmor_packages.ycp"; Modified: trunk/apparmor/src/clients/SD_EditProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/SD_EditProfile.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/clients/SD_EditProfile.ycp (original) +++ trunk/apparmor/src/clients/SD_EditProfile.ycp Fri Apr 11 11:12:00 2008 @@ -10,6 +10,7 @@ { import "Wizard"; import "Popup"; +import "Label"; import "Sequencer"; include "subdomain/apparmor_packages.ycp"; include "subdomain/apparmor_profile_check.ycp"; Modified: trunk/apparmor/src/clients/SD_Report.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/SD_Report.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/clients/SD_Report.ycp (original) +++ trunk/apparmor/src/clients/SD_Report.ycp Fri Apr 11 11:12:00 2008 @@ -11,6 +11,7 @@ import "Wizard"; import "Popup"; +import "Label"; import "Sequencer"; include "subdomain/apparmor_packages.ycp"; include "subdomain/apparmor_profile_check.ycp"; Modified: trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp (original) +++ trunk/apparmor/src/include/subdomain/apparmor_ycp_utils.ycp Fri Apr 11 11:12:00 2008 @@ -17,6 +17,7 @@ */ +import "Label"; import "Popup"; import "AppArmorDialogs"; textdomain "yast2-apparmor"; @@ -25,7 +26,7 @@ CMDS["CMD_ALLOW"] = _("&Allow"); CMDS["CMD_DENY"] = _("&Deny"); CMDS["CMD_ABORT"] = _("Abo(r)t"); - CMDS["CMD_FINISHED"] = _("&Finish"); + CMDS["CMD_FINISHED"] = Label::FinishButton(); CMDS["CMD_INHERIT"] = _("&Inherit"); CMDS["CMD_PROFILE"] = _("&Profile"); CMDS["CMD_UNCONFINED"] = _("&Unconfined"); @@ -47,8 +48,8 @@ CMDS["CMD_DISABLE_REPO"] = _("&Disable Repository"); CMDS["CMD_ASK_NEVER"] = _("&Never Ask Again"); CMDS["CMD_ASK_LATER"] = _("Ask Me &Later"); - CMDS["CMD_YES"] = _("&Yes"); - CMDS["CMD_NO"] = _("&No"); + CMDS["CMD_YES"] = Label::YesButton(); + CMDS["CMD_NO"] = Label::NoButton(); define boolean validEmailAddress ( string emailAddr, boolean allowlocal ) { @@ -105,7 +106,7 @@ `HSpacing(0.5), `VBox( `TextEntry(`id(`username), _("Username")), - `Password(`id(`password), _("Password")), + `Password(`id(`password), Label::Password()), `VSpacing(1), `HBox( `CheckBox(`id(`save_conf), `opt(`notify), @@ -114,7 +115,7 @@ `Left(`PushButton(`id(`signin_submit), _("&Sign in"))), `Right(`PushButton(`id(`signin_cancel), - _("&Cancel"))), + Label::CancelButton())), `HSpacing( 0.5) ) ), @@ -151,7 +152,7 @@ `Left(`PushButton(`id(`register_submit), _("&Register"))), `Right(`PushButton(`id(`register_cancel), - _("&Cancel"))), + Label::CancelButton())), `HSpacing( 0.2) ) ), @@ -366,9 +367,9 @@ `HWeight(1, `PushButton(`id(`okay), `opt(`default, `key_F10), - _("&OK"))), + Label::OKButton())), `HSpacing(2), - `HWeight(1, `PushButton(`id(`cancel), `opt(`key_F9), _("&Cancel"))) + `HWeight(1, `PushButton(`id(`cancel), `opt(`key_F9), Label::CancelButton())) ) ); results["STATUS"] = "ok"; @@ -498,18 +499,18 @@ disable_ask_upload_str), `VSpacing(0.5), `HBox( - `HWeight( 50, `HCenter(`PushButton(`id(`save), _("&OK")))), + `HWeight( 50, `HCenter(`PushButton(`id(`save), Label::OKButton()))), `HWeight( 50, `HCenter(`PushButton(`id(`cancel), - _("&Cancel")))) + Label::CancelButton()))) ) ); } else { if ( in_ncurses ) { control_widgets = `HBox( - `HWeight( 50, `HCenter(`PushButton(`id(`save), _("&OK")))), + `HWeight( 50, `HCenter(`PushButton(`id(`save), Label::OKButton()))), `HWeight( 50, `HCenter(`PushButton(`id(`cancel), - _("&Cancel")))) + Label::CancelButton()))) ); } else { control_widgets = @@ -517,9 +518,9 @@ `VSpacing(0.5), `HBox( `HWeight( 50, `HCenter(`PushButton(`id(`save), - _("&OK")))), + Label::OKButton()))), `HWeight( 50, `HCenter(`PushButton(`id(`cancel), - _("&Cancel")))) + Label::CancelButton()))) ) ); } Modified: trunk/apparmor/src/include/subdomain/config_complain.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/config_complain.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/config_complain.ycp (original) +++ trunk/apparmor/src/include/subdomain/config_complain.ycp Fri Apr 11 11:12:00 2008 @@ -11,6 +11,8 @@ { textdomain "yast2-apparmor"; +import "Label"; + string modeHelp = _("<p><b>Profile Mode Configuration</b><br>This tool allows you to set AppArmor profiles to either complain or enforce mode.</p><p>Complain mode is a profile training state that logs application activity, but does not restrict the application's behavior.</p><p>Profiles in enforce mode are protected by AppArmor.</p>"); boolean showAll = false; // Button for showing active or all profiles @@ -128,7 +130,7 @@ list<term> recList = getRecordList(showAll); term modeForm = getProfModeForm(recList, showAll); - Wizard::SetContentsButtons( _("Profile Mode Configuration"), modeForm, modeHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("Profile Mode Configuration"), modeForm, modeHelp, Label::BackButton(), _("&Done") ); map event = $[]; any id = nil; @@ -147,13 +149,13 @@ } else if ( id == `showAll ) { showAll = true; - Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, Label::BackButton(), _("&Done") ); continue; } else if ( id == `showAct ) { showAll = false; - Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, Label::BackButton(), _("&Done") ); continue; } else if ( id == `next || id == `toggle) { @@ -163,7 +165,7 @@ mode = (string) select((term) UI::QueryWidget(`id(`table), `Item(itemselected)), 2, ""); updateComplain(id, profile, mode, showAll); - Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, Label::BackButton(), _("&Done") ); continue; } else if ( id == `allEnforce || id == `allComplain) { @@ -177,7 +179,7 @@ } updateComplain(id, profile, mode, showAll); - Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("Configure Profile Mode"), updateModeConfigForm(showAll), modeHelp, Label::BackButton(), _("&Done") ); continue; } else if ( id == `table ) { Modified: trunk/apparmor/src/include/subdomain/profile_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/profile_dialogs.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/profile_dialogs.ycp (original) +++ trunk/apparmor/src/include/subdomain/profile_dialogs.ycp Fri Apr 11 11:12:00 2008 @@ -10,6 +10,7 @@ { import "Wizard"; import "Popup"; +import "Label"; include "subdomain/capabilities.ycp"; textdomain "yast2-apparmor"; @@ -56,8 +57,8 @@ ), `VSpacing( 0.5 ), `HBox( - `HWeight( 50, `HCenter(`PushButton(`id(`save), _("&OK")))), - `HWeight( 50, `HCenter(`PushButton(`id(`cancel), _("&Cancel")))) + `HWeight( 50, `HCenter(`PushButton(`id(`save), Label::OKButton()))), + `HWeight( 50, `HCenter(`PushButton(`id(`cancel), Label::CancelButton()))) ), `VSpacing( `opt(`hstretch), 0.5 ) ) @@ -175,8 +176,8 @@ ), `VSpacing(1), `HBox( - `HCenter(`PushButton(`id(`cancel), _("&Cancel"))), - `HCenter(`PushButton(`id(`save), _("&Save"))) + `HCenter(`PushButton(`id(`cancel), Label::CancelButton())), + `HCenter(`PushButton(`id(`save), Label::SaveButton())) ), `VSpacing(0.5) ) @@ -274,8 +275,8 @@ ), `VSpacing( 0.5 ), `HBox( - `HWeight( 50, `HCenter(`PushButton(`id(`save), _("&OK")))), - `HWeight( 50, `HCenter(`PushButton(`id(`cancel), _("&Cancel")))) + `HWeight( 50, `HCenter(`PushButton(`id(`save), Label::OKButton()))), + `HWeight( 50, `HCenter(`PushButton(`id(`cancel), Label::CancelButton()))) ), `VSpacing( `opt(`hstretch), 0.5 ) ) @@ -685,7 +686,7 @@ `HBox( `HSpacing(`opt(`hstretch), 0.1), `HCenter(`PushButton(`id(`create), _("&Create Hat"))), - `HCenter(`PushButton(`id(`abort), _("&Abort"))), + `HCenter(`PushButton(`id(`abort), Label::AbortButton())), `HSpacing(`opt(`hstretch), 0.1), `VSpacing(1) ) @@ -795,7 +796,7 @@ help = help1 + help2 + help3 + help4 + help5 + help6 + help7 + help_net + helpHat + helpEdit + help8 + help9 + help10; formtitle = _("AppArmor Profile Dialog"); } - Wizard::SetContentsButtons( formtitle, contents_main_profile_form, help, _("&Back"), _("&Done") ); + Wizard::SetContentsButtons( formtitle, contents_main_profile_form, help, Label::BackButton(), _("&Done") ); Modified: trunk/apparmor/src/include/subdomain/reporting_archived_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/reporting_archived_dialogs.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/reporting_archived_dialogs.ycp (original) +++ trunk/apparmor/src/include/subdomain/reporting_archived_dialogs.ycp Fri Apr 11 11:12:00 2008 @@ -12,6 +12,7 @@ import "Wizard"; import "Popup"; +import "Label"; include "subdomain/report_helptext.ycp"; include "subdomain/reporting_utils.ycp"; textdomain "yast2-apparmor"; @@ -117,7 +118,7 @@ _("None"), _("csv"), _("html"), _("Both") ]), `TextEntry(`id(`expPath), _("Location to store log."), expPath ), - `Bottom( `VWeight( 1, `PushButton(`id(`accept), _("&Accept")) )), + `Bottom( `VWeight( 1, `PushButton(`id(`accept), Label::AcceptButton()) )), `Bottom( `VWeight( 1, `PushButton(`id(`browse), _("&Browse")) )) ) )); @@ -131,7 +132,7 @@ term archForm = filterArchForm(); Wizard::SetContentsButtons( _("Report Configuration Dialog"), archForm, - setArchHelp, _("Back"), _("&Next") ); + setArchHelp, Label::BackButton(), Label::NextButton() ); UI::ChangeWidget(`id(`bydate_frame), `Enabled, false); Modified: trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp (original) +++ trunk/apparmor/src/include/subdomain/reporting_dialogues.ycp Fri Apr 11 11:12:00 2008 @@ -11,6 +11,7 @@ import "Wizard"; import "Popup"; +import "Label"; include "subdomain/reporting_utils.ycp"; include "subdomain/report_helptext.ycp"; include "subdomain/reporting_archived_dialogs.ycp"; @@ -215,8 +216,8 @@ ), `VSpacing( 1 ), `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), - `PushButton(`id(`save), _("&Save") ) + `PushButton(`id(`cancel), Label::CancelButton() ), + `PushButton(`id(`save), Label::SaveButton() ) ) ); @@ -260,8 +261,8 @@ ), `VSpacing( 1 ), `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), - `PushButton(`id(`save), _("&Save") ) + `PushButton(`id(`cancel), Label::CancelButton() ), + `PushButton(`id(`save), Label::SaveButton() ) ) ); @@ -538,7 +539,7 @@ `Left(`CheckBox(`id(`exportHtml), _("HTML"), true)) ) ); - Wizard::SetContentsButtons( _("Report Configuration Dialog"), contents_report_config_form, repConfHelp, _("Back"), _("&Next") ); + Wizard::SetContentsButtons( _("Report Configuration Dialog"), contents_report_config_form, repConfHelp, Label::BackButton(), Label::NextButton() ); Settings = $[ ]; map event = $[]; @@ -679,7 +680,7 @@ ) ); Wizard::SetContentsButtons( _("AppArmor Security Event Report"), - contents_main_prof_form, help1, _("Back"), _("&Done") ); + contents_main_prof_form, help1, Label::BackButton(), _("&Done") ); map event = $[]; @@ -724,7 +725,7 @@ `VSpacing(0.5) ); - Wizard::SetContentsButtons( _("AppArmor Security Event Report"), mainForm, mainHelp, _("Back"), _("&Next") ); + Wizard::SetContentsButtons( _("AppArmor Security Event Report"), mainForm, mainHelp, Label::BackButton(), Label::NextButton() ); map event = $[]; any id = nil; @@ -842,7 +843,7 @@ if ( sev == "-" ) { sev = _("All"); } Wizard::SetContentsButtons( _("Report Configuration Dialog"), - filterForm2(name,preFilters), filterCfHelp1, _("Back"), _("&Next") ); + filterForm2(name,preFilters), filterCfHelp1, Label::BackButton(), Label::NextButton() ); if ( sev != "" && sev != _("All") ) { if ( sev != "U" ) { @@ -1137,7 +1138,7 @@ itemList = getArrayList(type,""); Wizard::SetContentsButtons( _("AppArmor Security Event Report"), - viewForm(archType, itemList, ""), archHelpText, _("Back"), _("&Done") ); + viewForm(archType, itemList, ""), archHelpText, Label::BackButton(), _("&Done") ); map event = $[]; any archId = nil; @@ -1166,7 +1167,7 @@ Settings["repPath"] = repPath; itemList = getArrayList(type,repPath); Wizard::SetContentsButtons( _("AppArmor Security Event Report"), - viewForm(archType, itemList, repPath), archHelpText, _("Back"), _("&Done") ); + viewForm(archType, itemList, repPath), archHelpText, Label::BackButton(), _("&Done") ); } else if ( archId == `browse ) { @@ -1182,7 +1183,7 @@ Settings["repPath"] = repPath; itemList = getArrayList(type,repPath); Wizard::SetContentsButtons( _("AppArmor Security Event Report"), - viewForm(archType, itemList, repPath), archHelpText, _("Back"), + viewForm(archType, itemList, repPath), archHelpText, Label::BackButton(), _("&Done") ); } else if ( archId == `sirRep ) { @@ -1196,7 +1197,7 @@ itemList = getArrayList(type,repPath); Wizard::SetContentsButtons( _("View Archived SIR Report"), - viewForm(archType,itemList,""), formHelp, _("Back"), _("&Done")); + viewForm(archType,itemList,""), formHelp, Label::BackButton(), _("&Done")); } else if ( archId == `audRep ) { formHelp = audHelp; @@ -1208,7 +1209,7 @@ itemList= getArrayList(type,""); Wizard::SetContentsButtons( _("View Archived AUD Report"), - viewForm(archType,itemList,""), formHelp, _("Back"), _("&Done")); + viewForm(archType,itemList,""), formHelp, Label::BackButton(), _("&Done")); } else if ( archId == `essRep ) { formHelp = essHelp; @@ -1220,7 +1221,7 @@ itemList= getArrayList(type,""); Wizard::SetContentsButtons( _("View Archived AUD Report"), - viewForm(archType,itemList,""), formHelp, _("Back"), _("&Done")); + viewForm(archType,itemList,""), formHelp, Label::BackButton(), _("&Done")); } else if ( archId == `view || archId == `viewall || archId == `table) { @@ -1273,7 +1274,7 @@ } Wizard::SetContentsButtons( _("Security Incident Report"), - viewArchForm(type,logFile,sirSettings), sirHelp, _("Back"), _("&Done")); + viewArchForm(type,logFile,sirSettings), sirHelp, Label::BackButton(), _("&Done")); lastPage = getLastPage(type,Settings,""); // check 'name' setPageButtons(curPage,lastPage); @@ -1301,7 +1302,7 @@ string slastPage = tostring(lastPage); Wizard::SetContentsButtons( _("Applications Audit Report"), - displayRep(type,curPage,slastPage,reportList), formHelp, _("Back"), + displayRep(type,curPage,slastPage,reportList), formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); @@ -1326,7 +1327,7 @@ string slastPage = tostring(lastPage); Wizard::SetContentsButtons( _("Executive Security Summary Report"), - displayRep(type,curPage,slastPage,reportList), formHelp, _("Back"), + displayRep(type,curPage,slastPage,reportList), formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); @@ -1343,7 +1344,7 @@ curPage = newPage; term fwdForm = turnArchReportPage(curPage,lastPage); - Wizard::SetContentsButtons( _("AppArmor Report"), fwdForm, runHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("AppArmor Report"), fwdForm, runHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } @@ -1358,7 +1359,7 @@ sortCmd["sort"] = "1"; any junk = SCR::Write(.logparse, sortCmd); term fwdForm = turnArchReportPage(curPage,lastPage); - Wizard::SetContentsButtons( _("AppArmor Report"), fwdForm, runHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("AppArmor Report"), fwdForm, runHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } @@ -1366,7 +1367,7 @@ curPage = curPage +1; term fwdForm = turnArchReportPage(curPage,lastPage); - Wizard::SetContentsButtons( _("AppArmor Report"), fwdForm, formHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("AppArmor Report"), fwdForm, formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); @@ -1375,7 +1376,7 @@ if ( curPage > 0 ) { curPage = curPage -1; } term prevForm = turnArchReportPage(curPage,lastPage); - Wizard::SetContentsButtons( _("AppArmor Report"), prevForm, formHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("AppArmor Report"), prevForm, formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); @@ -1383,14 +1384,14 @@ curPage = 1; term firstForm = turnArchReportPage(curPage,lastPage); - Wizard::SetContentsButtons( _("AppArmor Report"), firstForm, formHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("AppArmor Report"), firstForm, formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } else if ( archId == `last ) { curPage = lastPage; term lastForm = turnArchReportPage(curPage,lastPage); - Wizard::SetContentsButtons( _("AppArmor Report"), lastForm, formHelp, _("Back"), _("&Done") ); + Wizard::SetContentsButtons( _("AppArmor Report"), lastForm, formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } else { @@ -1508,10 +1509,10 @@ if ( type == "noDb" ) { Wizard::SetContentsButtons( _("AppArmor On-Demand Report"), displayEmptyRep(type), - formHelp, _("Back"), _("&Done") ); + formHelp, Label::BackButton(), _("&Done") ); } else if ( type == "noList" ) { Wizard::SetContentsButtons( _("AppArmor On-Demand Report"), displayEmptyRep(type), - formHelp, _("Back"), _("&Done") ); + formHelp, Label::BackButton(), _("&Done") ); } else { lastPage = getLastPage(type,Settings,name); @@ -1519,7 +1520,7 @@ Wizard::SetContentsButtons( _("AppArmor On-Demand Report"), displayRep(type,curPage,slastPage,reportList), formHelp, - _("Back"), _("&Done") ); + Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } @@ -1556,7 +1557,7 @@ term goForm = turnReportPage(name,curPage,slastPage,Settings); Wizard::SetContentsButtons( _("AppArmor - Run Reports"), goForm, - formHelp, _("Back"), _("&Done") ); + formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } @@ -1575,7 +1576,7 @@ reportList = getReportList(type,Settings); Wizard::SetContentsButtons( _("AppArmor On-Demand Report"), displayRep(type,curPage, - slastPage,reportList), formHelp, _("Back"), _("&Done") ); + slastPage,reportList), formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } @@ -1585,14 +1586,14 @@ if ( curPage > 0 ) { curPage = curPage -1; } term prevForm = turnReportPage(name,curPage,slastPage,Settings); Wizard::SetContentsButtons( _("AppArmor - Run Reports"), prevForm, - formHelp, _("Back"), _("&Done") ); + formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } else if ( id == `fwd ) { curPage = curPage + 1; term fwdForm = turnReportPage(name,curPage,slastPage,Settings); Wizard::SetContentsButtons( _("AppArmor - Run Reports"), fwdForm, - formHelp, _("Back"), _("&Done") ); + formHelp, Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } else if ( id == `first ) { @@ -1601,7 +1602,7 @@ slastPage = tostring(lastPage); term firstForm = turnReportPage(name,curPage,slastPage,Settings); Wizard::SetContentsButtons( _("AppArmor - Run Reports"), firstForm, formHelp, - _("Back"), _("&Done") ); + Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } else if ( id == `last ) { @@ -1610,7 +1611,7 @@ slastPage = tostring(lastPage); term lastForm = turnReportPage(name,curPage,slastPage,Settings); Wizard::SetContentsButtons( _("AppArmor - Run Reports"), lastForm, formHelp, - _("Back"), _("&Done") ); + Label::BackButton(), _("&Done") ); setPageButtons(curPage,lastPage); } else { @@ -1679,8 +1680,8 @@ ), `VSpacing(1), `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), - `PushButton(`id(`next), _("&Next") ) + `PushButton(`id(`cancel), Label::CancelButton() ), + `PushButton(`id(`next), Label::NextButton() ) ) ))); @@ -2001,7 +2002,7 @@ term continueBtns = `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), + `PushButton(`id(`cancel), Label::CancelButton() ), `PushButton(`id(`fwd), _("N&ext") ) ); @@ -2011,8 +2012,8 @@ continueBtns = `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), - `PushButton(`id(`save), _("&Save") ) + `PushButton(`id(`cancel), Label::CancelButton() ), + `PushButton(`id(`save), Label::SaveButton() ) ); } @@ -2268,8 +2269,8 @@ ), `VSpacing(1), `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), - `PushButton(`id(`del), _("&Delete") ) + `PushButton(`id(`cancel), Label::CancelButton() ), + `PushButton(`id(`del), Label::DeleteButton() ) ) )); @@ -2330,14 +2331,14 @@ `PushButton(`id(`runrep), _("Run Now") ) ), `HBox( - `PushButton(`id(`add), _("Add") ), - `PushButton(`id(`edit), _("Edit") ), - `PushButton(`id(`delete), _("Delete") ) + `PushButton(`id(`add), Label::AddButton() ), + `PushButton(`id(`edit), Label::EditButton() ), + `PushButton(`id(`delete), Label::DeleteButton() ) ) ); Wizard::SetContentsButtons( _("AppArmor Security Event Report"), schedForm, - mainHelp, _("Back"), _("&Next") ); + mainHelp, Label::BackButton(), Label::NextButton() ); return; } @@ -2380,14 +2381,14 @@ `PushButton(`id(`runrep), _("Run Now") ) ), `HBox( - `PushButton(`id(`add), _("Add") ), - `PushButton(`id(`edit), _("Edit") ), - `PushButton(`id(`delete), _("Delete") ) + `PushButton(`id(`add), Label::AddButton() ), + `PushButton(`id(`edit), Label::EditButton() ), + `PushButton(`id(`delete), Label::DeleteButton() ) )) ); Wizard::SetContentsButtons( _("AppArmor Security Event Report"), schedForm, - mainHelp, _("Back"), _("&Done") ); + mainHelp, Label::BackButton(), _("&Done") ); // Double-click tracking integer newRecord = nil; @@ -2416,7 +2417,7 @@ break; } else if ( id == `add ) { addSchedForm(); - //Wizard::SetContentsButtons( _("AppArmor Security Event Report"), schedForm, mainHelp, "Back", _("&Next") ); + //Wizard::SetContentsButtons( _("AppArmor Security Event Report"), schedForm, mainHelp, "Back", Label::NextButton() ); updateSched(); continue; Modified: trunk/apparmor/src/include/subdomain/reporting_utils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/reporting_utils.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/reporting_utils.ycp (original) +++ trunk/apparmor/src/include/subdomain/reporting_utils.ycp Fri Apr 11 11:12:00 2008 @@ -11,6 +11,7 @@ import "Wizard"; import "Popup"; +import "Label"; include "subdomain/report_helptext.ycp"; textdomain "yast2-apparmor"; @@ -128,8 +129,8 @@ `TextEntry(`id(`gotoPage), _("Enter a Page to Move to."), "") ), `HBox( - `PushButton(`id(`abort), `opt(`notify), _("&Abort") ), - `PushButton(`id(`save), `opt(`notify), _("&Save") ) + `PushButton(`id(`abort), `opt(`notify), Label::AbortButton() ), + `PushButton(`id(`save), `opt(`notify), Label::SaveButton() ) ) ) ); @@ -281,8 +282,8 @@ ) ), `HBox( - `PushButton(`id(`abort), _("&Abort") ), - `PushButton(`id(`save), _("&Save") ) + `PushButton(`id(`abort), Label::AbortButton() ), + `PushButton(`id(`save), Label::SaveButton() ) ) ) ); @@ -337,8 +338,8 @@ `CheckBox(`id(`mmap), `opt(`notify, `immediate ), _("MMap"), false) ), `HBox( - `PushButton(`id(`cancel), _("&Cancel") ), - `PushButton(`id(`save), _("&Save") ) + `PushButton(`id(`cancel), Label::CancelButton() ), + `PushButton(`id(`save), Label::SaveButton() ) ) ) ); @@ -451,8 +452,8 @@ `CheckBox(`id(`audit),`opt(`notify, `immediate ), _("Audit"), false) ), `HBox( - `PushButton(`id(`cancel), `opt(`notify), _("&Cancel") ), - `PushButton(`id(`save), `opt(`notify), _("&Save") ) + `PushButton(`id(`cancel), `opt(`notify), Label::CancelButton() ), + `PushButton(`id(`save), `opt(`notify), Label::SaveButton() ) ) ) ); Modified: trunk/apparmor/src/include/subdomain/sd-config.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/include/subdomain/sd-config.ycp?rev=46389&r1=46388&r2=46389&view=diff ============================================================================== --- trunk/apparmor/src/include/subdomain/sd-config.ycp (original) +++ trunk/apparmor/src/include/subdomain/sd-config.ycp Fri Apr 11 11:12:00 2008 @@ -12,6 +12,8 @@ include "subdomain/event_notification_helptext.ycp"; textdomain "yast2-apparmor"; +import "Label"; + define boolean safeFormat (string emailAddr) { boolean isSafe = false; @@ -179,7 +181,7 @@ ); Wizard::CreateDialog(); - Wizard::SetContentsButtons(_("Security Event Notification"), event_config, EventNotifyHelpText, nil, _("&OK")); + Wizard::SetContentsButtons(_("Security Event Notification"), event_config, EventNotifyHelpText, nil, Label::OKButton()); Wizard::DisableBackButton(); any ntInput = nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org