[DRE-commits] [diaspora] 08/10: Merge tag 'upstream/0.5.3.0+debian' into master-0.5.3.0

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-0.5.3.0
in repository diaspora.

commit 2a90aef49b1f320b45771c093b01b0ce76e7693c
Merge: f713afc 75ba409
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Sep 7 19:04:28 2015 +0530

    Merge tag 'upstream/0.5.3.0+debian' into master-0.5.3.0
    
    Upstream version 0.5.3.0+debian
    
    # gpg: Signature made Monday 07 September 2015 07:04:19 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 bin/bundle                                         |   3 -
 bin/cucumber                                       |   7 -
 bin/eye                                            |  16 -
 bin/guard                                          |  16 -
 bin/rails                                          |   8 -
 bin/rake                                           |   8 -
 bin/rspec                                          |   7 -
 bin/rubocop                                        |  16 -
 bin/spring                                         |  18 --
 config/defaults.yml                                |   2 +-
 config/diaspora.yml.example                        |  21 +-
 config/locales/devise/devise.az.yml                |  12 +
 config/locales/devise/devise.hy.yml                |   4 +-
 config/locales/devise/devise.nb.yml                |   2 +-
 config/locales/diaspora/az.yml                     |  34 +-
 config/locales/diaspora/bs.yml                     |   3 -
 config/locales/diaspora/cs.yml                     |   3 -
 config/locales/diaspora/da.yml                     |   7 +-
 config/locales/diaspora/de.yml                     |   3 -
 config/locales/diaspora/de_formal.yml              |   3 -
 config/locales/diaspora/el.yml                     | 220 ++++++-------
 config/locales/diaspora/en_valspeak.yml            |   3 -
 config/locales/diaspora/eo.yml                     |   3 -
 config/locales/diaspora/es-AR.yml                  |  59 ++--
 config/locales/diaspora/es-CL.yml                  |   3 -
 config/locales/diaspora/es-MX.yml                  |   3 -
 config/locales/diaspora/es-VE.yml                  |  59 ++--
 config/locales/diaspora/es.yml                     |   4 +-
 config/locales/diaspora/eu.yml                     |   3 -
 config/locales/diaspora/fi.yml                     |   6 +-
 config/locales/diaspora/fr.yml                     |   3 -
 config/locales/diaspora/he.yml                     |   3 -
 config/locales/diaspora/hu.yml                     |   3 -
 config/locales/diaspora/hy.yml                     | 302 +++++++++---------
 config/locales/diaspora/ia.yml                     |   3 -
 config/locales/diaspora/it.yml                     |   3 -
 config/locales/diaspora/ko.yml                     |   3 -
 config/locales/diaspora/ml.yml                     |   3 -
 config/locales/diaspora/nb.yml                     | 352 +++++++++++++++------
 config/locales/diaspora/nds.yml                    |  11 +-
 config/locales/diaspora/nl.yml                     |   3 -
 config/locales/diaspora/nn.yml                     |   3 -
 config/locales/diaspora/pl.yml                     |   3 -
 config/locales/diaspora/pt-BR.yml                  |  17 +-
 config/locales/diaspora/pt-PT.yml                  |   3 -
 config/locales/diaspora/ru.yml                     |   3 -
 config/locales/diaspora/sc.yml                     |  41 ++-
 config/locales/diaspora/sk.yml                     |   3 -
 config/locales/diaspora/sl.yml                     |   3 -
 config/locales/diaspora/sv.yml                     |  89 +++---
 config/locales/diaspora/te.yml                     |   3 -
 config/locales/diaspora/tr.yml                     |   3 -
 config/locales/diaspora/uk.yml                     |   3 -
 config/locales/diaspora/vi.yml                     |   3 -
 config/locales/diaspora/zh-CN.yml                  |   3 -
 config/locales/diaspora/zh-TW.yml                  |   3 -
 config/locales/javascript/javascript.cs.yml        |   2 +
 config/locales/javascript/javascript.da.yml        |   2 +
 config/locales/javascript/javascript.de.yml        |   2 +
 config/locales/javascript/javascript.de_formal.yml |   2 +
 config/locales/javascript/javascript.el.yml        |   4 +-
 config/locales/javascript/javascript.es-AR.yml     |   7 +
 config/locales/javascript/javascript.es-VE.yml     |  28 +-
 config/locales/javascript/javascript.es.yml        |   2 +
 config/locales/javascript/javascript.fr.yml        |   2 +
 config/locales/javascript/javascript.hy.yml        |  18 +-
 config/locales/javascript/javascript.nb.yml        |  69 +++-
 config/locales/javascript/javascript.nl.yml        |   2 +
 config/locales/javascript/javascript.pl.yml        |   2 +
 config/locales/javascript/javascript.sv.yml        |  30 +-
 config/locales/javascript/javascript.uk.yml        |  12 +-
 71 files changed, 881 insertions(+), 731 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git