diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-11-18 11:07:49 +0100 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-11-18 11:07:49 +0100 | 
| commit | 250c3cb7970386b843a8dedda288fceab6004d7a (patch) | |
| tree | 87bd1ebb23a28f8598e87c9ab39eec0279ddd64c | |
| parent | a6db78af03ac715ee0278b4165cb382aedef9a88 (diff) | |
| parent | 0e384edd113205731fd0dc9f8e148d7dd5c6e5c3 (diff) | |
Update upstream source from tag 'upstream/3.30.2'
Update to upstream version '3.30.2'
with Debian dir 4e4d7054db73e8a6c61c0e464d71c32993b4b455
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | po/nb.po | 222 | 
3 files changed, 116 insertions, 112 deletions
| @@ -1,3 +1,7 @@ +Overview of changes in simple-scan 3.30.2 + +  * Updated translations +  Overview of changes in simple-scan 3.30.1.1    * Rebuild tarball as 3.30 releases have out of date content diff --git a/meson.build b/meson.build index 7966ee1..a3bb0b8 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@  project ('simple-scan', ['vala', 'c'], -         version: '3.30.1.1', +         version: '3.30.2',           license: 'GPLv3+',           default_options: [               'warning_level=1', @@ -2,14 +2,14 @@  # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009  # This file is distributed under the same license as the simple-scan package.  # Kjetil Birkeland Moe <kjetil@skifremme.no>, 2009. -# Kjartan Maraas <kmaraas@gnome.org>, 2017. +# Kjartan Maraas <kmaraas@gnome.org>, 2017-2018.  #  msgid ""  msgstr "" -"Project-Id-Version: simple-scan 3.27.x\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=simple-scan&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-10-29 21:10+0000\n" -"PO-Revision-Date: 2017-11-11 16:50+0100\n" +"Project-Id-Version: simple-scan 3.30.x\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/simple-scan/issues\n" +"POT-Creation-Date: 2018-09-02 17:27+0000\n" +"PO-Revision-Date: 2018-10-09 09:43+0200\n"  "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"  "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"  "Language: nb\n" @@ -134,7 +134,7 @@ msgstr "Pause i millisekunder mellom sider."  #. 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 -#: src/app-window.ui:76 src/app-window.vala:1560 +#: src/app-window.ui:76 src/app-window.vala:1571  msgid "Simple Scan"  msgstr "Simple Scan" @@ -175,29 +175,29 @@ msgstr "scanner"  #. Toolbar scan menu item to scan a single page from the scanner  #. Scan menu item to scan a single page from the scanner  #. Toolbar scan menu item to scan a single page from the scanner -#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:820 +#: src/app-window.ui:22 src/app-window.ui:123 src/app-window.ui:831  msgid "Single _Page"  msgstr "Enkel _side"  #. Toolbar scan menu item to scan all pages from a document feeder  #. Scan menu item to scan all pages from a document feeder  #. Toolbar scan menu item to scan all pages from a document feeder -#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:829 +#: src/app-window.ui:31 src/app-window.ui:133 src/app-window.ui:840  msgid "All Pages From _Feeder"  msgstr "Alle sider fra papirmater"  #. Toolbar scan menu item to scan continuously from the flatbed  #. Scan menu item to scan continuously from the flatbed  #. Toolbar scan menu item to scan continuously from the flatbed -#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:838 +#: src/app-window.ui:40 src/app-window.ui:143 src/app-window.ui:849  msgid "_Multiple Pages From Flatbed"  msgstr "_Flere sider fra planskanner" -#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:853 +#: src/app-window.ui:55 src/app-window.ui:170 src/app-window.ui:864  msgid "Text"  msgstr "Tekst" -#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:863 +#: src/app-window.ui:65 src/app-window.ui:180 src/app-window.ui:874  msgid "Photo"  msgstr "Bilde" @@ -218,7 +218,7 @@ msgstr "_Stopp skanning"  #. Menu item to reorder pages  #. Title of dialog to reorder pages -#: src/app-window.ui:196 src/app-window.vala:967 src/app-window.vala:1590 +#: src/app-window.ui:196 src/app-window.vala:978 src/app-window.vala:1586  msgid "Reorder Pages"  msgstr "Omplasser sider" @@ -282,91 +282,96 @@ msgstr "US Le_gal"  msgid "4×6"  msgstr "4×6" -#. Radio button for cropping to custom page size +#. Radio button for cropping page to A3  #: src/app-window.ui:397 +msgid "A_3" +msgstr "A_4" + +#. Radio button for cropping to custom page size +#: src/app-window.ui:408  msgid "_Custom"  msgstr "E_gendefinert"  #. Menu item to rotate the crop area -#: src/app-window.ui:415 +#: src/app-window.ui:426  msgid "_Rotate Crop"  msgstr "_Roter beskjæringsområdet"  #. Menu item to move the selected page to the left -#: src/app-window.ui:428 +#: src/app-window.ui:439  msgid "Move Left"  msgstr "Flytt til venstre"  #. Menu item to move the selected page to the right -#: src/app-window.ui:437 +#: src/app-window.ui:448  msgid "Move Right"  msgstr "Flytt til høyre"  #. Label on help menu -#: src/app-window.ui:474 +#: src/app-window.ui:485  msgid "_Help"  msgstr "_Hjelp"  #. Help|Contents menu -#: src/app-window.ui:482 +#: src/app-window.ui:493  msgid "_Contents"  msgstr "_Innhold"  #. Tooltip for scan toolbar button -#: src/app-window.ui:520 src/app-window.ui:720 +#: src/app-window.ui:531 src/app-window.ui:731  msgid "Scan a single page from the scanner"  msgstr "Skann én enkel side fra skanneren"  #. Label on scan toolbar item -#: src/app-window.ui:522 src/app-window.ui:716 +#: src/app-window.ui:533 src/app-window.ui:727  msgid "Scan"  msgstr "Skann"  #. Tooltip for save toolbar button -#: src/app-window.ui:538 src/app-window.ui:787 +#: src/app-window.ui:549 src/app-window.ui:798  msgid "Save document to a file"  msgstr "Lagre dokument til fil" -#: src/app-window.ui:540 +#: src/app-window.ui:551  msgid "Save"  msgstr "Lagre"  #. Tooltip for stop button -#: src/app-window.ui:555 src/app-window.ui:700 +#: src/app-window.ui:566 src/app-window.ui:711  msgid "Stop the current scan"  msgstr "Stopp skanning" -#: src/app-window.ui:556 src/app-window.ui:697 +#: src/app-window.ui:567 src/app-window.ui:708  msgid "Stop"  msgstr "Stopp"  #. Label shown when searching for scanners -#: src/app-window.ui:611 +#: src/app-window.ui:622  msgid "Searching for Scanners…"  msgstr "Søker etter skannere …" -#: src/app-window.vala:237 src/app-window.vala:1380 +#: src/app-window.vala:239 src/app-window.vala:1391  msgid "_Close"  msgstr "_Lukk"  #. Label in authorization dialog.  “%s” is replaced with the name of the resource requesting authorization -#: src/app-window.vala:246 +#: src/app-window.vala:248  #, c-format  msgid "Username and password required to access “%s”"  msgstr "Behøver brukernavn og passord for å få tilgang til «%s»"  #. Label shown when detected a scanner -#: src/app-window.vala:266 src/app-window.vala:584 +#: src/app-window.vala:268 src/app-window.vala:586  msgid "Ready to Scan"  msgstr "Klar til å skanne"  #. Warning displayed when no drivers are installed but a compatible scanner is detected -#: src/app-window.vala:273 +#: src/app-window.vala:275  msgid "Additional software needed"  msgstr "Tilleggsprogram må installeres"  #. Instructions to install driver software -#: src/app-window.vala:275 +#: src/app-window.vala:277  msgid ""  "You need to <a href=\"install-firmware\">install driver software</a> for "  "your scanner." @@ -375,150 +380,150 @@ msgstr ""  "skanner."  #. Warning displayed when no scanners are detected -#: src/app-window.vala:281 +#: src/app-window.vala:283  msgid "No scanners detected"  msgstr "Fant ingen skannere"  #. Hint to user on why there are no scanners detected -#: src/app-window.vala:283 +#: src/app-window.vala:285  msgid "Please check your scanner is connected and powered on"  msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"  #. Save dialog: Dialog title -#: src/app-window.vala:298 +#: src/app-window.vala:300  msgid "Save As…"  msgstr "Lagre som …" -#: src/app-window.vala:301 src/app-window.vala:471 src/app-window.vala:552 +#: src/app-window.vala:303 src/app-window.vala:473 src/app-window.vala:554  msgid "_Cancel"  msgstr "_Avbryt" -#: src/app-window.vala:302 src/app-window.vala:553 +#: src/app-window.vala:304 src/app-window.vala:555  msgid "_Save"  msgstr "_Lagre"  #. Default filename to use when saving document -#: src/app-window.vala:310 +#: src/app-window.vala:312  msgid "Scanned Document.pdf"  msgstr "Skannet_dokument.pdf"  #. Save dialog: Filter name to show only supported image files -#: src/app-window.vala:316 +#: src/app-window.vala:318  msgid "Image Files"  msgstr "Bildefiler"  #. Save dialog: Filter name to show all files -#: src/app-window.vala:326 +#: src/app-window.vala:328  msgid "All Files"  msgstr "Alle Filer"  #. Save dialog: Label for saving in PDF format -#: src/app-window.vala:335 +#: src/app-window.vala:337  msgid "PDF (multi-page document)"  msgstr "PDF (flersidig dokument)"  #. Save dialog: Label for saving in JPEG format -#: src/app-window.vala:341 +#: src/app-window.vala:343  msgid "JPEG (compressed)"  msgstr "JPEG (komprimert)"  #. Save dialog: Label for saving in PNG format -#: src/app-window.vala:347 +#: src/app-window.vala:349  msgid "PNG (lossless)"  msgstr "PNG (tapsfri)"  #. Save dialog: Label for sabing in WEBP format -#: src/app-window.vala:354 +#: src/app-window.vala:356  msgid "WebP (compressed)"  msgstr "WebP (komprimert)"  #. Label in save dialog beside combo box to choose file format (PDF, JPEG, PNG, WEBP) -#: src/app-window.vala:364 +#: src/app-window.vala:366  msgid "File format:"  msgstr "Filformat:"  #. Label in save dialog beside compression slider -#: src/app-window.vala:376 +#: src/app-window.vala:378  msgid "Compression:"  msgstr "Komprimering:"  #. Contents of dialog that shows if saving would overwrite and existing file. %s is replaced with the name of the file. -#: src/app-window.vala:470 +#: src/app-window.vala:472  #, c-format  msgid "A file named “%s” already exists.  Do you want to replace it?"  msgstr "En fil med navnet «%s» eksisterer allerede. Vil du erstatte den?"  #. Button in dialog that shows if saving would overwrite and existing file. Clicking the button allows simple-scan to overwrite the file. -#: src/app-window.vala:473 +#: src/app-window.vala:475  msgid "_Replace"  msgstr "E_rstatt" -#: src/app-window.vala:512 +#: src/app-window.vala:514  msgid "Saving"  msgstr "Lagrer"  #. Title of error dialog when save failed -#: src/app-window.vala:527 +#: src/app-window.vala:529  msgid "Failed to save file"  msgstr "Lagring av fil mislyktes"  #. Text in dialog warning when a document is about to be lost -#: src/app-window.vala:550 +#: src/app-window.vala:552  msgid "If you don’t save, changes will be permanently lost."  msgstr "Hvis du ikke lagrer vil endringene gå tapt for alltid."  #. Text in dialog warning when a document is about to be lost -#: src/app-window.vala:591 +#: src/app-window.vala:593  msgid "Save current document?"  msgstr "Lagre gjeldende dokument?"  #. Button in dialog to create new document and discard unsaved document -#: src/app-window.vala:593 +#: src/app-window.vala:595  msgid "Discard Changes"  msgstr "Forkast endringer"  #. Label shown when scan started -#: src/app-window.vala:692 +#: src/app-window.vala:694  msgid "Contacting scanner…"  msgstr "Kontakter _skanner …"  #. Error message display when unable to save image for preview -#: src/app-window.vala:800 +#: src/app-window.vala:804  msgid "Unable to save image for preview"  msgstr "Klarte ikke å lagre forhåndsvisning"  #. Error message display when unable to preview image -#: src/app-window.vala:812 +#: src/app-window.vala:816  msgid "Unable to open image preview application"  msgstr "Åpning av forhåndsvisning mislyktes"  #. Label on button for combining sides in reordering dialog -#: src/app-window.vala:990 +#: src/app-window.vala:1001  msgid "Combine sides"  msgstr "Kombiner sider"  #. Label on button for combining sides in reverse order in reordering dialog -#: src/app-window.vala:1000 +#: src/app-window.vala:1011  msgid "Combine sides (reverse)"  msgstr "Kombiner sider (omvendt)"  #. Label on button for reversing in reordering dialog -#: src/app-window.vala:1010 +#: src/app-window.vala:1021  msgid "Reverse"  msgstr "Omvendt"  #. Label on button for cancelling page reordering dialog -#: src/app-window.vala:1020 +#: src/app-window.vala:1031  msgid "Keep unchanged"  msgstr "Behold uendret"  #. Error message displayed when unable to launch help browser -#: src/app-window.vala:1250 +#: src/app-window.vala:1261  msgid "Unable to open help file"  msgstr "Klarte ikke å åpne hjelpefil"  #. The license this software is under (GPL3+) -#: src/app-window.vala:1271 +#: src/app-window.vala:1282  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" @@ -547,16 +552,16 @@ msgstr ""  "along with this program.  If not, see <http://www.gnu.org/licenses/>."  #. Title of about dialog -#: src/app-window.vala:1274 +#: src/app-window.vala:1285  msgid "About Simple Scan"  msgstr "Om Simple Scan"  #. Description of program -#: src/app-window.vala:1277 +#: src/app-window.vala:1288  msgid "Simple document scanning tool"  msgstr "Enkelt verktøy for å skanne dokumenter" -#: src/app-window.vala:1286 +#: src/app-window.vala:1297  msgid "translator-credits"  msgstr ""  "Launchpad Contributions:\n" @@ -569,22 +574,22 @@ msgstr ""  "  Åka Sikrom https://launchpad.net/~akrosikam"  #. Text in dialog warning when a document is about to be lost -#: src/app-window.vala:1308 +#: src/app-window.vala:1319  msgid "Save document before quitting?"  msgstr "Lagre dokumentet før du avslutter?"  #. Text in dialog warning when a document is about to be lost -#: src/app-window.vala:1310 +#: src/app-window.vala:1321  msgid "Quit without Saving"  msgstr "Avslutt uten å lagre"  #. Message to indicate a Brother scanner has been detected -#: src/app-window.vala:1357 +#: src/app-window.vala:1368  msgid "You appear to have a Brother scanner."  msgstr "Det ser ut som at du har en Brother-skanner."  #. Instructions on how to install Brother scanner drivers -#: src/app-window.vala:1359 +#: src/app-window.vala:1370  msgid ""  "Drivers for this are available on the <a href=\"http://support.brother.com"  "\">Brother website</a>." @@ -593,12 +598,12 @@ msgstr ""  "\">Brothers nettsider</a>."  #. Message to indicate a Samsung scanner has been detected -#: src/app-window.vala:1363 +#: src/app-window.vala:1374  msgid "You appear to have a Samsung scanner."  msgstr "Det ser ut som at du har en Samsung-skanner."  #. Instructions on how to install Samsung scanner drivers -#: src/app-window.vala:1365 +#: src/app-window.vala:1376  msgid ""  "Drivers for this are available on the <a href=\"http://samsung.com/support"  "\">Samsung website</a>." @@ -607,17 +612,17 @@ msgstr ""  "\">Samsungs nettsider</a>."  #. Message to indicate a HP scanner has been detected -#: src/app-window.vala:1369 +#: src/app-window.vala:1380  msgid "You appear to have an HP scanner."  msgstr "Det ser ut som at du har en HP-skanner."  #. Message to indicate an Epson scanner has been detected -#: src/app-window.vala:1374 +#: src/app-window.vala:1385  msgid "You appear to have an Epson scanner."  msgstr "Det ser ut som at du har en Epson-skanner."  #. Instructions on how to install Epson scanner drivers -#: src/app-window.vala:1376 +#: src/app-window.vala:1387  msgid ""  "Drivers for this are available on the <a href=\"http://support.epson.com"  "\">Epson website</a>." @@ -626,99 +631,94 @@ msgstr ""  "nettside."  #. Title of dialog giving instructions on how to install drivers -#: src/app-window.vala:1380 +#: src/app-window.vala:1391  msgid "Install drivers"  msgstr "Installer drivere"  #. Message in driver install dialog -#: src/app-window.vala:1411 +#: src/app-window.vala:1422  msgid "Once installed you will need to restart Simple Scan."  msgstr "Start Simple Scan på nytt når driveren er installert."  #. Label shown while installing drivers -#: src/app-window.vala:1423 +#: src/app-window.vala:1434  msgid "Installing drivers…"  msgstr "Installerer drivere …"  #. Label shown once drivers successfully installed -#: src/app-window.vala:1431 +#: src/app-window.vala:1442  msgid "Drivers installed successfully!"  msgstr "Driverne er nå installert."  #. Label shown if failed to install drivers -#: src/app-window.vala:1441 +#: src/app-window.vala:1452  #, c-format  msgid "Failed to install drivers (error code %d)."  msgstr "Klarte ikke å installere drivere (feilkode %d)."  #. Label shown if failed to install drivers -#: src/app-window.vala:1447 +#: src/app-window.vala:1458  msgid "Failed to install drivers."  msgstr "Klarte ikke å installere drivere."  #. Label shown to prompt user to install packages (when PackageKit not available) -#: src/app-window.vala:1454 +#: src/app-window.vala:1465  #, c-format  msgid "You need to install the %s package."  msgid_plural "You need to install the %s packages."  msgstr[0] "Du må installere %s-pakken."  msgstr[1] "Du må installere %s-pakkene." +#: src/app-window.vala:1585 +msgid "Email" +msgstr "E-post" +  #. Title of preferences dialog -#: src/app-window.vala:1568 src/app-window.vala:1591 -#: src/preferences-dialog.ui:53 +#: src/app-window.vala:1589 src/preferences-dialog.ui:53  msgid "Preferences"  msgstr "Innstillinger" -#: src/app-window.vala:1572 +#: src/app-window.vala:1590  msgid "Keyboard Shortcuts"  msgstr "Tastatursnarveier" -#: src/app-window.vala:1573 +#: src/app-window.vala:1591  msgid "Help"  msgstr "Hjelp" -#: src/app-window.vala:1574 +#: src/app-window.vala:1592  msgid "About"  msgstr "Om" -#: src/app-window.vala:1575 -msgid "Quit" -msgstr "Avslutt" - -#: src/app-window.vala:1589 -msgid "Email" -msgstr "E-post" -  #. Populate ActionBar (not supported in Glade)  #. https://bugzilla.gnome.org/show_bug.cgi?id=769966  #. Label on new document button -#: src/app-window.vala:1599 +#: src/app-window.vala:1600  msgid "Start Again…"  msgstr "Start igjen …"  #. Tooltip for rotate left (counter-clockwise) button -#: src/app-window.vala:1616 +#: src/app-window.vala:1617  msgid "Rotate the page to the left (counter-clockwise)"  msgstr "Roter siden til venstre (mot urviseren)"  #. Tooltip for rotate right (clockwise) button -#: src/app-window.vala:1623 +#: src/app-window.vala:1624  msgid "Rotate the page to the right (clockwise)"  msgstr "Roter siden til høyre (med urviseren)"  #. Tooltip for crop button -#: src/app-window.vala:1633 +#: src/app-window.vala:1634  msgid "Crop the selected page"  msgstr "Beskjær valgt side"  #. Tooltip for delete button -#: src/app-window.vala:1649 +#: src/app-window.vala:1650  msgid "Delete the selected page"  msgstr "Slett valgt side"  #. Text of button for cancelling save -#: src/app-window.vala:1814 +#: src/app-window.vala:1815  msgid "Cancel"  msgstr "A_vbryt" @@ -932,42 +932,42 @@ msgstr "Kvalitet"  msgid "Automatic"  msgstr "Automatisk" -#: src/preferences-dialog.vala:116 +#: src/preferences-dialog.vala:118  msgid "Darker"  msgstr "Mørkere" -#: src/preferences-dialog.vala:118 +#: src/preferences-dialog.vala:120  msgid "Lighter"  msgstr "Lysere" -#: src/preferences-dialog.vala:126 +#: src/preferences-dialog.vala:128  msgid "Less"  msgstr "Mindre" -#: src/preferences-dialog.vala:128 +#: src/preferences-dialog.vala:130  msgid "More"  msgstr "Mer"  #. Preferences dialog: Label for default resolution in resolution list -#: src/preferences-dialog.vala:440 +#: src/preferences-dialog.vala:442  #, c-format  msgid "%d dpi (default)"  msgstr "%d dpi (standard)"  #. Preferences dialog: Label for minimum resolution in resolution list -#: src/preferences-dialog.vala:443 +#: src/preferences-dialog.vala:445  #, c-format  msgid "%d dpi (draft)"  msgstr "%d dpi (kladd)"  #. Preferences dialog: Label for maximum resolution in resolution list -#: src/preferences-dialog.vala:446 +#: src/preferences-dialog.vala:448  #, c-format  msgid "%d dpi (high resolution)"  msgstr "%d dpi (høy oppløsning)"  #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch) -#: src/preferences-dialog.vala:449 +#: src/preferences-dialog.vala:451  #, c-format  msgid "%d dpi"  msgstr "%d dpi" @@ -988,7 +988,7 @@ msgid "Unable to start scan"  msgstr "Klarte ikke å sette i gang skanneren"  #. Error displayed when communication with scanner broken -#: src/scanner.vala:1240 src/scanner.vala:1340 +#: src/scanner.vala:1240 src/scanner.vala:1347  msgid "Error communicating with scanner"  msgstr "Det oppsto en kommunikasjonsfeil mellom skanneren og datamaskinen" @@ -1007,22 +1007,22 @@ msgid "Fix PDF files generated with older versions of Simple Scan"  msgstr "Reparer PDF-filer som er opprettet med eldre versjoner av Simple Scan"  #. Title of error dialog when scan failed -#: src/simple-scan.vala:392 +#: src/simple-scan.vala:393  msgid "Failed to scan"  msgstr "Klarte ikke å utføre skanningen"  #. Attempt to inhibit the screensaver when scanning -#: src/simple-scan.vala:407 +#: src/simple-scan.vala:408  msgid "Scan in progress"  msgstr "Skanning pågår"  #. Arguments and description for --help text -#: src/simple-scan.vala:584 +#: src/simple-scan.vala:585  msgid "[DEVICE…] — Scanning utility"  msgstr "[ENHET …] – Scanneutstyr"  #. Text printed out when an unknown command-line argument provided -#: src/simple-scan.vala:595 +#: src/simple-scan.vala:596  #, c-format  msgid "Run “%s --help” to see a full list of available command line options."  msgstr "" | 
