Settings: Fix FR translation

Change-Id: I4eb2195604b07e609d111dcad6070743272e4451
Settings: Swedish translations

Patchset 1: fixed missing '<' in line 73

Change-Id: I6b78cbbff74cf45584432ea3d32ecb71a965a7ce
MSIM: Hide latest area info broadcast if not brazilian sim

Change-Id: I6beafb788ea66c6e97ca0545380f1ea296841c1f
MSIM: Ui fixes, replace Subscriptions with real operator names

Add Sim slot number after Operator name and check
for SIM_STATE_ABSENT and display No SIM instead of NULL

Change-Id: I2a340487fcb01dde1a50f5a45c71cd61711380c3

Conflicts:
	res/values-af/cm_caf.xml
	res/values-ca/cm_caf.xml
	res/values-cs/cm_caf.xml
	res/values-da/cm_caf.xml
	res/values-de/cm_caf.xml
	res/values-el/cm_caf.xml
	res/values-es/cm_caf.xml
	res/values-fi/cm_caf.xml
	res/values-it/cm_caf.xml
	res/values-iw/cm_caf.xml
	res/values-nl/cm_caf.xml
	res/values-pt-rBR/cm_caf.xml
	res/values-pt-rPT/cm_caf.xml
	res/values-ru/cm_caf.xml
	res/values-sk/cm_caf.xml
	res/values-tr/cm_caf.xml
Merge " Settings: Fix FR translation" into kitkat
Move Multi Sim settings above other settings

Change-Id: Id7ce844529299fa1e42bde5d433bc0ecd1c68527

Conflicts:
	res/xml/settings_headers.xml
Call equals() comparing different types

See: http://review.cyanogenmod.org/#/c/28642/
https://android-review.googlesource.com/#/c/45430/

Change-Id: I1ef553e5d64cb36e96fdb28e7f437efb9edd5c6d
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
Update MobileNetworks Icon

Match to QS tile icon

Change-Id: I416f0c9da40973532f79dc2ae7a46a274591a948
Merge remote-tracking branch 'PA/kitkat' into legacy-staging

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