'in-accurate proximity' Setting + french
remove bad hungarian translations

Change-Id: I8bd461a8082afb8f8dd11dc3b9b203b0e343b42a
Merge remote-tracking branch 'cyanogen/gingerbread' into gingerbread
Merge remote-tracking branch 'remotes/cyanogen/gingerbread' into gingerbread
Merge branch 'cyanogen' into gingerbread
Add build date to 'About phone'.

Change-Id: I77f3c6e855287154f5992546452741e14bb3ad90
french: build date
Merge remote-tracking branch 'remotes/cyanogen/gingerbread' into gingerbread
Merge remote-tracking branch 'remotes/cyanogen/gingerbread' into gingerbread
Merge remote-tracking branch 'remotes/cyanogen/gingerbread' into gingerbread
Added hungarian translation for Lock Screen Shortcuts and ShortcutPickHelper in Settings

Change-Id: Ie30319c8a49010ad666d0c12c8522145d08a4581
Settings: PT-BR translations

Added pt-br translations

Change-Id: Ic31a09f31495020cffef9cb20e66a8bfb65bca75
Merge "Added hungarian translation for Lock Screen Shortcuts and ShortcutPickHelper in Settings" into ics
Merge "Settings: PT-BR translations" into ics
first commit
Merge https://github.com/CyanogenMod/android_packages_apps_Settings into gingerbread

Conflicts:
	AndroidManifest.xml
	res/drawable-mdpi/ic_appwidget_settings_bluetooth_off.png
	res/drawable-mdpi/ic_appwidget_settings_bluetooth_on.png
	res/drawable-mdpi/ic_appwidget_settings_gps_off.png
	res/drawable-mdpi/ic_appwidget_settings_gps_on.png
	res/drawable-mdpi/ic_appwidget_settings_sync_off.png
	res/drawable-mdpi/ic_appwidget_settings_sync_on.png
	res/drawable-mdpi/ic_appwidget_settings_wifi_off.png
	res/drawable-mdpi/ic_appwidget_settings_wifi_on.png
	res/drawable-mdpi/ic_settings_sync.png
	res/drawable-mdpi/ic_settings_wireless.png
	res/layout/manage_apps_tab_content.xml
	res/layout/widget.xml
	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-be/strings.xml
	res/values-ca/arrays.xml
	res/values-ca/strings.xml
	res/values-cs/arrays.xml
	res/values-cs/strings.xml
	res/values-de/arrays.xml
	res/values-de/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/arrays.xml
	res/values-es/strings.xml
	res/values-et/strings.xml
	res/values-fr/arrays.xml
	res/values-fr/strings.xml
	res/values-hi/strings.xml
	res/values-hu/arrays.xml
	res/values-hu/strings.xml
	res/values-it/arrays.xml
	res/values-it/strings.xml
	res/values-iw/arrays.xml
	res/values-iw/strings.xml
	res/values-ja/arrays.xml
	res/values-ja/strings.xml
	res/values-ko/arrays.xml
	res/values-ko/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/arrays.xml
	res/values-nl/strings.xml
	res/values-pl/arrays.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/arrays.xml
	res/values-pt/strings.xml
	res/values-ru/arrays.xml
	res/values-ru/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-tr/arrays.xml
	res/values-tr/strings.xml
	res/values-uk/arrays.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/arrays.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/arrays.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/arrays.xml
	res/values-zu/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/appgroup_list.xml
	res/xml/appwidget_info.xml
	res/xml/bluetooth_settings.xml
	res/xml/development_prefs.xml
	res/xml/device_info_memory.xml
	res/xml/device_info_settings.xml
	res/xml/display_settings.xml
	res/xml/lockscreen_interface_settings.xml
	res/xml/memory_management.xml
	res/xml/profile_config.xml
	res/xml/profile_settings.xml
	res/xml/profiles_settings.xml
	res/xml/quiet_hours_settings.xml
	res/xml/security_settings.xml
	res/xml/security_settings_biometric_weak.xml
	res/xml/security_settings_cyanogenmod.xml
	res/xml/settings.xml
	res/xml/settings_headers.xml
	res/xml/usb_settings.xml
	src/com/android/settings/ApnEditor.java
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/ChooseLockPattern.java
	src/com/android/settings/DataUsageSummary.java
	src/com/android/settings/DateTimeSettingsSetupWizard.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/LanguageSettings.java
	src/com/android/settings/ProgressCategory.java
	src/com/android/settings/ProxySelector.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/bluetooth/BluetoothEventRedirector.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/CachedBluetoothDevice.java
	src/com/android/settings/bluetooth/ConnectSpecificProfilesActivity.java
	src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
	src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
	src/com/android/settings/cyanogenmod/MemoryManagement.java
	src/com/android/settings/cyanogenmod/PowerWidgetUtil.java
	src/com/android/settings/cyanogenmod/QuietHours.java
	src/com/android/settings/cyanogenmod/ScreenSecurity.java
	src/com/android/settings/cyanogenmod/StatusBar.java
	src/com/android/settings/deviceinfo/Memory.java
	src/com/android/settings/deviceinfo/UsbSettings.java
	src/com/android/settings/profiles/AppGroupConfig.java
	src/com/android/settings/profiles/AppGroupList.java
	src/com/android/settings/profiles/ApplicationItemPreference.java
	src/com/android/settings/profiles/NamePreference.java
	src/com/android/settings/profiles/ProfileConfig.java
	src/com/android/settings/profiles/ProfilesPreference.java
	src/com/android/settings/profiles/ProfilesSettings.java
	src/com/android/settings/tts/TextToSpeechSettings.java
	src/com/android/settings/tts/TtsEnginePreference.java
	src/com/android/settings/tts/TtsEngineSettingsFragment.java
	src/com/android/settings/vpn/AuthenticationActor.java
	src/com/android/settings/vpn/VpnEditor.java
	src/com/android/settings/vpn/VpnProfileEditor.java
	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/widget/SettingsAppWidgetProvider.java
	src/com/android/settings/wifi/AccessPoint.java
	src/com/android/settings/wifi/WifiConfigController.java
	src/com/android/settings/wifi/WifiDialog.java
	src/com/android/settings/wifi/WifiSettings.java