From 143fc164f11f08509a1d22943aec5b691612e81a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 21 Sep 2016 21:13:20 +0200 Subject: New upstream version 3.22.0.1 --- NEWS | 8 +++++ configure | 20 ++++++------ configure.ac | 2 +- data/Makefile.am | 4 ++- data/Makefile.in | 4 ++- help/sk/adf.page | 9 ++---- help/sk/crop.page | 20 ++++++------ help/sk/dpi.page | 23 ++++++-------- help/sk/print.page | 8 ++--- help/sk/rotate.page | 22 ++++++------- help/sk/save.page | 6 ++-- help/sk/scanning.page | 2 +- help/sk/sk.po | 88 +++++++++++++++++++++++++++++---------------------- 13 files changed, 114 insertions(+), 102 deletions(-) diff --git a/NEWS b/NEWS index 91fd02e..b9cfb82 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +Overview of changes in simple-scan 3.22.0.1 + + * Stop icon name in .desktop file being translated + +Overview of changes in simple-scan 3.22.0 + + * Updated translations + Overview of changes in simple-scan 3.21.90 * Use recent features of gettext, dropping intltool diff --git a/configure b/configure index 684d32a..717d9b5 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.21.90. +# Generated by GNU Autoconf 2.69 for simple-scan 3.22.0.1. # # # 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.21.90' -PACKAGE_STRING='simple-scan 3.21.90' +PACKAGE_VERSION='3.22.0.1' +PACKAGE_STRING='simple-scan 3.22.0.1' 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.21.90 to adapt to many kinds of systems. +\`configure' configures simple-scan 3.22.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1486,7 +1486,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of simple-scan 3.21.90:";; + short | recursive ) echo "Configuration of simple-scan 3.22.0.1:";; esac cat <<\_ACEOF @@ -1617,7 +1617,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -simple-scan configure 3.21.90 +simple-scan configure 3.22.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1915,7 +1915,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.21.90, which was +It was created by simple-scan $as_me 3.22.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2779,7 +2779,7 @@ fi # Define the identity of the package. PACKAGE='simple-scan' - VERSION='3.21.90' + VERSION='3.22.0.1' cat >>confdefs.h <<_ACEOF @@ -8374,7 +8374,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.21.90, which was +This file was extended by simple-scan $as_me 3.22.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8431,7 +8431,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.21.90 +simple-scan config.status 3.22.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 19c9a0a..6950507 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.21.90) +AC_INIT(simple-scan, 3.22.0.1) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE diff --git a/data/Makefile.am b/data/Makefile.am index 5f421a0..7d29429 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,8 +4,10 @@ desktopdir = $(datadir)/applications desktop_in_files = simple-scan.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +# Explicitly list the keywords to stop the icon field being translated +# https://bugs.launchpad.net/bugs/1624662 $(desktop_DATA): $(desktop_in_files) - $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@ gsettings_SCHEMAS = org.gnome.SimpleScan.gschema.xml @GSETTINGS_RULES@ diff --git a/data/Makefile.in b/data/Makefile.in index d9bc6f4..d310329 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -749,8 +749,10 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile +# Explicitly list the keywords to stop the icon field being translated +# https://bugs.launchpad.net/bugs/1624662 $(desktop_DATA): $(desktop_in_files) - $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=GenericName --keyword=Comment --keyword=Keywords --template $< -d $(top_srcdir)/po -o $@ @GSETTINGS_RULES@ @APPSTREAM_XML_RULES@ diff --git a/help/sk/adf.page b/help/sk/adf.page index 0da45f5..8d55001 100644 --- a/help/sk/adf.page +++ b/help/sk/adf.page @@ -7,10 +7,7 @@ Použitie automatického podávača dokumentov -

- If your scanner features an Automatic Document Feeder (ADF) - you can scan all the pages from the feeder via one of following methods: -

+

Ak váš skener obsahuje automatický podávač dokumentov (ADF), môžete skenovať všetky stránky z podávača jedným z týchto spôsobov:

<title>Používať klávesové skratky @@ -31,10 +28,10 @@ Use the Toolbar Buttons -

Click on the arrow to the right of the "Scan" button.

+

Kliknite na šípku napravo od tlačidla „Skenovať“.

 -

Choose "All Pages From Feeder".

+

Zvoľte „Všetky stránky z podávača“.

 diff --git a/help/sk/crop.page b/help/sk/crop.page index 59e31b1..0bdedd9 100644 --- a/help/sk/crop.page +++ b/help/sk/crop.page @@ -15,30 +15,28 @@

- Use a Right Click -

Right click anywhere on the image area and select "Crop".

 + Použitím pravého tlačidla +

Kliknite pravým tlačidlom kdekoľvek v oblasti obrázku a vyberte „Orezanie“.

Choose one of the fixed crop frames, or select "Custom" to manually set the crop frame's dimensions by dragging its borders.

 -

Click and hold the frame, then move it to the desired position.

 +

Kliknite a podržte rámec, potom ho premiestnite do požadovanej pozície.

 Use a Menu -

Navigate to the PageCrop menu.

 +

Prejdite do ponuky StránkaOrezanie.

Choose one of the fixed crop frames, or select "Custom" to manually adjust the frame's dimensions by dragging its borders.

 -

Click and hold the frame, then move it to the desired position.

 +

Kliknite a podržte rámec, potom ho premiestnite do požadovanej pozície.

 - Use the Toolbar -

Click the "Crop" button in the toolbar.

+ Použitím panela nástrojov +

Kliknite na tlačidlo „Orezanie“ v paneli nástrojov.

This is the same as choosing "Custom" in step 2 of the aforementioned methods.

 -

Drag the borders of the frame to set the desired dimensions and position.

 +

Pretiahnutím okrajov rámca nastavíte požadované rozmery a pozíciu.

 -

- Each new scanned page will use the previous crop. -

+

Na každú novú skenovanú stránku sa použije predchádzajúce orezanie.

 diff --git a/help/sk/dpi.page b/help/sk/dpi.page index 7e1d164..aaccbc2 100644 --- a/help/sk/dpi.page +++ b/help/sk/dpi.page @@ -14,33 +14,32 @@

-

The available scanning resolutions for both document types (Text and Photo) are the same - and are listed in the following table:

+

Dostupné rozlíšenia skenovania pre oba typy dokumentov (text a fotografia) sú rovnaké a sú vypísané v nasledujúcej tabuľke:

- - + + - - + + - + - + - - + + @@ -48,9 +47,7 @@

Text Resolution

Photo Resolution

Rozlíšenie textu

Rozlíšenie fotografie

75 dpi (draft)

75 dpi (draft)

75 dpi (koncept)

75 dpi (koncept)

150 dpi (default)

150 dpi (predvolené)

150 dpi

300 dpi

300 dpi (default)

300 dpi (predvolené)

600 dpi

600 dpi

1200 dpi (high resolution)

1200 dpi (high resolution)

1200 dpi (vysoké rozlíšenie)

1200 dpi (vysoké rozlíšenie)

2400 dpi

-

Text documents are always scanned in black - and white, while Photo documents are always scanned in color, at any - resolution!

+

Textové dokumenty sú vždy skenované čierno bielo, zatiaľ čo fotografické dokumenty sú vždy skenované vo farbe, v každom rozlíšení!

 diff --git a/help/sk/print.page b/help/sk/print.page index a9091bd..09b4739 100644 --- a/help/sk/print.page +++ b/help/sk/print.page @@ -7,13 +7,9 @@ Tlač -

- Simple Scan allows you print a scanned document directly from the its - interface, without having to save the document first. This feature makes Simple - Scan a very convenient tool for making copies of documents or photos. -

+

Aplikácia Jednoduché skenovanie umožňuje tlač skenovaného dokumentu priamo prostredníctvom svojho rozhrania, bez nutnosti uloženia dokumentu. Táto funkcia vytvára z aplikácie Jednoduché skenovanie veľmi pohodlný nástroj na tvorbu kópií dokumentov a fotografií.

- To Print a Document + Na vytlačenie dokumentu

Go to the DocumentPrint menu or use the keyboard shortcut CtrlP. diff --git a/help/sk/rotate.page b/help/sk/rotate.page index ea82994..3720af5 100644 --- a/help/sk/rotate.page +++ b/help/sk/rotate.page @@ -5,7 +5,7 @@ - Rotating a Page + Otočenie stránky

In Simple Scan, you can change the rotation of a page either before or after scanning the page. @@ -30,27 +30,25 @@ - Use Shortcuts + Použitie skratiek

Select the page you want to rotate by clicking on it once.

 -

Press one of the following shortcut keys:

+

Stlačte jednu z nasledovných klávesových skratiek:

- - + + - - + + - - + +

Command

Shortcut Key

Príkaz

Klávesová skratka

Rotate Left

[ (left bracket)

Otočenie doľava

[ (ľavá hranatá zátvorka)

Rotate Right

] (right bracket)

Otočenie doprava

] (pravá hranatá zátvorka)
-

- Each new scanned page will use the previous rotation. -

+

Pre každú novú skenovanú stránku sa použije predchádzajúce otočenie.

 diff --git a/help/sk/save.page b/help/sk/save.page index 7cbb1e0..c5e8881 100644 --- a/help/sk/save.page +++ b/help/sk/save.page @@ -19,15 +19,15 @@

-

Press the "Save" button.

+

Stlačte tlačidlo „Uložiť“.

 - Supported File Types + Podporované typy súborov - + diff --git a/help/sk/scanning.page b/help/sk/scanning.page index cd4d5ad..cd4e781 100644 --- a/help/sk/scanning.page +++ b/help/sk/scanning.page @@ -10,7 +10,7 @@

Pre skenovanie dokumentu z vášho skenera:

-

Connect the scanner to your computer and power it on.

 +

Pripojte skener k vášmu počítaču a zapnite ho .

Otvorte aplikáciu Jednoduché skenovanie.

Click the arrow to the right of the "Scan" button and choose the type of document you are scanning: Photo or Text.

diff --git a/help/sk/sk.po b/help/sk/sk.po index 56b8e05..25264a9 100644 --- a/help/sk/sk.po +++ b/help/sk/sk.po @@ -9,14 +9,14 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2016-04-25 14:55+0200\n" -"PO-Revision-Date: 2016-07-09 08:21+0000\n" +"PO-Revision-Date: 2016-08-16 18:26+0000\n" "Last-Translator: Dusan Kazik \n" "Language-Team: slovenčina <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-07-10 05:20+0000\n" -"X-Generator: Launchpad (build 18115)\n" +"X-Launchpad-Export-Date: 2016-08-17 05:26+0000\n" +"X-Generator: Launchpad (build 18169)\n" #. Put one translator per line, in the form NAME , YEAR1, YEAR2 msgctxt "_" @@ -85,6 +85,8 @@ msgid "" "If your scanner features an Automatic Document Feeder (ADF) you can scan all " "the pages from the feeder via one of following methods:" msgstr "" +"Ak váš skener obsahuje automatický podávač dokumentov (ADF), môžete skenovať " +"všetky stránky z podávača jedným z týchto spôsobov:" #. (itstool) path: steps/title #: C/adf.page:17 @@ -118,12 +120,12 @@ msgstr "" #. (itstool) path: item/p #: C/adf.page:35 msgid "Click on the arrow to the right of the \"Scan\" button." -msgstr "" +msgstr "Kliknite na šípku napravo od tlačidla „Skenovať“." #. (itstool) path: item/p #: C/adf.page:38 msgid "Choose \"All Pages From Feeder\"." -msgstr "" +msgstr "Zvoľte „Všetky stránky z podávača“." #. (itstool) path: item/media #. This is a reference to an external file such as an image or video. When @@ -193,12 +195,13 @@ msgstr "" #. (itstool) path: steps/title #: C/crop.page:19 msgid "Use a Right Click" -msgstr "" +msgstr "Použitím pravého tlačidla" #. (itstool) path: item/p #: C/crop.page:20 msgid "Right click anywhere on the image area and select \"Crop\"." msgstr "" +"Kliknite pravým tlačidlom kdekoľvek v oblasti obrázku a vyberte „Orezanie“." #. (itstool) path: item/p #: C/crop.page:21 @@ -212,11 +215,13 @@ msgstr "" #: C/crop.page:30 msgid "Click and hold the frame, then move it to the desired position." msgstr "" +"Kliknite a podržte rámec, potom ho premiestnite do požadovanej pozície." #. (itstool) path: item/p #: C/crop.page:28 msgid "Navigate to the PageCrop menu." msgstr "" +"Prejdite do ponuky StránkaOrezanie." #. (itstool) path: item/p #: C/crop.page:29 @@ -228,12 +233,12 @@ msgstr "" #. (itstool) path: steps/title #: C/crop.page:34 msgid "Use the Toolbar" -msgstr "" +msgstr "Použitím panela nástrojov" #. (itstool) path: item/p #: C/crop.page:35 msgid "Click the \"Crop\" button in the toolbar." -msgstr "" +msgstr "Kliknite na tlačidlo „Orezanie“ v paneli nástrojov." #. (itstool) path: note/p #: C/crop.page:36 @@ -246,12 +251,12 @@ msgstr "" #: C/crop.page:38 msgid "" "Drag the borders of the frame to set the desired dimensions and position." -msgstr "" +msgstr "Pretiahnutím okrajov rámca nastavíte požadované rozmery a pozíciu." #. (itstool) path: note/p #: C/crop.page:42 msgid "Each new scanned page will use the previous crop." -msgstr "" +msgstr "Na každú novú skenovanú stránku sa použije predchádzajúce orezanie." #. (itstool) path: page/title #: C/dpi.page:9 @@ -273,60 +278,62 @@ msgid "" "The available scanning resolutions for both document types (Text and Photo) " "are the same and are listed in the following table:" msgstr "" +"Dostupné rozlíšenia skenovania pre oba typy dokumentov (text a fotografia) " +"sú rovnaké a sú vypísané v nasledujúcej tabuľke:" #. (itstool) path: td/p #: C/dpi.page:23 msgid "Text Resolution" -msgstr "" +msgstr "Rozlíšenie textu" #. (itstool) path: td/p #: C/dpi.page:24 msgid "Photo Resolution" -msgstr "" +msgstr "Rozlíšenie fotografie" #. (itstool) path: td/p #: C/dpi.page:27 #: C/dpi.page:28 msgid "75 dpi (draft)" -msgstr "" +msgstr "75 dpi (koncept)" #. (itstool) path: td/p #: C/dpi.page:31 msgid "150 dpi (default)" -msgstr "" +msgstr "150 dpi (predvolené)" #. (itstool) path: td/p #: C/dpi.page:32 msgid "150 dpi" -msgstr "" +msgstr "150 dpi" #. (itstool) path: td/p #: C/dpi.page:35 msgid "300 dpi" -msgstr "" +msgstr "300 dpi" #. (itstool) path: td/p #: C/dpi.page:36 msgid "300 dpi (default)" -msgstr "" +msgstr "300 dpi (predvolené)" #. (itstool) path: td/p #: C/dpi.page:39 #: C/dpi.page:40 msgid "600 dpi" -msgstr "" +msgstr "600 dpi" #. (itstool) path: td/p #: C/dpi.page:43 #: C/dpi.page:44 msgid "1200 dpi (high resolution)" -msgstr "" +msgstr "1200 dpi (vysoké rozlíšenie)" #. (itstool) path: td/p #: C/dpi.page:47 #: C/dpi.page:48 msgid "2400 dpi" -msgstr "" +msgstr "2400 dpi" #. (itstool) path: note/p #: C/dpi.page:52 @@ -335,6 +342,9 @@ msgid "" "while Photo documents are always scanned in color, at " "any resolution!" msgstr "" +"Textové dokumenty sú vždy skenované čierno bielo, zatiaľ " +"čo fotografické dokumenty sú vždy skenované vo farbe, v " +"každom rozlíšení!" #. (itstool) path: page/title #: C/email.page:9 @@ -394,11 +404,15 @@ msgid "" "Simple Scan a very convenient tool for making copies of documents " "or photos." msgstr "" +"Aplikácia Jednoduché skenovanie umožňuje tlač skenovaného " +"dokumentu priamo prostredníctvom svojho rozhrania, bez nutnosti uloženia " +"dokumentu. Táto funkcia vytvára z aplikácie Jednoduché skenovanie " +"veľmi pohodlný nástroj na tvorbu kópií dokumentov a fotografií." #. (itstool) path: steps/title #: C/print.page:17 msgid "To Print a Document" -msgstr "" +msgstr "Na vytlačenie dokumentu" #. (itstool) path: item/p #: C/print.page:19 @@ -456,7 +470,7 @@ msgstr "" #. (itstool) path: page/title #: C/rotate.page:9 msgid "Rotating a Page" -msgstr "" +msgstr "Otočenie stránky" #. (itstool) path: page/p #: C/rotate.page:11 @@ -509,47 +523,47 @@ msgstr "" #. (itstool) path: steps/title #: C/rotate.page:34 msgid "Use Shortcuts" -msgstr "" +msgstr "Použitie skratiek" #. (itstool) path: item/p #: C/rotate.page:36 msgid "Press one of the following shortcut keys:" -msgstr "" +msgstr "Stlačte jednu z nasledovných klávesových skratiek:" #. (itstool) path: td/p #: C/rotate.page:39 msgid "Command" -msgstr "" +msgstr "Príkaz" #. (itstool) path: td/p #: C/rotate.page:40 msgid "Shortcut Key" -msgstr "" +msgstr "Klávesová skratka" #. (itstool) path: td/p #: C/rotate.page:43 msgid "Rotate Left" -msgstr "" +msgstr "Otočenie doľava" #. (itstool) path: td/p #: C/rotate.page:44 msgid "[ (left bracket)" -msgstr "" +msgstr "[ (ľavá hranatá zátvorka)" #. (itstool) path: td/p #: C/rotate.page:47 msgid "Rotate Right" -msgstr "" +msgstr "Otočenie doprava" #. (itstool) path: td/p #: C/rotate.page:48 msgid "] (right bracket)" -msgstr "" +msgstr "] (pravá hranatá zátvorka)" #. (itstool) path: note/p #: C/rotate.page:54 msgid "Each new scanned page will use the previous rotation." -msgstr "" +msgstr "Pre každú novú skenovanú stránku sa použije predchádzajúce otočenie." #. (itstool) path: page/title #: C/save.page:9 @@ -573,17 +587,17 @@ msgstr "" #. (itstool) path: item/p #: C/save.page:23 msgid "Press the \"Save\" button." -msgstr "" +msgstr "Stlačte tlačidlo „Uložiť“." #. (itstool) path: table/title #: C/save.page:29 msgid "Supported File Types" -msgstr "" +msgstr "Podporované typy súborov" #. (itstool) path: td/p #: C/save.page:31 msgid "Type" -msgstr "" +msgstr "Typ" #. (itstool) path: td/p #: C/save.page:32 @@ -593,7 +607,7 @@ msgstr "" #. (itstool) path: td/p #: C/save.page:35 msgid "PDF" -msgstr "" +msgstr "PDF" #. (itstool) path: td/p #: C/save.page:36 @@ -643,7 +657,7 @@ msgstr "" #. (itstool) path: td/p #: C/save.page:61 msgid "TIFF" -msgstr "" +msgstr "TIFF" #. (itstool) path: td/p #: C/save.page:62 @@ -695,7 +709,7 @@ msgstr "Pre skenovanie dokumentu z vášho skenera:" #. (itstool) path: item/p #: C/scanning.page:16 msgid "Connect the scanner to your computer and power it on." -msgstr "" +msgstr "Pripojte skener k vášmu počítaču a zapnite ho ." #. (itstool) path: item/p #: C/scanning.page:17 -- cgit v1.2.3

Type

Typ

Brief Description