Merge tag 'upstream/3.23.2'

Upstream version 3.23.2

1 files changed, 144 insertions, 86 deletions

diff --git a/po/ko.po b/po/ko.po
index 6c639bb..84e2caf 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-07-30 05:45+0000\n"
-"X-Generator: Launchpad (build 18169)\n"
+"X-Launchpad-Export-Date: 2016-11-18 05:52+0000\n"
+"X-Generator: Launchpad (build 18269)\n"
 
 #. Button to submit authorization dialog
 #: data/simple-scan.ui:24
@@ -88,8 +88,8 @@ msgstr "텍스트"
 msgid "Photo"
 msgstr "사진"
 
-#. Menu item to reorder pages
-#: data/simple-scan.ui:336 src/ui.vala:1183 src/ui.vala:1841
+#. Title of dialog to reorder pages
+#: ../src/ui.vala:1183 ../src/ui.vala:1841
 msgid "Reorder Pages"
 msgstr "페이지 다시 정렬"
 
@@ -207,7 +207,7 @@ msgstr "스캔"
 msgid "Save document to a file"
 msgstr "파일로 문서 저장하기"
 
-#: data/simple-scan.ui:709 src/ui.vala:1842
+#: ../src/ui.vala:1842
 msgid "Save"
 msgstr "저장"
 
@@ -248,8 +248,7 @@ msgstr "선택한 페이지 자르기"
 msgid "Crop"
 msgstr "잘라내기"
 
-#. Title of preferences dialog
-#: data/simple-scan.ui:997 src/ui.vala:1849
+#: ../src/ui.vala:1849
 msgid "Preferences"
 msgstr "기본 설정"
 
@@ -324,157 +323,191 @@ msgid ""
 "Simple Scan uses the SANE framework to support most existing scanners."
 msgstr "심플 스캔은 현존하는 거의 모든 스캐너들을 지원하는 SANE 프레임워크를 사용합니다."
 
-#: src/scanner.vala:841
+#. Error displayed when no scanners to scan with
+#: ../src/scanner.vala:841
 msgid "No scanners available.  Please connect a scanner."
 msgstr "사용할 수 있는 스캐너가 없습니다. 스캐너를 연결하세요."
 
-#: src/scanner.vala:871
+#. Error displayed when cannot connect to scanner
+#: ../src/scanner.vala:871
 msgid "Unable to connect to scanner"
 msgstr "스캐너에 연결할 수 없음"
 
-#: src/scanner.vala:1223
+#. Error display when unable to start scan
+#: ../src/scanner.vala:1223
 msgid "Unable to start scan"
 msgstr "스캔을 시작할 수 없음"
 
-#: src/scanner.vala:1236 src/scanner.vala:1333
+#. Error displayed when communication with scanner broken
+#: ../src/scanner.vala:1236 ../src/scanner.vala:1333
 msgid "Error communicating with scanner"
 msgstr "스캐너와의 통신 에러"
 
-#: src/simple-scan.vala:21
+#. Help string for command line --version flag
+#: ../src/simple-scan.vala:21
 msgid "Show release version"
 msgstr "릴리즈 버전 보이기"
 
-#: src/simple-scan.vala:24
+#. Help string for command line --debug flag
+#: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
 msgstr "디버깅 메세지 표시"
 
-#: src/simple-scan.vala:26
+#: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr "이전 버전의 심플 스캔으로 만든 PDF 파일 고치기"
 
-#: src/simple-scan.vala:391
+#. Title of error dialog when scan failed
+#: ../src/simple-scan.vala:391
 msgid "Failed to scan"
 msgstr "스캔 실패"
 
-#: src/simple-scan.vala:621
+#. Arguments and description for --help text
+#: ../src/simple-scan.vala:621
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[장치...] - 스캐닝 도구"
 
-#: src/simple-scan.vala:632
+#. Text printed out when an unknown command-line argument provided
+#: ../src/simple-scan.vala:632
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "사용 가능한 모든 옵션의 목록을 보려면 '%s --help' 명령을 실행하십시오."
 
-#: src/ui.vala:318 src/ui.vala:1602 src/ui.vala:1887
+#: ../src/ui.vala:318 ../src/ui.vala:1602 ../src/ui.vala:1887
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: src/ui.vala:327
+#. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
+#: ../src/ui.vala:327
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'에 접근하려면 사용자 이름과 암호가 필요합니다"
 
-#: src/ui.vala:375
+#. Warning displayed when no scanners are detected
+#: ../src/ui.vala:375
 msgid "No scanners detected"
 msgstr "감지된 스캐너 없음"
 
-#: src/ui.vala:377
+#. Hint to user on why there are no scanners detected
+#: ../src/ui.vala:377
 msgid "Please check your scanner is connected and powered on"
 msgstr "스캐너와 연결되어있는지, 전원이 켜져 있는지 확인해 주세요"
 
-#: src/ui.vala:382
+#. Warning displayed when no drivers are installed but a compatible scanner is detected
+#: ../src/ui.vala:382
 msgid "Additional software needed"
 msgstr "추가 소프트웨어 필요"
 
-#: src/ui.vala:384
+#. Instructions to install driver software
+#: ../src/ui.vala:384
 msgid "You need to install driver software for your scanner."
 msgstr "스캐너용 드라이버를 설치해야 합니다."
 
-#: src/ui.vala:506 src/ui.vala:1843
+#. Save dialog: Dialog title
+#: ../src/ui.vala:506 ../src/ui.vala:1843
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: src/ui.vala:509 src/ui.vala:675
+#: ../src/ui.vala:509 ../src/ui.vala:675
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: src/ui.vala:510 src/ui.vala:676
+#: ../src/ui.vala:510 ../src/ui.vala:676
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: src/ui.vala:516
+#. Default filename to use when saving document
+#: ../src/ui.vala:516
 msgid "Scanned Document.pdf"
 msgstr "스캔한 문서.pdf"
 
-#: src/ui.vala:521
+#. Save dialog: Filter name to show only image files
+#: ../src/ui.vala:521
 msgid "Image Files"
 msgstr "그림 파일"
 
-#: src/ui.vala:527
+#. Save dialog: Filter name to show all files
+#: ../src/ui.vala:527
 msgid "All Files"
 msgstr "모든 파일"
 
-#: src/ui.vala:536
+#. Save dialog: Label for saving in PDF format
+#: ../src/ui.vala:536
 msgid "PDF (multi-page document)"
 msgstr "PDF (복수 페이지 문서)"
 
-#: src/ui.vala:542
+#. Save dialog: Label for saving in JPEG format
+#: ../src/ui.vala:542
 msgid "JPEG (compressed)"
 msgstr "JPEG (압축된)"
 
-#: src/ui.vala:548
+#. Save dialog: Label for saving in PNG format
+#: ../src/ui.vala:548
 msgid "PNG (lossless)"
 msgstr "PNG (무손실)"
 
-#: src/ui.vala:557
+#. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG)
+#: ../src/ui.vala:557
 msgid "File format:"
 msgstr "파일 형식:"
 
-#: src/ui.vala:650
+#. Title of error dialog when save failed
+#: ../src/ui.vala:650
 msgid "Failed to save file"
 msgstr "파일 저장 실패"
 
-#: src/ui.vala:673
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:673
 msgid "If you don't save, changes will be permanently lost."
 msgstr "저장하지 않으면 바뀐 사항을 영영 잃어버립니다."
 
-#: src/ui.vala:708
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:708
 msgid "Save current document?"
 msgstr "현재 문서를 저장하시겠습니까?"
 
-#: src/ui.vala:710
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.vala:710
 msgid "Discard Changes"
 msgstr "바뀐 내용 버리기"
 
-#: src/ui.vala:992
+#. Error message display when unable to save image for preview
+#: ../src/ui.vala:992
 msgid "Unable to save image for preview"
 msgstr "미리 보기 그림을 저장할 수 없습니다."
 
-#: src/ui.vala:1004
+#. Error message display when unable to preview image
+#: ../src/ui.vala:1004
 msgid "Unable to open image preview application"
 msgstr "그림 미리보기 프로그램을 열 수 없습니다"
 
-#: src/ui.vala:1206
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1206
 msgid "Combine sides"
 msgstr "측면 결합"
 
-#: src/ui.vala:1216
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1216
 msgid "Combine sides (reverse)"
 msgstr "측면 결합(역순)"
 
-#: src/ui.vala:1226
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1226
 msgid "Reverse"
 msgstr "역순"
 
-#: src/ui.vala:1236
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1236
 msgid "Keep unchanged"
 msgstr "바꾸지 않은 상태 유지"
 
-#: src/ui.vala:1451
+#. Error message displayed when unable to launch help browser
+#: ../src/ui.vala:1451
 msgid "Unable to open help file"
 msgstr "도움말 파일을 열 수 없습니다"
 
-#: src/ui.vala:1472
+#. The license this software is under (GPL3+)
+#: ../src/ui.vala:1472
 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"
@@ -502,15 +535,17 @@ msgstr ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
-#: src/ui.vala:1475
+#. Title of about dialog
+#: ../src/ui.vala:1475
 msgid "About Simple Scan"
 msgstr "심플 스캔 소개"
 
-#: src/ui.vala:1478
+#. Description of program
+#: ../src/ui.vala:1478
 msgid "Simple document scanning tool"
 msgstr "간단한 문서 스캐닝 도구"
 
-#: src/ui.vala:1487
+#: ../src/ui.vala:1487
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -525,170 +560,193 @@ msgstr ""
 "  Sunil https://launchpad.net/~sodoetha\n"
 "  atto https://launchpad.net/~kpsman"
 
-#: src/ui.vala:1509
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.vala:1509
 msgid "Save document before quitting?"
 msgstr "종료하기 전에 문서를 저장하시겠습니까?"
 
-#: src/ui.vala:1511
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.vala:1511
 msgid "Quit without Saving"
 msgstr "저장하지 않고 종료"
 
-#: src/ui.vala:1579
+#. Message to indicate a Brother scanner has been detected
+#: ../src/ui.vala:1579
 msgid "You appear to have a Brother scanner."
 msgstr "Brother 스캐너를 가지고 계신 것 같습니다"
 
-#: src/ui.vala:1581
+#. Instructions on how to install Brother scanner drivers
+#: ../src/ui.vala:1581
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.brother.com\">Brother website</a>."
 msgstr ""
 "사용 가능한 드라이버 확인 <a href=\"http://support.brother.com\">Brother website</a>."
 
-#: src/ui.vala:1585
+#. Message to indicate a Samsung scanner has been detected
+#: ../src/ui.vala:1585
 msgid "You appear to have a Samsung scanner."
 msgstr "삼성 스캐너를 가지고 계신 것 같습니다."
 
-#: src/ui.vala:1587
+#. Instructions on how to install Samsung scanner drivers
+#: ../src/ui.vala:1587
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://samsung.com/support\">Samsung website</a>."
 msgstr ""
 "사용 가능한 드라이버 확인 <a href=\"http://samsung.com/support\">Samsung website</a>."
 
-#: src/ui.vala:1591
+#. Message to indicate a HP scanner has been detected
+#: ../src/ui.vala:1591
 msgid "You appear to have an HP scanner."
 msgstr "HP 스캐너를 가지고 계신 것 같습니다."
 
-#: src/ui.vala:1596
+#. Message to indicate an Epson scanner has been detected
+#: ../src/ui.vala:1596
 msgid "You appear to have an Epson scanner."
 msgstr "Epson 스캐너를 가지고 계신 것 같습니다."
 
-#: src/ui.vala:1598
+#. Instructions on how to install Epson scanner drivers
+#: ../src/ui.vala:1598
 msgid ""
 "Drivers for this are available on the <a "
 "href=\"http://support.epson.com\">Epson website</a>."
 msgstr ""
 "사용 가능한 드라이버 확인 <a href=\"http://support.epson.com\">Epson website</a>."
 
-#: src/ui.vala:1602
+#. Title of dialog giving instructions on how to install drivers
+#: ../src/ui.vala:1602
 msgid "Install drivers"
 msgstr "드라이버 설치"
 
-#: src/ui.vala:1633
+#. Message in driver install dialog
+#: ../src/ui.vala:1633
 msgid "Once installed you will need to restart Simple Scan."
 msgstr "드라이버 설치 후엔 심플 스캔을  다시 시작해야 합니다."
 
-#: src/ui.vala:1645
+#. Label shown while installing drivers
+#: ../src/ui.vala:1645
 msgid "Installing drivers..."
 msgstr "드라이버를 설치하고 있습니다..."
 
-#: src/ui.vala:1653
+#. Label shown once drivers successfully installed
+#: ../src/ui.vala:1653
 msgid "Drivers installed successfully!"
 msgstr "드라이버를 설치했습니다!"
 
-#: src/ui.vala:1663
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1663
 #, c-format
 msgid "Failed to install drivers (error code %d)."
 msgstr "드라이버 설치 실패 (에러 코드 %d)."
 
-#: src/ui.vala:1669
+#. Label shown if failed to install drivers
+#: ../src/ui.vala:1669
 msgid "Failed to install drivers."
 msgstr "드라이버 설치에 실패했습니다."
 
-#: src/ui.vala:1676
+#. Label shown to prompt user to install packages (when PackageKit not available)
+#: ../src/ui.vala:1676
 #, c-format
 msgid "You need to install the %s package(s)."
 msgstr "%s 패키지를 설치해야 합니다."
 
-#: src/ui.vala:1784
+#. Preferences dialog: Label for default resolution in resolution list
+#: ../src/ui.vala:1784
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (기본값)"
 
-#: src/ui.vala:1787
+#. Preferences dialog: Label for minimum resolution in resolution list
+#: ../src/ui.vala:1787
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (초안)"
 
-#: src/ui.vala:1790
+#. Preferences dialog: Label for maximum resolution in resolution list
+#: ../src/ui.vala:1790
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (고해상도)"
 
-#: src/ui.vala:1793
+#. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
+#: ../src/ui.vala:1793
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#: src/ui.vala:1835
+#: ../src/ui.vala:1835
 msgid "New Document"
 msgstr "새 문서"
 
-#: src/ui.vala:1840
+#: ../src/ui.vala:1840
 msgid "Document"
 msgstr "문서"
 
-#: src/ui.vala:1844
+#: ../src/ui.vala:1844
 msgid "Email..."
 msgstr "이메일..."
 
-#: src/ui.vala:1845
+#: ../src/ui.vala:1845
 msgid "Print..."
 msgstr "인쇄..."
 
-#: src/ui.vala:1853
+#: ../src/ui.vala:1853
 msgid "Help"
 msgstr "도움말"
 
-#: src/ui.vala:1854
+#: ../src/ui.vala:1854
 msgid "About"
 msgstr "소개"
 
-#: src/ui.vala:1855
+#: ../src/ui.vala:1855
 msgid "Quit"
 msgstr "끝내기"
 
-#: src/ui.vala:1889
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.vala:1889
 msgid "Change _Scanner"
 msgstr "스캐너 변경(_S)"
 
-#: src/ui.vala:1891
+#. Button in error infobar to prompt user to install drivers
+#: ../src/ui.vala:1891
 msgid "_Install Drivers"
 msgstr "드라이버 설치(_I)"
 
-#: src/ui.vala:1897
+#. Combo box value for automatic paper size
+#: ../src/ui.vala:1897
 msgid "Automatic"
 msgstr "자동 설정"
 
-#: src/ui.vala:1947
+#: ../src/ui.vala:1947
 msgid "Darker"
 msgstr "어둡게"
 
-#: src/ui.vala:1949
+#: ../src/ui.vala:1949
 msgid "Lighter"
 msgstr "밝게"
 
-#: src/ui.vala:1957
+#: ../src/ui.vala:1957
 msgid "Less"
 msgstr "적게"
 
-#: src/ui.vala:1959
+#: ../src/ui.vala:1959
 msgid "More"
 msgstr "많이"
 
-#: src/ui.vala:1967
+#: ../src/ui.vala:1967
 msgid "Minimum"
 msgstr "최소"
 
-#: src/ui.vala:1969
+#: ../src/ui.vala:1969
 msgid "Maximum"
 msgstr "최대"
 
-#: src/ui.vala:2008
+#: ../src/ui.vala:2008
 msgid "Saving document..."
 msgstr "문서 저장..."
 
-#: src/ui.vala:2173
+#: ../src/ui.vala:2173
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d 페이지(전체 %d 페이지) 저장 중"