Bug 826286 - time label should update should wait for moztimechange
Revert "Merge pull request #7311 from timdream/settings/sample-format"

This reverts commit 185a9cd5c446fee5bf05f38034a3607d9a7a4082, reversing
changes made to 194062b4e8b17a38247d5417094ab9743bd862b2.
Bug 824625 - Make "Sample Format" label localizable, r=evelyn, pike, a=blocking-basecamp
Merge pull request #7332 from timdream/ftu/time-label2

Bug 826286 - time label should update should wait for moztimechange, r=kaze
Bug 827233 - Adding feedback when calling from Contacts and no network

Fixing locales

Fixing locales