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
Allow disabling the IME selector notification (2/2)

Credit CM

Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>
Merge remote-tracking branch 'aospa/kitkat' into kitkat