Hello community, here is the log from the commit of package eog for openSUSE:Factory checked in at 2019-06-03 18:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eog (Old) and /work/SRC/openSUSE:Factory/.eog.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eog" Mon Jun 3 18:44:47 2019 rev:138 rq:704775 version:3.32.2 Changes: -------- --- /work/SRC/openSUSE:Factory/eog/eog.changes 2019-05-03 22:10:01.423226648 +0200 +++ /work/SRC/openSUSE:Factory/.eog.new.5148/eog.changes 2019-06-03 18:44:48.784651691 +0200 @@ -1,0 +2,9 @@ +Wed May 22 13:10:18 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 3.32.2: + + Fix PNG file displayed darker after conversion from JPEG file. + + Only build and attach RGB color profiles to PNGs when both gAMA + and cHRM are present. + + Updated translations. + +------------------------------------------------------------------- Old: ---- eog-3.32.1.tar.xz New: ---- eog-3.32.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eog.spec ++++++ --- /var/tmp/diff_new_pack.aPy9bA/_old 2019-06-03 18:44:49.276651522 +0200 +++ /var/tmp/diff_new_pack.aPy9bA/_new 2019-06-03 18:44:49.280651521 +0200 @@ -17,7 +17,7 @@ Name: eog -Version: 3.32.1 +Version: 3.32.2 Release: 0 Summary: Image Viewer for GNOME License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ eog-3.32.1.tar.xz -> eog-3.32.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eog-3.32.1/NEWS new/eog-3.32.2/NEWS --- old/eog-3.32.1/NEWS 2019-04-08 22:36:51.000000000 +0200 +++ new/eog-3.32.2/NEWS 2019-05-20 21:24:42.000000000 +0200 @@ -1,3 +1,21 @@ +Version 3.32.2 +-------------- + +Bug fixes: + + #51, PNG file displayed darker after conversion from JPEG file (F. Riemann) + #725359, only build and attach RGB color profiles to PNGs when both + gAMA and cHRM are present (pdknsk) + +New and updated translations: + +- Dingzhong Chen [zh_CN] + +New and updated manual translations + +- Marek Černocký [cs] +- Christian Kirbach [de] + Version 3.32.1 -------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eog-3.32.1/help/cs/cs.po new/eog-3.32.2/help/cs/cs.po --- old/eog-3.32.1/help/cs/cs.po 2019-04-08 22:36:51.000000000 +0200 +++ new/eog-3.32.2/help/cs/cs.po 2019-05-20 21:24:42.000000000 +0200 @@ -7,9 +7,9 @@ # msgid "" msgstr "" -"Project-Id-Version: eog gnome-2-28\n" -"POT-Creation-Date: 2019-03-03 12:08+0000\n" -"PO-Revision-Date: 2019-03-11 10:18+0100\n" +"Project-Id-Version: eog gnome-3-32\n" +"POT-Creation-Date: 2019-03-30 22:45+0000\n" +"PO-Revision-Date: 2019-04-10 17:02+0200\n" "Last-Translator: Marek Černocký <[email protected]>\n" "Language-Team: čeština <[email protected]>\n" "Language: cs\n" @@ -43,7 +43,7 @@ #: C/plugin-slideshow-shuffle.page:13 C/plugins.page:13 #: C/plugin-zoom-width.page:12 C/preferences.page:14 C/print.page:11 #: C/rename-multiple.page:12 C/shortcuts.page:11 C/slideshow.page:13 -#: C/translate.page:10 C/view.page:11 C/zoom.page:12 +#: C/translate.page:10 C/view.page:12 C/zoom.page:12 msgid "Tiffany Antopolski" msgstr "Tiffany Antopolski" @@ -59,7 +59,7 @@ #: C/plugin-slideshow-shuffle.page:17 C/plugins.page:21 #: C/plugin-zoom-width.page:16 C/preferences.page:18 C/print.page:15 #: C/rename-multiple.page:16 C/shortcuts.page:15 C/slideshow.page:17 -#: C/translate.page:19 C/view.page:15 C/zoom.page:16 +#: C/translate.page:19 C/view.page:16 C/zoom.page:16 msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Share Alike 3.0" @@ -796,10 +796,10 @@ msgctxt "_" msgid "" "external ref='figures/multiple-convert.png' " -"md5='50b0ff184faaf2824df6dbe6f0875d52'" +"md5='d415e9f6b1a50acd33e7f754791a49a2'" msgstr "" "external ref='figures/multiple-convert.png' " -"md5='50b0ff184faaf2824df6dbe6f0875d52'" +"md5='d415e9f6b1a50acd33e7f754791a49a2'" #. (itstool) path: item/p #: C/format-change.page:72 @@ -1297,8 +1297,8 @@ "gui> tab. Then, check <gui>Date in statusbar</gui>." msgstr "" "Pokud to chcete, zmáčkněte tlačítko nabídky v pravém horním rohu okna, " -"vyberte <gui style=\"menuitem\">Předvolby</gui> a přejděte na kartu <gui>" -"Zásuvné moduly</gui>. Tam zaškrtněte <gui>Datum ve stavové liště</gui>." +"vyberte <gui style=\"menuitem\">Předvolby</gui> a přejděte na kartu " +"<gui>Zásuvné moduly</gui>. Tam zaškrtněte <gui>Datum ve stavové liště</gui>." #. (itstool) path: section/title #: C/plugin-exif-digital.page:46 @@ -1496,9 +1496,9 @@ "and close the dialog." msgstr "" "Uděláte to tak, že zmáčknete tlačítko nabídky v pravém horním rohu okna, " -"vyberete <gui style=\"menuitem\">Předvolby</gui> a přejdete na kartu <gui>" -"Zásuvné moduly</gui>. Pak zaškrtnete <gui>Celá obrazovka dvojklikem</gui> a " -"zavřete dialogové okno." +"vyberete <gui style=\"menuitem\">Předvolby</gui> a přejdete na kartu " +"<gui>Zásuvné moduly</gui>. Pak zaškrtnete <gui>Celá obrazovka dvojklikem</" +"gui> a zavřete dialogové okno." #. (itstool) path: page/p #: C/plugin-fullscreen-double-click.page:33 @@ -1633,9 +1633,9 @@ msgstr "" "Uděláte to tak, že zmáčkněte tlačítko nabídky v pravém horním rohu, vyberete " "<gui style=\"menuitem\">Předvolby</gui> a přejdete na kartu <gui>Zásuvné " -"moduly</gui>. Pak zaškrtněte <gui>Poslat e-mailem</gui> a klikněte na <gui>" -"Zavřít</gui>. Tím získáte v nabídce položku <gui style=\"menuitem\">Poslat " -"e-mailem</gui>." +"moduly</gui>. Pak zaškrtněte <gui>Poslat e-mailem</gui> a klikněte na " +"<gui>Zavřít</gui>. Tím získáte v nabídce položku <gui style=\"menuitem" +"\">Poslat e-mailem</gui>." #. (itstool) path: note/p #: C/plugin-send-by-mail.page:35 @@ -1674,9 +1674,9 @@ "the dialog." msgstr "" "Pokud tak chcete učinit, zmáčkněte tlačítko nabídky v pravém horním rohu, " -"vyberte <gui style=\"menuitem\">Předvolby</gui> a přejděte na kartu <gui>" -"Zásuvné moduly</gui>. Pak zaškrtněte <gui>Náhodné promítání snímků</gui> a " -"zavřete dialogové okno." +"vyberte <gui style=\"menuitem\">Předvolby</gui> a přejděte na kartu " +"<gui>Zásuvné moduly</gui>. Pak zaškrtněte <gui>Náhodné promítání snímků</" +"gui> a zavřete dialogové okno." #. (itstool) path: info/desc #: C/plugins.page:9 @@ -2066,9 +2066,9 @@ #: C/preferences.page:105 msgctxt "_" msgid "" -"external ref='figures/plugins-all.png' md5='f9ef35c46fca34eaaac1f5c578ad334b'" +"external ref='figures/plugins-all.png' md5='1f672b89abffd693cc23f668fe7f78e4'" msgstr "" -"external ref='figures/plugins-all.png' md5='f9ef35c46fca34eaaac1f5c578ad334b'" +"external ref='figures/plugins-all.png' md5='1f672b89abffd693cc23f668fe7f78e4'" #. (itstool) path: section/media #. This is a reference to an external file such as an image or video. When @@ -2079,10 +2079,10 @@ msgctxt "_" msgid "" "external ref='figures/prefs-plugins.png' " -"md5='a564e614f540f47ca57593abb2e6d646'" +"md5='c91d2b21700ffa11a4df2acb87a44268'" msgstr "" "external ref='figures/prefs-plugins.png' " -"md5='a564e614f540f47ca57593abb2e6d646'" +"md5='c91d2b21700ffa11a4df2acb87a44268'" #. (itstool) path: section/p #: C/preferences.page:108 @@ -2297,10 +2297,10 @@ msgctxt "_" msgid "" "external ref='figures/multiple-rename-count.png' " -"md5='24db2c6381bfb1665f2673edef727f8f'" +"md5='d89839fd4b49f4bf8733ed2dddc3b01c'" msgstr "" "external ref='figures/multiple-rename-count.png' " -"md5='24db2c6381bfb1665f2673edef727f8f'" +"md5='d89839fd4b49f4bf8733ed2dddc3b01c'" #. (itstool) path: section/title #: C/rename-multiple.page:62 @@ -2805,12 +2805,12 @@ "použijte galerii k zobrazení všech obrázků." #. (itstool) path: page/title -#: C/view.page:18 +#: C/view.page:19 msgid "View all pictures in a folder" msgstr "Zobrazení všech obrázků ve složce" #. (itstool) path: page/p -#: C/view.page:20 +#: C/view.page:21 msgid "" "You can quickly browse through all of the pictures in a folder by opening " "one of the pictures and then clicking the <gui>Next</gui> and <gui>Previous</" @@ -2825,12 +2825,12 @@ "obrázků ve složce naráz." #. (itstool) path: section/title -#: C/view.page:23 +#: C/view.page:24 msgid "Browse through all pictures in a folder" msgstr "Procházení všech obrázků ve složce" #. (itstool) path: section/p -#: C/view.page:24 +#: C/view.page:25 msgid "" "If you have a folder containing several pictures, you can conveniently " "browse through all of the pictures without having to open them individually." @@ -2839,7 +2839,7 @@ "procházet, aniž byste museli otevírat jeden za druhým." #. (itstool) path: item/p -#: C/view.page:28 +#: C/view.page:29 msgid "" "<link xref=\"open\">Open</link> any one of the pictures from the folder you " "want to browse through." @@ -2848,7 +2848,7 @@ "chcete procházet." #. (itstool) path: item/p -#: C/view.page:32 +#: C/view.page:33 msgid "" "Click <gui>Next</gui> and <gui>Previous</gui> on the left and right of the " "displayed image, or press the <key>Right</key> and <key>Left</key> keys, to " @@ -2859,7 +2859,7 @@ "klávesy <key>←</key> a <key>→</key>." #. (itstool) path: item/p -#: C/view.page:35 +#: C/view.page:36 msgid "" "Alternatively, you can use the <key>Up</key> and <key>Down</key> keys, or " "<key>Space bar</key> and <key>Backspace</key> keys." @@ -2868,7 +2868,7 @@ "<key>mezerník</key> a <key>Backspace</key>." #. (itstool) path: item/p -#: C/view.page:39 +#: C/view.page:40 msgid "" "You can browse through the pictures in fullscreen mode by clicking the " "<gui>Fullscreen</gui> button in the header bar or by pressing <key>F11</" @@ -2879,19 +2879,19 @@ "zmáčknutím <key>F11</key>. K přecházení mezi obrázky pak použijte klávesnici." #. (itstool) path: item/p -#: C/view.page:43 +#: C/view.page:44 msgid "To return to normal viewing, press <key>Esc</key> or <key>F11</key>." msgstr "" "Do normálního režimu prohlížení se vrátite zmáčknutím <key>Esc</key> nebo " "<key>F11</key>." #. (itstool) path: section/title -#: C/view.page:49 +#: C/view.page:50 msgid "Browse the image gallery" msgstr "Procházení galerie obrázků" #. (itstool) path: section/p -#: C/view.page:50 +#: C/view.page:51 msgid "" "The <em>image gallery</em> shows small previews (thumbnails) of all of the " "pictures in a folder at once. This makes it easier to quickly browse through " @@ -2902,21 +2902,25 @@ "obrázků." #. (itstool) path: item/p -#: C/view.page:56 +#: C/view.page:57 msgid "" -"To show the image gallery, click <gui style=\"menuitem\">Image Gallery</" -"gui>, or press <keyseq><key>Ctrl</key><key>F9</key></keyseq>." +"To show the image gallery, press the menu button in the top-right corner of " +"the window and select <guiseq><gui style=\"menuitem\">Show</gui><gui style=" +"\"menuitem\">Image Gallery</gui></guiseq>, or press <keyseq><key>Ctrl</" +"key><key>F9</key></keyseq>." msgstr "" -"Galerii obrázků zobrazíte kliknutím na <gui style=\"menuitem\">Galerie " -"obrázků</gui>, nebo zmáčknutím <keyseq><key>Ctrl</key><key>F9</key></keyseq>." +"Galerii obrázků zobrazíte zmáčknutím tlačítka nabídky v pravém horním rohu " +"okna a výběrem <guiseq><gui style=\"menuitem\">Zobrazit</gui> <gui " +"style=\"menuitem\">Galerie obrázků</gui></guiseq>, nebo zmáčknutím <keyseq>" +"<key>Ctrl</key><key>F9</key></keyseq>." #. (itstool) path: item/p -#: C/view.page:60 +#: C/view.page:62 msgid "Click on a picture in the gallery to show it full-size." msgstr "Kliknutím na obrázek v galerii si jej zobrazíte v plné velikosti." #. (itstool) path: item/p -#: C/view.page:61 +#: C/view.page:63 msgid "" "You can also use the <key>Left</key> and <key>Right</key> keys to skip " "through the pictures in the gallery" @@ -2925,14 +2929,17 @@ "key> a <key>→</key>." #. (itstool) path: item/p -#: C/view.page:65 +#: C/view.page:67 msgid "" -"To hide the gallery, click <gui style=\"menuitem\">Image Gallery</gui> " -"again, or press <keyseq><key>Ctrl</key><key>F9</key></keyseq>." -msgstr "" -"Galerii obrázků skryjete tím, že na <gui style=\"menuitem\">Galerie obrázků</" -"gui> kliknete znovu, nebo znovu zmáčknete <keyseq><key>Ctrl</key><key>F9</" -"key></keyseq>." +"To hide the gallery, press the menu button in the top-right corner of the " +"window and unselect <guiseq><gui style=\"menuitem\">Show</gui><gui style=" +"\"menuitem\">Image Gallery</gui></guiseq>, or press <keyseq><key>Ctrl</" +"key><key>F9</key></keyseq>." +msgstr "" +"Galerii obrázků skryjete zmáčknutím tlačítka nabídky v pravém horním rohu " +"okna a výběrem <guiseq><gui style=\"menuitem\">Zobrazit</gui> <gui " +"style=\"menuitem\">Galerie obrázků</gui></guiseq>, nebo zmáčknutím <keyseq>" +"<key>Ctrl</key><key>F9</key></keyseq>." #. (itstool) path: info/desc #: C/zoom.page:8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eog-3.32.1/help/de/de.po new/eog-3.32.2/help/de/de.po --- old/eog-3.32.1/help/de/de.po 2019-04-08 22:36:51.000000000 +0200 +++ new/eog-3.32.2/help/de/de.po 2019-05-20 21:24:42.000000000 +0200 @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: eog manual\n" -"POT-Creation-Date: 2019-03-19 20:10+0000\n" -"PO-Revision-Date: 2019-03-25 22:32+0100\n" +"POT-Creation-Date: 2019-03-30 22:45+0000\n" +"PO-Revision-Date: 2019-05-05 17:51+0200\n" "Last-Translator: Christian Kirbach <[email protected]>\n" "Language-Team: Deutsch <[email protected]>\n" "Language: de\n" @@ -48,7 +48,7 @@ #: C/plugin-slideshow-shuffle.page:13 C/plugins.page:13 #: C/plugin-zoom-width.page:12 C/preferences.page:14 C/print.page:11 #: C/rename-multiple.page:12 C/shortcuts.page:11 C/slideshow.page:13 -#: C/translate.page:10 C/view.page:11 C/zoom.page:12 +#: C/translate.page:10 C/view.page:12 C/zoom.page:12 msgid "Tiffany Antopolski" msgstr "Tiffany Antopolski" @@ -64,7 +64,7 @@ #: C/plugin-slideshow-shuffle.page:17 C/plugins.page:21 #: C/plugin-zoom-width.page:16 C/preferences.page:18 C/print.page:15 #: C/rename-multiple.page:16 C/shortcuts.page:15 C/slideshow.page:17 -#: C/translate.page:19 C/view.page:15 C/zoom.page:16 +#: C/translate.page:19 C/view.page:16 C/zoom.page:16 msgid "Creative Commons Share Alike 3.0" msgstr "Creative Commons Share Alike 3.0" @@ -824,7 +824,7 @@ msgctxt "_" msgid "" "external ref='figures/multiple-convert.png' " -"md5='50b0ff184faaf2824df6dbe6f0875d52'" +"md5='d415e9f6b1a50acd33e7f754791a49a2'" msgstr "ok" #. (itstool) path: item/p @@ -2111,7 +2111,7 @@ #: C/preferences.page:105 msgctxt "_" msgid "" -"external ref='figures/plugins-all.png' md5='f9ef35c46fca34eaaac1f5c578ad334b'" +"external ref='figures/plugins-all.png' md5='1f672b89abffd693cc23f668fe7f78e4'" msgstr "ok" #. (itstool) path: section/media @@ -2123,7 +2123,7 @@ msgctxt "_" msgid "" "external ref='figures/prefs-plugins.png' " -"md5='a564e614f540f47ca57593abb2e6d646'" +"md5='c91d2b21700ffa11a4df2acb87a44268'" msgstr "ok" #. (itstool) path: section/p @@ -2344,7 +2344,7 @@ msgctxt "_" msgid "" "external ref='figures/multiple-rename-count.png' " -"md5='24db2c6381bfb1665f2673edef727f8f'" +"md5='d89839fd4b49f4bf8733ed2dddc3b01c'" msgstr "" "external ref='figures/multiple-rename-count.png' " "md5='24db2c6381bfb1665f2673edef727f8f'" @@ -2856,12 +2856,12 @@ "oder verwenden Sie die Bildersammlung, um alle anzuzeigen." #. (itstool) path: page/title -#: C/view.page:18 +#: C/view.page:19 msgid "View all pictures in a folder" msgstr "Alle Bilder in einem Ordner betrachten" #. (itstool) path: page/p -#: C/view.page:20 +#: C/view.page:21 msgid "" "You can quickly browse through all of the pictures in a folder by opening " "one of the pictures and then clicking the <gui>Next</gui> and <gui>Previous</" @@ -2877,12 +2877,12 @@ "einmal sehen zu können." #. (itstool) path: section/title -#: C/view.page:23 +#: C/view.page:24 msgid "Browse through all pictures in a folder" msgstr "Durchsuchen der in einem Ordner enthaltenen Bilder" #. (itstool) path: section/p -#: C/view.page:24 +#: C/view.page:25 msgid "" "If you have a folder containing several pictures, you can conveniently " "browse through all of the pictures without having to open them individually." @@ -2891,7 +2891,7 @@ "durchsuchen, ohne sie einzeln öffnen zu müssen." #. (itstool) path: item/p -#: C/view.page:28 +#: C/view.page:29 msgid "" "<link xref=\"open\">Open</link> any one of the pictures from the folder you " "want to browse through." @@ -2900,7 +2900,7 @@ "durchsuchen wollen." #. (itstool) path: item/p -#: C/view.page:32 +#: C/view.page:33 msgid "" "Click <gui>Next</gui> and <gui>Previous</gui> on the left and right of the " "displayed image, or press the <key>Right</key> and <key>Left</key> keys, to " @@ -2911,7 +2911,7 @@ "key> und <key>Pfeiltaste rechts</key>, um in den Bildern zu blättern." #. (itstool) path: item/p -#: C/view.page:35 +#: C/view.page:36 msgid "" "Alternatively, you can use the <key>Up</key> and <key>Down</key> keys, or " "<key>Space bar</key> and <key>Backspace</key> keys." @@ -2920,7 +2920,7 @@ "<key>Leertaste</key> und die <key>Löschtaste</key>." #. (itstool) path: item/p -#: C/view.page:39 +#: C/view.page:40 msgid "" "You can browse through the pictures in fullscreen mode by clicking the " "<gui>Fullscreen</gui> button in the header bar or by pressing <key>F11</" @@ -2931,19 +2931,19 @@ "die Tastatur, um im Vollbildmodus in den Bildern zu blättern." #. (itstool) path: item/p -#: C/view.page:43 +#: C/view.page:44 msgid "To return to normal viewing, press <key>Esc</key> or <key>F11</key>." msgstr "" "Um zur normalen Ansicht zurückzukehren, drücken Sie <key>Esc</key> oder " "<key>F11</key>." #. (itstool) path: section/title -#: C/view.page:49 +#: C/view.page:50 msgid "Browse the image gallery" msgstr "Die Bildersammlung durchsuchen" #. (itstool) path: section/p -#: C/view.page:50 +#: C/view.page:51 msgid "" "The <em>image gallery</em> shows small previews (thumbnails) of all of the " "pictures in a folder at once. This makes it easier to quickly browse through " @@ -2954,24 +2954,27 @@ "Bildersammlungen." #. (itstool) path: item/p -#: C/view.page:56 +#: C/view.page:57 msgid "" -"To show the image gallery, click <gui style=\"menuitem\">Image Gallery</" -"gui>, or press <keyseq><key>Ctrl</key><key>F9</key></keyseq>." +"To show the image gallery, press the menu button in the top-right corner of " +"the window and select <guiseq><gui style=\"menuitem\">Show</gui><gui style=" +"\"menuitem\">Image Gallery</gui></guiseq>, or press <keyseq><key>Ctrl</" +"key><key>F9</key></keyseq>." msgstr "" -"Um die Bildersammlung anzuzeigen, klicken Sie auf <gui style=\"menuitem" -"\">Bildersammlung</gui> oder drücken Sie <keyseq><key>Strg</key><key>F9</" -"key></keyseq>." +"Um die Bildersammlung anzuzeigen, klicken Sie auf den Menüknopf rechts oben " +"im Fenster und wählen Sie <guiseq><gui style=\"menuitem\">Anzeigen</gui><gui " +"style=\"menuitem\">Bildersammlung</gui></guiseq> oder drücken Sie " +"<keyseq><key>Strg</key><key>F9</key></keyseq>." #. (itstool) path: item/p -#: C/view.page:60 +#: C/view.page:62 msgid "Click on a picture in the gallery to show it full-size." msgstr "" "Klicken Sie auf ein Bild in der Bildersammlung, um es in voller Größe " "anzuzeigen." #. (itstool) path: item/p -#: C/view.page:61 +#: C/view.page:63 msgid "" "You can also use the <key>Left</key> and <key>Right</key> keys to skip " "through the pictures in the gallery" @@ -2980,14 +2983,17 @@ "durch die Bilder in der Bildersammlung zu bewegen." #. (itstool) path: item/p -#: C/view.page:65 +#: C/view.page:67 msgid "" -"To hide the gallery, click <gui style=\"menuitem\">Image Gallery</gui> " -"again, or press <keyseq><key>Ctrl</key><key>F9</key></keyseq>." -msgstr "" -"Um die Bildersammlung zu verbergen, klicken Sie erneut auf <gui style=" -"\"menuitem\">Bildersammlung</gui> oder drücken Sie <keyseq><key>Strg</" +"To hide the gallery, press the menu button in the top-right corner of the " +"window and unselect <guiseq><gui style=\"menuitem\">Show</gui><gui style=" +"\"menuitem\">Image Gallery</gui></guiseq>, or press <keyseq><key>Ctrl</" "key><key>F9</key></keyseq>." +msgstr "" +"Um die Bildersammlung zu verbergen, klicken Sie erneut auf den Menüknopf " +"rechts oben im Fenster und wählen Sie <guiseq><gui style=\"menuitem" +"\">Anzeigen</gui><gui style=\"menuitem\">Bildersammlung</gui></guiseq> ab " +"oder drücken Sie <keyseq><key>Strg</key><key>F9</key></keyseq>." #. (itstool) path: info/desc #: C/zoom.page:8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eog-3.32.1/meson.build new/eog-3.32.2/meson.build --- old/eog-3.32.1/meson.build 2019-04-08 22:36:51.000000000 +0200 +++ new/eog-3.32.2/meson.build 2019-05-20 21:24:42.000000000 +0200 @@ -1,6 +1,6 @@ project( 'eog', 'c', - version: '3.32.1', + version: '3.32.2', license: 'GPL2+', default_options: 'buildtype=debugoptimized', meson_version: '>= 0.44.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eog-3.32.1/po/zh_CN.po new/eog-3.32.2/po/zh_CN.po --- old/eog-3.32.1/po/zh_CN.po 2019-04-08 22:36:51.000000000 +0200 +++ new/eog-3.32.2/po/zh_CN.po 2019-05-20 21:24:42.000000000 +0200 @@ -17,42 +17,22 @@ # Tong Hui <[email protected]>, 2013. # YunQiang Su <[email protected]>, 2010, 2011, 2012, 2015. # Mingcong Bai <[email protected]>, 2015, 2017. +# Dingzhong Chen <[email protected]>, 2019. # msgid "" msgstr "" -"Project-Id-Version: eog master\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; -"product=eog&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2017-06-08 08:11+0000\n" -"PO-Revision-Date: 2017-06-10 14:24+0800\n" -"Last-Translator: Mingcong Bai <[email protected]>\n" -"Language-Team: 汉语 <[email protected]>\n" +"Project-Id-Version: eog 3.32\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/eog/issues\n"; +"POT-Creation-Date: 2019-04-10 17:21+0000\n" +"PO-Revision-Date: 2019-04-11 18:18+0800\n" +"Last-Translator: Dingzhong Chen <[email protected]>\n" +"Language-Team: Chinese (China) <[email protected]>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.0.2\n" - -#: data/eog-app-menu.ui:7 -msgid "Prefere_nces" -msgstr "首选项(_N)" - -#: data/eog-app-menu.ui:13 -msgid "_Keyboard Shortcuts" -msgstr "键盘快捷键(_K)" - -#: data/eog-app-menu.ui:17 data/eog-preferences-dialog.ui:21 -msgid "_Help" -msgstr "帮助(_H)" - -#: data/eog-app-menu.ui:21 -msgid "_About" -msgstr "关于(_A)" - -#: data/eog-app-menu.ui:25 -msgid "_Quit" -msgstr "退出(_Q)" +"X-Generator: Poedit 2.2.1\n" #: data/eog.appdata.xml.in:6 msgid "Eye of GNOME" @@ -81,16 +61,10 @@ "GNOME 之眼也可以全屏幻灯片播放的方式查看图片，或者将图片设置为桌面壁纸。它会" "自动读取相机的标签来自动旋转您的照片，从而正确的横向/纵向显示它们。" -#: data/eog.desktop.in.in:3 src/eog-application.c:312 src/eog-window.c:5508 +#: data/eog.desktop.in.in:3 src/eog-application.c:312 src/eog-window.c:5568 msgid "Image Viewer" msgstr "图像查看器" -#. TRANSLATORS: Do NOT translate or transliterate this text! -#. This is an icon file name -#: data/eog.desktop.in.in:9 -msgid "eog" -msgstr "eog" - #. Extra keywords that can be used to search for eog in GNOME Shell and Unity #. TRANSLATORS: Search terms to find this application. #. Do NOT translate or localize the semicolons! @@ -104,8 +78,8 @@ msgstr "打开(_O)…" #: data/eog-gear-menu.ui:10 -msgid "Open _With" -msgstr "打开方式(_W)" +msgid "Op_en With" +msgstr "打开方式(_E)" #: data/eog-gear-menu.ui:17 data/popup-menus.ui:13 #: src/eog-close-confirmation-dialog.c:178 src/eog-file-chooser.c:465 @@ -126,24 +100,44 @@ msgstr "设为桌面壁纸(_L)" #: data/eog-gear-menu.ui:37 +msgid "Image Prope_rties" +msgstr "图像属性(_R)" + +#: data/eog-gear-menu.ui:43 msgid "Sli_deshow" msgstr "幻灯片放映(_D)" -#: data/eog-gear-menu.ui:41 +#: data/eog-gear-menu.ui:50 +msgid "Sho_w" +msgstr "显示(_W)" + +#: data/eog-gear-menu.ui:52 msgid "S_ide Pane" msgstr "侧边栏(_I)" -#: data/eog-gear-menu.ui:45 +#: data/eog-gear-menu.ui:56 msgid "Image _Gallery" msgstr "图片廊(_G)" -#: data/eog-gear-menu.ui:49 +#: data/eog-gear-menu.ui:60 msgid "S_tatus Bar" msgstr "状态栏(_T)" -#: data/eog-gear-menu.ui:55 data/popup-menus.ui:41 -msgid "Prope_rties" -msgstr "属性(_R)" +#: data/eog-gear-menu.ui:68 +msgid "Prefere_nces" +msgstr "首选项(_N)" + +#: data/eog-gear-menu.ui:72 +msgid "_Keyboard Shortcuts" +msgstr "键盘快捷键(_K)" + +#: data/eog-gear-menu.ui:76 data/eog-preferences-dialog.ui:21 +msgid "_Help" +msgstr "帮助(_H)" + +#: data/eog-gear-menu.ui:80 +msgid "_About Image Viewer" +msgstr "关于图像查看器(_A)" #: data/eog-image-properties-dialog.ui:17 msgid "Image Properties" @@ -255,8 +249,8 @@ #: data/eog-multiple-save-as-dialog.ui:32 #: src/eog-close-confirmation-dialog.c:172 src/eog-error-message-area.c:123 #: src/eog-file-chooser.c:456 src/eog-file-chooser.c:464 -#: src/eog-file-chooser.c:472 src/eog-window.c:3223 src/eog-window.c:3226 -#: src/eog-window.c:3479 +#: src/eog-file-chooser.c:472 src/eog-window.c:3283 src/eog-window.c:3286 +#: src/eog-window.c:3539 msgid "_Cancel" msgstr "取消(_C)" @@ -416,7 +410,7 @@ msgid "_First Image" msgstr "第一张图像(_F)" -#: data/fullscreen-toolbar.ui:28 src/eog-scroll-view.c:2359 +#: data/fullscreen-toolbar.ui:28 src/eog-scroll-view.c:2342 msgid "Go to the previous image of the gallery" msgstr "转到图片廊中上一张图像" @@ -424,7 +418,7 @@ msgid "_Previous Image" msgstr "上一张图像(_P)" -#: data/fullscreen-toolbar.ui:43 src/eog-scroll-view.c:2347 +#: data/fullscreen-toolbar.ui:43 src/eog-scroll-view.c:2330 msgid "Go to the next image of the gallery" msgstr "转到图片廊中下一张图像" @@ -456,7 +450,7 @@ msgid "_Best Fit" msgstr "最佳匹配(_B)" -#: data/fullscreen-toolbar.ui:153 src/eog-scroll-view.c:2374 +#: data/fullscreen-toolbar.ui:153 src/eog-scroll-view.c:2357 msgid "Rotate the image 90 degrees to the left" msgstr "将图像逆时针旋转 90 度" @@ -464,7 +458,7 @@ msgid "Rotate Counter_clockwise" msgstr "逆时针旋转(_C)" -#: data/fullscreen-toolbar.ui:168 src/eog-scroll-view.c:2385 +#: data/fullscreen-toolbar.ui:168 src/eog-scroll-view.c:2368 msgid "Rotate the image 90 degrees to the right" msgstr "将图像顺时针旋转 90 度" @@ -534,13 +528,13 @@ #: data/help-overlay.ui:68 msgctxt "shortcut window" -msgid "Show/Hide the sidebar" -msgstr "显示/隐藏侧边栏" +msgid "Show image properties dialog" +msgstr "显示图像属性对话框" #: data/help-overlay.ui:75 msgctxt "shortcut window" -msgid "Show image properties dialog" -msgstr "显示图像属性对话框" +msgid "Show/Hide the sidebar" +msgstr "显示/隐藏侧边栏" # SUN CHANGED MESSAGE #: data/help-overlay.ui:82 @@ -643,7 +637,7 @@ msgid "Pause slideshow" msgstr "暂停放映" -#: data/metadata-sidebar.ui:29 src/eog-print-image-setup.c:969 +#: data/metadata-sidebar.ui:29 src/eog-print-image-setup.c:968 msgid "Size" msgstr "大小" @@ -707,7 +701,7 @@ "theme instead." msgstr "" "用于填充图像背后区域的颜色。如果未设置 use-background-color 键，则根据所启用" -"的 GTK+ 主题决定颜色" +"的 GTK+ 主题决定颜色." # SUN CHANGED MESSAGE #: data/org.gnome.eog.gschema.xml.in:21 @@ -920,10 +914,14 @@ msgid "_Copy" msgstr "复制(_C)" -#: data/popup-menus.ui:35 src/eog-window.c:3482 +#: data/popup-menus.ui:35 src/eog-window.c:3542 msgid "Move to _Trash" msgstr "移至回收站(_T)" +#: data/popup-menus.ui:41 +msgid "Prope_rties" +msgstr "属性(_R)" + #: data/popup-menus.ui:49 msgid "Show Containing _Folder" msgstr "显示图像所在文件夹(_F)" @@ -936,12 +934,6 @@ msgid "Fullscreen with double-click" msgstr "双击切换全屏" -#. TRANSLATORS: Do NOT translate or transliterate this text! -#. This is an icon file name -#: plugins/fullscreen/fullscreen.plugin.desktop.in:8 -msgid "view-fullscreen" -msgstr "view-fullscreen" - #: plugins/fullscreen/fullscreen.plugin.desktop.in:9 msgid "Activate fullscreen mode with double-click" msgstr "双击启用全屏模式" @@ -951,16 +943,16 @@ msgid "Reload Image" msgstr "重新载入图像" -#. TRANSLATORS: Do NOT translate or transliterate this text! -#. This is an icon file name -#: plugins/reload/reload.plugin.desktop.in:8 -msgid "view-refresh" -msgstr "view-refresh" - #: plugins/reload/reload.plugin.desktop.in:9 msgid "Reload current image" msgstr "重新载入当前图像" +#. A strftime-formatted string, to display the date the image was taken. +#: plugins/statusbar-date/eog-statusbar-date-plugin.c:69 +#: src/eog-exif-util.c:193 src/eog-exif-util.c:195 +msgid "%a, %d %B %Y %X" +msgstr "%Y年%m月%d日 %X" + #: plugins/statusbar-date/statusbar-date.plugin.desktop.in:5 msgid "Date in statusbar" msgstr "在状态栏中显示日期" @@ -973,36 +965,32 @@ msgid "Close _without Saving" msgstr "关闭而不保存(_W)" -#: src/eog-close-confirmation-dialog.c:212 -msgid "Question" -msgstr "问题" - -#: src/eog-close-confirmation-dialog.c:391 +#: src/eog-close-confirmation-dialog.c:383 msgid "If you don’t save, your changes will be lost." msgstr "如果不保存，您的更改将会丢失。" -#: src/eog-close-confirmation-dialog.c:437 +#: src/eog-close-confirmation-dialog.c:404 #, c-format msgid "Save changes to image “%s” before closing?" msgstr "要在关闭之前保存更改到图像“%s”吗？" -#: src/eog-close-confirmation-dialog.c:652 +#: src/eog-close-confirmation-dialog.c:564 #, c-format msgid "There is %d image with unsaved changes. Save changes before closing?" msgid_plural "" "There are %d images with unsaved changes. Save changes before closing?" msgstr[0] "还有 %d 幅图像有没有保存的更改。在关闭之前保存更改？" -#: src/eog-close-confirmation-dialog.c:669 +#: src/eog-close-confirmation-dialog.c:584 msgid "S_elect the images you want to save:" msgstr "选择您想保存的图像(_E)：" #. Secondary label -#: src/eog-close-confirmation-dialog.c:688 +#: src/eog-close-confirmation-dialog.c:603 msgid "If you don’t save, all your changes will be lost." msgstr "如果不保存，您的所有更改都会丢失。" -#: src/eog-error-message-area.c:128 src/eog-window.c:881 +#: src/eog-error-message-area.c:128 src/eog-window.c:932 msgid "_Reload" msgstr "重新载入(_R)" @@ -1047,11 +1035,6 @@ "该图像包含多个页面。图像查看器只能显示第一页。\n" "您可以安装文档查看器来查看所有页面。" -#. A strftime-formatted string, to display the date the image was taken. -#: src/eog-exif-util.c:193 src/eog-exif-util.c:195 -msgid "%a, %d %B %Y %X" -msgstr "%Y年%m月%d日 %X" - #. TRANSLATORS: This is the actual focal length used when #. the image was taken. #: src/eog-exif-util.c:284 @@ -1119,30 +1102,37 @@ msgstr "打开文件夹" #: src/eog-image.c:566 +#, c-format msgid "Transformation on unloaded image." msgstr "转换未加载的图像。" #: src/eog-image.c:594 +#, c-format msgid "Transformation failed." msgstr "转换失败。" -#: src/eog-image.c:1074 +#: src/eog-image.c:1079 +#, c-format msgid "EXIF not supported for this file format." msgstr "这种文件格式不支持 EXIF。" -#: src/eog-image.c:1221 +#: src/eog-image.c:1226 +#, c-format msgid "Image loading failed." msgstr "图像载入失败。" -#: src/eog-image.c:1802 src/eog-image.c:1922 +#: src/eog-image.c:1807 src/eog-image.c:1927 +#, c-format msgid "No image loaded." msgstr "没有载入图像。" -#: src/eog-image.c:1810 src/eog-image.c:1931 +#: src/eog-image.c:1815 src/eog-image.c:1936 +#, c-format msgid "You do not have the permissions necessary to save the file." msgstr "您没有保存此文件必须的权限。" -#: src/eog-image.c:1820 src/eog-image.c:1942 +#: src/eog-image.c:1825 src/eog-image.c:1947 +#, c-format msgid "Temporary file creation failed." msgstr "临时文件创建失败。" @@ -1152,6 +1142,7 @@ msgstr "无法创建用于保存 %s 的临时文件" #: src/eog-image-jpeg.c:393 +#, c-format msgid "Couldn’t allocate memory for loading JPEG file" msgstr "无法分配用于载入 JPEG 文件的内存" @@ -1245,88 +1236,88 @@ msgid "Image Settings" msgstr "图像设置" -#: src/eog-print-image-setup.c:897 +#: src/eog-print-image-setup.c:896 msgid "Image" msgstr "图像" -#: src/eog-print-image-setup.c:898 +#: src/eog-print-image-setup.c:897 msgid "The image whose printing properties will be set up" msgstr "要设置打印属性的图像" -#: src/eog-print-image-setup.c:904 +#: src/eog-print-image-setup.c:903 msgid "Page Setup" msgstr "页面设置" -#: src/eog-print-image-setup.c:905 +#: src/eog-print-image-setup.c:904 msgid "The information for the page where the image will be printed" msgstr "即将用来打印图像的页面的信息" -#: src/eog-print-image-setup.c:931 +#: src/eog-print-image-setup.c:930 msgid "Position" msgstr "位置" -#: src/eog-print-image-setup.c:935 +#: src/eog-print-image-setup.c:934 msgid "_Left:" msgstr "左(_L)：" -#: src/eog-print-image-setup.c:937 +#: src/eog-print-image-setup.c:936 msgid "_Right:" msgstr "右(_R)：" -#: src/eog-print-image-setup.c:938 +#: src/eog-print-image-setup.c:937 msgid "_Top:" msgstr "上(_T)：" -#: src/eog-print-image-setup.c:939 +#: src/eog-print-image-setup.c:938 msgid "_Bottom:" msgstr "下(_B)：" -#: src/eog-print-image-setup.c:942 +#: src/eog-print-image-setup.c:941 msgid "C_enter:" msgstr "中(_E)：" -#: src/eog-print-image-setup.c:947 +#: src/eog-print-image-setup.c:946 msgid "None" msgstr "无" -#: src/eog-print-image-setup.c:949 +#: src/eog-print-image-setup.c:948 msgid "Horizontal" msgstr "水平" -#: src/eog-print-image-setup.c:951 +#: src/eog-print-image-setup.c:950 msgid "Vertical" msgstr "垂直" -#: src/eog-print-image-setup.c:953 +#: src/eog-print-image-setup.c:952 msgid "Both" msgstr "双向" -#: src/eog-print-image-setup.c:972 +#: src/eog-print-image-setup.c:971 msgid "_Width:" msgstr "宽度(_W)：" # SUN CHANGED MESSAGE -#: src/eog-print-image-setup.c:974 +#: src/eog-print-image-setup.c:973 msgid "_Height:" msgstr "高度(_H)：" -#: src/eog-print-image-setup.c:977 +#: src/eog-print-image-setup.c:976 msgid "_Scaling:" msgstr "缩放(_S)：" -#: src/eog-print-image-setup.c:988 +#: src/eog-print-image-setup.c:987 msgid "_Unit:" msgstr "单位(_U)：" -#: src/eog-print-image-setup.c:993 +#: src/eog-print-image-setup.c:992 msgid "Millimeters" msgstr "毫米" -#: src/eog-print-image-setup.c:995 +#: src/eog-print-image-setup.c:994 msgid "Inches" msgstr "英寸" -#: src/eog-print-image-setup.c:1024 +#: src/eog-print-image-setup.c:1023 msgid "Preview" msgstr "预览" @@ -1358,6 +1349,7 @@ msgstr "拍摄时间" #: src/eog-uri-converter.c:989 +#, c-format msgid "At least two file names are equal." msgstr "至少两个文件名相同。" @@ -1376,20 +1368,20 @@ #. * - image height #. * - image size in bytes #. * - zoom in percent -#: src/eog-window.c:543 +#: src/eog-window.c:547 #, c-format msgid "%i × %i pixel %s %i%%" msgid_plural "%i × %i pixels %s %i%%" msgstr[0] "%i × %i 像素 %s %i%%" -#: src/eog-window.c:883 src/eog-window.c:2617 +#: src/eog-window.c:934 src/eog-window.c:2677 msgctxt "MessageArea" msgid "Hi_de" msgstr "隐藏(_D)" #. The newline character is currently necessary due to a problem #. * with the automatic line break. -#: src/eog-window.c:893 +#: src/eog-window.c:944 #, c-format msgid "" "The image “%s” has been modified by an external application.\n" @@ -1403,22 +1395,22 @@ #. * - the original filename #. * - the current image's position in the queue #. * - the total number of images queued for saving -#: src/eog-window.c:1156 +#: src/eog-window.c:1218 #, c-format msgid "Saving image “%s” (%u/%u)" msgstr "正在保存图像“%s”（第 %u 个，共 %u 个）" -#: src/eog-window.c:1581 +#: src/eog-window.c:1642 #, c-format msgid "Opening image “%s”" msgstr "正在打开图像“%s”" #. L10N: This the reason why the screensaver is inhibited. -#: src/eog-window.c:1964 +#: src/eog-window.c:2028 msgid "Viewing a slideshow" msgstr "正在以幻灯片方式查看" -#: src/eog-window.c:2183 +#: src/eog-window.c:2247 #, c-format msgid "" "Error printing file:\n" @@ -1427,17 +1419,17 @@ "打印文件出错：\n" "%s" -#: src/eog-window.c:2566 src/eog-window.c:2581 +#: src/eog-window.c:2626 src/eog-window.c:2641 msgid "Error launching System Settings: " msgstr "启动系统设置时出错：" -#: src/eog-window.c:2615 +#: src/eog-window.c:2675 msgid "_Open Background Preferences" msgstr "打开背景首选项(_O)" #. The newline character is currently necessary due to a problem #. * with the automatic line break. -#: src/eog-window.c:2631 +#: src/eog-window.c:2691 #, c-format msgid "" "The image “%s” has been set as Desktop Background.\n" @@ -1446,18 +1438,18 @@ "图像“%s”已设为桌面背景。\n" "您想修改它的外观吗？" -#: src/eog-window.c:3121 +#: src/eog-window.c:3181 msgid "Saving image locally…" msgstr "本地保存图像…" -#: src/eog-window.c:3199 +#: src/eog-window.c:3259 #, c-format msgid "" "Are you sure you want to remove\n" "“%s” permanently?" msgstr "您要永久删除“%s”吗？" -#: src/eog-window.c:3202 +#: src/eog-window.c:3262 #, c-format msgid "" "Are you sure you want to remove\n" @@ -1469,38 +1461,41 @@ "您确定要永久删除选中的\n" "这 %d 张图像吗？" -#: src/eog-window.c:3224 src/eog-window.c:3490 +#: src/eog-window.c:3284 src/eog-window.c:3550 msgid "_Delete" msgstr "删除(_D)" -#: src/eog-window.c:3227 src/eog-window.c:3492 +#: src/eog-window.c:3287 src/eog-window.c:3552 msgid "_Yes" msgstr "是(_Y)" #. add 'dont ask again' button -#: src/eog-window.c:3231 src/eog-window.c:3484 +#: src/eog-window.c:3291 src/eog-window.c:3544 msgid "Do _not ask again during this session" msgstr "在该会话期间不再询问(_N)" -#: src/eog-window.c:3275 +#: src/eog-window.c:3335 +#, c-format msgid "Couldn’t retrieve image file" msgstr "无法获取图像文件" -#: src/eog-window.c:3291 +#: src/eog-window.c:3351 +#, c-format msgid "Couldn’t retrieve image file information" msgstr "无法获取图像文件信息" -#: src/eog-window.c:3307 src/eog-window.c:3551 +#: src/eog-window.c:3367 src/eog-window.c:3611 +#, c-format msgid "Couldn’t delete file" msgstr "无法删除文件" #. set dialog error message -#: src/eog-window.c:3357 src/eog-window.c:3651 +#: src/eog-window.c:3417 src/eog-window.c:3711 #, c-format msgid "Error on deleting image %s" msgstr "删除图像 %s 出错" -#: src/eog-window.c:3452 +#: src/eog-window.c:3512 #, c-format msgid "" "Are you sure you want to move\n" @@ -1509,14 +1504,14 @@ "您真的想要将“%s”\n" "移至回收站吗？" -#: src/eog-window.c:3455 +#: src/eog-window.c:3515 #, c-format msgid "" "A trash for “%s” couldn’t be found. Do you want to remove this image " "permanently?" msgstr "无法找到可用于“%s”的回收站。您想要将此图像永久移除吗？" -#: src/eog-window.c:3460 +#: src/eog-window.c:3520 #, c-format msgid "" "Are you sure you want to move\n" @@ -1528,33 +1523,34 @@ "您真的想要将 %d 个\n" "选中的图像移至回收站吗？" -#: src/eog-window.c:3465 +#: src/eog-window.c:3525 msgid "" "Some of the selected images can’t be moved to the trash and will be removed " "permanently. Are you sure you want to proceed?" msgstr "有些所选择的图像无法移动到回收站并将永久移除。您确定要这样进行吗？" -#: src/eog-window.c:3529 src/eog-window.c:3543 +#: src/eog-window.c:3589 src/eog-window.c:3603 +#, c-format msgid "Couldn’t access trash." msgstr "无法访问回收站。" -#: src/eog-window.c:4210 +#: src/eog-window.c:4270 msgid "Shrink or enlarge the current image" msgstr "缩小或放大当前图像" -#: src/eog-window.c:4269 +#: src/eog-window.c:4329 msgid "Show the current image in fullscreen mode" msgstr "在全屏模式中显示当前图像" -#: src/eog-window.c:4346 +#: src/eog-window.c:4406 msgid "Properties" msgstr "属性" -#: src/eog-window.c:5511 +#: src/eog-window.c:5571 msgid "The GNOME image viewer." msgstr "GNOME 图像查看器。" -#: src/eog-window.c:5514 +#: src/eog-window.c:5574 msgid "translator-credits" msgstr "" "开源软件国际化之简体中文组\n" @@ -1566,8 +1562,8 @@ "李炜 <[email protected]>, 2011\n" "Julius Wong<[email protected]>, 2011\n" "tuhaihe <[email protected]>, 2013\n" -"Dingzhong Chen <[email protected]>, 2016\n" -"Mingcong Bai <[email protected]>, 2015, 2017" +"Mingcong Bai <[email protected]>, 2015, 2017\n" +"Dingzhong Chen <[email protected]>, 2016, 2019" #. L10N: This is a percentage value used for the image zoom. #. * This should be translated similar to the statusbar zoom value. @@ -1615,6 +1611,24 @@ msgid "Run “%s --help” to see a full list of available command line options." msgstr "运行“%s --help”来查看可用命令行选项的完整列表。" +#~ msgid "_About" +#~ msgstr "关于(_A)" + +#~ msgid "_Quit" +#~ msgstr "退出(_Q)" + +#~ msgid "eog" +#~ msgstr "eog" + +#~ msgid "view-fullscreen" +#~ msgstr "view-fullscreen" + +#~ msgid "view-refresh" +#~ msgstr "view-refresh" + +#~ msgid "Question" +#~ msgstr "问题" + #~ msgid "Fit the image to the window" #~ msgstr "使图像适合窗口" @@ -1806,9 +1820,6 @@ #~ msgid "Edit Image" #~ msgstr "编辑图像" -#~ msgid "_About Image Viewer" -#~ msgstr "关于图像查看器(_A)" - #~ msgctxt "PrefDlgSlideSwitchPrefix" #~ msgid "_Switch image after:" #~ msgstr "切换图像的时间(_S)：" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/eog-3.32.1/src/eog-metadata-reader-png.c new/eog-3.32.2/src/eog-metadata-reader-png.c --- old/eog-3.32.1/src/eog-metadata-reader-png.c 2019-04-08 22:36:51.000000000 +0200 +++ new/eog-3.32.2/src/eog-metadata-reader-png.c 2019-05-20 21:24:42.000000000 +0200 @@ -25,6 +25,7 @@ #include <config.h> #endif +#include <math.h> #include <string.h> #include <zlib.h> @@ -489,6 +490,31 @@ * A maximum output buffer of 5MB should be enough. */ #define EOG_ICC_INFLATE_BUFFER_LIMIT (1024*1024*5) +/* Apparently an sRGB profile saved in cHRM and gAMA chunks does not compute + * a profile that exactly matches the built-in sRGB profile and thus could + * cause a slight color deviation. Try catching this case to allow fallback + * to the built-in profile instead. + */ +static gboolean +_chrm_matches_srgb(const cmsCIExyY *whitepoint, + const cmsCIExyYTRIPLE *primaries, + gdouble gammaValue) +{ + /* PNGs gAMA value for 2.2 is only accurate to the 4th decimal point */ +#define DOUBLE_EQUAL_MAX_DIFF 1e-4 +#define DOUBLE_EQUAL(a,b) (fabs (a - b) < DOUBLE_EQUAL_MAX_DIFF) + + return (DOUBLE_EQUAL(gammaValue, 2.2) + && DOUBLE_EQUAL(whitepoint->x, 0.3127) + && DOUBLE_EQUAL(whitepoint->y, 0.329) + && DOUBLE_EQUAL(primaries->Red.x, 0.64) + && DOUBLE_EQUAL(primaries->Red.y, 0.33) + && DOUBLE_EQUAL(primaries->Green.x, 0.3) + && DOUBLE_EQUAL(primaries->Green.y, 0.6) + && DOUBLE_EQUAL(primaries->Blue.x, 0.15) + && DOUBLE_EQUAL(primaries->Blue.y, 0.06)); +} + static gpointer eog_metadata_reader_png_get_icc_profile (EogMetadataReaderPng *emr) { @@ -574,11 +600,11 @@ profile = cmsCreate_sRGBProfile (); } - if (!profile && priv->cHRM_chunk) { + if (!profile && priv->cHRM_chunk && priv->gAMA_chunk) { cmsCIExyY whitepoint; cmsCIExyYTRIPLE primaries; cmsToneCurve *gamma[3]; - double gammaValue = 2.2; // 2.2 should be a sane default gamma + double gammaValue; /* This uglyness extracts the chromacity and whitepoint values * from a PNG's cHRM chunk. These can be accurate up to the @@ -597,19 +623,23 @@ primaries.Blue.x = EXTRACT_DOUBLE_UINT_BLOCK_OFFSET (priv->cHRM_chunk, 6, 100000); primaries.Blue.y = EXTRACT_DOUBLE_UINT_BLOCK_OFFSET (priv->cHRM_chunk, 7, 100000); - primaries.Red.Y = primaries.Green.Y = primaries.Blue.Y = 1.0; + whitepoint.Y = primaries.Red.Y = primaries.Green.Y = primaries.Blue.Y = 1.0; - /* If the gAMA_chunk is present use its value which is saved - * the same way as the whitepoint. Use 2.2 as default value if - * the chunk is not present. */ - if (priv->gAMA_chunk) - gammaValue = (double) 1.0/EXTRACT_DOUBLE_UINT_BLOCK_OFFSET (priv->gAMA_chunk, 0, 100000); + gammaValue = (double) 1.0/EXTRACT_DOUBLE_UINT_BLOCK_OFFSET (priv->gAMA_chunk, 0, 100000); + eog_debug_message (DEBUG_LCMS, "Gamma %.5lf", gammaValue); - gamma[0] = gamma[1] = gamma[2] = cmsBuildGamma (NULL, gammaValue); - - profile = cmsCreateRGBProfile (&whitepoint, &primaries, gamma); - - cmsFreeToneCurve(gamma[0]); + /* Catch SRGB in cHRM/gAMA chunks and use accurate built-in + * profile instead of computing one that "gets close". */ + if(_chrm_matches_srgb (&whitepoint, &primaries, gammaValue)) { + eog_debug_message (DEBUG_LCMS, "gAMA and cHRM match sRGB"); + profile = cmsCreate_sRGBProfile (); + } else { + gamma[0] = gamma[1] = gamma[2] = + cmsBuildGamma (NULL, gammaValue); + profile = cmsCreateRGBProfile (&whitepoint, &primaries, + gamma); + cmsFreeToneCurve(gamma[0]); + } } return profile;
