Merge tag 'upstream/3.13.92'

Upstream version 3.13.92

5 files changed, 33 insertions, 29 deletions

diff --git a/NEWS b/NEWS
index 19340fe..904cdb7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.13.92
+
+  * Updated translations
+
 Overview of changes in simple-scan 3.13.91
 
   * Updated translations
diff --git a/aclocal.m4 b/aclocal.m4
index 563bf25..69979aa 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -376,7 +376,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
 
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
diff --git a/configure b/configure
index 74afa4b..82d3276 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.13.91.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.13.92.
 #
 #
 # 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.13.91'
-PACKAGE_STRING='simple-scan 3.13.91'
+PACKAGE_VERSION='3.13.92'
+PACKAGE_STRING='simple-scan 3.13.92'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1398,7 +1398,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.13.91 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.13.92 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1464,7 +1464,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.13.91:";;
+     short | recursive ) echo "Configuration of simple-scan 3.13.92:";;
    esac
   cat <<\_ACEOF
 
@@ -1580,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.13.91
+simple-scan configure 3.13.92
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1945,7 +1945,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.13.91, which was
+It was created by simple-scan $as_me 3.13.92, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2808,7 +2808,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.13.91'
+ VERSION='3.13.92'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6522,7 +6522,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.13.91, which was
+This file was extended by simple-scan $as_me 3.13.92, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6579,7 +6579,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.13.91
+simple-scan config.status 3.13.92
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index aca80d6..20ac0d2 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.13.91)
+AC_INIT(simple-scan, 3.13.92)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
diff --git a/po/nb.po b/po/nb.po
index 2d89399..74b057b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-08-18 17:31+1200\n"
-"PO-Revision-Date: 2012-07-23 09:04+0000\n"
+"PO-Revision-Date: 2014-09-02 16:41+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-19 06:31+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
+"X-Launchpad-Export-Date: 2014-09-03 06:05+0000\n"
+"X-Generator: Launchpad (build 17196)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -89,7 +89,7 @@ msgstr "Bilde"
 #. Title of dialog to reorder pages
 #: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
 msgid "Reorder Pages"
-msgstr ""
+msgstr "Omplasser sider"
 
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:30
@@ -164,12 +164,12 @@ msgstr "_Roter beskjæringsområdet"
 #. Menu item to move the selected page to the left
 #: ../data/simple-scan.ui.h:58
 msgid "Move Left"
-msgstr ""
+msgstr "Flytt til venstre"
 
 #. Menu item to move the selected page to the right
 #: ../data/simple-scan.ui.h:60
 msgid "Move Right"
-msgstr ""
+msgstr "Flytt til høyre"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:62
@@ -553,22 +553,22 @@ msgstr "Åpning av forhåndsvisning mislyktes"
 #. Label on button for combining sides in reordering dialog
 #: ../src/ui.vala:1204
 msgid "Combine sides"
-msgstr ""
+msgstr "Kombiner sider"
 
 #. Label on button for combining sides in reverse order in reordering dialog
 #: ../src/ui.vala:1214
 msgid "Combine sides (reverse)"
-msgstr ""
+msgstr "Kombiner sider (omvendt)"
 
 #. Label on button for reversing in reordering dialog
 #: ../src/ui.vala:1224
 msgid "Reverse"
-msgstr ""
+msgstr "Omvendt"
 
 #. Label on button for cancelling page reordering dialog
 #: ../src/ui.vala:1234
 msgid "Keep unchanged"
-msgstr ""
+msgstr "Behold uendret"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.vala:1449
@@ -661,31 +661,31 @@ msgstr "%d dpi"
 
 #: ../src/ui.vala:1688
 msgid "New Document"
-msgstr ""
+msgstr "Nytt dokument"
 
 #: ../src/ui.vala:1693
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #: ../src/ui.vala:1697
 msgid "Email..."
-msgstr ""
+msgstr "E-post …"
 
 #: ../src/ui.vala:1698
 msgid "Print..."
-msgstr ""
+msgstr "Skriv ut …"
 
 #: ../src/ui.vala:1706
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
 
 #: ../src/ui.vala:1707
 msgid "About"
-msgstr ""
+msgstr "Om"
 
 #: ../src/ui.vala:1708
 msgid "Quit"
-msgstr ""
+msgstr "Avslutt"
 
 #. Button in error infobar to open preferences dialog and change scanner
 #: ../src/ui.vala:1748