Settings: Fix FR translation

Change-Id: I4eb2195604b07e609d111dcad6070743272e4451
Settings: Swedish translations

Patchset 1: fixed missing '<' in line 73

Change-Id: I6b78cbbff74cf45584432ea3d32ecb71a965a7ce
Merge " Settings: Fix FR translation" into kitkat
PEEK [2/2]

Add ability to switch peek on or off.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Change-Id: I1943221aa867099aeed001f3ff54ab83def90391

Conflicts:
	src/com/android/settings/DisplaySettings.java
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

Conflicts:
	res/values/pa_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: I6c851f2061ffc092f481d39e9d0c89bc71f13613
Merge branch 'kitkat' of github.com:AOSPA-legacy/android_packages_apps_Settings into kk4.4

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java

Change-Id: I04822956b902654153a80615c600d9c229df1212