[Pkg-mozext-commits] [all-in-one-sidebar] 05/29: Merge remote-tracking branch 'origin/master' into development

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository all-in-one-sidebar.

commit d7ed165ffd8e82dabb4a9bfcb5b451b08013bf3d
Merge: 1aea9a4 c01c53a
Author: Ingo Wennemaring <github at addonlab.com>
Date:   Thu Jul 30 21:54:16 2015 +0200

    Merge remote-tracking branch 'origin/master' into development
    
    # Conflicts:
    #	locale/pt-BR/aios.dtd
    #	locale/sq-AL/prefs.dtd

 install.rdf                 |  6 +++---
 locale/ar-SA/about.dtd      | 40 ++++++++++++++++++++++++++++++++++++++++
 locale/ar-SA/aios.dtd       |  3 +++
 locale/ar-SA/lib.dtd        |  4 ++++
 locale/ar-SA/lib.properties |  1 +
 locale/ar-SA/multipanel.dtd |  2 ++
 locale/ar-SA/prefs.dtd      |  2 ++
 locale/be-BY/about.dtd      | 11 +++++++++++
 locale/be-BY/aios.dtd       |  5 +++++
 locale/be-BY/lib.dtd        |  1 +
 locale/be-BY/lib.properties |  3 +++
 locale/be-BY/multipanel.dtd |  4 ++++
 locale/be-BY/prefs.dtd      |  8 ++++++++
 locale/cs-CZ/about.dtd      | 11 +++++++++++
 locale/cs-CZ/aios.dtd       |  4 ++++
 locale/cs-CZ/lib.dtd        |  1 +
 locale/cs-CZ/lib.properties |  3 +++
 locale/cs-CZ/multipanel.dtd |  4 ++++
 locale/cs-CZ/prefs.dtd      |  7 +++++++
 locale/da/about.dtd         |  4 ++++
 locale/da/aios.dtd          |  2 ++
 locale/da/lib.dtd           |  1 +
 locale/da/lib.properties    |  1 +
 locale/da/multipanel.dtd    |  1 +
 locale/da/prefs.dtd         |  5 +++++
 locale/el/aios.dtd          |  2 ++
 locale/es-AR/about.dtd      |  2 ++
 locale/es-AR/aios.dtd       |  2 ++
 locale/es-AR/prefs.dtd      |  1 +
 locale/es-ES/about.dtd      |  2 ++
 locale/es-ES/aios.dtd       |  2 ++
 locale/es-ES/prefs.dtd      |  1 +
 locale/fi/about.dtd         |  2 ++
 locale/fi/aios.dtd          |  2 ++
 locale/fi/prefs.dtd         |  1 +
 locale/fr/aios.dtd          |  2 ++
 locale/hr-HR/about.dtd      | 11 +++++++++++
 locale/hr-HR/aios.dtd       |  3 +++
 locale/hr-HR/lib.dtd        |  1 +
 locale/hr-HR/lib.properties |  2 ++
 locale/hr-HR/multipanel.dtd |  4 ++++
 locale/hr-HR/prefs.dtd      |  6 ++++++
 locale/hy-AM/about.dtd      |  2 ++
 locale/hy-AM/aios.dtd       |  2 ++
 locale/hy-AM/prefs.dtd      |  1 +
 locale/ja-JP/about.dtd      |  3 +++
 locale/ja-JP/aios.dtd       |  2 ++
 locale/ja-JP/multipanel.dtd |  1 +
 locale/ja-JP/prefs.dtd      |  1 +
 locale/ko-KR/about.dtd      |  2 ++
 locale/ko-KR/aios.dtd       |  2 ++
 locale/ko-KR/multipanel.dtd |  1 +
 locale/ko-KR/prefs.dtd      |  1 +
 locale/lt-LT/about.dtd      |  9 +++++++++
 locale/lt-LT/aios.dtd       |  3 +++
 locale/lt-LT/lib.dtd        |  1 +
 locale/lt-LT/lib.properties |  1 +
 locale/lt-LT/multipanel.dtd |  4 ++++
 locale/lt-LT/prefs.dtd      |  5 +++++
 locale/nb-NO/about.dtd      |  8 ++++++++
 locale/nb-NO/aios.dtd       |  3 +++
 locale/nb-NO/lib.dtd        |  1 +
 locale/nb-NO/lib.properties |  1 +
 locale/nb-NO/multipanel.dtd |  4 ++++
 locale/nb-NO/prefs.dtd      |  5 +++++
 locale/sk-SK/about.dtd      | 40 ++++++++++++++++++++++++++++++++++++++++
 locale/sk-SK/aios.dtd       |  3 +++
 locale/sk-SK/lib.dtd        |  1 +
 locale/sk-SK/lib.properties |  1 +
 locale/sk-SK/multipanel.dtd |  4 ++++
 locale/sk-SK/prefs.dtd      |  5 +++++
 locale/sq-AL/aios.dtd       |  2 ++
 locale/sq-AL/lib.properties |  2 ++
 locale/sq-AL/multipanel.dtd | 10 ++++++++++
 locale/sq-AL/prefs.dtd      | 24 ++++++++++++++++++++++++
 locale/sv-SE/aios.dtd       |  2 ++
 locale/vi/about.dtd         |  2 ++
 locale/vi/aios.dtd          |  2 ++
 locale/vi/multipanel.dtd    |  1 +
 locale/vi/prefs.dtd         |  1 +
 locale/zh-TW/about.dtd      |  9 +++++++++
 locale/zh-TW/aios.dtd       |  3 +++
 locale/zh-TW/lib.dtd        |  1 +
 locale/zh-TW/lib.properties |  1 +
 locale/zh-TW/multipanel.dtd |  4 ++++
 locale/zh-TW/prefs.dtd      |  5 +++++
 86 files changed, 363 insertions(+), 3 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git