Merge commit 'upstream/2.31.5.bzr424'

1 files changed, 136 insertions, 105 deletions

diff --git a/po/sl.po b/po/sl.po
index cd65eaa..62b14f1 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-04-27 11:43+1000\n"
-"PO-Revision-Date: 2010-03-13 09:16+0000\n"
+"POT-Creation-Date: 2010-07-08 04:05+0000\n"
+"PO-Revision-Date: 2010-07-10 20:01+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@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: 2010-05-05 03:54+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@ msgstr "Vse strani iz _podajalnika"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Hrbtna stran"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@ msgstr "Obreži izbrano stran"
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Prednja stran"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Hrbtna in prednja stran"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@ msgstr "Novo"
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Velikost strani:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,37 +126,37 @@ msgstr "Shrani"
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Shrani dokument v datoteko"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
 msgid "Sc_an"
-msgstr "Sk_eniraj"
+msgstr "Op_tično branje"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:46
 msgid "Scan"
-msgstr "Skeniraj"
+msgstr "Optično branje"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:48
 msgid "Scan S_ource:"
-msgstr "Vir s_keniranja:"
+msgstr "_Vir optičnega branja:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Stran optičnega branja:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
 msgid "Scan a single page from the scanner"
-msgstr "Skeniranje ene streni iz skenerja"
+msgstr "Optično branje ene strani iz skenerja"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
-msgstr "Preprosto skeniranje"
+msgstr "Enostavno optično branje"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:56
@@ -175,7 +175,7 @@ msgstr "Zaustavi"
 #. Tooltip for stop button
 #: ../data/simple-scan.ui.h:61
 msgid "Stop the current scan"
-msgstr "Ustavi trenutno skeniranje"
+msgstr "Zaustavi trenutno optično branje"
 
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:63
@@ -190,7 +190,7 @@ msgstr "_Pooblasti"
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:67
 msgid "_Contents"
-msgstr "Vsebina pomoči"
+msgstr "_Vsebina"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:69
@@ -210,7 +210,7 @@ msgstr "_Dokument"
 #. Label on email menu item
 #: ../data/simple-scan.ui.h:75
 msgid "_Email"
-msgstr "_E-pošta"
+msgstr "_Elektronska pošta"
 
 #. Label on help menu
 #: ../data/simple-scan.ui.h:77
@@ -230,7 +230,7 @@ msgstr "_Brez"
 #. Page menu (contains action for each page, e.g. delete, crop)
 #: ../data/simple-scan.ui.h:83
 msgid "_Page"
-msgstr "Stran"
+msgstr "_Stran"
 
 #. Label beside password entry
 #: ../data/simple-scan.ui.h:85
@@ -240,7 +240,7 @@ msgstr "_Geslo:"
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:87
 msgid "_Photo Resolution:"
-msgstr "_Ločljivost za fotografije:"
+msgstr "_Ločljivost fotografij:"
 
 #. Menu item to rotate the crop area
 #: ../data/simple-scan.ui.h:89
@@ -250,12 +250,12 @@ msgstr "_Zavrti obrezovano območje"
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:91
 msgid "_Stop Scan"
-msgstr "_Zaustavi skeniranje"
+msgstr "_Zaustavi optično branje"
 
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:93
 msgid "_Text Resolution:"
-msgstr "_Ločljivost za besedila:"
+msgstr "_Ločljivost besedila:"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:95
@@ -264,15 +264,15 @@ msgstr "_Uporabniško ime za vir:"
 
 #: ../data/simple-scan.desktop.in.h:1
 msgid "Scan Documents"
-msgstr "Skeniraj dokumente"
+msgstr "Optično preberite dokumente"
 
 #: ../data/simple-scan.schemas.in.h:1
 msgid "Device to scan from"
-msgstr "Naprava za skeniranje"
+msgstr "Naprava za optično branje"
 
 #: ../data/simple-scan.schemas.in.h:2
 msgid "Direction of scan"
-msgstr "Smer skeniranja"
+msgstr "Smer optičnega branja"
 
 #: ../data/simple-scan.schemas.in.h:3
 msgid "Directory to save files to"
@@ -280,11 +280,11 @@ msgstr "Mapa za shranjevanje datotek"
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Višina papirja v desetinkah milimetra"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
-msgstr "Višina skenirane slike v točkah"
+msgstr "Višina optično prebrane slike v točkah"
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
@@ -292,15 +292,15 @@ msgstr ""
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
-msgstr "Ločljivost za skeniranje fotografij"
+msgstr "Ločljivost za optično branje fotografij"
 
 #: ../data/simple-scan.schemas.in.h:8
 msgid "Resolution for text scans"
-msgstr "Ločljivost za skeniranje besedil"
+msgstr "Ločljivost za optično branje besedil"
 
 #: ../data/simple-scan.schemas.in.h:9
 msgid "Resolution of last scanned image"
-msgstr "Ločljivost zadnjega skeniranja"
+msgstr "Ločljivost zadnjega optičnega branja"
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid "SANE device to acquire images from."
@@ -315,8 +315,9 @@ msgid ""
 "The direction of the scanner across the scanned page. It can be one of the "
 "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
 msgstr ""
-"Smer skenerja čez skenirano stran. Lahko je ena od sledečih: 'od-zgoraj-"
-"navzdol' 'od-spodaj-navzgor' 'od-leve-proti-desni' 'od-desne-proti-levi'"
+"Smer optičnega branja čez optično brano stran. Lahko je ena od naslednjih: "
+"'od-zgoraj-navzdol' 'od-spodaj-navzgor' 'od-leve-proti-desni' 'od-desne-"
+"proti-levi'"
 
 #: ../data/simple-scan.schemas.in.h:13
 msgid ""
@@ -329,49 +330,54 @@ msgid ""
 "The height of scanned image in pixels. This value is updated to what the "
 "last scanned page was."
 msgstr ""
-"Višina skenirane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje skenirane strani."
+"Višina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+"zadnje optično prebrane strani."
 
 #: ../data/simple-scan.schemas.in.h:15
 msgid ""
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Višina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje "
+"papirja)."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"Stran strani za optično branje. Lahko je eno od naslednjega: 'obe' 'spredaj' "
+"'zadaj'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
-msgstr "Ločljivost zadnjega skeniranja v točkah na palec (dpi)"
+msgstr "Ločljivost zadnjega optičnega branja v točkah na palec (dpi)"
 
 #: ../data/simple-scan.schemas.in.h:18
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "Ločljivost pri skeniranju fotografij v točkah na palec (dpi)"
+msgstr "Ločljivost optičnega branja fotografij v točkah na palec (dpi)"
 
 #: ../data/simple-scan.schemas.in.h:19
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "Ločljivost pri skeniranju besedil v točkah na palec (dpi)"
+msgstr "Ločljivost optičnega branja besedil v točkah na palec (dpi)"
 
 #: ../data/simple-scan.schemas.in.h:20
 msgid ""
 "The width of scanned image in pixels. This value is updated to what the last "
 "scanned page was."
 msgstr ""
-"Širina skenirane slike v točkah. Ta vrednost je posodobljena na vrednost "
-"zadnje skenirane strani."
+"Širina optično brane slike v točkah. Ta vrednost je posodobljena na vrednost "
+"zadnje optično brane strani."
 
 #: ../data/simple-scan.schemas.in.h:21
 msgid ""
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Širina papirja v desetinkah milimetra (ali 0 za samodejno zaznavanje)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
-msgstr "Vrsta skeniranega dokumenta"
+msgstr "Vrsta optično branega dokumenta"
 
 #: ../data/simple-scan.schemas.in.h:23
 msgid ""
@@ -379,17 +385,17 @@ msgid ""
 "photos. This setting decides on the scan resolution, colors and post-"
 "processing."
 msgstr ""
-"Vrsta skeniranega dokumenta. 'besedilo' za dokumente z besedilom, "
-"'fotografije' za fotografije. Ta nastavitev določi ločljivost skeniranje, "
-"barve in nadaljnje odvelovanje"
+"Vrsta optično branega dokumenta. 'besedilo' za dokumente z besedilom, "
+"'fotografije' za fotografije. Ta nastavitev določi ločljivost optičnega "
+"branja, barve in nadaljnje obdvelovanje"
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Širina papirja v desetinkah milimetra"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
-msgstr "Širina skenirane slike v točkah"
+msgstr "Širina optično brane slike v točkah"
 
 #: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
@@ -402,50 +408,45 @@ msgstr "Širina okna v točkah"
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:889
 msgid "No scanners available.  Please connect a scanner."
-msgstr "Ni skenerjev na voljo. Priklopite skener."
+msgstr "Ni optičnih bralnikov na voljo. Priklopite optični bralnik."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.c:916
 msgid "Unable to connect to scanner"
-msgstr "S skenerjem se ni mogoče povezati"
+msgstr "Z optičnim bralnikom se ni mogoče povezati"
 
 #. Error display when unable to start scan
 #: ../src/scanner.c:1222
 msgid "Unable to start scan"
-msgstr "Skeniranja ni mogoče začeti"
+msgstr "Optičnega branja ni mogoče začeti"
 
 #. Error displayed when communication with scanner broken
-#: ../src/scanner.c:1240 ../src/scanner.c:1336
+#: ../src/scanner.c:1240 ../src/scanner.c:1338
 msgid "Error communicating with scanner"
-msgstr "Napaka med komuniciranjem s skenerjem"
+msgstr "Napaka med sporazumevanjem z optičnim bralnikom"
 
 #. Title of error dialog when scan failed
-#: ../src/simple-scan.c:262
+#: ../src/simple-scan.c:265
 msgid "Failed to scan"
-msgstr "Skeniranje je spodletelo"
+msgstr "Optično branje je spodletelo"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
-#: ../src/simple-scan.c:280
+#: ../src/simple-scan.c:283
 msgid "Scanned Document"
-msgstr "Skeniran dokument"
-
-#. Title of error dialog when save failed
-#: ../src/simple-scan.c:347
-msgid "Failed to save file"
-msgstr "Shranjevanje datoteke je spodletelo"
+msgstr "Optično bran dokument"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:471
+#: ../src/simple-scan.c:426
 #, c-format
 msgid ""
 "Usage:\n"
 "  %s [DEVICE...] - Scanning utility"
 msgstr ""
 "Uporaba:\n"
-"  %s [NAPRAVA ...] - Pripomoček skeniranja"
+"  %s [NAPRAVA ...] - Pripomoček optičnega branja"
 
 #. Description on how to use simple-scan displayed on command-line
-#: ../src/simple-scan.c:479
+#: ../src/simple-scan.c:434
 #, c-format
 msgid ""
 "Help Options:\n"
@@ -463,7 +464,7 @@ msgstr ""
 "  --help-gtk Pokaže možnosti GTK+"
 
 #. Description on simple-scan command-line GTK+ options displayed on command-line
-#: ../src/simple-scan.c:491
+#: ../src/simple-scan.c:446
 #, c-format
 msgid ""
 "GTK+ Options:\n"
@@ -478,75 +479,95 @@ msgid ""
 msgstr ""
 "Možnosti GTK+:\n"
 "  --class=CLASS Programski razred uporabljen v upravljalniku oken\n"
-"  --name=NAME Ime programa, ki uporabljen v upravljalniku oken\n"
-"  --screen=SCREEN X zaslon za uporabo\n"
+"  --name=NAME Ime programa, ki je uporabljen v upravljalniku oken\n"
+"  --screen=SCREEN Zaslon X za uporabo\n"
 "  --sync Uskladi klice X\n"
 "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
-"  --g-fatal-warnings Določi vsa opozorila usodna"
+"  --g-fatal-warnings Naredi vsa opozorila usodna"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.c:129
+#: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.c:231
+#: ../src/ui.c:200
 msgid "No scanners detected"
-msgstr "Skenerja ni mogoče zaznati"
+msgstr "Optičnega bralnika ni mogoče zaznati"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.c:233
+#: ../src/ui.c:202
 msgid "Please check your scanner is connected and powered on"
-msgstr "Preverite da je vaš skener povezan in vklopljen"
-
-#. Error message display when unable to preview image
-#: ../src/ui.c:638
-msgid "Unable to open image preview application"
-msgstr "Ni mogoče odpreti programa predogleda slik"
+msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.c:888
+#: ../src/ui.c:382
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.c:890
+#: ../src/ui.c:384
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.c:892
+#: ../src/ui.c:386
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Save dialog: Dialog title
-#: ../src/ui.c:904
+#: ../src/ui.c:398
 msgid "Save As..."
-msgstr "Shrani kot..."
+msgstr "Shrani kot ..."
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.c:920
+#: ../src/ui.c:414
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.c:927
+#: ../src/ui.c:421
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. 
-#: ../src/ui.c:932
+#: ../src/ui.c:426
 msgid "Select File _Type"
 msgstr "Izberite _vrsto datoteke"
 
+#. Title of error dialog when save failed
+#: ../src/ui.c:524
+msgid "Failed to save file"
+msgstr "Shranjevanje datoteke je spodletelo"
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:552
+msgid "If you don't save, changes will be permanently lost."
+msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
+
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:594
+msgid "Save current document?"
+msgstr "Naj bo trenutni dokument shranjen?"
+
+#. Button in dialog to create new document and discard unsaved document
+#: ../src/ui.c:596
+msgid "Discard Changes"
+msgstr "Zavrzi vse spremembe"
+
+#. Error message display when unable to preview image
+#: ../src/ui.c:949
+msgid "Unable to open image preview application"
+msgstr "Ni mogoče odpreti programa predogleda slik"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.c:1068
+#: ../src/ui.c:1245
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.c:1084
+#: ../src/ui.c:1260
 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"
@@ -578,16 +599,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.c:1098
+#: ../src/ui.c:1274
 msgid "About Simple Scan"
 msgstr "O Programu"
 
 #. Description of program
-#: ../src/ui.c:1101
+#: ../src/ui.c:1277
 msgid "Simple document scanning tool"
-msgstr "Preprosto orodje za skeniranje dokumentov"
+msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.c:1110
+#: ../src/ui.c:1286
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -595,50 +616,60 @@ msgstr ""
 "  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
 "  grofaty https://launchpad.net/~grofaty"
 
+#. Text in dialog warning when a document is about to be lost
+#: ../src/ui.c:1304
+msgid "Save document before quitting?"
+msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
+
+#. Button in dialog to quit and discard unsaved document
+#: ../src/ui.c:1306
+msgid "Quit without Saving"
+msgstr "Končaj brez shranjevanja"
+
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.c:1248
+#: ../src/ui.c:1448
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.c:1250 ../src/ui.c:1251 ../src/ui.c:1252 ../src/ui.c:1255
+#: ../src/ui.c:1450 ../src/ui.c:1451 ../src/ui.c:1452 ../src/ui.c:1455
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.c:1254
+#: ../src/ui.c:1454
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.c:1277
+#: ../src/ui.c:1477
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Title of dialog when cannot load required files
-#: ../src/ui.c:1311
+#: ../src/ui.c:1522
 msgid "Files missing"
 msgstr "Datoteke manjkajo"
 
 #. Description in dialog when cannot load required files
-#: ../src/ui.c:1313
+#: ../src/ui.c:1524
 msgid "Please check your installation"
-msgstr "Preverite vašo namestitev"
+msgstr "Preverite svojo namestitev"
+
+#. Button in error infobar to open preferences dialog and change scanner
+#: ../src/ui.c:1581
+msgid "Change _Scanner"
+msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.c:1352
+#: ../src/ui.c:1587
 msgid "Automatic"
-msgstr ""
-
-#. Button in error dialog to open prefereces dialog and change scanner
-#: ../src/ui.c:1508
-msgid "Change _Scanner"
-msgstr "Spremeni _Skener"
+msgstr "Samodejno"
 
-#: ../src/ui.c:1651
+#: ../src/ui.c:1865
 msgid "Scanned Document.pdf"
-msgstr "Skeniran dokument.pdf"
+msgstr "Optično bran dokument.pdf"