Making lint happy

* fixes issue in values-ca
* fixes issue in values-fa
* conditionalizes an incompatible API call in MapActivity
Update spanish strings
Merge pull request #521 from tamcap/lint-fixes

Making lint happy (@tamcap)
Update French strings (Wifi always/disabled + sat)
Merge pull request #523 from pl6025/patch-6

Update French strings (Wifi always/disabled + sat) (@pl6025)
Merge pull request #522 from rodmoreno/master

Update Spanish strings (@rodmoreno)
Fix Persian misspellings
Merge pull request #525 from cpeterso/cpeterso/fix-persian-misspellings

Fix Persian misspellings (@cpeterso)
Update bn-BD Translation
Update strings.xml
Merge pull request #527 from tamcap/patch-1

Fix strings.xml typo (@tamcap)
Merge pull request #526 from rabbihossain/master

Update bn-BD translation (@rabbihossain)
Update SSIDBlockList.java

Rename of NS train wifi (source: http://tweakers.net/nieuws/95116/ns-neemt-wifi-in-de-trein-over-van-t-mobile.html)
Update zh-TW strings
German (values-de) translation update
Fixed typo
Merge pull request #528 from martiensch/patch-2

Update Nederlandse Spoorwegen on-train WiFi (@martiensch)
Merge pull request #529 from moztw/0404_zhtw

Update zh-TW strings (@petercpg)
Merge pull request #530 from Djfe/patch-2

Update German translation (@Djfe)