[Pkg-privacy-commits] [nautilus-wipe] 17/20: Merge branch 'upstream-experimental' into experimental

[Intrigeri]

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

intrigeri pushed a commit to branch experimental
in repository nautilus-wipe.

commit e819a84dea27b903b5acc58b88a00bf081f3ec81
Merge: feb5b76 afa962a
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Jul 12 15:38:49 2016 +0000

    Merge branch 'upstream-experimental' into experimental

 .gitignore                                  |   7 +-
 Makefile.am                                 |   3 +-
 README                                      |   7 +-
 autogen.sh                                  |   3 -
 configure.ac                                |  10 +-
 help/C/{nautilus-wipe.xml => index.docbook} |  35 ++++---
 help/C/legal.xml                            |   2 +-
 help/Makefile.am                            |  12 +--
 help/nautilus-wipe.omf.in                   |   9 --
 nautilus-wipe/nw-extension.c                |  28 ++++--
 nautilus-wipe/nw-operation-manager.c        |  21 +++-
 nautilus-wipe/nw-operation-manager.h        |   1 +
 po/Makevars                                 |  41 ++++++++
 po/de.po                                    | 147 ++++++++++++++-------------
 po/fr.po                                    | 138 +++++++++++++-------------
 po/ru.po                                    | 149 +++++++++++++++-------------
 16 files changed, 348 insertions(+), 265 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/nautilus-wipe.git