Power sound notifications: fix ringtone picker title

Change-Id: Ied0a08ec1607b778324e69a7b40bac056235bebf
Settings : FR translation

Patch set 2 : rebase, correction
Patch set 3 : correction

Change-Id: I1a1a3541f5e9e1a989df20666b56930d8c6708ce
Merge "Power sound notifications: fix ringtone picker title" into cm-10.1
Merge branch 'cm-10.1' into martincz
Revert "AppDetail: Allow installed apps to be disabled"

This reverts commit a8cc26eb0bd7a9eedd558efe0006679e4843935f

Change-Id: I9919be9f4069c47cbb66d66cf8520dbd78986e0b
Merge "Revert "AppDetail: Allow installed apps to be disabled"" into jb-mr1_mkt
Revert "Revert "AppDetail: Allow installed apps to be disabled""

This reverts commit bd51d6df3bb909f6854e91b4e8cc155d5e4664a2

Change-Id: I3100dfd7ede10606f069e53a392d32428b0a89be
Merge "Revert "Revert "AppDetail: Allow installed apps to be disabled""" into jb-mr1_mkt