[tracker: 7/9] Merge branch 'thunderbird-24'

[Martyn James Russell <mr src gnome org>]

commit a74d26e67f992fadc4c2eb6129c0635633df8618
Merge: b7a6815 4e692dc
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Feb 10 11:52:12 2014 +0000

    Merge branch 'thunderbird-24'

 src/plugins/thunderbird/chrome.manifest            |    3 +
 src/plugins/thunderbird/chrome/content/bindings.js |    4 +
 .../thunderbird/chrome/content/mailstore.js        |  170 ++++++++++++-------
 .../thunderbird/chrome/content/persistent-store.js |    9 +-
 src/plugins/thunderbird/chrome/content/plugin.js   |   19 ++-
 src/plugins/thunderbird/chrome/content/queue.js    |   26 +++-
 .../thunderbird/chrome/content/trackerstore.js     |   10 +-
 src/plugins/thunderbird/chrome/content/ui.js       |    7 +-
 .../thunderbird/chrome/locale/de-DE/about.dtd      |    4 +
 .../thunderbird/chrome/locale/de-DE/options.dtd    |    4 +
 .../thunderbird/chrome/locale/de-DE/overlay.dtd    |    2 +
 .../chrome/locale/de-DE/overlay.properties         |    9 +
 .../chrome/locale/en-US/overlay.properties         |   10 +-
 .../thunderbird/chrome/locale/es-ES/about.dtd      |    4 +
 .../thunderbird/chrome/locale/es-ES/options.dtd    |    4 +
 .../thunderbird/chrome/locale/es-ES/overlay.dtd    |    2 +
 .../chrome/locale/es-ES/overlay.properties         |    9 +
 .../thunderbird/chrome/locale/fr-FR/about.dtd      |    4 +
 .../thunderbird/chrome/locale/fr-FR/options.dtd    |    4 +
 .../thunderbird/chrome/locale/fr-FR/overlay.dtd    |    2 +
 .../chrome/locale/fr-FR/overlay.properties         |    9 +
 src/plugins/thunderbird/install.rdf.in             |    4 +-
 22 files changed, 232 insertions(+), 87 deletions(-)
---