~ubuntu-branches/ubuntu/trusty/menu/trusty

Viewing changes to install-menu/functions.cc

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2010-02-04 20:13:59 UTC
mfrom: (3.1.4 sid)
Revision ID: james.westby@ubuntu.com-20100204201359-hofrky8s8mkenjzm

Tags: 2.1.43ubuntu1

* Merge from debian testing (LP: #517112), Remaining changes:
  - debian/conffiles, debian/su-to-rootrc, debian/rules, doc/su-to-root.1:
    Set default of SU_TO_ROOT_SU to "sudo" in conffile.
    (Ubuntu specific change)

Show diffs side-by-side

added added

removed removed

464

{

465

string lang=args[0]->soutput(menuentry);

466

string text=args[1]->soutput(menuentry);

467

468

return o << ldgettext(lang.c_str(), "menu-sections", text.c_str());

467

const char *txt = text.c_str();

468

const char *trans = ldgettext(lang.c_str(), "menu-sections", txt);

469

if (trans == txt)

470

trans = ldgettext(lang.c_str(), "menu-entries", txt);

471

return o << trans;

469

472

}

470

473

471

474

}

Older »