Merge branch 'feature/upstream' into develop

1 files changed, 92 insertions, 76 deletions

diff --git a/po/ru.po b/po/ru.po
index 01e8434..abe88cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,18 +10,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n"
-"POT-Creation-Date: 2022-04-17 18:42+0000\n"
-"PO-Revision-Date: 2022-04-19 12:13+0300\n"
+"POT-Creation-Date: 2023-02-14 11:59+0000\n"
+"PO-Revision-Date: 2023-02-16 16:43+0300\n"
 "Last-Translator: Aleksandr Melman <Alexmelman88@gmail.com>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Launchpad-Export-Date: 2016-12-19 05:08+0000\n"
-"X-Generator: Poedit 3.0.1\n"
+"X-Generator: Poedit 3.2.2\n"
 "X-DL-Team: ru\n"
 "X-DL-Module: simple-scan\n"
 "X-DL-Branch: master\n"
@@ -188,13 +188,13 @@ msgstr ""
 #. https://bugzilla.gnome.org/show_bug.cgi?id=782753
 #. Title of scan window
 #: data/simple-scan.appdata.xml.in:6 data/simple-scan.desktop.in:3
-#: data/ui/app-window.ui:454 src/app-window.vala:1558 src/app-window.vala:1832
+#: data/ui/app-window.ui:454 src/app-window.vala:1584 src/app-window.vala:1858
 msgid "Document Scanner"
 msgstr "Сканер документов"
 
 #: data/simple-scan.appdata.xml.in:7 data/simple-scan.desktop.in:4
 msgid "Make a digital copy of your photos and documents"
-msgstr "Сделайте цифровую копию своих фотографий и документов"
+msgstr "Делайте цифровые копии своих фотографий и документов"
 
 #: data/simple-scan.appdata.xml.in:9
 msgid ""
@@ -213,9 +213,9 @@ msgstr ""
 "Это приложение использует фреймворк SANE для поддержки большинства "
 "существующих сканеров."
 
-#: data/simple-scan.appdata.xml.in:26
+#: data/simple-scan.appdata.xml.in:27
 msgid "The GNOME Project"
-msgstr "Проект GNOME"
+msgstr "The GNOME Project"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: data/simple-scan.desktop.in:6
@@ -312,7 +312,7 @@ msgstr "_Текст"
 msgid "_Image"
 msgstr "_Изображение"
 
-#: data/ui/app-window.ui:433 src/app-window.vala:1862
+#: data/ui/app-window.ui:433 src/app-window.vala:1889
 msgid "_Preferences"
 msgstr "_Параметры"
 
@@ -456,13 +456,18 @@ msgstr "Открыть меню"
 
 #: data/ui/help-overlay.ui:147
 msgctxt "shortcut window"
+msgid "Show preferences"
+msgstr "Показать параметры"
+
+#: data/ui/help-overlay.ui:154
+msgctxt "shortcut window"
 msgid "Keyboard shortcuts"
 msgstr "Комбинации клавиш"
 
-#: data/ui/help-overlay.ui:154
+#: data/ui/help-overlay.ui:161
 msgctxt "shortcut window"
 msgid "Quit"
-msgstr "Выйти"
+msgstr "Закрыть"
 
 #. Preferences Dialog: Section label for scanning settings
 #: data/ui/preferences-dialog.ui:52
@@ -579,7 +584,7 @@ msgstr "_Аргументы сценария"
 msgid "_Keep original file"
 msgstr "_Сохранить исходный файл"
 
-#: src/app-window.vala:229 src/app-window.vala:1660
+#: src/app-window.vala:229 src/app-window.vala:1686
 msgid "_Close"
 msgstr "_Закрыть"
 
@@ -779,61 +784,72 @@ msgstr "В обратном порядке"
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
+#. Label on button for keeping the ordering, but flip every second upside down
+#: src/app-window.vala:1347
+msgid "Flip even pages upside-down"
+msgstr "Перевернуть четные страницы"
+
+#. Label on button for keeping the ordering, but flip every second upside down
+#: src/app-window.vala:1358
+msgid "Flip odd pages upside-down"
+msgstr "Перевернуть нечетные страницы"
+
 #. Error message displayed when unable to launch help browser
-#: src/app-window.vala:1533
+#: src/app-window.vala:1559
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
-#: src/app-window.vala:1547
+#: src/app-window.vala:1573
 msgid "About Document Scanner"
-msgstr "О Сканере документов"
+msgstr "О приложении"
 
-#: src/app-window.vala:1549
+#: src/app-window.vala:1575
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: src/app-window.vala:1554
+#: src/app-window.vala:1580
 msgid "translator-credits"
 msgstr ""
 "Stas Solovey <whats_up@tut.by>, 2015-2018\n"
 "Роман Верменко <dargodet@gmail.com>, 2017\n"
-"Aleksandr Melman <alexmelman88@gmail.com>, 2021"
+"Aleksandr Melman <alexmelman88@gmail.com>, 2021-2023"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1573
+#: src/app-window.vala:1599
 msgid "Save document before quitting?"
-msgstr "Сохранить документ перед выходом?"
+msgstr "Сохранить документ перед закрытием?"
 
 #. Text in dialog warning when a document is about to be lost
-#: src/app-window.vala:1575
+#: src/app-window.vala:1601
 msgid "_Quit without Saving"
-msgstr "_Выйти без сохранения"
+msgstr "_Закрыть без сохранения"
 
 #. Message to indicate a Brother scanner has been detected
-#: src/app-window.vala:1616
+#: src/app-window.vala:1642
 msgid "You appear to have a Brother scanner."
 msgstr "Похоже, у вас сканер компании Brother."
 
 #. Instructions on how to install Brother scanner drivers
-#: src/app-window.vala:1618
+#: src/app-window.vala:1644
 msgid ""
-"Drivers for this are available on the <a href=\"http://support.brother.com"
-"\">Brother website</a>."
+"Drivers for this are available on the <a href=\"http://support.brother."
+"com\">Brother website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a href=\"http://support.brother.com"
-"\">веб-сайте Brother</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://support.brother."
+"com\">веб-сайте Brother</a>."
 
 #. Message to indicate a Canon Pixma scanner has been detected
-#: src/app-window.vala:1622
+#: src/app-window.vala:1648
 msgid ""
-"You appear to have a Canon scanner, which is supported by the <a href="
-"\"http://www.sane-project.org/man/sane-pixma.5.html\">Pixma SANE backend</a>."
+"You appear to have a Canon scanner, which is supported by the <a "
+"href=\"http://www.sane-project.org/man/sane-pixma.5.html\">Pixma SANE "
+"backend</a>."
 msgstr ""
 "Судя по всему, у вас сканер Canon, который поддерживается <a href=\"http://"
 "www.sane-project.org/man/sane-pixma.5.html\">бэкендом Pixma SANE</a>."
 
 #. Instructions on how to resolve issue with SANE scanner drivers
-#: src/app-window.vala:1624
+#: src/app-window.vala:1650
 msgid ""
 "Please check if your <a href=\"http://www.sane-project.org/sane-supported-"
 "devices.html\">scanner is supported by SANE</a>, otherwise report the issue "
@@ -847,22 +863,22 @@ msgstr ""
 "mailman/listinfo/sane-devel\">список рассылки SANE</a>."
 
 #. Message to indicate a Samsung scanner has been detected
-#: src/app-window.vala:1628
+#: src/app-window.vala:1654
 msgid "You appear to have a Samsung scanner."
 msgstr "Похоже, у вас сканер компании Samsung."
 
 #. Instructions on how to install Samsung scanner drivers.
 #. Because HP acquired Samsung's global printing business in 2017, the support is made on HP site.
-#: src/app-window.vala:1631
+#: src/app-window.vala:1657
 msgid ""
 "Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
 "website</a> (HP acquired Samsung's printing business)."
 msgstr ""
-"Драйверы для этого устройства доступны на <a href=\"https://support.hp.com"
-"\">сайте HP</a> (HP приобрела бизнес Samsung по печати)."
+"Драйверы для этого устройства доступны на <a href=\"https://support.hp."
+"com\">сайте HP</a> (HP приобрела бизнес Samsung по печати)."
 
 #. Message to indicate a HP scanner has been detected
-#: src/app-window.vala:1636
+#: src/app-window.vala:1662
 msgid "You appear to have an HP scanner."
 msgstr "Похоже, у вас сканер компании HP."
 
@@ -870,7 +886,7 @@ msgstr "Похоже, у вас сканер компании HP."
 #. smfp is rebranded and slightly modified Samsung devices,
 #. for example: HP Laser MFP 135a is rebranded Samsung Xpress SL-M2070.
 #. It require custom drivers, not available in hpaio package
-#: src/app-window.vala:1644
+#: src/app-window.vala:1670
 msgid ""
 "Drivers for this are available on the <a href=\"https://support.hp.com\">HP "
 "website</a>."
@@ -879,66 +895,66 @@ msgstr ""
 "сайте HP</a>."
 
 #. Message to indicate an Epson scanner has been detected
-#: src/app-window.vala:1648
+#: src/app-window.vala:1674
 msgid "You appear to have an Epson scanner."
 msgstr "Похоже, у вас сканер компании Epson."
 
 #. Instructions on how to install Epson scanner drivers
-#: src/app-window.vala:1650
+#: src/app-window.vala:1676
 msgid ""
-"Drivers for this are available on the <a href=\"http://support.epson.com"
-"\">Epson website</a>."
+"Drivers for this are available on the <a href=\"http://support.epson."
+"com\">Epson website</a>."
 msgstr ""
-"Драйверы для этих сканеров доступны на <a href=\"http://support.epson.com"
-"\">веб-сайте Epson</a>."
+"Драйверы для этих сканеров доступны на <a href=\"http://support.epson."
+"com\">веб-сайте Epson</a>."
 
-#. Message to indicate an Lexmark scanner has been detected
-#: src/app-window.vala:1654
-msgid "You appear to have an Lexmark scanner."
-msgstr "Похоже, у вас сканер Lexmark."
+#. Message to indicate a Lexmark scanner has been detected
+#: src/app-window.vala:1680
+msgid "You appear to have a Lexmark scanner."
+msgstr "Похоже, что у вас сканер Lexmark."
 
 #. Instructions on how to install Lexmark scanner drivers
-#: src/app-window.vala:1656
+#: src/app-window.vala:1682
 msgid ""
-"Drivers for this are available on the <a href=\"http://support.lexmark.com"
-"\">Lexmark website</a>."
+"Drivers for this are available on the <a href=\"http://support.lexmark."
+"com\">Lexmark website</a>."
 msgstr ""
 "Драйверы для него можно найти на <a href=\"http://support.lexmark.com\">веб-"
 "сайте Lexmark</a>."
 
 #. Title of dialog giving instructions on how to install drivers
-#: src/app-window.vala:1660
+#: src/app-window.vala:1686
 msgid "Install drivers"
 msgstr "Установка драйверов"
 
 #. Message in driver install dialog
-#: src/app-window.vala:1694
+#: src/app-window.vala:1720
 msgid "Once installed you will need to restart this app."
 msgstr "После установки вам нужно будет перезапустить это приложение."
 
 #. Label shown while installing drivers
-#: src/app-window.vala:1707
+#: src/app-window.vala:1733
 msgid "Installing drivers…"
 msgstr "Установка драйверов…"
 
 #. Label shown once drivers successfully installed
-#: src/app-window.vala:1715
+#: src/app-window.vala:1741
 msgid "Drivers installed successfully!"
 msgstr "Драйверы успешно установлены!"
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1725
+#: src/app-window.vala:1751
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "Не удалось установить драйверы (код ошибки %d)."
 
 #. Label shown if failed to install drivers
-#: src/app-window.vala:1731
+#: src/app-window.vala:1757
 msgid "Failed to install drivers."
 msgstr "Не удалось установить драйверы."
 
 #. Label shown to prompt user to install packages (when PackageKit not available)
-#: src/app-window.vala:1738
+#: src/app-window.vala:1764
 #, c-format
 msgid "You need to install the %s package."
 msgid_plural "You need to install the %s packages."
@@ -946,64 +962,64 @@ msgstr[0] "Необходимо установить %s пакет."
 msgstr[1] "Необходимо установить %s пакета."
 msgstr[2] "Необходимо установить %s пакетов."
 
-#: src/app-window.vala:1857
+#: src/app-window.vala:1884
 msgid "_Email"
 msgstr "Отправить _почтой"
 
-#: src/app-window.vala:1858
+#: src/app-window.vala:1885
 msgid "Pri_nt"
-msgstr "Рас_печатать"
+msgstr "Пе_чать"
 
-#: src/app-window.vala:1859
+#: src/app-window.vala:1886
 msgctxt "menu"
 msgid "_Reorder Pages"
 msgstr "_Организация страниц"
 
-#: src/app-window.vala:1863
+#: src/app-window.vala:1890
 msgid "_Keyboard Shortcuts"
 msgstr "_Комбинации клавиш"
 
-#: src/app-window.vala:1864
+#: src/app-window.vala:1891
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/app-window.vala:1865
+#: src/app-window.vala:1892
 msgid "_About Document Scanner"
-msgstr "_О Сканере документов"
+msgstr "_О приложении"
 
 #. Populate ActionBar (not supported in Glade)
 #. https://bugzilla.gnome.org/show_bug.cgi?id=769966
 #. Label on new document button
-#: src/app-window.vala:1873
+#: src/app-window.vala:1900
 msgid "_New Document"
 msgstr "_Новый документ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: src/app-window.vala:1892
+#: src/app-window.vala:1919
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Повернуть страницу влево (против часовой стрелки)"
 
 #. Tooltip for rotate right (clockwise) button
-#: src/app-window.vala:1901
+#: src/app-window.vala:1928
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
 #. Tooltip for crop button
-#: src/app-window.vala:1913
+#: src/app-window.vala:1940
 msgid "Crop the selected page"
 msgstr "Обрезать выбранную страницу"
 
 #. Tooltip for delete button
-#: src/app-window.vala:1931
+#: src/app-window.vala:1958
 msgid "Delete the selected page"
 msgstr "Удалить выбранную страницу"
 
 #. Text of button for cancelling save
-#: src/app-window.vala:2107
+#: src/app-window.vala:2134
 msgid "Cancel"
 msgstr "Отменить"
 
-#: src/book.vala:355 src/book.vala:361
+#: src/book.vala:381 src/book.vala:387
 #, c-format
 msgid "Unable to encode page %i"
 msgstr "Не удалось преобразовать страницу %i"
@@ -1064,7 +1080,7 @@ msgid "Unable to connect to scanner"
 msgstr "Не удалось подключиться к сканеру"
 
 #. Error displayed when no documents at the start of scanning
-#: src/scanner.vala:1361 src/scanner.vala:1496
+#: src/scanner.vala:1361 src/scanner.vala:1495
 msgid "Document feeder empty"
 msgstr "Автоподача документов пуста"
 
@@ -1089,7 +1105,7 @@ msgid "Unable to start scan"
 msgstr "Не удалось начать сканирование"
 
 #. Error displayed when communication with scanner broken
-#: src/scanner.vala:1395 src/scanner.vala:1506
+#: src/scanner.vala:1395 src/scanner.vala:1505
 msgid "Error communicating with scanner"
 msgstr "Ошибка связи со сканером"