Fix FR translations

(cherry picked from commit 923d41239bdd983f0b7d0c02333c70ca862127a6)
Enable Back-key when go to Emergency call

When go to "Emergency call" from lock screen, back key is disappeared.
It is difficult for user to find the way to go back to previous screen.
This might be bad user experience. So we are going to make it enable.

Change-Id: Iefcca9b8943472c24ddbca6e3ec3441e93e5be91

Patchset: 2
http://review.cyanogenmod.org/#/c/57524/
(cherry picked from commit a4727b1a0d152f159646b1bc65595cd32d8f07dd)
[1/2] Settings: Add Captive Detection toggle

http://jira.omnirom.org/browse/OMNI-356

Change-Id: I284ce5951c9c4bf8a6875e129a947fb3912df71d

Patchset: 6
https://gerrit.omnirom.org/#/c/4827/
(cherry picked from commit 88b12374ef53525037f2f883f3773e369670f6ff)

Conflicts:
	src/com/android/settings/WirelessSettings.java
Settings: Don't crash if we pause too quickly

Notifier is unregistered in every case in pause.
However, if you close the Settings app too quick, the notifier
might not be registered at all, causing an IllegalArgumentException
during the unregistering.

Change-Id: I54141cbfc91d08c28ef524f4155b673ae8dee90e
(cherry picked from commit 18d8f7df0201cf6a734921dd694f8ad9b46ff623)