Automatic translation import

Change-Id: Ieb689a31b3d243d88a11d3b156a26782e9ed5f12
Automatic translation import

Change-Id: I8f0058e0b2afc69d957b22c604156a9aa2d5f239
Merge pull request #18 from CyanogenMod/cm-11.0

Update to upstream