Update simpleaosp_strings.xml

add french translation
Update simpleaosp_strings.xml

Update french translation
Merge pull request #15 from RenaudR/patch-9

Update simpleaosp_strings.xml
Open app when clicking on icon in App Info screen

Based on Xposed module Shortcut in App Info:
http://repo.xposed.info/module/com.mohammadag.shortcutinappinfo

Credit: Adam77Root
There is no vibration as in the module as I didn't find it necessary
Change-Id: I07b3f947aaaa13702adba3b4e78bb780fe861baf
[1/2] Settings: Clock on lockscreen

Allow to enable status bar clock on lockscreen (default off)

Conflicts:
	res/values/mahdi_strings.xml
Settings: Add proximity wake-up toggle

Change-Id: I2f2449eb324f61b2f7a93acd91b99f144930e66e
Move this up
ProgressBar: make progress bar color themeable (2/2)

one issue: ColorPickerPreference doesn't update preview to default colors when reset,
will look into this later.

Conflicts:
	src/com/android/settings/simpleaosp/ProgressBar.java

Conflicts:
	src/com/android/settings/simpleaosp/ProgressBar.java
Merge branch 'kk' into headsup

Conflicts:
	res/values/simpleaosp_strings.xml
	src/com/android/settings/simpleaosp/ProgressBar.java
Progress bar: Remove color options
Let's give color options to themes only