Merge tag 'upstream/3.15.4'

Upstream version 3.15.4

1 files changed, 55 insertions, 46 deletions

diff --git a/po/ru.po b/po/ru.po
index 288dc64..a2d0909 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 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"
+"POT-Creation-Date: 2015-01-15 10:02+1300\n"
 "PO-Revision-Date: 2014-07-10 05:43+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@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-12-01 06:08+0000\n"
-"X-Generator: Launchpad (build 17274)\n"
+"X-Launchpad-Export-Date: 2015-01-15 05:38+0000\n"
+"X-Generator: Launchpad (build 17303)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,7 +87,7 @@ msgstr "Фотография"
 
 #. Menu item to reorder pages
 #. Title of dialog to reorder pages
-#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1181 ../src/ui.vala:1694
+#: ../data/simple-scan.ui.h:28 ../src/ui.vala:1180 ../src/ui.vala:1689
 msgid "Reorder Pages"
 msgstr "Организация страниц"
 
@@ -205,7 +205,7 @@ msgstr "Отсканировать"
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1695
+#: ../data/simple-scan.ui.h:74 ../src/ui.vala:1690
 msgid "Save"
 msgstr "Сохранить"
 
@@ -247,7 +247,7 @@ msgid "Crop"
 msgstr "Обрезать"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1702
+#: ../data/simple-scan.ui.h:89 ../src/ui.vala:1697
 msgid "Preferences"
 msgstr "Параметры"
 
@@ -292,9 +292,17 @@ msgid "Quality:"
 msgstr "Качество:"
 
 #: ../data/simple-scan.desktop.in.h:2
+msgid "Document Scanner"
+msgstr ""
+
+#: ../data/simple-scan.desktop.in.h:3
 msgid "Scan Documents"
 msgstr "Сканирование документов"
 
+#: ../data/simple-scan.desktop.in.h:4
+msgid "scan;scanner;flatbed;adf;"
+msgstr ""
+
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
 msgstr "Устройство сканирования"
@@ -438,12 +446,12 @@ msgid "Scanned Document"
 msgstr "Отсканированный документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:543
+#: ../src/simple-scan.vala:541
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] — Устройство сканирования"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:554
+#: ../src/simple-scan.vala:552
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
@@ -452,7 +460,7 @@ msgstr "Выполните '%s --help', чтобы вывести полный �
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#: ../src/ui.vala:316 ../src/ui.vala:1746
+#: ../src/ui.vala:316 ../src/ui.vala:1735
 msgid "_Close"
 msgstr "_Закрыть"
 
@@ -473,7 +481,7 @@ msgid "Please check your scanner is connected and powered on"
 msgstr "Пожалуйста, проверьте, что сканер подсоединён и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:507 ../src/ui.vala:1696
+#: ../src/ui.vala:507 ../src/ui.vala:1691
 msgid "Save As..."
 msgstr "Сохранить как..."
 
@@ -526,52 +534,52 @@ msgid "If you don't save, changes will be permanently lost."
 msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:706
+#: ../src/ui.vala:705
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:708
+#: ../src/ui.vala:707
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:990
+#: ../src/ui.vala:989
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:1002
+#: ../src/ui.vala:1001
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
 #. Label on button for combining sides in reordering dialog
-#: ../src/ui.vala:1204
+#: ../src/ui.vala:1203
 msgid "Combine sides"
 msgstr "Объединить стороны"
 
 #. Label on button for combining sides in reverse order in reordering dialog
-#: ../src/ui.vala:1214
+#: ../src/ui.vala:1213
 msgid "Combine sides (reverse)"
 msgstr "Объединить стороны (в обратном порядке)"
 
 #. Label on button for reversing in reordering dialog
-#: ../src/ui.vala:1224
+#: ../src/ui.vala:1223
 msgid "Reverse"
 msgstr "В обратном порядке"
 
 #. Label on button for cancelling page reordering dialog
-#: ../src/ui.vala:1234
+#: ../src/ui.vala:1233
 msgid "Keep unchanged"
 msgstr "Оставить без изменений"
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1449
+#: ../src/ui.vala:1448
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1470
+#: ../src/ui.vala:1469
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -600,16 +608,16 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1473
+#: ../src/ui.vala:1472
 msgid "About Simple Scan"
 msgstr "О программе"
 
 #. Description of program
-#: ../src/ui.vala:1476
+#: ../src/ui.vala:1475
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1485
+#: ../src/ui.vala:1484
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -632,6 +640,7 @@ msgstr ""
 "  Int https://launchpad.net/~howrudoin\n"
 "  Ivan Bulychev https://launchpad.net/~vanyok\n"
 "  KEIII https://launchpad.net/~cashagent\n"
+"  ManDrive https://launchpad.net/~roman-romul\n"
 "  Net4Hack https://launchpad.net/~networkforhackers\n"
 "  Novichkov Alexander https://launchpad.net/~berkut\n"
 "  Oleg https://launchpad.net/~oleg-devyatilov\n"
@@ -649,106 +658,106 @@ msgstr ""
 "  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1507
+#: ../src/ui.vala:1506
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1509
+#: ../src/ui.vala:1508
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1633
+#: ../src/ui.vala:1632
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1636
+#: ../src/ui.vala:1635
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1639
+#: ../src/ui.vala:1638
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1642
+#: ../src/ui.vala:1641
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: ../src/ui.vala:1688
+#: ../src/ui.vala:1683
 msgid "New Document"
 msgstr "Новый документ"
 
-#: ../src/ui.vala:1693
+#: ../src/ui.vala:1688
 msgid "Document"
 msgstr "Документ"
 
-#: ../src/ui.vala:1697
+#: ../src/ui.vala:1692
 msgid "Email..."
 msgstr "Отправить..."
 
-#: ../src/ui.vala:1698
+#: ../src/ui.vala:1693
 msgid "Print..."
 msgstr "Печать..."
 
-#: ../src/ui.vala:1706
+#: ../src/ui.vala:1701
 msgid "Help"
 msgstr "Справка"
 
-#: ../src/ui.vala:1707
+#: ../src/ui.vala:1702
 msgid "About"
 msgstr "О программе"
 
-#: ../src/ui.vala:1708
+#: ../src/ui.vala:1703
 msgid "Quit"
 msgstr "Завершить"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1748
+#: ../src/ui.vala:1737
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1754
+#: ../src/ui.vala:1743
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1804
+#: ../src/ui.vala:1793
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1806
+#: ../src/ui.vala:1795
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1814
+#: ../src/ui.vala:1803
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1816
+#: ../src/ui.vala:1805
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1824
+#: ../src/ui.vala:1813
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1826
+#: ../src/ui.vala:1815
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:1867
+#: ../src/ui.vala:1856
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:2017
+#: ../src/ui.vala:2019
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"