Bug 859035 - [l10n] Do not use the same unknown entity for Size & Author when installing a WebApp
Bug 855117 - Move the description to a separate li
Bug 902517 - The e.me banner is shown above the dock when a bookmark is added. r=vingtetun
Bug 902973 - REAPPLY Disable sms notification_test.js for frequent TBPL orange, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit e300467f475fa6139fb4e5644b14386bec02a521)
Bug 903400 - Trim whitespaces for search in the e.me search bar. r=vingtetun,a=leo+
Bug 903443 - Fix overlapping tips on first time Evme usage. r=vingtetun,a=leo+
Merge pull request #11341 from fabi1cazenave/systemMissingEntities-bug901449

Bug 901449 - [STK] missing l10n entities, r=timdream(cherry picked from commit cfe8c521c2ba67986c0347cbb07c8ad8ec31af2c)
Merge pull request #11467 from fabi1cazenave/uplift-bug901449

Uplift bug901449
Bug 858463 - Hide the subtitle 'Accounts' if there is no account in settings
(cherry picked from commit c542dd13ed8cfa07e98b21961fcad36f98d57a07)

Conflicts:

	apps/calendar/index.html
	apps/calendar/js/views/advanced_settings.js
Bug 903260 - [SMS][MMS] SettingsURL value is never used in sms/js/notification.js: Ringtones BROKEN

https://bugzilla.mozilla.org/show_bug.cgi?id=903260

- Make the mock's set method behave enough like the real thing to write a correct test
- Assign the result of the call to set(…) to the actual local setting
- Tests
    - Ensure that the src property is as expected

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit cd57d1eaeddd651c853c53c7a0e6f8851966aa94)

Conflicts:

	apps/sms/js/notification.js
	apps/sms/test/unit/notification_test.js

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 903260 fixes tests, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Merge pull request #11232 from TheoChevalier/Bug859035-v1-train

Bug 859035 - [l10n] Do not use the same "unknown" entity for Size & Author when installing a WebApp r=julienw
Merge pull request #11263 from crh0716/855117

Bug 855117 - Move the description to a separate li r=evelyn
Merge branch 'Bug_904009-keyboard_layout_changes_to_lowercase_even_when_the_capslock__ON' of http://github.com/leob2g/gaia
(cherry picked from commit d2421331c9242aeddd9d19f9bce3d95d4e306200)
Merge pull request #11359 from davidflanagan/bug901377

Bug 901377: fix serious autocorrect regressions r=yxl
(cherry picked from commit 42c4efb7550820b7b6d6086d419a32a9e0cad174)
Merge pull request #10929 from lissyx/bug892520

Bug 892520 - Ensure serialization of upgrade path
(cherry picked from commit d2856fd2d87c78e0f7b34c3a555cb8cd3a409aff)
Merge pull request #11333 from crh0716/900386

Bug 900386 - Use localize function to do localization r=evelyn
(cherry picked from commit 12fc265df560709ae5262b881f6de214c0f4bd12)
Merge pull request #10865 from lissyx/bug889245

Bug 889245 - [Call log] When user make a voicemail call, call log shows ...
(cherry picked from commit ae1905a5bf10f064a86731e2bff195c2bccf620f)
Merge pull request #11421 from lissyx/bug900848

Bug 900848 - Use withheld-number string key instead of unknown in call log r=etienne
(cherry picked from commit 2830c85f5fa44ac2f08578f81d8dbf47af09fa8e)
Merge pull request #11428 from fabi1cazenave/smsCursorScroll-bug875338

Bug 875338: the content is not scrolled down when sending an MMS, r=julienw
(cherry picked from commit 9c39bef4a338123b9794a18658712b94c3e9a2ce)