summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-02-18 03:44:00 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-02-18 03:44:00 +0100
commit693e0c6abc3bc3b90e9c4d4087184422a7a04725 (patch)
tree3d263a473673fab250464f0559e999442b85b32c
parent18bfa16e1e9af17b6517eaf70a4c74b7143bcb5b (diff)
parent59c8c1046c1b17411232821ff892febf42cb82e6 (diff)
Merge tag 'upstream/3.19.90'
Upstream version 3.19.90
-rw-r--r--NEWS4
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac2
-rwxr-xr-xinstall-sh23
-rw-r--r--po/es.po10
-rw-r--r--po/fr.po10
-rw-r--r--po/sr.po79
7 files changed, 83 insertions, 65 deletions
diff --git a/NEWS b/NEWS
index be781e4..079bc56 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 3.19.90
+
+ * Updated translations
+
Overview of changes in simple-scan 3.19.4
* Updated translations
diff --git a/configure b/configure
index 9b23a5e..d9627cc 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.19.4.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.19.90.
#
#
# 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.19.4'
-PACKAGE_STRING='simple-scan 3.19.4'
+PACKAGE_VERSION='3.19.90'
+PACKAGE_STRING='simple-scan 3.19.90'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1415,7 +1415,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.19.4 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.19.90 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of simple-scan 3.19.4:";;
+ short | recursive ) echo "Configuration of simple-scan 3.19.90:";;
esac
cat <<\_ACEOF
@@ -1604,7 +1604,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-simple-scan configure 3.19.4
+simple-scan configure 3.19.90
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1856,7 +1856,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.19.4, which was
+It was created by simple-scan $as_me 3.19.90, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2719,7 +2719,7 @@ fi
# Define the identity of the package.
PACKAGE='simple-scan'
- VERSION='3.19.4'
+ VERSION='3.19.90'
cat >>confdefs.h <<_ACEOF
@@ -6527,7 +6527,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.19.4, which was
+This file was extended by simple-scan $as_me 3.19.90, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6584,7 +6584,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.19.4
+simple-scan config.status 3.19.90
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index c2908f4..1219cfe 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.19.4)
+AC_INIT(simple-scan, 3.19.90)
AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
AM_SILENT_RULES([yes])
AM_MAINTAINER_MODE
diff --git a/install-sh b/install-sh
index 0b0fdcb..59990a1 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2014-09-12.12; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,34 +324,41 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # $RANDOM is not portable (e.g. dash); use it when possible to
+ # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
+ # create the $tmpdir first (and fail if unsuccessful) to make sure
+ # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
diff --git a/po/es.po b/po/es.po
index 19cac3e..79ddbc9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: simple-scan\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2015-11-27 09:10+1300\n"
-"PO-Revision-Date: 2015-05-25 02:42+0000\n"
-"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
+"PO-Revision-Date: 2016-01-24 21:20+0000\n"
+"Last-Translator: Julian Alarcon <alarconj@gmail.com>\n"
"Language-Team: Spanish <es@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: 2015-12-22 04:39+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-01-25 05:12+0000\n"
+"X-Generator: Launchpad (build 17902)\n"
#. Button to submit authorization dialog
#: ../data/simple-scan.ui.h:2
@@ -524,7 +524,7 @@ msgstr "_Guardar"
#. Default filename to use when saving document
#: ../src/ui.vala:515
msgid "Scanned Document.pdf"
-msgstr "Documento.pdf escaneado"
+msgstr "Documento escaneado.pdf"
#. Save dialog: Filter name to show only image files
#: ../src/ui.vala:520
diff --git a/po/fr.po b/po/fr.po
index 1d41bdc..7f8db4f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: simple-scan\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2015-11-27 09:10+1300\n"
-"PO-Revision-Date: 2016-01-10 16:58+0000\n"
-"Last-Translator: Jean-Marc <Unknown>\n"
+"PO-Revision-Date: 2016-01-23 14:01+0000\n"
+"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
"Language-Team: French <fr@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: 2016-01-11 04:43+0000\n"
-"X-Generator: Launchpad (build 17881)\n"
+"X-Launchpad-Export-Date: 2016-01-24 05:13+0000\n"
+"X-Generator: Launchpad (build 17902)\n"
#. Button to submit authorization dialog
#: ../data/simple-scan.ui.h:2
@@ -532,7 +532,7 @@ msgstr "_Enregistrer"
#. Default filename to use when saving document
#: ../src/ui.vala:515
msgid "Scanned Document.pdf"
-msgstr "Document.pdf numérisé"
+msgstr "Document numérisé.pdf"
#. Save dialog: Filter name to show only image files
#: ../src/ui.vala:520
diff --git a/po/sr.po b/po/sr.po
index 45ecd27..3087a63 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,20 +1,20 @@
# Serbian translation for simple-scan
# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
# This file is distributed under the same license as the simple-scan package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2014.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2016.
msgid ""
msgstr ""
"Project-Id-Version: simple-scan\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2015-11-27 09:10+1300\n"
-"PO-Revision-Date: 2015-05-19 19:28+0000\n"
-"Last-Translator: Марко М. Костић <Unknown>\n"
-"Language-Team: Serbian translators\n"
+"PO-Revision-Date: 2016-02-08 06:49+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-12-22 04:39+0000\n"
-"X-Generator: Launchpad (build 17865)\n"
+"X-Launchpad-Export-Date: 2016-02-09 05:23+0000\n"
+"X-Generator: Launchpad (build 17908)\n"
"Language: sr\n"
#. Button to submit authorization dialog
@@ -222,7 +222,7 @@ msgstr "Заустави"
#. Tooltip for rotate left (counter-clockwise) button
#: ../data/simple-scan.ui.h:79
msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Окрените страну на лево (супротно смеру казаљке на сату)"
+msgstr "Окрените страницу на лево (супротно смеру казаљке на сату)"
#. Label on rotate page left (anti-clockwise) item
#: ../data/simple-scan.ui.h:81
@@ -232,7 +232,7 @@ msgstr "Окрени на лево"
#. Tooltip for rotate right (clockwise) button
#: ../data/simple-scan.ui.h:83
msgid "Rotate the page to the right (clockwise)"
-msgstr "Окрените страну на десно (у смеру казаљке на сату)"
+msgstr "Окрените страницу на десно (у смеру казаљке на сату)"
#. Label on rotate page right (clockwise) item
#: ../data/simple-scan.ui.h:85
@@ -241,7 +241,7 @@ msgstr "Окрени на десно"
#: ../data/simple-scan.ui.h:86
msgid "Crop the selected page"
-msgstr "Одрежите изабрану страну"
+msgstr "Одрежите изабрану страницу"
#: ../data/simple-scan.ui.h:87
msgid "Crop"
@@ -255,7 +255,7 @@ msgstr "Поставке"
#. Label beside scan source combo box
#: ../data/simple-scan.ui.h:91
msgid "Scan S_ource:"
-msgstr "Извор _скенирања:"
+msgstr "_Извор скенирања:"
#. Label beside scan source combo box
#: ../data/simple-scan.ui.h:93
@@ -265,7 +265,7 @@ msgstr "Резолуција _текста:"
#. Label beside scan source combo box
#: ../data/simple-scan.ui.h:95
msgid "_Photo Resolution:"
-msgstr "Ре_золуција слике:"
+msgstr "Резолуција _слике:"
#. Label beside scan side combo box
#: ../data/simple-scan.ui.h:97
@@ -280,7 +280,7 @@ msgstr "Величина странице:"
#. Label beside brightness scale
#: ../data/simple-scan.ui.h:101
msgid "Brightness:"
-msgstr "Освјетљај:"
+msgstr "Осветљај:"
#. Label beside contrast scale
#: ../data/simple-scan.ui.h:103
@@ -302,7 +302,7 @@ msgstr "Скенирајте документе"
#: ../data/simple-scan.desktop.in.h:4
msgid "scan;scanner;flatbed;adf;"
-msgstr "скенирати;скенер;flatbed;adf;"
+msgstr "скенирај;скенер;flatbed;adf;"
#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
msgid "Device to scan from"
@@ -371,7 +371,7 @@ msgstr "Резолуција за скенирања текста"
#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
msgid "The resolution in dots-per-inch to use when scanning text."
msgstr ""
-"Резолуција у тачкама-по-инчу (dpi) која ће бити коришћена при скенирању "
+"Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
"текста."
#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
@@ -381,7 +381,7 @@ msgstr "Резолуција за скенирања слика"
#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
msgid "The resolution in dots-per-inch to use when scanning photos."
msgstr ""
-"Резолуција у тачкама-по-инчу (dpi) која ће бити коришћена при скенирању "
+"Резолуција у тачкама-по-палцу (dpi) која ће бити коришћена при скенирању "
"фотографија."
#: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
@@ -418,8 +418,8 @@ msgid ""
"print your scans, export them to pdf, or save them in a range of image "
"formats."
msgstr ""
-"Једноставно решење за лако скенирање докумената и слика. Можете исећи лоше "
-"делове слика и ротирати скенирано. Можете штампати скенирано, одрадити извоз "
+"Једноставно решење за лако скенирање докумената и слика. Можете отсећи лоше "
+"делове слика и окренути скенирано. Можете штампати скенирано, одрадити извоз "
"у ПДФ или сачувати скенирано у један од мноштва подржаних формата слика."
#: ../data/appdata/simple-scan.appdata.xml.in.h:3
@@ -462,7 +462,7 @@ msgstr "Исписује поруке за отклањање грешака"
#: ../src/simple-scan.vala:26
msgid "Fix PDF files generated with older versions of Simple Scan"
msgstr ""
-"Поправи ПДФ датотеке створене старијим издањима Једноставног скенирања"
+"Поправља ПДФ датотеке створене старијим издањима Једноставног скенирања"
#. Title of error dialog when scan failed
#: ../src/simple-scan.vala:391
@@ -504,12 +504,12 @@ msgstr "Проверите да ли је скенер повезан и укљ
#. Warning displayed when no drivers are installed but a compatible scanner is detected
#: ../src/ui.vala:381
msgid "Additional software needed"
-msgstr ""
+msgstr "Потребан је додатни софтвер"
#. Instructions to install driver software
#: ../src/ui.vala:383
msgid "You need to install driver software for your scanner."
-msgstr ""
+msgstr "Морате да инсталирате управљачке програме за ваш скенер."
#. Save dialog: Dialog title
#: ../src/ui.vala:505 ../src/ui.vala:1834
@@ -557,7 +557,7 @@ msgstr "ПНГ (без губитака)"
#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
#: ../src/ui.vala:556
msgid "File format:"
-msgstr ""
+msgstr "Запис датотеке:"
#. Title of error dialog when save failed
#: ../src/ui.vala:649
@@ -678,7 +678,7 @@ msgstr "Изађи без чувања"
#. Message to indicate a Brother scanner has been detected
#: ../src/ui.vala:1580
msgid "You appear to have a Brother scanner."
-msgstr ""
+msgstr "Изгледа да имате Бродеров скенер."
#. Instructions on how to install Brother scanner drivers
#: ../src/ui.vala:1582
@@ -686,11 +686,13 @@ msgid ""
"Drivers for this are available on the <a "
"href=\"http://support.brother.com\">Brother website</a>."
msgstr ""
+"Управљачки програми су доступни на <a "
+"href=\"http://support.brother.com\">веб сајту Бродера</a>."
#. Message to indicate a Samsung scanner has been detected
#: ../src/ui.vala:1586
msgid "You appear to have a Samsung scanner."
-msgstr ""
+msgstr "Изгледа да имате Самсунгов скенер."
#. Instructions on how to install Samsung scanner drivers
#: ../src/ui.vala:1588
@@ -698,16 +700,18 @@ msgid ""
"Drivers for this are available on the <a "
"href=\"http://samsung.com/support\">Samsung website</a>."
msgstr ""
+"Управљачки програми су доступни на <a "
+"href=\"http://samsung.com/support\">веб сајту Самсунга</a>."
#. Message to indicate a HP scanner has been detected
#: ../src/ui.vala:1592
msgid "You appear to have an HP scanner."
-msgstr ""
+msgstr "Изгледа да имате Хевлет-Пакардов скенер."
#. Message to indicate an Epson scanner has been detected
#: ../src/ui.vala:1597
msgid "You appear to have an Epson scanner."
-msgstr ""
+msgstr "Изгледа да имате Епсонов скенер."
#. Instructions on how to install Epson scanner drivers
#: ../src/ui.vala:1599
@@ -715,43 +719,46 @@ msgid ""
"Drivers for this are available on the <a "
"href=\"http://support.epson.com\">Epson website</a>."
msgstr ""
+"Управљачки програми су доступни на <a href=\"http://support.epson.com\">веб "
+"сајту Епсона</a>."
#. Title of dialog giving instructions on how to install drivers
#: ../src/ui.vala:1603
msgid "Install drivers"
-msgstr ""
+msgstr "Инсталација управљачких програма"
#. Message in driver install dialog
#: ../src/ui.vala:1634
msgid "Once installed you will need to restart Simple Scan."
msgstr ""
+"Након инсталације мораћете поново да покренете Једноставно скенирање."
#. Label shown while installing drivers
#: ../src/ui.vala:1646
msgid "Installing drivers..."
-msgstr ""
+msgstr "Инсталирам управљачке програме..."
#. Label shown once drivers successfully installed
#: ../src/ui.vala:1654
msgid "Drivers installed successfully!"
-msgstr ""
+msgstr "Управљачки програми су успешно инсталирани!"
#. Label shown if failed to install drivers
#: ../src/ui.vala:1664
#, c-format
msgid "Failed to install drivers (error code %d)."
-msgstr ""
+msgstr "Нисам успео да инсталирам управљачке програме (грешка %d)."
#. Label shown if failed to install drivers
#: ../src/ui.vala:1670
msgid "Failed to install drivers."
-msgstr ""
+msgstr "Нисам успео да инсталирам управљачке програме."
#. Label shown to prompt user to install packages (when PackageKit not available)
#: ../src/ui.vala:1677
#, c-format
msgid "You need to install the %s package(s)."
-msgstr ""
+msgstr "Треба да инсталирате пакет „%s“."
#. Preferences dialog: Label for default resolution in resolution list
#: ../src/ui.vala:1775
@@ -813,7 +820,7 @@ msgstr "Промени _скенер"
#. Button in error infobar to prompt user to install drivers
#: ../src/ui.vala:1882
msgid "_Install Drivers"
-msgstr ""
+msgstr "_Инсталирај управљачке програме"
#. Combo box value for automatic paper size
#: ../src/ui.vala:1888
@@ -830,19 +837,19 @@ msgstr "Светлије"
#: ../src/ui.vala:1948
msgid "Less"
-msgstr "Мање"
+msgstr "Мањи"
#: ../src/ui.vala:1950
msgid "More"
-msgstr "Више"
+msgstr "Већи"
#: ../src/ui.vala:1958
msgid "Minimum"
-msgstr "Најмање"
+msgstr "Најнижи"
#: ../src/ui.vala:1960
msgid "Maximum"
-msgstr "Највише"
+msgstr "Највиши"
#: ../src/ui.vala:1994
msgid "Saving document..."