Merge tag 'upstream/3.17.2'

Upstream version 3.17.2

4 files changed, 26 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index d5fede6..dd8067c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.17.2
+
+  * Updated translations
+
 Overview of changes in simple-scan 3.17.1.1
 
   * Build appdata in a separate directory so it can have translations merged in
diff --git a/configure b/configure
index b8a84e0..f81a819 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.17.1.1.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.17.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.17.1.1'
-PACKAGE_STRING='simple-scan 3.17.1.1'
+PACKAGE_VERSION='3.17.2'
+PACKAGE_STRING='simple-scan 3.17.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1397,7 +1397,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.17.1.1 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.17.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1463,7 +1463,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.17.1.1:";;
+     short | recursive ) echo "Configuration of simple-scan 3.17.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.17.1.1
+simple-scan configure 3.17.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1831,7 +1831,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simple-scan $as_me 3.17.1.1, which was
+It was created by simple-scan $as_me 3.17.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2694,7 +2694,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.17.1.1'
+ VERSION='3.17.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6370,7 +6370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by simple-scan $as_me 3.17.1.1, which was
+This file was extended by simple-scan $as_me 3.17.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6427,7 +6427,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-simple-scan config.status 3.17.1.1
+simple-scan config.status 3.17.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index f569788..6f83589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.17.1.1)
+AC_INIT(simple-scan, 3.17.2)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/po/sr.po b/po/sr.po
index aeb313d..f538624 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2015-04-15 12:17+1200\n"
-"PO-Revision-Date: 2014-02-28 14:28+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"PO-Revision-Date: 2015-05-19 19:28+0000\n"
+"Last-Translator: Марко М. Костић <Unknown>\n"
 "Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-05-05 05:30+0000\n"
-"X-Generator: Launchpad (build 17474)\n"
+"X-Launchpad-Export-Date: 2015-05-20 05:11+0000\n"
+"X-Generator: Launchpad (build 17508)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -293,7 +293,7 @@ msgstr "Квалитет:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Document Scanner"
-msgstr ""
+msgstr "Скенер докумената"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
@@ -301,7 +301,7 @@ msgstr "Скенирајте документе"
 
 #: ../data/simple-scan.desktop.in.h:4
 msgid "scan;scanner;flatbed;adf;"
-msgstr ""
+msgstr "скенирати;скенер;flatbed;adf;"
 
 #: ../data/simple-scan.appdata.xml.in.h:2
 msgid ""
@@ -310,11 +310,16 @@ msgid ""
 "print your scans, export them to pdf, or save them in a range of image "
 "formats."
 msgstr ""
+"Једноставно решење за лако скенирање докумената и слика. Можете исећи лоше "
+"делове слика и ротирати скенирано. Можете штампати скенирано, одрадити извоз "
+"у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
 
 #: ../data/simple-scan.appdata.xml.in.h:3
 msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr ""
+"Обично скенирање користи САНЕ радни оквир да би додатно подржао већину "
+"тренутних скенера."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"