lp:~dpm/ubuntu-system-settings/fix-1210341

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-system-settings at revision 390

PS Jenkins bot: Approve (continuous-integration) on 2013-09-26

Sebastien Bacher (community): Approve on 2013-09-26

Diff: 117 lines (+19/-17)

2 files modified

plugins/battery/PageComponent.qml (+1/-0)
po/ubuntu-system-settings.pot (+18/-17)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1210341: [translation] Need for a comment for #35

Low

Fix Released

Link a bug report

Related blueprints

390. By David Planella on 2013-09-26

Added translator comment for battery charging level message, updated .pot file

389. By Sebastien Bacher on 2013-09-26

update the translation template.

Approved by Sebastien Bacher, PS Jenkins bot.

388. By Charles Kerr on 2013-09-26

As requested, remove the linefeed between a function's return type and its name.

Approved by Iain Lane, PS Jenkins bot.

387. By Launchpad Translations on behalf of system-settings-touch on 2013-09-26

Launchpad automatic translations update.

386. By Sebastien Bacher on 2013-09-26

hide phone settings, we lack phone app support for call forwarding,waiting.

Approved by PS Jenkins bot, Charles Kerr.

385. By Sebastien Bacher on 2013-09-25

hide reset options until we get some backend code working.
The factory resets require support for the system image side, the other
options should be doable from our side later on.

Approved by PS Jenkins bot, Charles Kerr.

384. By Sebastien Bacher on 2013-09-25

datetime: drop empty list item, it's not in the design.

Approved by Charles Kerr, PS Jenkins bot.

383. By Sebastien Bacher on 2013-09-25

timezone: some tweaks and fixes
- hide the selector, we don't have a backend for automatic selection
- replace the text widget by label from the ubuntu uitk, it fixes the issue
with the text being too small
- update the placeholder string according to the new design.

Approved by Charles Kerr, PS Jenkins bot.

382. By Sebastien Bacher on 2013-09-25

battery: hide screen idle delay selection, the backend is not working.

Approved by Charles Kerr, PS Jenkins bot.

381. By Sebastien Bacher on 2013-09-25

security: hide non working PIN and app access settings.

Approved by PS Jenkins bot.