Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2021-10-13 18:03:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane" Wed Oct 13 18:03:05 2021 rev:134 rq:924010 version:21.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2021-09-04 22:35:45.668183843 +0200 +++ /work/SRC/openSUSE:Factory/.libksane.new.2443/libksane.changes 2021-10-13 18:04:20.063109802 +0200 @@ -1,0 +2,11 @@ +Tue Oct 5 16:29:06 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.08.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.2/ +- Changes since 21.08.1: + * set initial values for the scan thread + * Fix multi page detection when 'source' is const + +------------------------------------------------------------------- Old: ---- libksane-21.08.1.tar.xz libksane-21.08.1.tar.xz.sig New: ---- libksane-21.08.2.tar.xz libksane-21.08.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.3iWxsu/_old 2021-10-13 18:04:21.679112334 +0200 +++ /var/tmp/diff_new_pack.3iWxsu/_new 2021-10-13 18:04:21.683112341 +0200 @@ -23,7 +23,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libksane -Version: 21.08.1 +Version: 21.08.2 Release: 0 Summary: KDE scanning library License: GPL-2.0-or-later ++++++ libksane-21.08.1.tar.xz -> libksane-21.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.1/CMakeLists.txt new/libksane-21.08.2/CMakeLists.txt --- old/libksane-21.08.1/CMakeLists.txt 2021-08-31 02:28:09.000000000 +0200 +++ new/libksane-21.08.2/CMakeLists.txt 2021-10-05 07:36:15.000000000 +0200 @@ -3,7 +3,7 @@ # KDE Applications version, managed by release script. set(RELEASE_SERVICE_VERSION_MAJOR "21") set(RELEASE_SERVICE_VERSION_MINOR "08") -set(RELEASE_SERVICE_VERSION_MICRO "1") +set(RELEASE_SERVICE_VERSION_MICRO "2") set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(KSane) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.1/po/hi/libksane.po new/libksane-21.08.2/po/hi/libksane.po --- old/libksane-21.08.1/po/hi/libksane.po 2021-08-31 02:28:09.000000000 +0200 +++ new/libksane-21.08.2/po/hi/libksane.po 2021-10-05 07:36:15.000000000 +0200 @@ -3,75 +3,76 @@ # This file is distributed under the same license as the PACKAGE package. # # Ravishankar Shrivastava <raviratl...@yahoo.com>, 2008. +# Raghavendra Kamath <ra...@raghukamath.com>, 2021. msgid "" msgstr "" "Project-Id-Version: libksane\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-08-20 01:49+0000\n" -"PO-Revision-Date: 2008-03-30 16:10+0530\n" -"Last-Translator: Ravishankar Shrivastava <raviratl...@yahoo.com>\n" -"Language-Team: Hindi <indlinux-hi...@lists.sourceforge.net>\n" +"PO-Revision-Date: 2021-09-18 12:40+0530\n" +"Last-Translator: Raghavendra Kamath <ra...@raghukamath.com>\n" +"Language-Team: kde-hindi\n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 21.08.1\n" #: ../ksanetwain/ktwain_widget.cpp:36 #, kde-format msgid "Open scan dialog" -msgstr "" +msgstr "??????????????? ??????????????? ???????????????" #: i18n-hplip.cpp:3 #, kde-format msgid "None" -msgstr "" +msgstr "????????? ????????????" #: i18n-hplip.cpp:4 #, kde-format msgid "MH" -msgstr "" +msgstr "?????? ??????" #: i18n-hplip.cpp:5 #, kde-format msgid "MR" -msgstr "" +msgstr "?????? ??????" #: i18n-hplip.cpp:6 #, kde-format msgid "MMR" -msgstr "" +msgstr "?????? ?????? ??????" #: i18n-hplip.cpp:7 #, kde-format msgid "JPEG" -msgstr "" +msgstr "???????????????" #: i18n-hplip.cpp:8 #, kde-format msgid "Auto" -msgstr "" +msgstr "???????????????" #: i18n-hplip.cpp:9 #, kde-format msgid "Flatbed" -msgstr "" +msgstr "????????????????????????" #: i18n-hplip.cpp:10 #, kde-format msgid "ADF" -msgstr "" +msgstr "???????????????" #: i18n-hplip.cpp:11 #, kde-format msgid "Advanced" -msgstr "" +msgstr "???????????????" #: i18n-hplip.cpp:12 #, kde-format msgid "Compression" -msgstr "" +msgstr "??????????????????" #: i18n-hplip.cpp:13 #, kde-format @@ -79,11 +80,12 @@ "Selects the scanner compression method for faster scans, possibly at the " "expense of image quality." msgstr "" +"???????????? ?????? ??????????????? ?????? ????????? ?????????????????? ????????????????????? ???????????? ?????? ????????? ????????????, ?????????????????? ????????? ???????????????????????? ?????? ???????????? ????????? " #: i18n-hplip.cpp:15 #, kde-format msgid "JPEG compression factor" -msgstr "" +msgstr "??????????????? ?????????????????? ????????????" #: i18n-hplip.cpp:16 #, kde-format @@ -91,36 +93,38 @@ "Sets the scanner JPEG compression factor. Larger numbers mean better " "compression, and smaller numbers mean better image quality." msgstr "" +"?????????????????? ??????????????? ????????????????????? ???????????? ????????? ???????????? ????????? ???????????? ?????????????????? ?????? ???????????? ??????????????? ????????????????????? ??????, ?????? ???????????? ?????????????????? " +"?????? ???????????? ??????????????? ????????? ???????????????????????? ?????????" #: i18n-hplip.cpp:19 #, kde-format msgid "Batch scan" -msgstr "" +msgstr "????????? ???????????????" #: i18n-hplip.cpp:20 #, kde-format msgid "Enables continuous scanning with automatic document feeder (ADF)." -msgstr "" +msgstr "???????????????????????? ??????????????????????????? ???????????? (???????????????) ?????? ????????? ?????????????????? ???????????????????????? ??????????????? ???????????? ?????????" #: i18n-hplip.cpp:21 #, kde-format msgid "Duplex" -msgstr "" +msgstr "???????????????????????????" #: i18n-hplip.cpp:22 #, kde-format msgid "Enables scanning on both sides of the page." -msgstr "" +msgstr "??????????????? ?????? ??????????????? ?????? ???????????????????????? ??????????????? ???????????? ?????????" #: i18n-hplip.cpp:23 #, kde-format msgid "Geometry" -msgstr "" +msgstr "????????????????????????" #: i18n-hplip.cpp:24 #, kde-format msgid "Length measurement" -msgstr "" +msgstr "??????????????? ?????????" #: i18n-hplip.cpp:25 #, kde-format @@ -128,36 +132,38 @@ "Selects how the scanned image length is measured and reported, which is " "impossible to know in advance for scrollfed scans." msgstr "" +"?????? ??????????????? ?????? ?????? ??????????????? ?????? ?????? ????????? ?????? ??????????????? ???????????? ???????????? ?????? ????????????????????? ?????? ???????????? ??????, ?????? ?????? " +"?????????????????????????????? ??????????????? ?????? ????????? ???????????? ?????? ??????????????? ??????????????? ?????????" #: i18n-hplip.cpp:27 #, kde-format msgid "Unknown" -msgstr "" +msgstr "??????????????????" #: i18n-hplip.cpp:28 #, kde-format msgid "Unlimited" -msgstr "" +msgstr "??????????????????" #: i18n-hplip.cpp:29 #, kde-format msgid "Approximate" -msgstr "" +msgstr "?????????????????????" #: i18n-hplip.cpp:30 #, kde-format msgid "Padded" -msgstr "" +msgstr "???????????????" #: i18n-hplip.cpp:31 #, kde-format msgid "Exact" -msgstr "" +msgstr "????????????" #: i18n-hplip.cpp:32 #, kde-format msgid "???" -msgstr "" +msgstr "???" #: ksanedevicedialog.cpp:45 #, kde-format @@ -167,98 +173,101 @@ "systems scanner setup.<br>For details about SANE see the <a href='http://www." "sane-project.org/'>SANE homepage</a>.</html>" msgstr "" +"<html>SANE (?????????????????? ?????????????????? ????????? ????????????) ??????????????? ?????? ????????? ??????????????? ???????????? ??????????????? <br>???????????? ???????????? ?????? ?????????????????? " +"???????????? ?????? ?????? ?????? ???????????? ??????<br> ?????? ???????????? ??????????????? ?????????????????? ??????????????? ?????? ???????????? ??????????????? <br>SANE ?????? ???????????? ????????? ??????????????? " +"?????? ?????????<a href='http://www.sane-project.org/'> SANE ????????????????????????</a> ??????????????? ???</html>" #: ksanedevicedialog.cpp:67 #, kde-format msgid "Reload devices list" -msgstr "" +msgstr "??????????????? ???????????? ??????????????? ????????????" #: ksanedevicedialog.cpp:91 #, kde-format msgid "Looking for devices. Please wait." -msgstr "" +msgstr "????????????????????? ?????? ???????????? ?????? ?????? ????????? ????????? ??????????????? ??????????????????????????? ???????????????" #: ksanedevicedialog.cpp:126 #, kde-format msgid "Sorry. No devices found." -msgstr "" +msgstr "???????????? ??????????????? ????????? ??????????????? ???????????? ???????????????" #: ksanedevicedialog.cpp:136 #, kde-format msgid "Found devices:" -msgstr "" +msgstr "???????????? ????????? ??????????????? :" #: ksaneviewer.cpp:108 ksanewidget.cpp:85 #, kde-format msgid "Zoom In" -msgstr "" +msgstr "???????????? ??????" #: ksaneviewer.cpp:111 ksanewidget.cpp:91 #, kde-format msgid "Zoom Out" -msgstr "" +msgstr "???????????? ?????????" #: ksaneviewer.cpp:114 ksanewidget.cpp:97 #, kde-format msgid "Zoom to Selection" -msgstr "" +msgstr "????????? ?????? ???????????? ????????????" #: ksaneviewer.cpp:117 ksanewidget.cpp:103 #, kde-format msgid "Zoom to Fit" -msgstr "" +msgstr "???????????? ?????? ?????????????????? ????????????" #: ksaneviewer.cpp:120 ksanewidget.cpp:109 #, kde-format msgid "Clear Selections" -msgstr "" +msgstr "????????? ???????????? ????????????" #: ksanewidget.cpp:60 #, kde-format msgid "Waiting for the scan to start." -msgstr "" +msgstr "??????????????? ???????????? ???????????? ?????? ??????????????????????????? ?????? ????????? ?????????" #: ksanewidget.cpp:72 #, kde-format msgid "Cancel current scan operation" -msgstr "" +msgstr "????????????????????? ??????????????? ???????????????????????? ???????????? ????????????" #: ksanewidget.cpp:120 #, kde-format msgid "Scan Preview Image (%1)" -msgstr "" +msgstr "????????????????????????????????? ????????? (%1) ??????????????? ????????????" #: ksanewidget.cpp:121 #, kde-format msgctxt "Preview button text" msgid "Preview" -msgstr "" +msgstr "?????????????????????????????????" #: ksanewidget.cpp:126 #, kde-format msgid "Scan Final Image (%1)" -msgstr "" +msgstr "???????????????????????? ????????? (%1) ??????????????? ????????????" #: ksanewidget.cpp:127 #, kde-format msgctxt "Final scan button text" msgid "Scan" -msgstr "" +msgstr "???????????????" #: ksanewidget.cpp:170 #, kde-format msgid "Basic Options" -msgstr "" +msgstr "????????? ??????????????????" #: ksanewidget.cpp:176 #, kde-format msgid "Scanner Specific Options" -msgstr "" +msgstr "?????????????????? ????????????????????? ??????????????????" #: ksanewidget.cpp:319 #, kde-format msgid "Authentication required for resource: %1" -msgstr "" +msgstr "?????????????????? ?????? ????????? ?????????????????????????????? ?????????????????? : %1" #: ksanewidget.cpp:481 #, kde-format @@ -266,11 +275,13 @@ "The image data contained 16 bits per color, but the color depth has been " "truncated to 8 bits per color." msgstr "" +"????????? ???????????? ????????? ??????????????? ????????? ?????? ????????? ??????, ??????????????? ????????? ?????? ??????????????? ?????? ??? ????????? ??????????????? ????????? ?????? ???????????? ?????? " +"???????????? ????????? ?????????" #: ksanewidget_p.cpp:477 #, kde-format msgid "Image intensity" -msgstr "" +msgstr "????????? ?????????????????????" #: ksanewidget_p.cpp:481 #, kde-format @@ -279,156 +290,146 @@ "green, and blue channels simultaneously (i.e., it is an intensity gamma " "table)." msgstr "" +"????????????-??????????????? ????????????????????? ????????? ????????? ????????? ?????? ?????????????????? ?????????, ????????? ?????? ???????????? ?????????????????? ?????? ?????? ????????? ???????????? ????????? ?????? " +"???????????????????????? ???????????? ?????? (????????????, ?????? ?????? ????????????????????? ???????????? ???????????? ?????????????????? ??????)???" #: ksanewidget_p.cpp:489 #, kde-format msgid "Separate color intensity tables" -msgstr "" +msgstr "????????? ????????? ????????????????????? ??????????????????" #: ksanewidget_p.cpp:515 #, kde-format msgid "Scan Area Size" -msgstr "" +msgstr "??????????????? ????????????????????? ?????? ????????????" #: ksanewidget_p.cpp:520 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " mm" +#, kde-format msgid " mm" -msgstr "????????????" +msgstr " ????????????" #: ksanewidget_p.cpp:520 #, kde-format msgid " inch" -msgstr "" +msgstr " ?????????" #: ksanewidget_p.cpp:522 #, kde-format msgid "Width" -msgstr "" +msgstr "??????????????????" #: ksanewidget_p.cpp:527 #, kde-format msgid "Height" -msgstr "" +msgstr "???????????????" #: ksanewidget_p.cpp:532 #, kde-format msgid "X Offset" -msgstr "" +msgstr "???????????? ???????????????" #: ksanewidget_p.cpp:537 #, kde-format msgid "Y Offset" -msgstr "" +msgstr "????????? ???????????????" #: ksanewidget_p.cpp:1197 #, kde-format msgctxt "This is compared to the option string returned by sane" msgid "Transparency" -msgstr "" +msgstr "??????????????????????????????" #: ksanewidget_p.cpp:1199 #, kde-format msgctxt "This is compared to the option string returned by sane" msgid "Negative" -msgstr "" +msgstr "?????????????????????" #: ksanewidget_p.cpp:1245 #, kde-format msgctxt "@title:window" msgid "General Error" -msgstr "" +msgstr "?????????????????? ??????????????????" #: ksanewidget_p.cpp:1248 #, kde-format msgctxt "@title:window" msgid "Information" -msgstr "" +msgstr "?????????????????????" #: ksanewidget_p.cpp:1330 #, kde-format msgid "Custom" -msgstr "" +msgstr "?????????????????????" #: ksanewidget_p.cpp:1355 #, kde-format msgctxt "Page size landscape" msgid " Landscape" -msgstr "" +msgstr " ????????????" #: options/ksaneinvertoption.cpp:60 #, kde-format msgid "Invert colors" -msgstr "" +msgstr "????????? ???????????????" #: options/ksaneinvertoption.cpp:65 #, kde-format msgid "Invert the colors of the scanned image." -msgstr "" +msgstr "??????????????? ?????? ?????? ????????? ?????? ??????????????? ?????? ????????? ????????????" #: options/ksanepagesizeoption.cpp:99 #, kde-format msgctxt "Page size landscape" msgid "Landscape %1" -msgstr "" +msgstr "???????????? %1" #: options/ksanepagesizeoption.cpp:174 #, kde-format msgid "Scan area size" -msgstr "" +msgstr "??????????????? ????????????????????? ?????? ????????????" #: options/ksanepagesizeoption.cpp:179 #, kde-format msgid "Select a predefined page size for the scanning area." -msgstr "" +msgstr "???????????????????????? ????????????????????? ?????? ????????? ?????? ?????????????????????????????????????????? ??????????????? ???????????? ?????? ????????? ???????????????" #: widgets/ksaneoptionwidget.cpp:68 #, kde-format msgctxt "Label for a scanner option" msgid "%1:" -msgstr "" +msgstr "%1:" #: widgets/labeledcombo.cpp:170 widgets/labeledcombo.cpp:198 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " Pixels" +#, kde-format msgctxt "Parameter and Unit" msgid "%1 Pixel" msgid_plural "%1 Pixels" -msgstr[0] "???????????????????????????" -msgstr[1] "???????????????????????????" +msgstr[0] "%1 ?????????????????????" +msgstr[1] "%1 ???????????????????????????" #: widgets/labeledcombo.cpp:173 widgets/labeledcombo.cpp:201 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "Parameter and Unit" msgid "%1 Bit" msgid_plural "%1 Bits" -msgstr[0] "%1 %" -msgstr[1] "%1 %" +msgstr[0] "%1 ?????????" +msgstr[1] "%1 ???????????????" #: widgets/labeledcombo.cpp:176 widgets/labeledcombo.cpp:204 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " mm" +#, kde-format msgctxt "Parameter and Unit (Millimeter)" msgid "%1 mm" -msgstr "????????????" +msgstr "%1 ????????????" #: widgets/labeledcombo.cpp:179 widgets/labeledcombo.cpp:207 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "Parameter and Unit (Dots Per Inch)" msgid "%1 DPI" -msgstr "%1 %" +msgstr "%1 ??????????????????" #: widgets/labeledcombo.cpp:182 widgets/labeledcombo.cpp:210 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "Parameter and Unit (Percentage)" msgid "%1 %" msgstr "%1 %" @@ -437,63 +438,51 @@ #, kde-format msgctxt "Parameter and Unit (Microseconds)" msgid "%1 ??s" -msgstr "" +msgstr "%1 ??s" #: widgets/labeledcombo.cpp:188 widgets/labeledcombo.cpp:216 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgid "%1" -msgstr "%1 %" +msgstr "%1" #: widgets/labeledentry.cpp:54 #, kde-format msgctxt "Label for button to reset text in a KLineEdit" msgid "Reset" -msgstr "" +msgstr "???????????????" #: widgets/labeledentry.cpp:56 #, kde-format msgctxt "Label for button to write text in a KLineEdit to sane" msgid "Set" -msgstr "" +msgstr "???????????? ????????????" #: widgets/labeledfslider.cpp:42 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " Pixels" +#, kde-format msgctxt "Double numbers. SpinBox parameter unit" msgid " Pixels" -msgstr "???????????????????????????" +msgstr " ???????????????????????????" #: widgets/labeledfslider.cpp:45 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "Double numbers. SpinBox parameter unit" msgid " Bits" -msgstr "%1 %" +msgstr " ???????????????" #: widgets/labeledfslider.cpp:48 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " mm" +#, kde-format msgctxt "Double numbers. SpinBox parameter unit (Millimeter)" msgid " mm" -msgstr "????????????" +msgstr " ????????????" #: widgets/labeledfslider.cpp:51 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "Double numbers. SpinBox parameter unit (Dots Per Inch)" msgid " DPI" -msgstr "%1 %" +msgstr " ??????????????????" #: widgets/labeledfslider.cpp:54 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " %" +#, kde-format msgctxt "Double numbers. SpinBox parameter unit (Percentage)" msgid " %" msgstr " %" @@ -502,7 +491,7 @@ #, kde-format msgctxt "Double numbers. SpinBox parameter unit (Microseconds)" msgid " ??s" -msgstr "" +msgstr " ??s" #: widgets/labeledgamma.cpp:53 #, kde-format @@ -520,49 +509,39 @@ msgstr "????????????" #: widgets/labeledslider.cpp:44 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " Pixels" +#, kde-format msgctxt "SpinBox parameter unit" msgid " Pixel" msgid_plural " Pixels" -msgstr[0] "???????????????????????????" -msgstr[1] "???????????????????????????" +msgstr[0] " ?????????????????????" +msgstr[1] " ???????????????????????????" #: widgets/labeledslider.cpp:47 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "SpinBox parameter unit" msgid " Bit" msgid_plural " Bits" -msgstr[0] "%1 %" -msgstr[1] "%1 %" +msgstr[0] " ?????????" +msgstr[1] " ???????????????" #: widgets/labeledslider.cpp:50 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " mm" +#, kde-format msgctxt "SpinBox parameter unit (Millimeter)" msgid " mm" msgid_plural " mm" -msgstr[0] "????????????" -msgstr[1] "????????????" +msgstr[0] " ????????????" +msgstr[1] " ????????????" #: widgets/labeledslider.cpp:53 -#, fuzzy, kde-format -#| msgid "%1 %" -#| msgid_plural "%1 %" +#, kde-format msgctxt "SpinBox parameter unit (Dots Per Inch)" msgid " DPI" msgid_plural " DPI" -msgstr[0] "%1 %" -msgstr[1] "%1 %" +msgstr[0] " ??????????????????" +msgstr[1] " ??????????????????" #: widgets/labeledslider.cpp:56 -#, fuzzy, kde-format -#| msgctxt "SpinBox parameter unit" -#| msgid " %" +#, kde-format msgctxt "SpinBox parameter unit (Percentage)" msgid " %" msgid_plural " %" @@ -574,8 +553,8 @@ msgctxt "SpinBox parameter unit (Microseconds)" msgid " ??s" msgid_plural " ??s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] " ??s" +msgstr[1] " ??s" #, fuzzy #~| msgctxt "SpinBox parameter unit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.1/po/nb/libksane.po new/libksane-21.08.2/po/nb/libksane.po --- old/libksane-21.08.1/po/nb/libksane.po 2021-08-31 02:28:09.000000000 +0200 +++ new/libksane-21.08.2/po/nb/libksane.po 2021-10-05 07:36:15.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libksane\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2021-07-04 00:15+0000\n" +"POT-Creation-Date: 2021-08-20 01:49+0000\n" "PO-Revision-Date: 2012-09-03 14:26+0200\n" "Last-Translator: Bj??rn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokm??l <l10n...@lister.huftis.org>\n" @@ -333,36 +333,36 @@ msgid "Y Offset" msgstr "" -#: ksanewidget_p.cpp:1189 +#: ksanewidget_p.cpp:1197 #, kde-format msgctxt "This is compared to the option string returned by sane" msgid "Transparency" msgstr "Gjennomsiktighet" -#: ksanewidget_p.cpp:1191 +#: ksanewidget_p.cpp:1199 #, kde-format msgctxt "This is compared to the option string returned by sane" msgid "Negative" msgstr "Negativ" -#: ksanewidget_p.cpp:1237 +#: ksanewidget_p.cpp:1245 #, kde-format msgctxt "@title:window" msgid "General Error" msgstr "" -#: ksanewidget_p.cpp:1240 +#: ksanewidget_p.cpp:1248 #, kde-format msgctxt "@title:window" msgid "Information" msgstr "Informasjon" -#: ksanewidget_p.cpp:1322 +#: ksanewidget_p.cpp:1330 #, kde-format msgid "Custom" msgstr "" -#: ksanewidget_p.cpp:1347 +#: ksanewidget_p.cpp:1355 #, kde-format msgctxt "Page size landscape" msgid " Landscape" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.1/po/zh_CN/libksane.po new/libksane-21.08.2/po/zh_CN/libksane.po --- old/libksane-21.08.1/po/zh_CN/libksane.po 2021-08-31 02:28:09.000000000 +0200 +++ new/libksane-21.08.2/po/zh_CN/libksane.po 2021-10-05 07:36:15.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-08-20 01:49+0000\n" -"PO-Revision-Date: 2021-08-30 11:45\n" +"PO-Revision-Date: 2021-09-27 13:10\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.1/src/ksanecore_p.cpp new/libksane-21.08.2/src/ksanecore_p.cpp --- old/libksane-21.08.1/src/ksanecore_p.cpp 2021-08-27 22:40:09.000000000 +0200 +++ new/libksane-21.08.2/src/ksanecore_p.cpp 2021-10-05 00:06:36.000000000 +0200 @@ -161,6 +161,8 @@ optionResolution = option; } if (option->name() == QStringLiteral(SANE_NAME_SCAN_SOURCE)) { + // some scanners only have ADF and never update the source name + determineMultiPageScanning(option->value()); connect(option, &KSaneBaseOption::valueChanged, this, &KSaneCorePrivate::determineMultiPageScanning); } if (option->name() == QStringLiteral("wait-for-button")) { @@ -204,9 +206,17 @@ // Create the scan thread m_scanThread = new KSaneScanThread(m_saneHandle); - connect(m_scanThread, &KSaneScanThread::finished, this, &KSaneCorePrivate::imageScanFinished); + + m_scanThread->setImageInverted(invertOption->value()); connect(invertOption, &KSaneInvertOption::valueChanged, m_scanThread, &KSaneScanThread::setImageInverted); + + if (optionResolution != nullptr) { + m_scanThread->setImageResolution(optionResolution->value()); + connect(optionResolution, &KSaneBaseOption::valueChanged, m_scanThread, &KSaneScanThread::setImageResolution); + } + connect(m_scanThread, &KSaneScanThread::scanProgressUpdated, q, &KSaneCore::scanProgress); + connect(m_scanThread, &KSaneScanThread::finished, this, &KSaneCorePrivate::imageScanFinished); // try to set to default values setDefaultValues();