[gnome-commander/GSettings: 8/11] Merge branch 'master'

[Uwe Scholz <uwescholz src gnome org>]

commit fc7eea5a42c43d3bcaf8e608f580c9250cd5c042
Merge: 0673857 3299113
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Mon Dec 14 21:43:06 2015 +0100

    Merge branch 'master'

 Makefile.am                    |   14 +-
 doc/cs/cs.po                   | 1030 ++++++++++++++--------------
 po/POTFILES.skip               |    1 +
 po/de.po                       | 1449 +++++++++++++++++++++-------------------
 tests/Makefile.am              |   14 +-
 tests/iv_bm_search_test.cc     |   40 +-
 tests/iv_bm_search_test.h      |   61 --
 tests/iv_datapresentation.cc   |    2 +-
 tests/iv_fileops_test.cc       |   10 +-
 tests/iv_fileops_test.h        |   38 -
 tests/iv_imagerenderer_test.cc |    3 +-
 tests/iv_inputmodes_test.cc    |    2 +-
 tests/iv_textrenderer_test.cc  |    2 +-
 tests/iv_viewerwidget_test.cc  |    4 +-
 14 files changed, 1343 insertions(+), 1327 deletions(-)
---