Merge lp:~chipaca/ubuntuone-client/fix-menu-items into lp:ubuntuone-client
Proposed by
John Lenton
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | John Lenton | ||||||||||||
Approved revision: | 662 | ||||||||||||
Merged at revision: | 659 | ||||||||||||
Proposed branch: | lp:~chipaca/ubuntuone-client/fix-menu-items | ||||||||||||
Merge into: | lp:ubuntuone-client | ||||||||||||
Diff against target: |
226 lines (+31/-30) 3 files modified
bin/ubuntuone-preferences (+5/-4) nautilus/ubuntuone-nautilus.c (+25/-25) tests/test_preferences.py (+1/-1) |
||||||||||||
To merge this branch: | bzr merge lp:~chipaca/ubuntuone-client/fix-menu-items | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincenzo Di Somma (community) | Approve | ||
Rodrigo Moya (community) | Approve | ||
Review via email: mp+33769@code.launchpad.net |
To post a comment you must log in.
199 - _("Hide location bar"), menu_item_ new ("ubuntuone- location- show",
200 - _("Do not show the location bar"
201 + _("Hide ribbon"),
202 + _("Do not show the Ubuntu One ribbon"
203 " in selected folders"),
204 "ubuntuone");
205 } else {
206 item = nautilus_
207 - _("Show location bar"),
208 - _("Show the location bar"
209 + _("Show ribbon (in some folders)"),
210 + _("Show the Ubuntu One ribbon"
211 " in selected folders"),
212 "ubuntuone");
Only one thing, those 'Hide ribbon'/'Show ribbon' should have 'Ribbon'